Mesa (master): st/va: Added support for NV12 to IYUV conversion in vlVaGetImage

[Christian König]

Module: Mesa
Branch: master
Commit: b0a44f1017be51c3eb612da2a6ccd5df5695c25a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b0a44f1017be51c3eb612da2a6ccd5df5695c25a

Author: Indrajit Das <indrajit-kumar.das at amd.com>
Date:   Fri Oct 16 12:36:45 2015 +0530

st/va: Added support for NV12 to IYUV conversion in vlVaGetImage

Reviewed-by: Christian König <christian.koenig at amd.com>

---

 src/gallium/state_trackers/va/image.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gallium/state_trackers/va/image.c b/src/gallium/state_trackers/va/image.c
index 3b36430..b37a971 100644
--- a/src/gallium/state_trackers/va/image.c
+++ b/src/gallium/state_trackers/va/image.c
@@ -240,9 +240,11 @@ vlVaGetImage(VADriverContextP ctx, VASurfaceID surface, int x, int y,
       return VA_STATUS_ERROR_OPERATION_FAILED;
 
    if (format != surf->buffer->buffer_format) {
-      /* support NV12 to YV12 conversion now only */
-      if (format == PIPE_FORMAT_YV12 &&
-          surf->buffer->buffer_format == PIPE_FORMAT_NV12)
+      /* support NV12 to YV12 and IYUV conversion now only */
+      if ((format == PIPE_FORMAT_YV12 &&
+          surf->buffer->buffer_format == PIPE_FORMAT_NV12) ||
+          (format == PIPE_FORMAT_IYUV &&
+          surf->buffer->buffer_format == PIPE_FORMAT_NV12))
          convert = true;
       else
          return VA_STATUS_ERROR_OPERATION_FAILED;