vaapi: recognize P012, Y212, and Y412 VAImages (#2768) (#2985)

In FFmpeg VAAPI path, the following fourcc codes are used for 12bit contents VA_FOURCC_P012 4:2:0 12bit VA_FOURCC_Y212 4:2:2 12bit VA_FOURCC_Y412 4:4:4 12bit We should use these codes too in FFmpeg QSV path, hence add mapping P012/Y212/Y412 here
Intel-Media-SDK · Sep 13, 2022 · 070e7de · 070e7de
1 parent d057770
commit 070e7de
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/_studio/shared/src/libmfx_allocator_vaapi.cpp b/_studio/shared/src/libmfx_allocator_vaapi.cpp
@@ -568,14 +568,17 @@ mfxStatus mfxDefaultAllocatorVAAPI::SetFrameData(const VAImage &va_image, mfxU32
     case VA_FOURCC_P010:
 #if (MFX_VERSION >= 1031)
     case VA_FOURCC_P016:
+    case VA_FOURCC_P012:
 #endif
-        if (mfx_fourcc != va_image.format.fourcc) return MFX_ERR_LOCK_MEMORY;
-
+        if ((mfx_fourcc == MFX_FOURCC_P010 && va_image.format.fourcc == VA_FOURCC_P010) ||
+            (mfx_fourcc == MFX_FOURCC_P016 && (va_image.format.fourcc == VA_FOURCC_P012 ||
+                                               va_image.format.fourcc == VA_FOURCC_P016)))
         {
             ptr->Y = p_buffer + va_image.offsets[0];
             ptr->U = p_buffer + va_image.offsets[1];
             ptr->V = ptr->U + sizeof(mfxU16);
         }
+        else return MFX_ERR_LOCK_MEMORY;
         break;
 
     case VA_FOURCC_AYUV:
@@ -597,14 +600,17 @@ mfxStatus mfxDefaultAllocatorVAAPI::SetFrameData(const VAImage &va_image, mfxU32
     case VA_FOURCC_Y210:
 #if (MFX_VERSION >= 1031)
     case VA_FOURCC_Y216:
+    case VA_FOURCC_Y212:
 #endif
-        if (mfx_fourcc != va_image.format.fourcc) return MFX_ERR_LOCK_MEMORY;
-
+        if ((mfx_fourcc == MFX_FOURCC_Y210 && va_image.format.fourcc == VA_FOURCC_Y210) ||
+            (mfx_fourcc == MFX_FOURCC_Y216 && (va_image.format.fourcc == VA_FOURCC_Y216 ||
+                                               va_image.format.fourcc == VA_FOURCC_Y212)))
         {
             ptr->Y16 = (mfxU16 *) (p_buffer + va_image.offsets[0]);
             ptr->U16 = ptr->Y16 + 1;
             ptr->V16 = ptr->Y16 + 3;
         }
+        else return MFX_ERR_LOCK_MEMORY;
         break;
 
     case VA_FOURCC_Y410:
@@ -619,14 +625,15 @@ mfxStatus mfxDefaultAllocatorVAAPI::SetFrameData(const VAImage &va_image, mfxU32
 
 #if (MFX_VERSION >= 1031)
     case VA_FOURCC_Y416:
-        if (mfx_fourcc != va_image.format.fourcc) return MFX_ERR_LOCK_MEMORY;
-
+    case VA_FOURCC_Y412:
+        if (mfx_fourcc == MFX_FOURCC_Y416)
         {
             ptr->U16 = (mfxU16 *) (p_buffer + va_image.offsets[0]);
             ptr->Y16 = ptr->U16 + 1;
             ptr->V16 = ptr->Y16 + 1;
             ptr->A   = (mfxU8 *)(ptr->V16 + 1);
         }
+        else return MFX_ERR_LOCK_MEMORY;
         break;
 
 #endif