vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Fri Dec 9 12:36:30 2011 +0100| [7b91aa21f97edd6daabb06ae3565137cfd579eac] | committer: Jean-Baptiste Kempf
DxVA: Re-format the table Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7b91aa21f97edd6daabb06ae3565137cfd579eac --- modules/codec/avcodec/dxva2.c | 87 ++++++++++++++++++++++------------------- 1 files changed, 47 insertions(+), 40 deletions(-) diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c index 31762cd..8a8ed16 100644 --- a/modules/codec/avcodec/dxva2.c +++ b/modules/codec/avcodec/dxva2.c @@ -184,46 +184,53 @@ typedef struct { } dxva2_mode_t; /* 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 }, - - { "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 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 }, - - { "Windows Media Video 9 IDCT", &DXVA2_ModeWMV9_C, 0 }, - { "Windows Media Video 9 motion compensation", &DXVA2_ModeWMV9_B, 0 }, - { "Windows Media Video 9 post processing", &DXVA2_ModeWMV9_A, 0 }, - - { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, CODEC_ID_VC1 }, - { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, CODEC_ID_WMV3 }, - { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, CODEC_ID_VC1 }, - { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, CODEC_ID_WMV3 }, - { "VC-1 inverse discrete cosine transform", &DXVA2_ModeVC1_C, 0 }, - { "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 }, - { "VC-1 variable-length decoder 2 (Intel)", &DXVA_Intel_VC1_ClearVideo_2, 0 }, - - { "MPEG-4 Part 2 nVidia bitstream decoder", &DXVA_nVidia_MPEG4_ASP, 0 }, - { "MPEG-4 Part 2 variable-length decoder, Simple Profile", &DXVA_ModeMPEG4pt2_VLD_Simple, 0 }, - { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, no global motion compensation", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_NoGMC, 0 }, - { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, global motion compensation", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_GMC, 0 }, + /* MPEG-1/2 */ + { "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 }, + + { "MPEG-1 variable-length decoder", &DXVA2_ModeMPEG1_VLD, 0 }, + + /* H.264 */ + { "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 }, + + /* WMV */ + { "Windows Media Video 8 motion compensation", &DXVA2_ModeWMV8_B, 0 }, + { "Windows Media Video 8 post processing", &DXVA2_ModeWMV8_A, 0 }, + + { "Windows Media Video 9 IDCT", &DXVA2_ModeWMV9_C, 0 }, + { "Windows Media Video 9 motion compensation", &DXVA2_ModeWMV9_B, 0 }, + { "Windows Media Video 9 post processing", &DXVA2_ModeWMV9_A, 0 }, + + /* VC-1 */ + { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, CODEC_ID_VC1 }, + { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, CODEC_ID_WMV3 }, + { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, CODEC_ID_VC1 }, + { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, CODEC_ID_WMV3 }, + { "VC-1 variable-length decoder 2 (Intel)", &DXVA_Intel_VC1_ClearVideo_2, 0 }, + { "VC-1 variable-length decoder (Intel)", &DXVA_Intel_VC1_ClearVideo, 0 }, + + { "VC-1 inverse discrete cosine transform", &DXVA2_ModeVC1_C, 0 }, + { "VC-1 motion compensation", &DXVA2_ModeVC1_B, 0 }, + { "VC-1 post processing", &DXVA2_ModeVC1_A, 0 }, + + /* Xvid/Divx: TODO */ + { "MPEG-4 Part 2 nVidia bitstream decoder", &DXVA_nVidia_MPEG4_ASP, 0 }, + { "MPEG-4 Part 2 variable-length decoder, Simple Profile", &DXVA_ModeMPEG4pt2_VLD_Simple, 0 }, + { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, no GMC", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_NoGMC, 0 }, + { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, GMC", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_GMC, 0 }, { NULL, NULL, 0 } }; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
