[vlc-devel] [PATCH 7/7] directx_va: set the workaround flags directly in directx_va_mode_t
Steve Lhomme
robux4 at ycbcr.xyz
Fri Oct 4 15:15:58 CEST 2019
---
modules/codec/avcodec/d3d11va.c | 4 +-
modules/codec/avcodec/directx_va.c | 137 +++++++++++++++--------------
modules/codec/avcodec/directx_va.h | 1 +
modules/codec/avcodec/dxva2.c | 4 +-
4 files changed, 74 insertions(+), 72 deletions(-)
diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c
index 573951ea1b3..2182bab2e46 100644
--- a/modules/codec/avcodec/d3d11va.c
+++ b/modules/codec/avcodec/d3d11va.c
@@ -142,9 +142,7 @@ static void SetupAVCodecContext(vlc_va_sys_t *sys, unsigned surfaces)
sys->hw.surface_count = surfaces;
sys->hw.surface = sys->hw_surface;
sys->hw.context_mutex = sys->d3d_dev.context_mutex;
-
- if (IsEqualGUID(sys->selected_decoder->guid, &DXVA_Intel_H264_NoFGT_ClearVideo))
- sys->hw.workaround |= FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO;
+ sys->hw.workaround = sys->selected_decoder->workaround;
}
static void d3d11_pic_context_destroy(struct picture_context_t *opaque)
diff --git a/modules/codec/avcodec/directx_va.c b/modules/codec/avcodec/directx_va.c
index 381b0494da2..0fd74b96a4e 100644
--- a/modules/codec/avcodec/directx_va.c
+++ b/modules/codec/avcodec/directx_va.c
@@ -32,6 +32,11 @@
#include <vlc_common.h>
#include <vlc_codecs.h>
#include <vlc_codec.h>
+#if HAVE_LIBAVCODEC_D3D11VA_H
+#include <libavcodec/d3d11va.h>
+#else
+#include <libavcodec/dxva2.h>
+#endif
#define COBJMACROS
@@ -162,102 +167,102 @@ DEFINE_GUID(DXVA_ModeVP9_VLD_Intel, 0x76988a52, 0xdf13, 0x419a,
/* XXX Prefered modes must come first */
static const directx_va_mode_t DXVA_MODES[] = {
/* MPEG-1/2 */
- { "MPEG-1 decoder, restricted profile A", &DXVA_ModeMPEG1_A, 8, {1, 1}, 0, NULL },
- { "MPEG-2 decoder, restricted profile A", &DXVA_ModeMPEG2_A, 8, {1, 1}, 0, NULL },
- { "MPEG-2 decoder, restricted profile B", &DXVA_ModeMPEG2_B, 8, {1, 1}, 0, NULL },
- { "MPEG-2 decoder, restricted profile C", &DXVA_ModeMPEG2_C, 8, {1, 1}, 0, NULL },
- { "MPEG-2 decoder, restricted profile D", &DXVA_ModeMPEG2_D, 8, {1, 1}, 0, NULL },
-
- { "MPEG-2 variable-length decoder", &DXVA2_ModeMPEG2_VLD, 8, {1, 1}, AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_MAIN },
- { "MPEG-2 & MPEG-1 variable-length decoder", &DXVA2_ModeMPEG2and1_VLD, 8, {1, 1}, AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_MAIN },
- { "MPEG-2 & MPEG-1 variable-length decoder", &DXVA2_ModeMPEG2and1_VLD, 8, {1, 1}, AV_CODEC_ID_MPEG1VIDEO, NULL },
- { "MPEG-2 motion compensation", &DXVA2_ModeMPEG2_MoComp, 8, {1, 1}, 0, NULL },
- { "MPEG-2 inverse discrete cosine transform", &DXVA2_ModeMPEG2_IDCT, 8, {1, 1}, 0, NULL },
+ { "MPEG-1 decoder, restricted profile A", &DXVA_ModeMPEG1_A, 8, {1, 1}, 0, NULL, 0 },
+ { "MPEG-2 decoder, restricted profile A", &DXVA_ModeMPEG2_A, 8, {1, 1}, 0, NULL, 0 },
+ { "MPEG-2 decoder, restricted profile B", &DXVA_ModeMPEG2_B, 8, {1, 1}, 0, NULL, 0 },
+ { "MPEG-2 decoder, restricted profile C", &DXVA_ModeMPEG2_C, 8, {1, 1}, 0, NULL, 0 },
+ { "MPEG-2 decoder, restricted profile D", &DXVA_ModeMPEG2_D, 8, {1, 1}, 0, NULL, 0 },
+
+ { "MPEG-2 variable-length decoder", &DXVA2_ModeMPEG2_VLD, 8, {1, 1}, AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_MAIN, 0 },
+ { "MPEG-2 & MPEG-1 variable-length decoder", &DXVA2_ModeMPEG2and1_VLD, 8, {1, 1}, AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_MAIN, 0 },
+ { "MPEG-2 & MPEG-1 variable-length decoder", &DXVA2_ModeMPEG2and1_VLD, 8, {1, 1}, AV_CODEC_ID_MPEG1VIDEO, NULL, 0 },
+ { "MPEG-2 motion compensation", &DXVA2_ModeMPEG2_MoComp, 8, {1, 1}, 0, NULL, 0 },
+ { "MPEG-2 inverse discrete cosine transform", &DXVA2_ModeMPEG2_IDCT, 8, {1, 1}, 0, NULL, 0 },
/* MPEG-1 http://download.microsoft.com/download/B/1/7/B172A3C8-56F2-4210-80F1-A97BEA9182ED/DXVA_MPEG1_VLD.pdf */
- { "MPEG-1 variable-length decoder, no D pictures", &DXVA2_ModeMPEG1_VLD, 8, {1, 1}, 0, NULL },
+ { "MPEG-1 variable-length decoder, no D pictures", &DXVA2_ModeMPEG1_VLD, 8, {1, 1}, 0, NULL, 0 },
/* H.264 http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=3d1c290b-310b-4ea2-bf76-714063a6d7a6 */
- { "H.264 variable-length decoder, film grain technology", &DXVA2_ModeH264_F, 8, {1, 1}, AV_CODEC_ID_H264, PROF_H264_HIGH },
- { "H.264 variable-length decoder, no film grain technology", &DXVA2_ModeH264_E, 8, {1, 1}, AV_CODEC_ID_H264, PROF_H264_HIGH },
- { "H.264 variable-length decoder, no film grain technology (Intel ClearVideo)", &DXVA_Intel_H264_NoFGT_ClearVideo, 8, {1, 1}, AV_CODEC_ID_H264, PROF_H264_HIGH },
- { "H.264 variable-length decoder, no film grain technology, FMO/ASO", &DXVA_ModeH264_VLD_WithFMOASO_NoFGT, 8, {1, 1}, AV_CODEC_ID_H264, PROF_H264_HIGH },
- { "H.264 variable-length decoder, no film grain technology, Flash", &DXVA_ModeH264_VLD_NoFGT_Flash, 8, {1, 1}, AV_CODEC_ID_H264, PROF_H264_HIGH },
+ { "H.264 variable-length decoder, film grain technology", &DXVA2_ModeH264_F, 8, {1, 1}, AV_CODEC_ID_H264, PROF_H264_HIGH, 0 },
+ { "H.264 variable-length decoder, no film grain technology", &DXVA2_ModeH264_E, 8, {1, 1}, AV_CODEC_ID_H264, PROF_H264_HIGH, 0 },
+ { "H.264 variable-length decoder, no film grain technology (Intel ClearVideo)", &DXVA_Intel_H264_NoFGT_ClearVideo, 8, {1, 1}, AV_CODEC_ID_H264, PROF_H264_HIGH, FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO },
+ { "H.264 variable-length decoder, no film grain technology, FMO/ASO", &DXVA_ModeH264_VLD_WithFMOASO_NoFGT, 8, {1, 1}, AV_CODEC_ID_H264, PROF_H264_HIGH, 0 },
+ { "H.264 variable-length decoder, no film grain technology, Flash", &DXVA_ModeH264_VLD_NoFGT_Flash, 8, {1, 1}, AV_CODEC_ID_H264, PROF_H264_HIGH, 0 },
- { "H.264 inverse discrete cosine transform, film grain technology", &DXVA2_ModeH264_D, 8, {1, 1}, 0, NULL },
- { "H.264 inverse discrete cosine transform, no film grain technology", &DXVA2_ModeH264_C, 8, {1, 1}, 0, NULL },
- { "H.264 inverse discrete cosine transform, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_C, 8, {1, 1}, 0, NULL },
+ { "H.264 inverse discrete cosine transform, film grain technology", &DXVA2_ModeH264_D, 8, {1, 1}, 0, NULL, 0 },
+ { "H.264 inverse discrete cosine transform, no film grain technology", &DXVA2_ModeH264_C, 8, {1, 1}, 0, NULL, 0 },
+ { "H.264 inverse discrete cosine transform, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_C, 8, {1, 1}, 0, NULL, 0 },
- { "H.264 motion compensation, film grain technology", &DXVA2_ModeH264_B, 8, {1, 1}, 0, NULL },
- { "H.264 motion compensation, no film grain technology", &DXVA2_ModeH264_A, 8, {1, 1}, 0, NULL },
- { "H.264 motion compensation, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_A, 8, {1, 1}, 0, NULL },
+ { "H.264 motion compensation, film grain technology", &DXVA2_ModeH264_B, 8, {1, 1}, 0, NULL, 0 },
+ { "H.264 motion compensation, no film grain technology", &DXVA2_ModeH264_A, 8, {1, 1}, 0, NULL, 0 },
+ { "H.264 motion compensation, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_A, 8, {1, 1}, 0, NULL, 0 },
/* http://download.microsoft.com/download/2/D/0/2D02E72E-7890-430F-BA91-4A363F72F8C8/DXVA_H264_MVC.pdf */
- { "H.264 stereo high profile, mbs flag set", &DXVA_ModeH264_VLD_Stereo_Progressive_NoFGT, 8, {1, 1}, 0, NULL },
- { "H.264 stereo high profile", &DXVA_ModeH264_VLD_Stereo_NoFGT, 8, {1, 1}, 0, NULL },
- { "H.264 multiview high profile", &DXVA_ModeH264_VLD_Multiview_NoFGT, 8, {1, 1}, 0, NULL },
+ { "H.264 stereo high profile, mbs flag set", &DXVA_ModeH264_VLD_Stereo_Progressive_NoFGT, 8, {1, 1}, 0, NULL, 0 },
+ { "H.264 stereo high profile", &DXVA_ModeH264_VLD_Stereo_NoFGT, 8, {1, 1}, 0, NULL, 0 },
+ { "H.264 multiview high profile", &DXVA_ModeH264_VLD_Multiview_NoFGT, 8, {1, 1}, 0, NULL, 0 },
/* SVC http://download.microsoft.com/download/C/8/A/C8AD9F1B-57D1-4C10-85A0-09E3EAC50322/DXVA_SVC_2012_06.pdf */
- { "H.264 scalable video coding, Scalable Baseline Profile", &DXVA_ModeH264_VLD_SVC_Scalable_Baseline, 8, {1, 1}, 0, NULL },
- { "H.264 scalable video coding, Scalable Constrained Baseline Profile", &DXVA_ModeH264_VLD_SVC_Restricted_Scalable_Baseline, 8, {1, 1}, 0, NULL },
- { "H.264 scalable video coding, Scalable High Profile", &DXVA_ModeH264_VLD_SVC_Scalable_High, 8, {1, 1}, 0, NULL },
- { "H.264 scalable video coding, Scalable Constrained High Profile", &DXVA_ModeH264_VLD_SVC_Restricted_Scalable_High_Progressive, 8, {1, 1}, 0, NULL },
+ { "H.264 scalable video coding, Scalable Baseline Profile", &DXVA_ModeH264_VLD_SVC_Scalable_Baseline, 8, {1, 1}, 0, NULL, 0 },
+ { "H.264 scalable video coding, Scalable Constrained Baseline Profile", &DXVA_ModeH264_VLD_SVC_Restricted_Scalable_Baseline, 8, {1, 1}, 0, NULL, 0 },
+ { "H.264 scalable video coding, Scalable High Profile", &DXVA_ModeH264_VLD_SVC_Scalable_High, 8, {1, 1}, 0, NULL, 0 },
+ { "H.264 scalable video coding, Scalable Constrained High Profile", &DXVA_ModeH264_VLD_SVC_Restricted_Scalable_High_Progressive, 8, {1, 1}, 0, NULL, 0 },
/* WMV */
- { "Windows Media Video 8 motion compensation", &DXVA2_ModeWMV8_B, 8, {1, 1}, 0, NULL },
- { "Windows Media Video 8 post processing", &DXVA2_ModeWMV8_A, 8, {1, 1}, 0, NULL },
+ { "Windows Media Video 8 motion compensation", &DXVA2_ModeWMV8_B, 8, {1, 1}, 0, NULL, 0 },
+ { "Windows Media Video 8 post processing", &DXVA2_ModeWMV8_A, 8, {1, 1}, 0, NULL, 0 },
- { "Windows Media Video 9 IDCT", &DXVA2_ModeWMV9_C, 8, {1, 1}, 0, NULL },
- { "Windows Media Video 9 motion compensation", &DXVA2_ModeWMV9_B, 8, {1, 1}, 0, NULL },
- { "Windows Media Video 9 post processing", &DXVA2_ModeWMV9_A, 8, {1, 1}, 0, NULL },
+ { "Windows Media Video 9 IDCT", &DXVA2_ModeWMV9_C, 8, {1, 1}, 0, NULL, 0 },
+ { "Windows Media Video 9 motion compensation", &DXVA2_ModeWMV9_B, 8, {1, 1}, 0, NULL, 0 },
+ { "Windows Media Video 9 post processing", &DXVA2_ModeWMV9_A, 8, {1, 1}, 0, NULL, 0 },
/* VC-1 */
- { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, 8, {1, 1}, AV_CODEC_ID_VC1, NULL },
- { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, 8, {1, 1}, AV_CODEC_ID_WMV3, NULL },
- { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, 8, {1, 1}, AV_CODEC_ID_VC1, NULL },
- { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, 8, {1, 1}, AV_CODEC_ID_WMV3, NULL },
- { "VC-1 variable-length decoder 2 (Intel)", &DXVA_Intel_VC1_ClearVideo_2, 8, {1, 1}, 0, NULL },
- { "VC-1 variable-length decoder (Intel)", &DXVA_Intel_VC1_ClearVideo, 8, {1, 1}, 0, NULL },
+ { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, 8, {1, 1}, AV_CODEC_ID_VC1, NULL, 0 },
+ { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, 8, {1, 1}, AV_CODEC_ID_WMV3, NULL, 0 },
+ { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, 8, {1, 1}, AV_CODEC_ID_VC1, NULL, 0 },
+ { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, 8, {1, 1}, AV_CODEC_ID_WMV3, NULL, 0 },
+ { "VC-1 variable-length decoder 2 (Intel)", &DXVA_Intel_VC1_ClearVideo_2, 8, {1, 1}, 0, NULL, 0 },
+ { "VC-1 variable-length decoder (Intel)", &DXVA_Intel_VC1_ClearVideo, 8, {1, 1}, 0, NULL, 0 },
- { "VC-1 inverse discrete cosine transform", &DXVA2_ModeVC1_C, 8, {1, 1}, 0, NULL },
- { "VC-1 motion compensation", &DXVA2_ModeVC1_B, 8, {1, 1}, 0, NULL },
- { "VC-1 post processing", &DXVA2_ModeVC1_A, 8, {1, 1}, 0, NULL },
+ { "VC-1 inverse discrete cosine transform", &DXVA2_ModeVC1_C, 8, {1, 1}, 0, NULL, 0 },
+ { "VC-1 motion compensation", &DXVA2_ModeVC1_B, 8, {1, 1}, 0, NULL, 0 },
+ { "VC-1 post processing", &DXVA2_ModeVC1_A, 8, {1, 1}, 0, NULL, 0 },
/* Xvid/Divx: TODO */
- { "MPEG-4 Part 2 nVidia bitstream decoder", &DXVA_nVidia_MPEG4_ASP, 8, {1, 1}, 0, NULL },
- { "MPEG-4 Part 2 variable-length decoder, Simple Profile", &DXVA_ModeMPEG4pt2_VLD_Simple, 8, {1, 1}, 0, NULL },
- { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, no GMC", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_NoGMC, 8, {1, 1}, 0, NULL },
- { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, GMC", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_GMC, 8, {1, 1}, 0, NULL },
- { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, Avivo", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_Avivo, 8, {1, 1}, 0, NULL },
+ { "MPEG-4 Part 2 nVidia bitstream decoder", &DXVA_nVidia_MPEG4_ASP, 8, {1, 1}, 0, NULL, 0 },
+ { "MPEG-4 Part 2 variable-length decoder, Simple Profile", &DXVA_ModeMPEG4pt2_VLD_Simple, 8, {1, 1}, 0, NULL, 0 },
+ { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, no GMC", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_NoGMC, 8, {1, 1}, 0, NULL, 0 },
+ { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, GMC", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_GMC, 8, {1, 1}, 0, NULL, 0 },
+ { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, Avivo", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_Avivo, 8, {1, 1}, 0, NULL, 0 },
/* HEVC */
- { "HEVC Main profile", &DXVA_ModeHEVC_VLD_Main, 8, {1, 1}, AV_CODEC_ID_HEVC, PROF_HEVC_MAIN },
- { "HEVC Main 10 profile", &DXVA_ModeHEVC_VLD_Main10, 10, {1, 1}, AV_CODEC_ID_HEVC, PROF_HEVC_MAIN10 },
+ { "HEVC Main profile", &DXVA_ModeHEVC_VLD_Main, 8, {1, 1}, AV_CODEC_ID_HEVC, PROF_HEVC_MAIN, 0 },
+ { "HEVC Main 10 profile", &DXVA_ModeHEVC_VLD_Main10, 10, {1, 1}, AV_CODEC_ID_HEVC, PROF_HEVC_MAIN10, 0 },
/* H.261 */
- { "H.261 decoder, restricted profile A", &DXVA_ModeH261_A, 8, {1, 1}, 0, NULL },
- { "H.261 decoder, restricted profile B", &DXVA_ModeH261_B, 8, {1, 1}, 0, NULL },
+ { "H.261 decoder, restricted profile A", &DXVA_ModeH261_A, 8, {1, 1}, 0, NULL, 0 },
+ { "H.261 decoder, restricted profile B", &DXVA_ModeH261_B, 8, {1, 1}, 0, NULL, 0 },
/* H.263 */
- { "H.263 decoder, restricted profile A", &DXVA_ModeH263_A, 8, {1, 1}, 0, NULL },
- { "H.263 decoder, restricted profile B", &DXVA_ModeH263_B, 8, {1, 1}, 0, NULL },
- { "H.263 decoder, restricted profile C", &DXVA_ModeH263_C, 8, {1, 1}, 0, NULL },
- { "H.263 decoder, restricted profile D", &DXVA_ModeH263_D, 8, {1, 1}, 0, NULL },
- { "H.263 decoder, restricted profile E", &DXVA_ModeH263_E, 8, {1, 1}, 0, NULL },
- { "H.263 decoder, restricted profile F", &DXVA_ModeH263_F, 8, {1, 1}, 0, NULL },
+ { "H.263 decoder, restricted profile A", &DXVA_ModeH263_A, 8, {1, 1}, 0, NULL, 0 },
+ { "H.263 decoder, restricted profile B", &DXVA_ModeH263_B, 8, {1, 1}, 0, NULL, 0 },
+ { "H.263 decoder, restricted profile C", &DXVA_ModeH263_C, 8, {1, 1}, 0, NULL, 0 },
+ { "H.263 decoder, restricted profile D", &DXVA_ModeH263_D, 8, {1, 1}, 0, NULL, 0 },
+ { "H.263 decoder, restricted profile E", &DXVA_ModeH263_E, 8, {1, 1}, 0, NULL, 0 },
+ { "H.263 decoder, restricted profile F", &DXVA_ModeH263_F, 8, {1, 1}, 0, NULL, 0 },
/* VPx */
- { "VP8", &DXVA_ModeVP8_VLD, 8, {1, 1}, 0, NULL },
+ { "VP8", &DXVA_ModeVP8_VLD, 8, {1, 1}, 0, NULL, 0 },
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 57, 17, 100 ) && LIBAVCODEC_VERSION_MICRO >= 100
- { "VP9 profile 0", &DXVA_ModeVP9_VLD_Profile0, 8, {1, 1}, AV_CODEC_ID_VP9, PROF_VP9_MAIN },
- { "VP9 profile 2", &DXVA_ModeVP9_VLD_10bit_Profile2, 10, {1, 1}, AV_CODEC_ID_VP9, PROF_VP9_10 },
+ { "VP9 profile 0", &DXVA_ModeVP9_VLD_Profile0, 8, {1, 1}, AV_CODEC_ID_VP9, PROF_VP9_MAIN, 0 },
+ { "VP9 profile 2", &DXVA_ModeVP9_VLD_10bit_Profile2, 10, {1, 1}, AV_CODEC_ID_VP9, PROF_VP9_10, 0 },
#else
- { "VP9 profile 0", &DXVA_ModeVP9_VLD_Profile0, 8, {1, 1}, 0, NULL },
- { "VP9 profile 2", &DXVA_ModeVP9_VLD_10bit_Profile2, 10, {1, 1}, 0, NULL },
+ { "VP9 profile 0", &DXVA_ModeVP9_VLD_Profile0, 8, {1, 1}, 0, NULL, 0 },
+ { "VP9 profile 2", &DXVA_ModeVP9_VLD_10bit_Profile2, 10, {1, 1}, 0, NULL, 0 },
#endif
- { "VP9 profile Intel", &DXVA_ModeVP9_VLD_Intel, 8, {1, 1}, 0, NULL },
+ { "VP9 profile Intel", &DXVA_ModeVP9_VLD_Intel, 8, {1, 1}, 0, NULL, 0 },
- { NULL, NULL, 0, {0, 0}, 0, NULL }
+ { NULL, NULL, 0, {0, 0}, 0, NULL, 0 }
};
static const directx_va_mode_t *FindVideoServiceConversion(vlc_va_t *, const directx_sys_t *, const es_format_t *, video_format_t *fmt_out,
diff --git a/modules/codec/avcodec/directx_va.h b/modules/codec/avcodec/directx_va.h
index e714a324c13..5957c7d62e5 100644
--- a/modules/codec/avcodec/directx_va.h
+++ b/modules/codec/avcodec/directx_va.h
@@ -59,6 +59,7 @@ typedef struct {
};
enum AVCodecID codec;
const int *p_profiles; // NULL or ends with 0
+ int workaround;
} directx_va_mode_t;
#define MAX_SURFACE_COUNT (64)
diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index 8f210845509..f90b9639842 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -150,9 +150,7 @@ static void SetupAVCodecContext(vlc_va_sys_t *sys, unsigned surfaces)
sys->hw.cfg = &sys->cfg;
sys->hw.surface_count = surfaces;
sys->hw.surface = sys->hw_surface;
-
- if (IsEqualGUID(sys->selected_decoder->guid, &DXVA_Intel_H264_NoFGT_ClearVideo))
- sys->hw.workaround |= FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO;
+ sys->hw.workaround = sys->selected_decoder->workaround;
}
static void d3d9_pic_context_destroy(struct picture_context_t *opaque)
--
2.17.1
More information about the vlc-devel
mailing list