From: Leo Liu <leo.liu@amd.com>
Date: Tue, 15 Aug 2017 16:33:21 +0000 (-0400)
Subject: st/va: reallocate surface with YUYV stream
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5608f442712dc7ae7855c1bfd8059e1a62d721c7;p=mesa.git

st/va: reallocate surface with YUYV stream

Signed-off-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
---

diff --git a/src/gallium/state_trackers/va/picture.c b/src/gallium/state_trackers/va/picture.c
index 1e1212dd7a9..e0287d30f2c 100644
--- a/src/gallium/state_trackers/va/picture.c
+++ b/src/gallium/state_trackers/va/picture.c
@@ -592,6 +592,7 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID context_id)
    void *feedback;
    struct pipe_screen *screen;
    bool interlaced;
+   bool realloc = false;
 
    if (!ctx)
       return VA_STATUS_ERROR_INVALID_CONTEXT;
@@ -627,7 +628,23 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID context_id)
       surf->templat.interlaced = screen->get_video_param(screen, context->decoder->profile,
                                                          PIPE_VIDEO_ENTRYPOINT_BITSTREAM,
                                                          PIPE_VIDEO_CAP_PREFERS_INTERLACED);
+      realloc = true;
+   }
+
+   if (u_reduce_video_profile(context->templat.profile) == PIPE_VIDEO_FORMAT_JPEG &&
+       surf->buffer->buffer_format == PIPE_FORMAT_NV12) {
+      if (context->mjpeg.sampling_factor == 0x211111 ||
+          context->mjpeg.sampling_factor == 0x221212) {
+         surf->templat.buffer_format = PIPE_FORMAT_YUYV;
+         realloc = true;
+      } else if (context->mjpeg.sampling_factor != 0x221111) {
+         /* Not NV12 either */
+         mtx_unlock(&drv->mutex);
+         return VA_STATUS_ERROR_INVALID_SURFACE;
+      }
+   }
 
+   if (realloc) {
       surf->buffer->destroy(surf->buffer);
 
       if (vlVaHandleSurfaceAllocate(ctx, surf, &surf->templat) != VA_STATUS_SUCCESS) {