[vlc-commits] DxVA2: add some more GUID

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jun  3 00:45:47 2011 +0200| [b640fe3e5a66b0bd438732c10b3cd680655335dc] | committer: Jean-Baptiste Kempf

DxVA2: add some more GUID

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

 modules/codec/avcodec/dxva2.c |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index b1f2bf1..d309b6f 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -71,6 +71,9 @@ static const GUID DXVA2_ModeMPEG2_IDCT = {
 static const GUID DXVA2_ModeMPEG2_VLD = {
     0xee27417f, 0x5e28,0x4e65, {0xbe,0xea,0x1d,0x26,0xb5,0x08,0xad,0xc9}
 };
+static const GUID DXVA2_ModeMPEG2and1_VLD = {
+    0x86695f12, 0x340e,0x4f04, {0x9f,0xd3,0x92,0x53,0xdd,0x32,0x74,0x60}
+};
 
 static const GUID DXVA2_ModeH264_A = {
     0x1b81be64, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
@@ -96,7 +99,7 @@ static const GUID DXVADDI_Intel_ModeH264_A = {
 static const GUID DXVADDI_Intel_ModeH264_C = {
     0x604F8E66, 0x4951,0x4c54, {0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6}
 };
-static const GUID DXVADDI_Intel_ModeH264_E = {
+static const GUID DXVADDI_Intel_ModeH264_E = { // DXVA_Intel_H264_ClearVideo
     0x604F8E68, 0x4951,0x4c54, {0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6}
 };
 static const GUID DXVA2_ModeWMV8_A = {
@@ -132,6 +135,14 @@ static const GUID DXVA_NoEncrypt = {
     0x1b81bed0, 0xa0c7,0x11d3, {0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5}
 };
 
+static const GUID DXVA_Intel_VC1_ClearVideo = {
+    0xBCC5DB6D, 0xA2B6,0x4AF0, {0xAC,0xE4,0xAD,0xB1,0xF7,0x87,0xBC,0x89}
+};
+
+static const GUID DXVA_nVidia_MPEG4_ASP = {
+    0x9947EC6F, 0x689B,0x11DC, {0xA3,0x20,0x00,0x19,0xDB,0xBC,0x41,0x84}
+};
+
 /* */
 typedef struct {
     const char   *name;
@@ -141,12 +152,13 @@ typedef struct {
 /* XXX Prefered modes must come first */
 static const dxva2_mode_t dxva2_modes[] = {
     { "MPEG-2 variable-length decoder",            &DXVA2_ModeMPEG2_VLD,     CODEC_ID_MPEG2VIDEO },
+    { "MPEG-2 & MPEG-1 variable-length decoder",   &DXVA2_ModeMPEG2and1_VLD, CODEC_ID_MPEG2VIDEO },
     { "MPEG-2 motion compensation",                &DXVA2_ModeMPEG2_MoComp,  0 },
     { "MPEG-2 inverse discrete cosine transform",  &DXVA2_ModeMPEG2_IDCT,    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)",           &DXVADDI_Intel_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             },
@@ -167,6 +179,10 @@ static const dxva2_mode_t dxva2_modes[] = {
     { "VC-1 motion compensation",                  &DXVA2_ModeVC1_B, 0 },
     { "VC-1 post processing",                      &DXVA2_ModeVC1_A, 0 },
 
+    { "VC-1 variable-length decoder (Intel)",      &DXVA_Intel_VC1_ClearVideo, 0 },
+
+    { "MPEG-4 ASP nVidia bitstream decoder",       &DXVA_nVidia_MPEG4_ASP, 0 },
+
     { NULL, NULL, 0 }
 };