[Encode] XRGB force to do swizzle for AVC/HEVC

This is to fix msdkh264enc/msdkh265enc incorrect encoded output when having BGRx input. Signed-off-by: Cheah, Vincent Beng Keat <[email protected]>
SiewHoon · Nov 16, 2023 · 433068b · 433068b
1 parent f8d5f6e
commit 433068b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/media_softlet/linux/common/codec/ddi/enc/ddi_encode_avc_specific.h b/media_softlet/linux/common/codec/ddi/enc/ddi_encode_avc_specific.h
@@ -557,6 +557,7 @@ class DdiEncodeAvc : public encode::DdiEncodeBase
     inline bool NeedDisplayFormatSwizzle(DDI_MEDIA_SURFACE *rawSurface)
     {
         if (Media_Format_A8R8G8B8 == rawSurface->format ||
+            Media_Format_X8R8G8B8 == rawSurface->format ||
             Media_Format_B10G10R10A2 == rawSurface->format)
         {
             return true;

diff --git a/media_softlet/linux/common/codec/ddi/enc/ddi_encode_hevc_specific.h b/media_softlet/linux/common/codec/ddi/enc/ddi_encode_hevc_specific.h
@@ -293,14 +293,16 @@ class DdiEncodeHevc : public encode::DdiEncodeBase
         bool ret = false;
 
         if (Media_Format_A8R8G8B8 == rawSurface->format ||
-           Media_Format_B10G10R10A2 == rawSurface->format)
+            Media_Format_X8R8G8B8 == rawSurface->format ||
+            Media_Format_B10G10R10A2 == rawSurface->format)
         {
             ret = true;
         }
 
         if (ret &&
             (Media_Format_A8R8G8B8 == reconSurface->format ||
-            Media_Format_B10G10R10A2 == reconSurface->format))
+             Media_Format_X8R8G8B8 == reconSurface->format ||
+             Media_Format_B10G10R10A2 == reconSurface->format))
         {
             ret = false;
         }