[vlc-commits] DXVA2: list more GUID available from the official DxVA docs
Steve Lhomme
git at videolan.org
Fri Apr 10 15:03:49 CEST 2015
vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Fri Apr 3 13:33:40 2015 +0000| [a82a8e7105be992cedc0a9499ebfb20850531b2e] | committer: Jean-Baptiste Kempf
DXVA2: list more GUID available from the official DxVA docs
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a82a8e7105be992cedc0a9499ebfb20850531b2e
---
modules/codec/avcodec/dxva2.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index b7e8f51..b7be2b0 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -99,6 +99,11 @@ MS_GUID (DXVA_NoEncrypt, 0x1b81bed0, 0xa0c7, 0x11d3,
MS_GUID (DXVA2_ModeMPEG2_MoComp, 0xe6a9f44b, 0x61b0, 0x4563, 0x9e, 0xa4, 0x63, 0xd2, 0xa3, 0xc6, 0xfe, 0x66);
MS_GUID (DXVA2_ModeMPEG2_IDCT, 0xbf22ad00, 0x03ea, 0x4690, 0x80, 0x77, 0x47, 0x33, 0x46, 0x20, 0x9b, 0x7e);
MS_GUID (DXVA2_ModeMPEG2_VLD, 0xee27417f, 0x5e28, 0x4e65, 0xbe, 0xea, 0x1d, 0x26, 0xb5, 0x08, 0xad, 0xc9);
+DEFINE_GUID(DXVA_ModeMPEG1_A, 0x1b81be09, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+DEFINE_GUID(DXVA_ModeMPEG2_A, 0x1b81be0A, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+DEFINE_GUID(DXVA_ModeMPEG2_B, 0x1b81be0B, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+DEFINE_GUID(DXVA_ModeMPEG2_C, 0x1b81be0C, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+DEFINE_GUID(DXVA_ModeMPEG2_D, 0x1b81be0D, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
DEFINE_GUID(DXVA2_ModeMPEG2and1_VLD, 0x86695f12, 0x340e, 0x4f04, 0x9f, 0xd3, 0x92, 0x53, 0xdd, 0x32, 0x74, 0x60);
DEFINE_GUID(DXVA2_ModeMPEG1_VLD, 0x6f3ec719, 0x3735, 0x42cc, 0x80, 0x63, 0x65, 0xcc, 0x3c, 0xb3, 0x66, 0x16);
@@ -148,6 +153,16 @@ DEFINE_GUID(DXVA_ModeH264_VLD_SVC_Restricted_Scalable_Baseline, 0x9b8175
DEFINE_GUID(DXVA_ModeH264_VLD_SVC_Scalable_High, 0x728012c9, 0x66a8, 0x422f, 0x97, 0xe9, 0xb5, 0xe3, 0x9b, 0x51, 0xc0, 0x53);
DEFINE_GUID(DXVA_ModeH264_VLD_SVC_Restricted_Scalable_High_Progressive, 0x8efa5926, 0xbd9e, 0x4b04, 0x8b, 0x72, 0x8f, 0x97, 0x7d, 0xc4, 0x4c, 0x36);
+DEFINE_GUID(DXVA_ModeH261_A, 0x1b81be01, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+DEFINE_GUID(DXVA_ModeH261_B, 0x1b81be02, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+
+DEFINE_GUID(DXVA_ModeH263_A, 0x1b81be03, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+DEFINE_GUID(DXVA_ModeH263_B, 0x1b81be04, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+DEFINE_GUID(DXVA_ModeH263_C, 0x1b81be05, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+DEFINE_GUID(DXVA_ModeH263_D, 0x1b81be06, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+DEFINE_GUID(DXVA_ModeH263_E, 0x1b81be07, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+DEFINE_GUID(DXVA_ModeH263_F, 0x1b81be08, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+
/* */
typedef struct {
@@ -159,6 +174,11 @@ typedef struct {
/* XXX Prefered modes must come first */
static const dxva2_mode_t dxva2_modes[] = {
/* MPEG-1/2 */
+ { "MPEG-1 decoder, restricted profile A", &DXVA_ModeMPEG1_A, 0, 0 },
+ { "MPEG-2 decoder, restricted profile A", &DXVA_ModeMPEG2_A, 0, 0 },
+ { "MPEG-2 decoder, restricted profile B", &DXVA_ModeMPEG2_B, 0, 0 },
+ { "MPEG-2 decoder, restricted profile C", &DXVA_ModeMPEG2_C, 0, 0 },
+ { "MPEG-2 decoder, restricted profile D", &DXVA_ModeMPEG2_D, 0, 0 },
{ "MPEG-2 variable-length decoder", &DXVA2_ModeMPEG2_VLD, AV_CODEC_ID_MPEG2VIDEO, FF_PROFILE_MPEG2_SIMPLE },
{ "MPEG-2 & MPEG-1 variable-length decoder", &DXVA2_ModeMPEG2and1_VLD, AV_CODEC_ID_MPEG2VIDEO, FF_PROFILE_MPEG2_MAIN },
{ "MPEG-2 motion compensation", &DXVA2_ModeMPEG2_MoComp, 0, 0 },
@@ -224,6 +244,18 @@ static const dxva2_mode_t dxva2_modes[] = {
{ "HEVC Main profile", &DXVA_ModeHEVC_VLD_Main, AV_CODEC_ID_HEVC, FF_PROFILE_HEVC_MAIN },
{ "HEVC Main 10 profile", &DXVA_ModeHEVC_VLD_Main10, AV_CODEC_ID_HEVC, FF_PROFILE_HEVC_MAIN_10 },
+ /* H.261 */
+ { "H.261 decoder, restricted profile A", &DXVA_ModeH261_A, 0, 0 },
+ { "H.261 decoder, restricted profile B", &DXVA_ModeH261_B, 0, 0 },
+
+ /* H.261 */
+ { "H.263 decoder, restricted profile A", &DXVA_ModeH263_A, 0, 0 },
+ { "H.263 decoder, restricted profile B", &DXVA_ModeH263_B, 0, 0 },
+ { "H.263 decoder, restricted profile C", &DXVA_ModeH263_C, 0, 0 },
+ { "H.263 decoder, restricted profile D", &DXVA_ModeH263_D, 0, 0 },
+ { "H.263 decoder, restricted profile E", &DXVA_ModeH263_E, 0, 0 },
+ { "H.263 decoder, restricted profile F", &DXVA_ModeH263_F, 0, 0 },
+
{ NULL, NULL, 0, 0 }
};
More information about the vlc-commits
mailing list