[vlc-commits] DxVA2: add the GUID for H264/VLD With FMO/ASO

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jun 16 12:51:13 2011 +0200| [7243b753bae1f03d30380f2703ee9d1717e31d08] | committer: Jean-Baptiste Kempf

DxVA2: add the GUID for H264/VLD With FMO/ASO

As per the updated specification of December 2010

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7243b753bae1f03d30380f2703ee9d1717e31d08
---

 modules/codec/avcodec/dxva2.c |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index b0e27f4..e4ca528 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -96,6 +96,9 @@ static const GUID DXVA2_ModeH264_E = {
 static const GUID DXVA2_ModeH264_F = {
     0x1b81be69, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
 };
+static const GUID DXVA_ModeH264_VLD_WithFMOASO_NoFGT = {
+    0xd5f04ff9, 0x3418,0x45d8, {0x95,0x61,0x32,0xa7,0x6a,0xae,0x2d,0xdd}
+};
 static const GUID DXVADDI_Intel_ModeH264_A = {
     0x604F8E64, 0x4951,0x4c54, {0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6}
 };
@@ -165,15 +168,16 @@ static const dxva2_mode_t dxva2_modes[] = {
 
     { "MPEG-1 variable-length decoder",            &DXVA2_ModeMPEG1_VLD,     0 },
 
-    { "H.264 variable-length decoder, film grain technology",                      &DXVA2_ModeH264_F,         CODEC_ID_H264 },
-    { "H.264 variable-length decoder, no film grain technology",                   &DXVA2_ModeH264_E,         CODEC_ID_H264 },
-    { "H.264 variable-length decoder, no film grain technology (Intel ClearVideo)",&DXVADDI_Intel_ModeH264_E, CODEC_ID_H264 },
-    { "H.264 inverse discrete cosine transform, film grain technology",            &DXVA2_ModeH264_D,         0             },
-    { "H.264 inverse discrete cosine transform, no film grain technology",         &DXVA2_ModeH264_C,         0             },
-    { "H.264 inverse discrete cosine transform, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_C, 0             },
-    { "H.264 motion compensation, film grain technology",                          &DXVA2_ModeH264_B,         0             },
-    { "H.264 motion compensation, no film grain technology",                       &DXVA2_ModeH264_A,         0             },
-    { "H.264 motion compensation, no film grain technology (Intel)",               &DXVADDI_Intel_ModeH264_A, 0             },
+    { "H.264 variable-length decoder, film grain technology",                      &DXVA2_ModeH264_F,                   CODEC_ID_H264 },
+    { "H.264 variable-length decoder, no film grain technology",                   &DXVA2_ModeH264_E,                   CODEC_ID_H264 },
+    { "H.264 variable-length decoder, no film grain technology (Intel ClearVideo)",&DXVADDI_Intel_ModeH264_E,           CODEC_ID_H264 },
+    { "H.264 variable-length decoder, no film grain technology, FMO/ASO",          &DXVA_ModeH264_VLD_WithFMOASO_NoFGT, CODEC_ID_H264 },
+    { "H.264 inverse discrete cosine transform, film grain technology",            &DXVA2_ModeH264_D,                   0             },
+    { "H.264 inverse discrete cosine transform, no film grain technology",         &DXVA2_ModeH264_C,                   0             },
+    { "H.264 inverse discrete cosine transform, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_C,           0             },
+    { "H.264 motion compensation, film grain technology",                          &DXVA2_ModeH264_B,                   0             },
+    { "H.264 motion compensation, no film grain technology",                       &DXVA2_ModeH264_A,                   0             },
+    { "H.264 motion compensation, no film grain technology (Intel)",               &DXVADDI_Intel_ModeH264_A,           0             },
 
     { "Windows Media Video 8 motion compensation", &DXVA2_ModeWMV8_B, 0 },
     { "Windows Media Video 8 post processing",     &DXVA2_ModeWMV8_A, 0 },