[vlc-devel] [PATCH 1/3] DXVA2: split the decoder into generic code and specific DXVA2 code
Steve Lhomme
robUx4 at videolabs.io
Fri May 15 13:30:19 CEST 2015
---
modules/codec/Makefile.am | 4 +-
modules/codec/avcodec/directx_va.c | 560 ++++++++++++++++++++++++++
modules/codec/avcodec/directx_va.h | 143 +++++++
modules/codec/avcodec/dxva2.c | 779 ++++++++-----------------------------
po/POTFILES.in | 2 +
5 files changed, 867 insertions(+), 621 deletions(-)
create mode 100644 modules/codec/avcodec/directx_va.c
create mode 100644 modules/codec/avcodec/directx_va.h
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index f173c0e..3c077b0 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -344,8 +344,8 @@ endif
endif
libdxva2_plugin_la_SOURCES = \
- video_chroma/copy.c video_chroma/copy.h \
- codec/avcodec/dxva2.c packetizer/h264_nal.c packetizer/h264_nal.h
+ codec/avcodec/dxva2.c codec/avcodec/directx_va.c codec/avcodec/directx_va.h \
+ packetizer/h264_nal.c packetizer/h264_nal.h
libdxva2_plugin_la_LIBADD = -lole32 -lshlwapi -luuid
if HAVE_AVCODEC_DXVA2
codec_LTLIBRARIES += libdxva2_plugin.la
diff --git a/modules/codec/avcodec/directx_va.c b/modules/codec/avcodec/directx_va.c
new file mode 100644
index 0000000..305a3ce
--- /dev/null
+++ b/modules/codec/avcodec/directx_va.c
@@ -0,0 +1,560 @@
+/*****************************************************************************
+ * directx_va.c: DirectX Generic Video Acceleration helpers
+ *****************************************************************************
+ * Copyright (C) 2009 Geoffroy Couprie
+ * Copyright (C) 2009 Laurent Aimar
+ * Copyright (C) 2015 Steve Lhomme
+ * $Id$
+ *
+ * Authors: Geoffroy Couprie <geal at videolan.org>
+ * Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
+ * Steve Lhomme <robux4 at gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <assert.h>
+
+#include <vlc_common.h>
+#include <vlc_codecs.h>
+
+#define COBJMACROS
+
+#include "directx_va.h"
+
+#include "avcodec.h"
+#include "../../packetizer/h264_nal.h"
+
+static const int PROF_MPEG2_SIMPLE[] = { FF_PROFILE_MPEG2_SIMPLE, 0 };
+static const int PROF_MPEG2_MAIN[] = { FF_PROFILE_MPEG2_SIMPLE,
+ FF_PROFILE_MPEG2_MAIN, 0 };
+static const int PROF_H264_HIGH[] = { FF_PROFILE_H264_CONSTRAINED_BASELINE,
+ FF_PROFILE_H264_MAIN,
+ FF_PROFILE_H264_HIGH, 0 };
+static const int PROF_HEVC_MAIN[] = { FF_PROFILE_HEVC_MAIN, 0 };
+static const int PROF_HEVC_MAIN10[] = { FF_PROFILE_HEVC_MAIN,
+ FF_PROFILE_HEVC_MAIN_10, 0 };
+
+#include <dxva2api.h>
+
+#include <initguid.h> /* must be last included to not redefine existing GUIDs */
+
+/* dxva2api.h GUIDs: http://msdn.microsoft.com/en-us/library/windows/desktop/ms697067(v=vs100).aspx
+ * assume that they are declared in dxva2api.h */
+#define MS_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8)
+
+#ifdef __MINGW32__
+# include <_mingw.h>
+
+# if !defined(__MINGW64_VERSION_MAJOR)
+# undef MS_GUID
+# define MS_GUID DEFINE_GUID /* dxva2api.h fails to declare those, redefine as static */
+# define DXVA2_E_NEW_VIDEO_DEVICE MAKE_HRESULT(1, 4, 4097)
+# else
+# include <dxva.h>
+# endif
+
+#endif /* __MINGW32__ */
+
+/* Codec capabilities GUID, sorted by codec */
+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);
+
+MS_GUID (DXVA2_ModeH264_A, 0x1b81be64, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+MS_GUID (DXVA2_ModeH264_B, 0x1b81be65, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+MS_GUID (DXVA2_ModeH264_C, 0x1b81be66, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+MS_GUID (DXVA2_ModeH264_D, 0x1b81be67, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+MS_GUID (DXVA2_ModeH264_E, 0x1b81be68, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+MS_GUID (DXVA2_ModeH264_F, 0x1b81be69, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+DEFINE_GUID(DXVA_ModeH264_VLD_Multiview, 0x9901CCD3, 0xca12, 0x4b7e, 0x86, 0x7a, 0xe2, 0x22, 0x3d, 0x92, 0x55, 0xc3); // MVC
+DEFINE_GUID(DXVA_ModeH264_VLD_WithFMOASO_NoFGT, 0xd5f04ff9, 0x3418, 0x45d8, 0x95, 0x61, 0x32, 0xa7, 0x6a, 0xae, 0x2d, 0xdd);
+DEFINE_GUID(DXVADDI_Intel_ModeH264_A, 0x604F8E64, 0x4951, 0x4c54, 0x88, 0xFE, 0xAB, 0xD2, 0x5C, 0x15, 0xB3, 0xD6);
+DEFINE_GUID(DXVADDI_Intel_ModeH264_C, 0x604F8E66, 0x4951, 0x4c54, 0x88, 0xFE, 0xAB, 0xD2, 0x5C, 0x15, 0xB3, 0xD6);
+DEFINE_GUID(DXVA_Intel_H264_NoFGT_ClearVideo, 0x604F8E68, 0x4951, 0x4c54, 0x88, 0xFE, 0xAB, 0xD2, 0x5C, 0x15, 0xB3, 0xD6);
+DEFINE_GUID(DXVA_ModeH264_VLD_NoFGT_Flash, 0x4245F676, 0x2BBC, 0x4166, 0xa0, 0xBB, 0x54, 0xE7, 0xB8, 0x49, 0xC3, 0x80);
+
+MS_GUID (DXVA2_ModeWMV8_A, 0x1b81be80, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+MS_GUID (DXVA2_ModeWMV8_B, 0x1b81be81, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+
+MS_GUID (DXVA2_ModeWMV9_A, 0x1b81be90, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+MS_GUID (DXVA2_ModeWMV9_B, 0x1b81be91, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+MS_GUID (DXVA2_ModeWMV9_C, 0x1b81be94, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+
+MS_GUID (DXVA2_ModeVC1_A, 0x1b81beA0, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+MS_GUID (DXVA2_ModeVC1_B, 0x1b81beA1, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+MS_GUID (DXVA2_ModeVC1_C, 0x1b81beA2, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+MS_GUID (DXVA2_ModeVC1_D, 0x1b81beA3, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
+DEFINE_GUID(DXVA2_ModeVC1_D2010, 0x1b81beA4, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); // August 2010 update
+DEFINE_GUID(DXVA_Intel_VC1_ClearVideo, 0xBCC5DB6D, 0xA2B6, 0x4AF0, 0xAC, 0xE4, 0xAD, 0xB1, 0xF7, 0x87, 0xBC, 0x89);
+DEFINE_GUID(DXVA_Intel_VC1_ClearVideo_2, 0xE07EC519, 0xE651, 0x4CD6, 0xAC, 0x84, 0x13, 0x70, 0xCC, 0xEE, 0xC8, 0x51);
+
+DEFINE_GUID(DXVA_nVidia_MPEG4_ASP, 0x9947EC6F, 0x689B, 0x11DC, 0xA3, 0x20, 0x00, 0x19, 0xDB, 0xBC, 0x41, 0x84);
+DEFINE_GUID(DXVA_ModeMPEG4pt2_VLD_Simple, 0xefd64d74, 0xc9e8, 0x41d7, 0xa5, 0xe9, 0xe9, 0xb0, 0xe3, 0x9f, 0xa3, 0x19);
+DEFINE_GUID(DXVA_ModeMPEG4pt2_VLD_AdvSimple_NoGMC, 0xed418a9f, 0x010d, 0x4eda, 0x9a, 0xe3, 0x9a, 0x65, 0x35, 0x8d, 0x8d, 0x2e);
+DEFINE_GUID(DXVA_ModeMPEG4pt2_VLD_AdvSimple_GMC, 0xab998b5b, 0x4258, 0x44a9, 0x9f, 0xeb, 0x94, 0xe5, 0x97, 0xa6, 0xba, 0xae);
+DEFINE_GUID(DXVA_ModeMPEG4pt2_VLD_AdvSimple_Avivo, 0x7C74ADC6, 0xe2ba, 0x4ade, 0x86, 0xde, 0x30, 0xbe, 0xab, 0xb4, 0x0c, 0xc1);
+
+DEFINE_GUID(DXVA_ModeHEVC_VLD_Main, 0x5b11d51b, 0x2f4c, 0x4452,0xbc,0xc3,0x09,0xf2,0xa1,0x16,0x0c,0xc0);
+DEFINE_GUID(DXVA_ModeHEVC_VLD_Main10, 0x107af0e0, 0xef1a, 0x4d19,0xab,0xa8,0x67,0xa1,0x63,0x07,0x3d,0x13);
+
+DEFINE_GUID(DXVA_ModeH264_VLD_Stereo_Progressive_NoFGT, 0xd79be8da, 0x0cf1, 0x4c81,0xb8,0x2a,0x69,0xa4,0xe2,0x36,0xf4,0x3d);
+DEFINE_GUID(DXVA_ModeH264_VLD_Stereo_NoFGT, 0xf9aaccbb, 0xc2b6, 0x4cfc,0x87,0x79,0x57,0x07,0xb1,0x76,0x05,0x52);
+DEFINE_GUID(DXVA_ModeH264_VLD_Multiview_NoFGT, 0x705b9d82, 0x76cf, 0x49d6,0xb7,0xe6,0xac,0x88,0x72,0xdb,0x01,0x3c);
+
+DEFINE_GUID(DXVA_ModeH264_VLD_SVC_Scalable_Baseline, 0xc30700c4, 0xe384, 0x43e0, 0xb9, 0x82, 0x2d, 0x89, 0xee, 0x7f, 0x77, 0xc4);
+DEFINE_GUID(DXVA_ModeH264_VLD_SVC_Restricted_Scalable_Baseline, 0x9b8175d4, 0xd670, 0x4cf2, 0xa9, 0xf0, 0xfa, 0x56, 0xdf, 0x71, 0xa1, 0xae);
+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);
+
+/* 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, 0, NULL },
+ { "MPEG-2 decoder, restricted profile A", &DXVA_ModeMPEG2_A, 0, NULL },
+ { "MPEG-2 decoder, restricted profile B", &DXVA_ModeMPEG2_B, 0, NULL },
+ { "MPEG-2 decoder, restricted profile C", &DXVA_ModeMPEG2_C, 0, NULL },
+ { "MPEG-2 decoder, restricted profile D", &DXVA_ModeMPEG2_D, 0, NULL },
+
+ { "MPEG-2 variable-length decoder", &DXVA2_ModeMPEG2_VLD, AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_SIMPLE },
+ { "MPEG-2 & MPEG-1 variable-length decoder", &DXVA2_ModeMPEG2and1_VLD, AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_MAIN },
+ { "MPEG-2 & MPEG-1 variable-length decoder", &DXVA2_ModeMPEG2and1_VLD, AV_CODEC_ID_MPEG1VIDEO, NULL },
+ { "MPEG-2 motion compensation", &DXVA2_ModeMPEG2_MoComp, 0, NULL },
+ { "MPEG-2 inverse discrete cosine transform", &DXVA2_ModeMPEG2_IDCT, 0, NULL },
+
+ /* 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, 0, NULL },
+
+ /* 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, AV_CODEC_ID_H264, PROF_H264_HIGH },
+ { "H.264 variable-length decoder, no film grain technology (Intel ClearVideo)", &DXVA_Intel_H264_NoFGT_ClearVideo, AV_CODEC_ID_H264, PROF_H264_HIGH },
+ { "H.264 variable-length decoder, no film grain technology", &DXVA2_ModeH264_E, AV_CODEC_ID_H264, PROF_H264_HIGH },
+ { "H.264 variable-length decoder, no film grain technology, FMO/ASO", &DXVA_ModeH264_VLD_WithFMOASO_NoFGT, AV_CODEC_ID_H264, PROF_H264_HIGH },
+ { "H.264 variable-length decoder, no film grain technology, Flash", &DXVA_ModeH264_VLD_NoFGT_Flash, AV_CODEC_ID_H264, PROF_H264_HIGH },
+
+ { "H.264 inverse discrete cosine transform, film grain technology", &DXVA2_ModeH264_D, 0, NULL },
+ { "H.264 inverse discrete cosine transform, no film grain technology", &DXVA2_ModeH264_C, 0, NULL },
+ { "H.264 inverse discrete cosine transform, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_C, 0, NULL },
+
+ { "H.264 motion compensation, film grain technology", &DXVA2_ModeH264_B, 0, NULL },
+ { "H.264 motion compensation, no film grain technology", &DXVA2_ModeH264_A, 0, NULL },
+ { "H.264 motion compensation, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_A, 0, NULL },
+
+ /* 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, 0, NULL },
+ { "H.264 stereo high profile", &DXVA_ModeH264_VLD_Stereo_NoFGT, 0, NULL },
+ { "H.264 multiview high profile", &DXVA_ModeH264_VLD_Multiview_NoFGT, 0, NULL },
+
+ /* 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, 0, NULL },
+ { "H.264 scalable video coding, Scalable Constrained Baseline Profile", &DXVA_ModeH264_VLD_SVC_Restricted_Scalable_Baseline, 0, NULL },
+ { "H.264 scalable video coding, Scalable High Profile", &DXVA_ModeH264_VLD_SVC_Scalable_High, 0, NULL },
+ { "H.264 scalable video coding, Scalable Constrained High Profile", &DXVA_ModeH264_VLD_SVC_Restricted_Scalable_High_Progressive, 0, NULL },
+
+ /* WMV */
+ { "Windows Media Video 8 motion compensation", &DXVA2_ModeWMV8_B, 0, NULL },
+ { "Windows Media Video 8 post processing", &DXVA2_ModeWMV8_A, 0, NULL },
+
+ { "Windows Media Video 9 IDCT", &DXVA2_ModeWMV9_C, 0, NULL },
+ { "Windows Media Video 9 motion compensation", &DXVA2_ModeWMV9_B, 0, NULL },
+ { "Windows Media Video 9 post processing", &DXVA2_ModeWMV9_A, 0, NULL },
+
+ /* VC-1 */
+ { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, AV_CODEC_ID_VC1, NULL },
+ { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, AV_CODEC_ID_WMV3, NULL },
+ { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, AV_CODEC_ID_VC1, NULL },
+ { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, AV_CODEC_ID_WMV3, NULL },
+ { "VC-1 variable-length decoder 2 (Intel)", &DXVA_Intel_VC1_ClearVideo_2, 0, NULL },
+ { "VC-1 variable-length decoder (Intel)", &DXVA_Intel_VC1_ClearVideo, 0, NULL },
+
+ { "VC-1 inverse discrete cosine transform", &DXVA2_ModeVC1_C, 0, NULL },
+ { "VC-1 motion compensation", &DXVA2_ModeVC1_B, 0, NULL },
+ { "VC-1 post processing", &DXVA2_ModeVC1_A, 0, NULL },
+
+ /* Xvid/Divx: TODO */
+ { "MPEG-4 Part 2 nVidia bitstream decoder", &DXVA_nVidia_MPEG4_ASP, 0, NULL },
+ { "MPEG-4 Part 2 variable-length decoder, Simple Profile", &DXVA_ModeMPEG4pt2_VLD_Simple, 0, NULL },
+ { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, no GMC", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_NoGMC, 0, NULL },
+ { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, GMC", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_GMC, 0, NULL },
+ { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, Avivo", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_Avivo, 0, NULL },
+
+ /* HEVC */
+ { "HEVC Main profile", &DXVA_ModeHEVC_VLD_Main, AV_CODEC_ID_HEVC, PROF_HEVC_MAIN },
+ { "HEVC Main 10 profile", &DXVA_ModeHEVC_VLD_Main10, AV_CODEC_ID_HEVC, PROF_HEVC_MAIN10 },
+
+ /* H.261 */
+ { "H.261 decoder, restricted profile A", &DXVA_ModeH261_A, 0, NULL },
+ { "H.261 decoder, restricted profile B", &DXVA_ModeH261_B, 0, NULL },
+
+ /* H.263 */
+ { "H.263 decoder, restricted profile A", &DXVA_ModeH263_A, 0, NULL },
+ { "H.263 decoder, restricted profile B", &DXVA_ModeH263_B, 0, NULL },
+ { "H.263 decoder, restricted profile C", &DXVA_ModeH263_C, 0, NULL },
+ { "H.263 decoder, restricted profile D", &DXVA_ModeH263_D, 0, NULL },
+ { "H.263 decoder, restricted profile E", &DXVA_ModeH263_E, 0, NULL },
+ { "H.263 decoder, restricted profile F", &DXVA_ModeH263_F, 0, NULL },
+
+ { NULL, NULL, 0, NULL }
+};
+
+static int FindVideoServiceConversion(vlc_va_t *, directx_sys_t *, const es_format_t *fmt);
+static void DestroyVideoDecoder(vlc_va_t *, directx_sys_t *);
+static void DestroyVideoService(vlc_va_t *, directx_sys_t *);
+static void DestroyDeviceManager(vlc_va_t *, directx_sys_t *);
+static void DestroyDevice(vlc_va_t *, directx_sys_t *);
+
+static const directx_va_mode_t *FindDxvaMode(const GUID *guid)
+{
+ for (unsigned i = 0; DXVA_MODES[i].name; i++) {
+ if (IsEqualGUID(DXVA_MODES[i].guid, guid))
+ return &DXVA_MODES[i];
+ }
+ return NULL;
+}
+
+/* */
+int directx_va_Setup(vlc_va_t *va, directx_sys_t *dx_sys, AVCodecContext *avctx, vlc_fourcc_t *chroma)
+{
+ int surface_alignment = 16;
+ int surface_count = 4;
+
+ if (dx_sys->width == avctx->coded_width && dx_sys->height == avctx->coded_height
+ && dx_sys->decoder != NULL)
+ goto ok;
+
+ /* */
+ DestroyVideoDecoder(va, dx_sys);
+
+ avctx->hwaccel_context = NULL;
+ *chroma = 0;
+ if (avctx->coded_width <= 0 || avctx->coded_height <= 0)
+ return VLC_EGENERIC;
+
+ /* */
+ msg_Dbg(va, "directx_va_Setup id %d %dx%d", dx_sys->codec_id, avctx->coded_width, avctx->coded_height);
+
+ switch ( dx_sys->codec_id )
+ {
+ case AV_CODEC_ID_MPEG2VIDEO:
+ /* decoding MPEG-2 requires additional alignment on some Intel GPUs,
+ but it causes issues for H.264 on certain AMD GPUs..... */
+ surface_alignment = 32;
+ surface_count += 2;
+ break;
+ case AV_CODEC_ID_HEVC:
+ /* the HEVC DXVA2 spec asks for 128 pixel aligned surfaces to ensure
+ all coding features have enough room to work with */
+ surface_alignment = 128;
+ surface_count += 16;
+ break;
+ case AV_CODEC_ID_H264:
+ surface_count += 16;
+ break;
+ default:
+ surface_count += 2;
+ }
+
+ if ( avctx->active_thread_type & FF_THREAD_FRAME )
+ surface_count += dx_sys->thread_count;
+
+ if (surface_count > MAX_SURFACE_COUNT)
+ return VLC_EGENERIC;
+
+ dx_sys->surface_count = surface_count;
+
+#define ALIGN(x, y) (((x) + ((y) - 1)) & ~((y) - 1))
+ dx_sys->width = avctx->coded_width;
+ dx_sys->height = avctx->coded_height;
+ dx_sys->surface_width = ALIGN(dx_sys->width, surface_alignment);
+ dx_sys->surface_height = ALIGN(dx_sys->height, surface_alignment);
+
+ /* FIXME transmit a video_format_t by VaSetup directly */
+ video_format_t fmt;
+ memset(&fmt, 0, sizeof(fmt));
+ fmt.i_width = dx_sys->width;
+ fmt.i_height = dx_sys->height;
+ fmt.i_frame_rate = avctx->framerate.num;
+ fmt.i_frame_rate_base = avctx->framerate.den;
+
+ if (dx_sys->pf_create_decoder_surfaces(va, dx_sys->codec_id, &fmt, avctx->active_thread_type & FF_THREAD_FRAME))
+ return VLC_EGENERIC;
+
+ if (avctx->coded_width != dx_sys->surface_width ||
+ avctx->coded_height != dx_sys->surface_height)
+ msg_Warn( va, "surface dimensions (%dx%d) differ from avcodec dimensions (%dx%d)",
+ dx_sys->surface_width, dx_sys->surface_height,
+ avctx->coded_width, avctx->coded_height);
+
+ for (int i = 0; i < dx_sys->surface_count; i++) {
+ vlc_va_surface_t *surface = &dx_sys->surface[i];
+ surface->refcount = 0;
+ surface->order = 0;
+ surface->p_lock = &dx_sys->surface_lock;
+ }
+
+ dx_sys->pf_setup_avcodec_ctx(va);
+
+ok:
+ return VLC_SUCCESS;
+}
+
+void DestroyVideoDecoder(vlc_va_t *va, directx_sys_t *dx_sys)
+{
+ dx_sys->pf_destroy_surfaces(va);
+
+ for (int i = 0; i < dx_sys->surface_count; i++)
+ IUnknown_Release( dx_sys->hw_surface[i] );
+
+ if (dx_sys->decoder)
+ IUnknown_Release( dx_sys->decoder );
+
+ dx_sys->decoder = NULL;
+ dx_sys->surface_count = 0;
+}
+
+/* FIXME it is nearly common with VAAPI */
+int directx_va_Get(vlc_va_t *va, directx_sys_t *dx_sys, picture_t *pic, uint8_t **data)
+{
+ /* Check the device */
+ if (dx_sys->pf_check_device(va)!=VLC_SUCCESS)
+ return VLC_EGENERIC;
+
+ vlc_mutex_lock( &dx_sys->surface_lock );
+
+ /* Grab an unused surface, in case none are, try the oldest
+ * XXX using the oldest is a workaround in case a problem happens with libavcodec */
+ int i, old;
+ for (i = 0, old = 0; i < dx_sys->surface_count; i++) {
+ vlc_va_surface_t *surface = &dx_sys->surface[i];
+
+ if (!surface->refcount)
+ break;
+
+ if (surface->order < dx_sys->surface[old].order)
+ old = i;
+ }
+ if (i >= dx_sys->surface_count)
+ i = old;
+
+ vlc_va_surface_t *surface = &dx_sys->surface[i];
+
+ surface->refcount = 1;
+ surface->order = dx_sys->surface_order++;
+ *data = (void *)dx_sys->hw_surface[i];
+ pic->context = surface;
+
+ vlc_mutex_unlock( &dx_sys->surface_lock );
+
+ return VLC_SUCCESS;
+}
+
+void directx_va_Release(void *opaque, uint8_t *data)
+{
+ picture_t *pic = opaque;
+ vlc_va_surface_t *surface = pic->context;
+ vlc_mutex_lock( surface->p_lock );
+
+ surface->refcount--;
+ pic->context = NULL;
+ picture_Release(pic);
+ (void) data;
+
+ vlc_mutex_unlock( surface->p_lock );
+}
+
+void directx_va_Close(vlc_va_t *va, directx_sys_t *dx_sys)
+{
+ DestroyVideoDecoder(va, dx_sys);
+ DestroyVideoService(va, dx_sys);
+ DestroyDeviceManager(va, dx_sys);
+ DestroyDevice(va, dx_sys);
+
+ if (dx_sys->hdecoder_dll)
+ FreeLibrary(dx_sys->hdecoder_dll);
+
+ vlc_mutex_destroy( &dx_sys->surface_lock );
+}
+
+int directx_va_Open(vlc_va_t *va, directx_sys_t *dx_sys,
+ AVCodecContext *ctx, const es_format_t *fmt)
+{
+ // TODO va->sys = sys;
+ dx_sys->codec_id = ctx->codec_id;
+
+ vlc_mutex_init( &dx_sys->surface_lock );
+
+ /* Load dll*/
+ dx_sys->hdecoder_dll = LoadLibrary(dx_sys->psz_decoder_dll);
+ if (!dx_sys->hdecoder_dll) {
+ msg_Warn(va, "cannot load DirectX decoder DLL");
+ goto error;
+ }
+ msg_Dbg(va, "DLLs loaded");
+
+ if (dx_sys->d3ddev) {
+ msg_Dbg(va, "Reusing DirectX device");
+ } else {
+ /* */
+ if (dx_sys->pf_create_device(va)) {
+ msg_Err(va, "Failed to create DirectX device");
+ goto error;
+ }
+ msg_Dbg(va, "CreateDevice succeed");
+ }
+
+ if (dx_sys->pf_create_device_manager(va)) {
+ msg_Err(va, "D3dCreateDeviceManager failed");
+ goto error;
+ }
+
+ if (dx_sys->pf_create_video_service(va)) {
+ msg_Err(va, "DxCreateVideoService failed");
+ goto error;
+ }
+
+ /* */
+ if (FindVideoServiceConversion(va, dx_sys, fmt)) {
+ msg_Err(va, "FindVideoServiceConversion failed");
+ goto error;
+ }
+
+ dx_sys->thread_count = ctx->thread_count;
+
+ return VLC_SUCCESS;
+
+error:
+ return VLC_EGENERIC;
+}
+
+static bool profile_supported(const directx_va_mode_t *mode, const es_format_t *fmt)
+{
+ bool is_supported = mode->p_profiles == NULL || !mode->p_profiles[0];
+ if (!is_supported)
+ {
+ int profile = fmt->i_profile;
+ if (mode->codec == AV_CODEC_ID_H264)
+ {
+ size_t h264_profile;
+ if ( h264_get_profile_level(fmt, &h264_profile, NULL, NULL) )
+ profile = h264_profile;
+ }
+
+ if (profile <= 0)
+ is_supported = true;
+ else for (const int *p_profile = &mode->p_profiles[0]; *p_profile; ++p_profile)
+ {
+ if (*p_profile == profile)
+ {
+ is_supported = true;
+ break;
+ }
+ }
+ }
+ return is_supported;
+}
+
+void DestroyVideoService(vlc_va_t *va, directx_sys_t *dx_sys)
+{
+ dx_sys->pf_destroy_video_service(va);
+ if (dx_sys->d3ddec)
+ IUnknown_Release(dx_sys->d3ddec);
+}
+
+/**
+ * Find the best suited decoder mode GUID and render format.
+ */
+static int FindVideoServiceConversion(vlc_va_t *va, directx_sys_t *dx_sys, const es_format_t *fmt)
+{
+ input_list_t p_list = { 0 };
+ int err = dx_sys->pf_get_input_list(va, &p_list);
+ if (err != VLC_SUCCESS)
+ return err;
+
+ /* Retreive supported modes from the decoder service */
+ for (unsigned i = 0; i < p_list.count; i++) {
+ const GUID *g = &p_list.list[i];
+ const directx_va_mode_t *mode = FindDxvaMode(g);
+ if (mode) {
+ msg_Dbg(va, "- '%s' is supported by hardware", mode->name);
+ } else {
+ msg_Warn(va, "- Unknown GUID = " GUID_FMT, GUID_PRINT( *g ) );
+ }
+ }
+
+ /* Try all supported mode by our priority */
+ const directx_va_mode_t *mode = DXVA_MODES;
+ for (; mode->name; ++mode) {
+ if (!mode->codec || mode->codec != dx_sys->codec_id)
+ continue;
+
+ /* */
+ bool is_supported = false;
+ for (const GUID *g = &p_list.list[0]; !is_supported && g < &p_list.list[p_list.count]; g++) {
+ is_supported = IsEqualGUID(mode->guid, g);
+ }
+ if ( is_supported )
+ {
+ is_supported = profile_supported( mode, fmt );
+ if (!is_supported)
+ msg_Warn( va, "Unsupported profile for HWAccel: %d", fmt->i_profile );
+ }
+ if (!is_supported)
+ continue;
+
+ /* */
+ msg_Dbg(va, "Trying to use '%s' as input", mode->name);
+ if (dx_sys->pf_setup_output(va, mode->guid)==VLC_SUCCESS)
+ {
+ dx_sys->input = *mode->guid;
+ err = VLC_SUCCESS;
+ break;
+ }
+ }
+
+ p_list.pf_release(&p_list);
+ return err;
+}
+
+void DestroyDeviceManager(vlc_va_t *va, directx_sys_t *dx_sys)
+{
+ dx_sys->pf_destroy_device_manager(va);
+}
+
+void DestroyDevice(vlc_va_t *va, directx_sys_t *dx_sys)
+{
+ dx_sys->pf_destroy_device(va);
+ if (dx_sys->d3ddev)
+ IUnknown_Release( dx_sys->d3ddev );
+}
diff --git a/modules/codec/avcodec/directx_va.h b/modules/codec/avcodec/directx_va.h
new file mode 100644
index 0000000..7838bf4
--- /dev/null
+++ b/modules/codec/avcodec/directx_va.h
@@ -0,0 +1,143 @@
+/*****************************************************************************
+ * directx_va.h: DirectX Generic Video Acceleration helpers
+ *****************************************************************************
+ * Copyright (C) 2009 Geoffroy Couprie
+ * Copyright (C) 2009 Laurent Aimar
+ * Copyright (C) 2015 Steve Lhomme
+ * $Id$
+ *
+ * Authors: Geoffroy Couprie <geal at videolan.org>
+ * Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
+ * Steve Lhomme <robux4 at gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifndef AVCODEC_DIRECTX_VA_H
+#define AVCODEC_DIRECTX_VA_H
+
+# if _WIN32_WINNT < 0x600
+/* d3d11 needs Vista support */
+# undef _WIN32_WINNT
+# define _WIN32_WINNT 0x600
+# endif
+
+#include <vlc_common.h>
+
+#include <libavcodec/avcodec.h>
+#include "va.h"
+
+#include <unknwn.h>
+
+typedef struct {
+ const char *name;
+ const GUID *guid;
+ int codec;
+ const int *p_profiles; // NULL or ends with 0
+} directx_va_mode_t;
+
+/* */
+typedef struct {
+ int refcount;
+ unsigned int order;
+ vlc_mutex_t *p_lock;
+} vlc_va_surface_t;
+
+typedef struct input_list_t {
+ void (*pf_release)(struct input_list_t *);
+ GUID *list;
+ unsigned count;
+} input_list_t;
+
+#define MAX_SURFACE_COUNT (64)
+typedef struct
+{
+ int codec_id;
+ int width;
+ int height;
+
+ /* DLL */
+ HINSTANCE hdecoder_dll;
+ const TCHAR *psz_decoder_dll;
+
+ /* Direct3D */
+ IUnknown *d3ddev;
+
+ /* Video service */
+ GUID input;
+ IUnknown *d3ddec;
+
+ /* Video decoder */
+ IUnknown *decoder;
+
+ /* */
+ int surface_count;
+ int surface_order;
+ int surface_width;
+ int surface_height;
+
+ int thread_count;
+
+ vlc_mutex_t surface_lock;
+ vlc_va_surface_t surface[MAX_SURFACE_COUNT];
+ IUnknown *hw_surface[MAX_SURFACE_COUNT];
+
+ /**
+ * Check that the decoder device is still available
+ */
+ int (*pf_check_device)(vlc_va_t *);
+
+ int (*pf_create_device)(vlc_va_t *);
+ void (*pf_destroy_device)(vlc_va_t *);
+
+ int (*pf_create_device_manager)(vlc_va_t *);
+ void (*pf_destroy_device_manager)(vlc_va_t *);
+
+ int (*pf_create_video_service)(vlc_va_t *);
+ void (*pf_destroy_video_service)(vlc_va_t *);
+
+ /**
+ * Read the list of possible input GUIDs
+ */
+ int (*pf_get_input_list)(vlc_va_t *, input_list_t *);
+ /**
+ * Find a suitable decoder configuration for the input and set the
+ * internal state to use that output
+ */
+ int (*pf_setup_output)(vlc_va_t *, const GUID *input);
+
+ /**
+ * Create the DirectX surfaces in hw_surface and the decoder in decoder
+ */
+ int (*pf_create_decoder_surfaces)(vlc_va_t *, int codec_id,
+ const video_format_t *fmt, bool b_threading);
+ /**
+ * Destroy resources allocated with the surfaces except from hw_surface objects
+ */
+ void (*pf_destroy_surfaces)(vlc_va_t *);
+ /**
+ * Set the avcodec hw context after the decoder is created
+ */
+ void (*pf_setup_avcodec_ctx)(vlc_va_t *);
+
+} directx_sys_t;
+
+int directx_va_Open(vlc_va_t *, directx_sys_t *, AVCodecContext *ctx, const es_format_t *fmt);
+void directx_va_Close(vlc_va_t *, directx_sys_t *);
+int directx_va_Setup(vlc_va_t *, directx_sys_t *, AVCodecContext *avctx, vlc_fourcc_t *chroma);
+int directx_va_Get(vlc_va_t *, directx_sys_t *, picture_t *pic, uint8_t **data);
+void directx_va_Release(void *opaque, uint8_t *data);
+
+#endif /* AVCODEC_DIRECTX_VA_H */
diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index 52b40bd..7ab4c9d 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -27,31 +27,17 @@
# include "config.h"
#endif
-
-# if _WIN32_WINNT < 0x600
-/* dxva2 needs Vista support */
-# undef _WIN32_WINNT
-# define _WIN32_WINNT 0x600
-# endif
-
#include <assert.h>
#include <vlc_common.h>
#include <vlc_picture.h>
-#include <vlc_fourcc.h>
-#include <vlc_cpu.h>
#include <vlc_plugin.h>
-#include <vlc_codecs.h>
-#include <libavcodec/avcodec.h>
-# define DXVA2API_USE_BITFIELDS
-# define COBJMACROS
-# include <libavcodec/dxva2.h>
+#include "directx_va.h"
-#include "avcodec.h"
-#include "va.h"
-#include "../../video_chroma/copy.h"
-#include "../../packetizer/h264_nal.h"
+#define DXVA2API_USE_BITFIELDS
+#define COBJMACROS
+#include <libavcodec/dxva2.h>
static int Open(vlc_va_t *, AVCodecContext *, enum PixelFormat,
const es_format_t *, picture_sys_t *p_sys);
@@ -65,14 +51,6 @@ vlc_module_begin()
set_callbacks(Open, Close)
vlc_module_end()
-#include <windows.h>
-#include <windowsx.h>
-#include <ole2.h>
-#include <commctrl.h>
-#include <shlwapi.h>
-#include <d3d9.h>
-#include <dxva2api.h>
-
#include <initguid.h> /* must be last included to not redefine existing GUIDs */
/* dxva2api.h GUIDs: http://msdn.microsoft.com/en-us/library/windows/desktop/ms697067(v=vs100).aspx
@@ -97,190 +75,8 @@ MS_GUID(IID_IDirectXVideoAccelerationService, 0xfc51a550, 0xd5e7, 0x11d9, 0xaf,0
MS_GUID (DXVA_NoEncrypt, 0x1b81bed0, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-/* Codec capabilities GUID, sorted by codec */
-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);
-
-MS_GUID (DXVA2_ModeH264_A, 0x1b81be64, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-MS_GUID (DXVA2_ModeH264_B, 0x1b81be65, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-MS_GUID (DXVA2_ModeH264_C, 0x1b81be66, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-MS_GUID (DXVA2_ModeH264_D, 0x1b81be67, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-MS_GUID (DXVA2_ModeH264_E, 0x1b81be68, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-MS_GUID (DXVA2_ModeH264_F, 0x1b81be69, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-DEFINE_GUID(DXVA_ModeH264_VLD_Multiview, 0x9901CCD3, 0xca12, 0x4b7e, 0x86, 0x7a, 0xe2, 0x22, 0x3d, 0x92, 0x55, 0xc3); // MVC
-DEFINE_GUID(DXVA_ModeH264_VLD_WithFMOASO_NoFGT, 0xd5f04ff9, 0x3418, 0x45d8, 0x95, 0x61, 0x32, 0xa7, 0x6a, 0xae, 0x2d, 0xdd);
-DEFINE_GUID(DXVADDI_Intel_ModeH264_A, 0x604F8E64, 0x4951, 0x4c54, 0x88, 0xFE, 0xAB, 0xD2, 0x5C, 0x15, 0xB3, 0xD6);
-DEFINE_GUID(DXVADDI_Intel_ModeH264_C, 0x604F8E66, 0x4951, 0x4c54, 0x88, 0xFE, 0xAB, 0xD2, 0x5C, 0x15, 0xB3, 0xD6);
-DEFINE_GUID(DXVADDI_Intel_ModeH264_E, 0x604F8E68, 0x4951, 0x4c54, 0x88, 0xFE, 0xAB, 0xD2, 0x5C, 0x15, 0xB3, 0xD6); // DXVA_Intel_H264_NoFGT_ClearVideo
-DEFINE_GUID(DXVA_ModeH264_VLD_NoFGT_Flash, 0x4245F676, 0x2BBC, 0x4166, 0xa0, 0xBB, 0x54, 0xE7, 0xB8, 0x49, 0xC3, 0x80);
-
-MS_GUID (DXVA2_ModeWMV8_A, 0x1b81be80, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-MS_GUID (DXVA2_ModeWMV8_B, 0x1b81be81, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-
-MS_GUID (DXVA2_ModeWMV9_A, 0x1b81be90, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-MS_GUID (DXVA2_ModeWMV9_B, 0x1b81be91, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-MS_GUID (DXVA2_ModeWMV9_C, 0x1b81be94, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-
-MS_GUID (DXVA2_ModeVC1_A, 0x1b81beA0, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-MS_GUID (DXVA2_ModeVC1_B, 0x1b81beA1, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-MS_GUID (DXVA2_ModeVC1_C, 0x1b81beA2, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-MS_GUID (DXVA2_ModeVC1_D, 0x1b81beA3, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-DEFINE_GUID(DXVA2_ModeVC1_D2010, 0x1b81beA4, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); // August 2010 update
-DEFINE_GUID(DXVA_Intel_VC1_ClearVideo, 0xBCC5DB6D, 0xA2B6, 0x4AF0, 0xAC, 0xE4, 0xAD, 0xB1, 0xF7, 0x87, 0xBC, 0x89);
-DEFINE_GUID(DXVA_Intel_VC1_ClearVideo_2, 0xE07EC519, 0xE651, 0x4CD6, 0xAC, 0x84, 0x13, 0x70, 0xCC, 0xEE, 0xC8, 0x51);
-
-DEFINE_GUID(DXVA_nVidia_MPEG4_ASP, 0x9947EC6F, 0x689B, 0x11DC, 0xA3, 0x20, 0x00, 0x19, 0xDB, 0xBC, 0x41, 0x84);
-DEFINE_GUID(DXVA_ModeMPEG4pt2_VLD_Simple, 0xefd64d74, 0xc9e8, 0x41d7, 0xa5, 0xe9, 0xe9, 0xb0, 0xe3, 0x9f, 0xa3, 0x19);
-DEFINE_GUID(DXVA_ModeMPEG4pt2_VLD_AdvSimple_NoGMC, 0xed418a9f, 0x010d, 0x4eda, 0x9a, 0xe3, 0x9a, 0x65, 0x35, 0x8d, 0x8d, 0x2e);
-DEFINE_GUID(DXVA_ModeMPEG4pt2_VLD_AdvSimple_GMC, 0xab998b5b, 0x4258, 0x44a9, 0x9f, 0xeb, 0x94, 0xe5, 0x97, 0xa6, 0xba, 0xae);
-DEFINE_GUID(DXVA_ModeMPEG4pt2_VLD_AdvSimple_Avivo, 0x7C74ADC6, 0xe2ba, 0x4ade, 0x86, 0xde, 0x30, 0xbe, 0xab, 0xb4, 0x0c, 0xc1);
-
-DEFINE_GUID(DXVA_ModeHEVC_VLD_Main, 0x5b11d51b, 0x2f4c, 0x4452,0xbc,0xc3,0x09,0xf2,0xa1,0x16,0x0c,0xc0);
-DEFINE_GUID(DXVA_ModeHEVC_VLD_Main10, 0x107af0e0, 0xef1a, 0x4d19,0xab,0xa8,0x67,0xa1,0x63,0x07,0x3d,0x13);
-
-DEFINE_GUID(DXVA_ModeH264_VLD_Stereo_Progressive_NoFGT, 0xd79be8da, 0x0cf1, 0x4c81,0xb8,0x2a,0x69,0xa4,0xe2,0x36,0xf4,0x3d);
-DEFINE_GUID(DXVA_ModeH264_VLD_Stereo_NoFGT, 0xf9aaccbb, 0xc2b6, 0x4cfc,0x87,0x79,0x57,0x07,0xb1,0x76,0x05,0x52);
-DEFINE_GUID(DXVA_ModeH264_VLD_Multiview_NoFGT, 0x705b9d82, 0x76cf, 0x49d6,0xb7,0xe6,0xac,0x88,0x72,0xdb,0x01,0x3c);
-
-DEFINE_GUID(DXVA_ModeH264_VLD_SVC_Scalable_Baseline, 0xc30700c4, 0xe384, 0x43e0, 0xb9, 0x82, 0x2d, 0x89, 0xee, 0x7f, 0x77, 0xc4);
-DEFINE_GUID(DXVA_ModeH264_VLD_SVC_Restricted_Scalable_Baseline, 0x9b8175d4, 0xd670, 0x4cf2, 0xa9, 0xf0, 0xfa, 0x56, 0xdf, 0x71, 0xa1, 0xae);
-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 {
- const char *name;
- const GUID *guid;
- int codec;
- const int *p_profiles; // NULL or ends with 0
-} dxva2_mode_t;
-
-static const int PROF_MPEG2_SIMPLE[] = { FF_PROFILE_MPEG2_SIMPLE, 0 };
-static const int PROF_MPEG2_MAIN[] = { FF_PROFILE_MPEG2_SIMPLE,
- FF_PROFILE_MPEG2_MAIN, 0 };
-static const int PROF_H264_HIGH[] = { FF_PROFILE_H264_CONSTRAINED_BASELINE,
- FF_PROFILE_H264_MAIN,
- FF_PROFILE_H264_HIGH, 0 };
-static const int PROF_HEVC_MAIN[] = { FF_PROFILE_HEVC_MAIN, 0 };
-static const int PROF_HEVC_MAIN10[] = { FF_PROFILE_HEVC_MAIN,
- FF_PROFILE_HEVC_MAIN_10, 0 };
-
-/* 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, NULL },
- { "MPEG-2 decoder, restricted profile A", &DXVA_ModeMPEG2_A, 0, NULL },
- { "MPEG-2 decoder, restricted profile B", &DXVA_ModeMPEG2_B, 0, NULL },
- { "MPEG-2 decoder, restricted profile C", &DXVA_ModeMPEG2_C, 0, NULL },
- { "MPEG-2 decoder, restricted profile D", &DXVA_ModeMPEG2_D, 0, NULL },
-
- { "MPEG-2 variable-length decoder", &DXVA2_ModeMPEG2_VLD, AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_SIMPLE },
- { "MPEG-2 & MPEG-1 variable-length decoder", &DXVA2_ModeMPEG2and1_VLD, AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_MAIN },
- { "MPEG-2 & MPEG-1 variable-length decoder", &DXVA2_ModeMPEG2and1_VLD, AV_CODEC_ID_MPEG1VIDEO, NULL },
- { "MPEG-2 motion compensation", &DXVA2_ModeMPEG2_MoComp, 0, NULL },
- { "MPEG-2 inverse discrete cosine transform", &DXVA2_ModeMPEG2_IDCT, 0, NULL },
-
- /* 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, 0, NULL },
-
- /* 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, AV_CODEC_ID_H264, PROF_H264_HIGH },
- { "H.264 variable-length decoder, no film grain technology (Intel ClearVideo)", &DXVADDI_Intel_ModeH264_E, AV_CODEC_ID_H264, PROF_H264_HIGH },
- { "H.264 variable-length decoder, no film grain technology", &DXVA2_ModeH264_E, AV_CODEC_ID_H264, PROF_H264_HIGH },
- { "H.264 variable-length decoder, no film grain technology, FMO/ASO", &DXVA_ModeH264_VLD_WithFMOASO_NoFGT, AV_CODEC_ID_H264, PROF_H264_HIGH },
- { "H.264 variable-length decoder, no film grain technology, Flash", &DXVA_ModeH264_VLD_NoFGT_Flash, AV_CODEC_ID_H264, PROF_H264_HIGH },
-
- { "H.264 inverse discrete cosine transform, film grain technology", &DXVA2_ModeH264_D, 0, NULL },
- { "H.264 inverse discrete cosine transform, no film grain technology", &DXVA2_ModeH264_C, 0, NULL },
- { "H.264 inverse discrete cosine transform, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_C, 0, NULL },
-
- { "H.264 motion compensation, film grain technology", &DXVA2_ModeH264_B, 0, NULL },
- { "H.264 motion compensation, no film grain technology", &DXVA2_ModeH264_A, 0, NULL },
- { "H.264 motion compensation, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_A, 0, NULL },
-
- /* 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, 0, NULL },
- { "H.264 stereo high profile", &DXVA_ModeH264_VLD_Stereo_NoFGT, 0, NULL },
- { "H.264 multiview high profile", &DXVA_ModeH264_VLD_Multiview_NoFGT, 0, NULL },
-
- /* 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, 0, NULL },
- { "H.264 scalable video coding, Scalable Constrained Baseline Profile", &DXVA_ModeH264_VLD_SVC_Restricted_Scalable_Baseline, 0, NULL },
- { "H.264 scalable video coding, Scalable High Profile", &DXVA_ModeH264_VLD_SVC_Scalable_High, 0, NULL },
- { "H.264 scalable video coding, Scalable Constrained High Profile", &DXVA_ModeH264_VLD_SVC_Restricted_Scalable_High_Progressive, 0, NULL },
-
- /* WMV */
- { "Windows Media Video 8 motion compensation", &DXVA2_ModeWMV8_B, 0, NULL },
- { "Windows Media Video 8 post processing", &DXVA2_ModeWMV8_A, 0, NULL },
-
- { "Windows Media Video 9 IDCT", &DXVA2_ModeWMV9_C, 0, NULL },
- { "Windows Media Video 9 motion compensation", &DXVA2_ModeWMV9_B, 0, NULL },
- { "Windows Media Video 9 post processing", &DXVA2_ModeWMV9_A, 0, NULL },
-
- /* VC-1 */
- { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, AV_CODEC_ID_VC1, NULL },
- { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, AV_CODEC_ID_WMV3, NULL },
- { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, AV_CODEC_ID_VC1, NULL },
- { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, AV_CODEC_ID_WMV3, NULL },
- { "VC-1 variable-length decoder 2 (Intel)", &DXVA_Intel_VC1_ClearVideo_2, 0, NULL },
- { "VC-1 variable-length decoder (Intel)", &DXVA_Intel_VC1_ClearVideo, 0, NULL },
-
- { "VC-1 inverse discrete cosine transform", &DXVA2_ModeVC1_C, 0, NULL },
- { "VC-1 motion compensation", &DXVA2_ModeVC1_B, 0, NULL },
- { "VC-1 post processing", &DXVA2_ModeVC1_A, 0, NULL },
-
- /* Xvid/Divx: TODO */
- { "MPEG-4 Part 2 nVidia bitstream decoder", &DXVA_nVidia_MPEG4_ASP, 0, NULL },
- { "MPEG-4 Part 2 variable-length decoder, Simple Profile", &DXVA_ModeMPEG4pt2_VLD_Simple, 0, NULL },
- { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, no GMC", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_NoGMC, 0, NULL },
- { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, GMC", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_GMC, 0, NULL },
- { "MPEG-4 Part 2 variable-length decoder, Simple&Advanced Profile, Avivo", &DXVA_ModeMPEG4pt2_VLD_AdvSimple_Avivo, 0, NULL },
-
- /* HEVC */
- { "HEVC Main profile", &DXVA_ModeHEVC_VLD_Main, AV_CODEC_ID_HEVC, PROF_HEVC_MAIN },
- { "HEVC Main 10 profile", &DXVA_ModeHEVC_VLD_Main10, AV_CODEC_ID_HEVC, PROF_HEVC_MAIN10 },
-
- /* H.261 */
- { "H.261 decoder, restricted profile A", &DXVA_ModeH261_A, 0, NULL },
- { "H.261 decoder, restricted profile B", &DXVA_ModeH261_B, 0, NULL },
-
- /* H.263 */
- { "H.263 decoder, restricted profile A", &DXVA_ModeH263_A, 0, NULL },
- { "H.263 decoder, restricted profile B", &DXVA_ModeH263_B, 0, NULL },
- { "H.263 decoder, restricted profile C", &DXVA_ModeH263_C, 0, NULL },
- { "H.263 decoder, restricted profile D", &DXVA_ModeH263_D, 0, NULL },
- { "H.263 decoder, restricted profile E", &DXVA_ModeH263_E, 0, NULL },
- { "H.263 decoder, restricted profile F", &DXVA_ModeH263_F, 0, NULL },
-
- { NULL, NULL, 0, NULL }
-};
+DEFINE_GUID(DXVA_Intel_H264_NoFGT_ClearVideo, 0x604F8E68, 0x4951, 0x4c54, 0x88, 0xFE, 0xAB, 0xD2, 0x5C, 0x15, 0xB3, 0xD6);
-static const dxva2_mode_t *Dxva2FindMode(const GUID *guid)
-{
- for (unsigned i = 0; dxva2_modes[i].name; i++) {
- if (IsEqualGUID(dxva2_modes[i].guid, guid))
- return &dxva2_modes[i];
- }
- return NULL;
-}
/* */
typedef struct {
@@ -306,31 +102,16 @@ static const d3d_format_t *D3dFindFormat(D3DFORMAT format)
return NULL;
}
-/* */
-typedef struct {
- LPDIRECT3DSURFACE9 d3d;
- int refcount;
- unsigned int order;
- vlc_mutex_t *p_lock;
-} vlc_va_surface_t;
-
-#define VA_DXVA2_MAX_SURFACE_COUNT (64)
struct vlc_va_sys_t
{
- int codec_id;
- int width;
- int height;
-
- vlc_mutex_t surface_lock;
+ directx_sys_t dx_sys;
/* DLL */
HINSTANCE hd3d9_dll;
- HINSTANCE hdxva2_dll;
/* Direct3D */
LPDIRECT3D9 d3dobj;
D3DADAPTER_IDENTIFIER9 d3dai;
- LPDIRECT3DDEVICE9 d3ddev;
/* Device manager */
UINT token;
@@ -338,164 +119,97 @@ struct vlc_va_sys_t
HANDLE device;
/* Video service */
- IDirectXVideoDecoderService *vs;
- GUID input;
D3DFORMAT render;
/* Video decoder */
DXVA2_ConfigPictureDecode cfg;
- IDirectXVideoDecoder *decoder;
-
- /* Option conversion */
- D3DFORMAT output;
- copy_cache_t surface_cache;
- /* */
+ /* avcodec internals */
struct dxva_context hw;
+};
- /* */
- unsigned surface_count;
- unsigned surface_order;
- int surface_width;
- int surface_height;
- vlc_fourcc_t surface_chroma;
-
- int thread_count;
-
- vlc_va_surface_t surface[VA_DXVA2_MAX_SURFACE_COUNT];
- LPDIRECT3DSURFACE9 hw_surface[VA_DXVA2_MAX_SURFACE_COUNT];
+struct picture_sys_t
+{
+ LPDIRECT3DSURFACE9 surface;
};
/* */
static int D3dCreateDevice(vlc_va_t *);
-static void D3dDestroyDevice(vlc_va_sys_t *);
+static void D3dDestroyDevice(vlc_va_t *);
static char *DxDescribe(vlc_va_sys_t *);
static int D3dCreateDeviceManager(vlc_va_t *);
-static void D3dDestroyDeviceManager(vlc_va_sys_t *);
+static void D3dDestroyDeviceManager(vlc_va_t *);
static int DxCreateVideoService(vlc_va_t *);
-static void DxDestroyVideoService(vlc_va_sys_t *);
-static int DxFindVideoServiceConversion(vlc_va_t *, GUID *input, D3DFORMAT *output, const es_format_t *fmt);
+static void DxDestroyVideoService(vlc_va_t *);
+static int DxGetInputList(vlc_va_t *, input_list_t *);
+static int DxSetupOutput(vlc_va_t *, const GUID *);
static int DxCreateVideoDecoder(vlc_va_t *,
int codec_id, const video_format_t *, bool);
-static void DxDestroyVideoDecoder(vlc_va_sys_t *);
+static void DxDestroyVideoDecoder(vlc_va_t *);
static int DxResetVideoDecoder(vlc_va_t *);
-
-static bool profile_supported(const dxva2_mode_t *mode, const es_format_t *fmt);
-
-static void DxCreateVideoConversion(vlc_va_sys_t *);
-static void DxDestroyVideoConversion(vlc_va_sys_t *);
+static void SetupAVCodecContext(vlc_va_t *);
/* */
static int Setup(vlc_va_t *va, AVCodecContext *avctx, vlc_fourcc_t *chroma)
{
vlc_va_sys_t *sys = va->sys;
-
- if (sys->width == avctx->coded_width && sys->height == avctx->coded_height
- && sys->decoder != NULL)
- goto ok;
-
- /* */
- DxDestroyVideoConversion(sys);
- DxDestroyVideoDecoder(sys);
-
- avctx->hwaccel_context = NULL;
- *chroma = 0;
- if (avctx->coded_width <= 0 || avctx->coded_height <= 0)
- return VLC_EGENERIC;
-
- /* FIXME transmit a video_format_t by VaSetup directly */
- video_format_t fmt;
- memset(&fmt, 0, sizeof(fmt));
- fmt.i_width = avctx->coded_width;
- fmt.i_height = avctx->coded_height;
-
- if (DxCreateVideoDecoder(va, sys->codec_id, &fmt, avctx->active_thread_type & FF_THREAD_FRAME))
+ if (directx_va_Setup(va, &sys->dx_sys, avctx, chroma)!=VLC_SUCCESS)
return VLC_EGENERIC;
- /* */
- sys->hw.decoder = sys->decoder;
- sys->hw.cfg = &sys->cfg;
- sys->hw.surface_count = sys->surface_count;
- sys->hw.surface = sys->hw_surface;
- /* */
- DxCreateVideoConversion(sys);
-
- /* */
-ok:
avctx->hwaccel_context = &sys->hw;
- const d3d_format_t *output = D3dFindFormat(sys->output);
- *chroma = output->codec;
+ *chroma = VLC_CODEC_D3D9_OPAQUE;
return VLC_SUCCESS;
}
-static int Extract(vlc_va_t *va, picture_t *picture, uint8_t *data)
+void SetupAVCodecContext(vlc_va_t *va)
{
vlc_va_sys_t *sys = va->sys;
- LPDIRECT3DSURFACE9 d3d = (LPDIRECT3DSURFACE9)(uintptr_t)data;
+ directx_sys_t *dx_sys = &sys->dx_sys;
- if (!sys->surface_cache.buffer)
- return VLC_EGENERIC;
+ sys->hw.decoder = (IDirectXVideoDecoder*) dx_sys->decoder;
+ sys->hw.cfg = &sys->cfg;
+ sys->hw.surface_count = dx_sys->surface_count;
+ sys->hw.surface = (LPDIRECT3DSURFACE9*) dx_sys->hw_surface;
- /* */
- assert(sys->output == MAKEFOURCC('Y','V','1','2'));
+ if (IsEqualGUID(&dx_sys->input, &DXVA_Intel_H264_NoFGT_ClearVideo))
+ sys->hw.workaround |= FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO;
+}
- /* */
- D3DLOCKED_RECT lock;
- if (FAILED(IDirect3DSurface9_LockRect(d3d, &lock, NULL, D3DLOCK_READONLY))) {
- msg_Err(va, "Failed to lock surface");
- return VLC_EGENERIC;
- }
+static int Extract(vlc_va_t *va, picture_t *picture, uint8_t *data)
+{
+ directx_sys_t *dx_sys = &va->sys->dx_sys;
+ LPDIRECT3DSURFACE9 d3d = (LPDIRECT3DSURFACE9)(uintptr_t)data;
+ picture_sys_t *p_sys = picture->p_sys;
+ LPDIRECT3DSURFACE9 output = p_sys->surface;
+
+ assert(d3d != output);
+#ifndef NDEBUG
+ LPDIRECT3DDEVICE9 srcDevice, dstDevice;
+ IDirect3DSurface9_GetDevice(d3d, &srcDevice);
+ IDirect3DSurface9_GetDevice(output, &dstDevice);
+ assert(srcDevice == dstDevice);
+#endif
- if (sys->render == MAKEFOURCC('Y','V','1','2') ||
- sys->render == MAKEFOURCC('I','M','C','3')) {
- bool imc3 = sys->render == MAKEFOURCC('I','M','C','3');
- size_t chroma_pitch = imc3 ? lock.Pitch : (lock.Pitch / 2);
-
- size_t pitch[3] = {
- lock.Pitch,
- chroma_pitch,
- chroma_pitch,
- };
-
- uint8_t *plane[3] = {
- (uint8_t*)lock.pBits,
- (uint8_t*)lock.pBits + pitch[0] * sys->surface_height,
- (uint8_t*)lock.pBits + pitch[0] * sys->surface_height
- + pitch[1] * sys->surface_height / 2,
- };
-
- if (imc3) {
- uint8_t *V = plane[1];
- plane[1] = plane[2];
- plane[2] = V;
- }
- CopyFromYv12(picture, plane, pitch, sys->width, sys->height,
- &sys->surface_cache);
- } else {
- assert(sys->render == MAKEFOURCC('N','V','1','2'));
- uint8_t *plane[2] = {
- lock.pBits,
- (uint8_t*)lock.pBits + lock.Pitch * sys->surface_height
- };
- size_t pitch[2] = {
- lock.Pitch,
- lock.Pitch,
- };
- CopyFromNv12(picture, plane, pitch, sys->width, sys->height,
- &sys->surface_cache);
+ HRESULT hr;
+ RECT visibleSource;
+ visibleSource.left = 0;
+ visibleSource.top = 0;
+ visibleSource.right = picture->format.i_visible_width;
+ visibleSource.bottom = picture->format.i_visible_height;
+ hr = IDirect3DDevice9_StretchRect( (IDirect3DDevice9*) dx_sys->d3ddev, d3d, &visibleSource, output, &visibleSource, D3DTEXF_NONE);
+ if (FAILED(hr)) {
+ msg_Err(va, "Failed to copy the hw surface to the decoder surface (hr=0x%0lx)", hr );
+ return VLC_EGENERIC;
}
- /* */
- IDirect3DSurface9_UnlockRect(d3d);
return VLC_SUCCESS;
}
-/* FIXME it is nearly common with VAAPI */
-static int Get(vlc_va_t *va, picture_t *pic, uint8_t **data)
+static int CheckDevice(vlc_va_t *va)
{
vlc_va_sys_t *sys = va->sys;
@@ -508,48 +222,12 @@ static int Get(vlc_va_t *va, picture_t *pic, uint8_t **data)
msg_Err(va, "IDirect3DDeviceManager9_TestDevice %u", (unsigned)hr);
return VLC_EGENERIC;
}
-
- vlc_mutex_lock( &sys->surface_lock );
-
- /* Grab an unused surface, in case none are, try the oldest
- * XXX using the oldest is a workaround in case a problem happens with libavcodec */
- unsigned i, old;
- for (i = 0, old = 0; i < sys->surface_count; i++) {
- vlc_va_surface_t *surface = &sys->surface[i];
-
- if (!surface->refcount)
- break;
-
- if (surface->order < sys->surface[old].order)
- old = i;
- }
- if (i >= sys->surface_count)
- i = old;
-
- vlc_va_surface_t *surface = &sys->surface[i];
-
- surface->refcount = 1;
- surface->order = sys->surface_order++;
- *data = (void *)surface->d3d;
- pic->context = surface;
-
- vlc_mutex_unlock( &sys->surface_lock );
-
return VLC_SUCCESS;
}
-static void Release(void *opaque, uint8_t *data)
+static int Get(vlc_va_t *va, picture_t *pic, uint8_t **data)
{
- picture_t *pic = opaque;
- vlc_va_surface_t *surface = pic->context;
- vlc_mutex_lock( surface->p_lock );
-
- surface->refcount--;
- pic->context = NULL;
- picture_Release(pic);
- (void) data;
-
- vlc_mutex_unlock( surface->p_lock );
+ return directx_va_Get(va, &va->sys->dx_sys, pic, data);
}
static void Close(vlc_va_t *va, AVCodecContext *ctx)
@@ -557,17 +235,11 @@ static void Close(vlc_va_t *va, AVCodecContext *ctx)
vlc_va_sys_t *sys = va->sys;
(void) ctx;
- DxDestroyVideoConversion(sys);
- DxDestroyVideoDecoder(sys);
- DxDestroyVideoService(sys);
- D3dDestroyDeviceManager(sys);
- D3dDestroyDevice(sys);
-
- if (sys->hdxva2_dll)
- FreeLibrary(sys->hdxva2_dll);
+
+ directx_va_Close(va, &sys->dx_sys);
+
if (sys->hd3d9_dll)
FreeLibrary(sys->hd3d9_dll);
- vlc_mutex_destroy( &sys->surface_lock );
free((char *)va->description);
free(sys);
@@ -576,6 +248,9 @@ static void Close(vlc_va_t *va, AVCodecContext *ctx)
static int Open(vlc_va_t *va, AVCodecContext *ctx, enum PixelFormat pix_fmt,
const es_format_t *fmt, picture_sys_t *p_sys)
{
+ int err = VLC_EGENERIC;
+ directx_sys_t *dx_sys;
+
if (pix_fmt != AV_PIX_FMT_DXVA2_VLD)
return VLC_EGENERIC;
@@ -585,54 +260,45 @@ static int Open(vlc_va_t *va, AVCodecContext *ctx, enum PixelFormat pix_fmt,
if (unlikely(sys == NULL))
return VLC_ENOMEM;
- va->sys = sys;
- sys->codec_id = ctx->codec_id;
-
- vlc_mutex_init( &sys->surface_lock );
-
/* Load dll*/
sys->hd3d9_dll = LoadLibrary(TEXT("D3D9.DLL"));
if (!sys->hd3d9_dll) {
msg_Warn(va, "cannot load d3d9.dll");
goto error;
}
- sys->hdxva2_dll = LoadLibrary(TEXT("DXVA2.DLL"));
- if (!sys->hdxva2_dll) {
- msg_Warn(va, "cannot load dxva2.dll");
- goto error;
- }
- msg_Dbg(va, "DLLs loaded");
- /* */
- if (D3dCreateDevice(va)) {
- msg_Err(va, "Failed to create Direct3D device");
- goto error;
- }
- msg_Dbg(va, "D3dCreateDevice succeed");
+ dx_sys = &sys->dx_sys;
- if (D3dCreateDeviceManager(va)) {
- msg_Err(va, "D3dCreateDeviceManager failed");
- goto error;
- }
+ dx_sys->pf_check_device = CheckDevice;
+ dx_sys->pf_create_device = D3dCreateDevice;
+ dx_sys->pf_destroy_device = D3dDestroyDevice;
+ dx_sys->pf_create_device_manager = D3dCreateDeviceManager;
+ dx_sys->pf_destroy_device_manager = D3dDestroyDeviceManager;
+ dx_sys->pf_create_video_service = DxCreateVideoService;
+ dx_sys->pf_destroy_video_service = DxDestroyVideoService;
+ dx_sys->pf_create_decoder_surfaces = DxCreateVideoDecoder;
+ dx_sys->pf_destroy_surfaces = DxDestroyVideoDecoder;
+ dx_sys->pf_setup_avcodec_ctx = SetupAVCodecContext;
+ dx_sys->pf_get_input_list = DxGetInputList;
+ dx_sys->pf_setup_output = DxSetupOutput;
+ dx_sys->psz_decoder_dll = TEXT("DXVA2.DLL");
- if (DxCreateVideoService(va)) {
- msg_Err(va, "DxCreateVideoService failed");
- goto error;
- }
+ va->sys = sys;
- /* */
- if (DxFindVideoServiceConversion(va, &sys->input, &sys->render, fmt)) {
- msg_Err(va, "DxFindVideoServiceConversion failed");
+ dx_sys->d3ddev = NULL;
+ if (p_sys!=NULL)
+ IDirect3DSurface9_GetDevice(p_sys->surface, (IDirect3DDevice9**) &dx_sys->d3ddev );
+
+ err = directx_va_Open(va, &sys->dx_sys, ctx, fmt);
+ if (err!=VLC_SUCCESS)
goto error;
- }
- sys->thread_count = ctx->thread_count;
/* TODO print the hardware name/vendor for debugging purposes */
va->description = DxDescribe(sys);
va->setup = Setup;
va->get = Get;
- va->release = Release;
+ va->release = directx_va_Release;
va->extract = Extract;
return VLC_SUCCESS;
@@ -701,7 +367,7 @@ static int D3dCreateDevice(vlc_va_t *va)
msg_Err(va, "IDirect3D9_CreateDevice failed");
return VLC_EGENERIC;
}
- sys->d3ddev = d3ddev;
+ sys->dx_sys.d3ddev = (IUnknown*) d3ddev;
return VLC_SUCCESS;
}
@@ -709,12 +375,10 @@ static int D3dCreateDevice(vlc_va_t *va)
/**
* It releases a Direct3D device and its resources.
*/
-static void D3dDestroyDevice(vlc_va_sys_t *va)
+static void D3dDestroyDevice(vlc_va_t *va)
{
- if (va->d3ddev)
- IDirect3DDevice9_Release(va->d3ddev);
- if (va->d3dobj)
- IDirect3D9_Release(va->d3dobj);
+ if (va->sys->d3dobj)
+ IDirect3D9_Release(va->sys->d3dobj);
}
/**
* It describes our Direct3D object
@@ -756,11 +420,12 @@ static char *DxDescribe(vlc_va_sys_t *va)
static int D3dCreateDeviceManager(vlc_va_t *va)
{
vlc_va_sys_t *sys = va->sys;
+ directx_sys_t *dx_sys = &va->sys->dx_sys;
HRESULT (WINAPI *CreateDeviceManager9)(UINT *pResetToken,
IDirect3DDeviceManager9 **);
CreateDeviceManager9 =
- (void *)GetProcAddress(sys->hdxva2_dll,
+ (void *)GetProcAddress(dx_sys->hdecoder_dll,
"DXVA2CreateDirect3DDeviceManager9");
if (!CreateDeviceManager9) {
@@ -779,7 +444,7 @@ static int D3dCreateDeviceManager(vlc_va_t *va)
sys->devmng = devmng;
msg_Info(va, "obtained IDirect3DDeviceManager9");
- HRESULT hr = IDirect3DDeviceManager9_ResetDevice(devmng, sys->d3ddev, token);
+ HRESULT hr = IDirect3DDeviceManager9_ResetDevice(devmng, (IDirect3DDevice9*) dx_sys->d3ddev, token);
if (FAILED(hr)) {
msg_Err(va, "IDirect3DDeviceManager9_ResetDevice failed: %08x", (unsigned)hr);
return VLC_EGENERIC;
@@ -789,10 +454,10 @@ static int D3dCreateDeviceManager(vlc_va_t *va)
/**
* It destroys a Direct3D device manager
*/
-static void D3dDestroyDeviceManager(vlc_va_sys_t *va)
+static void D3dDestroyDeviceManager(vlc_va_t *va)
{
- if (va->devmng)
- IDirect3DDeviceManager9_Release(va->devmng);
+ if (va->sys->devmng)
+ IDirect3DDeviceManager9_Release(va->sys->devmng);
}
/**
@@ -801,12 +466,13 @@ static void D3dDestroyDeviceManager(vlc_va_sys_t *va)
static int DxCreateVideoService(vlc_va_t *va)
{
vlc_va_sys_t *sys = va->sys;
+ directx_sys_t *dx_sys = &va->sys->dx_sys;
HRESULT (WINAPI *CreateVideoService)(IDirect3DDevice9 *,
REFIID riid,
void **ppService);
CreateVideoService =
- (void *)GetProcAddress(sys->hdxva2_dll, "DXVA2CreateVideoService");
+ (void *)GetProcAddress(dx_sys->hdecoder_dll, "DXVA2CreateVideoService");
if (!CreateVideoService) {
msg_Err(va, "cannot load function");
@@ -831,7 +497,7 @@ static int DxCreateVideoService(vlc_va_t *va)
msg_Err(va, "GetVideoService failed");
return VLC_EGENERIC;
}
- sys->vs = pv;
+ dx_sys->d3ddec = pv;
return VLC_SUCCESS;
}
@@ -839,211 +505,113 @@ static int DxCreateVideoService(vlc_va_t *va)
/**
* It destroys a DirectX video service
*/
-static void DxDestroyVideoService(vlc_va_sys_t *va)
+static void DxDestroyVideoService(vlc_va_t *va)
{
- if (va->device)
- IDirect3DDeviceManager9_CloseDeviceHandle(va->devmng, va->device);
- if (va->vs)
- IDirectXVideoDecoderService_Release(va->vs);
+ if (va->sys->device)
+ IDirect3DDeviceManager9_CloseDeviceHandle(va->sys->devmng, va->sys->device);
}
-static bool profile_supported(const dxva2_mode_t *mode, const es_format_t *fmt)
+static void ReleaseInputList(input_list_t *p_list)
{
- bool is_supported = mode->p_profiles == NULL || !mode->p_profiles[0];
- if (!is_supported)
- {
- int profile = fmt->i_profile;
- if (mode->codec == AV_CODEC_ID_H264)
- {
- size_t h264_profile;
- if ( h264_get_profile_level(fmt, &h264_profile, NULL, NULL) )
- profile = h264_profile;
- }
-
- if (profile <= 0)
- is_supported = true;
- else for (const int *p_profile = &mode->p_profiles[0]; *p_profile; ++p_profile)
- {
- if (*p_profile == profile)
- {
- is_supported = true;
- break;
- }
- }
- }
- return is_supported;
+ CoTaskMemFree(p_list->list);
}
-/**
- * Find the best suited decoder mode GUID and render format.
- */
-static int DxFindVideoServiceConversion(vlc_va_t *va, GUID *input, D3DFORMAT *output, const es_format_t *fmt)
+static int DxGetInputList(vlc_va_t *va, input_list_t *p_list)
{
- vlc_va_sys_t *sys = va->sys;
-
- /* Retreive supported modes from the decoder service */
+ directx_sys_t *dx_sys = &va->sys->dx_sys;
UINT input_count = 0;
GUID *input_list = NULL;
- if (FAILED(IDirectXVideoDecoderService_GetDecoderDeviceGuids(sys->vs,
+ if (FAILED(IDirectXVideoDecoderService_GetDecoderDeviceGuids((IDirectXVideoDecoderService*) dx_sys->d3ddec,
&input_count,
&input_list))) {
msg_Err(va, "IDirectXVideoDecoderService_GetDecoderDeviceGuids failed");
return VLC_EGENERIC;
}
- for (unsigned i = 0; i < input_count; i++) {
- const GUID *g = &input_list[i];
- const dxva2_mode_t *mode = Dxva2FindMode(g);
- if (mode) {
- msg_Dbg(va, "- '%s' is supported by hardware", mode->name);
+
+ p_list->count = input_count;
+ p_list->list = input_list;
+ p_list->pf_release = ReleaseInputList;
+ return VLC_SUCCESS;
+}
+
+static int DxSetupOutput(vlc_va_t *va, const GUID *input)
+{
+ int err = VLC_EGENERIC;
+ UINT output_count = 0;
+ D3DFORMAT *output_list = NULL;
+ if (FAILED(IDirectXVideoDecoderService_GetDecoderRenderTargets((IDirectXVideoDecoderService*) va->sys->dx_sys.d3ddec,
+ input,
+ &output_count,
+ &output_list))) {
+ msg_Err(va, "IDirectXVideoDecoderService_GetDecoderRenderTargets failed");
+ return VLC_EGENERIC;
+ }
+
+ for (unsigned j = 0; j < output_count; j++) {
+ const D3DFORMAT f = output_list[j];
+ const d3d_format_t *format = D3dFindFormat(f);
+ if (format) {
+ msg_Dbg(va, "%s is supported for output", format->name);
} else {
- msg_Warn(va, "- Unknown GUID = " GUID_FMT, GUID_PRINT( *g ) );
+ msg_Dbg(va, "%d is supported for output (%4.4s)", f, (const char*)&f);
}
}
- /* Try all supported mode by our priority */
- for (unsigned i = 0; dxva2_modes[i].name; i++) {
- const dxva2_mode_t *mode = &dxva2_modes[i];
- if (!mode->codec || mode->codec != sys->codec_id)
- continue;
+ /* */
+ for (unsigned j = 0; d3d_formats[j].name; j++) {
+ const d3d_format_t *format = &d3d_formats[j];
/* */
bool is_supported = false;
- for (const GUID *g = &input_list[0]; !is_supported && g < &input_list[input_count]; g++) {
- is_supported = IsEqualGUID(mode->guid, g);
- }
- if ( is_supported )
- {
- is_supported = profile_supported( mode, fmt );
- if (!is_supported)
- msg_Warn( va, "Unsupported profile for DXVA2 HWAccel: %d", fmt->i_profile );
+ for (unsigned k = 0; !is_supported && k < output_count; k++) {
+ is_supported = format->format == output_list[k];
}
if (!is_supported)
continue;
- /* */
- msg_Dbg(va, "Trying to use '%s' as input", mode->name);
- UINT output_count = 0;
- D3DFORMAT *output_list = NULL;
- if (FAILED(IDirectXVideoDecoderService_GetDecoderRenderTargets(sys->vs, mode->guid,
- &output_count,
- &output_list))) {
- msg_Err(va, "IDirectXVideoDecoderService_GetDecoderRenderTargets failed");
- continue;
- }
- for (unsigned j = 0; j < output_count; j++) {
- const D3DFORMAT f = output_list[j];
- const d3d_format_t *format = D3dFindFormat(f);
- if (format) {
- msg_Dbg(va, "%s is supported for output", format->name);
- } else {
- msg_Dbg(va, "%d is supported for output (%4.4s)", f, (const char*)&f);
- }
- }
-
- /* */
- for (unsigned j = 0; d3d_formats[j].name; j++) {
- const d3d_format_t *format = &d3d_formats[j];
-
- /* */
- bool is_supported = false;
- for (unsigned k = 0; !is_supported && k < output_count; k++) {
- is_supported = format->format == output_list[k];
- }
- if (!is_supported)
- continue;
-
- /* We have our solution */
- msg_Dbg(va, "Using '%s' to decode to '%s'", mode->name, format->name);
- *input = *mode->guid;
- *output = format->format;
- CoTaskMemFree(output_list);
- CoTaskMemFree(input_list);
- return VLC_SUCCESS;
- }
- CoTaskMemFree(output_list);
+ /* We have our solution */
+ msg_Dbg(va, "Using decoder output '%s'", format->name);
+ va->sys->render = format->format;
+ err = VLC_SUCCESS;
+ break;
}
- CoTaskMemFree(input_list);
- return VLC_EGENERIC;
+ CoTaskMemFree(output_list);
+ return err;
}
/**
* It creates a DXVA2 decoder using the given video format
*/
-static int DxCreateVideoDecoder(vlc_va_t *va, int codec_id,
- const video_format_t *fmt, bool b_threading)
+static int DxCreateVideoDecoder(vlc_va_t *va, int codec_id, const video_format_t *fmt, bool b_threading)
{
- vlc_va_sys_t *sys = va->sys;
- int surface_alignment = 16;
- int surface_count = 4;
+ VLC_UNUSED(b_threading);
- /* */
- msg_Dbg(va, "DxCreateVideoDecoder id %d %dx%d",
- codec_id, fmt->i_width, fmt->i_height);
-
- sys->width = fmt->i_width;
- sys->height = fmt->i_height;
-
- switch ( codec_id )
- {
- case AV_CODEC_ID_MPEG2VIDEO:
- /* decoding MPEG-2 requires additional alignment on some Intel GPUs,
- but it causes issues for H.264 on certain AMD GPUs..... */
- surface_alignment = 32;
- surface_count += 2;
- break;
- case AV_CODEC_ID_HEVC:
- /* the HEVC DXVA2 spec asks for 128 pixel aligned surfaces to ensure
- all coding features have enough room to work with */
- surface_alignment = 128;
- surface_count += 16;
- break;
- case AV_CODEC_ID_H264:
- surface_count += 16;
- break;
- default:
- surface_count += 2;
- }
-
-#define ALIGN(x, y) (((x) + ((y) - 1)) & ~((y) - 1))
- sys->surface_width = ALIGN(fmt->i_width, surface_alignment);
- sys->surface_height = ALIGN(fmt->i_height, surface_alignment);
+ vlc_va_sys_t *p_sys = va->sys;
+ directx_sys_t *sys = &va->sys->dx_sys;
- if ( b_threading )
- surface_count += sys->thread_count;
-
- if (surface_count > VA_DXVA2_MAX_SURFACE_COUNT)
- return VLC_EGENERIC;
- sys->surface_count = surface_count;
- if (FAILED(IDirectXVideoDecoderService_CreateSurface(sys->vs,
+ if (FAILED(IDirectXVideoDecoderService_CreateSurface((IDirectXVideoDecoderService*) sys->d3ddec,
sys->surface_width,
sys->surface_height,
sys->surface_count - 1,
- sys->render,
+ p_sys->render,
D3DPOOL_DEFAULT,
0,
DXVA2_VideoDecoderRenderTarget,
- sys->hw_surface,
+ (LPDIRECT3DSURFACE9*) sys->hw_surface,
NULL))) {
msg_Err(va, "IDirectXVideoAccelerationService_CreateSurface failed");
sys->surface_count = 0;
return VLC_EGENERIC;
}
- for (unsigned i = 0; i < sys->surface_count; i++) {
- vlc_va_surface_t *surface = &sys->surface[i];
- surface->d3d = sys->hw_surface[i];
- surface->refcount = 0;
- surface->order = 0;
- surface->p_lock = &sys->surface_lock;
- }
msg_Dbg(va, "IDirectXVideoAccelerationService_CreateSurface succeed with %d surfaces (%dx%d)",
- sys->surface_count, fmt->i_width, fmt->i_height);
+ sys->surface_count, sys->surface_width, sys->surface_height);
/* */
DXVA2_VideoDesc dsc;
ZeroMemory(&dsc, sizeof(dsc));
dsc.SampleWidth = fmt->i_width;
dsc.SampleHeight = fmt->i_height;
- dsc.Format = sys->render;
+ dsc.Format = p_sys->render;
if (fmt->i_frame_rate > 0 && fmt->i_frame_rate_base > 0) {
dsc.InputSampleFreq.Numerator = fmt->i_frame_rate;
dsc.InputSampleFreq.Denominator = fmt->i_frame_rate_base;
@@ -1068,7 +636,7 @@ static int DxCreateVideoDecoder(vlc_va_t *va, int codec_id,
/* List all configurations available for the decoder */
UINT cfg_count = 0;
DXVA2_ConfigPictureDecode *cfg_list = NULL;
- if (FAILED(IDirectXVideoDecoderService_GetDecoderConfigurations(sys->vs,
+ if (FAILED(IDirectXVideoDecoderService_GetDecoderConfigurations((IDirectXVideoDecoderService*) sys->d3ddec,
&sys->input,
&dsc,
NULL,
@@ -1100,7 +668,7 @@ static int DxCreateVideoDecoder(vlc_va_t *va, int codec_id,
score += 16;
if (cfg_score < score) {
- sys->cfg = *cfg;
+ p_sys->cfg = *cfg;
cfg_score = score;
}
}
@@ -1112,34 +680,25 @@ static int DxCreateVideoDecoder(vlc_va_t *va, int codec_id,
/* Create the decoder */
IDirectXVideoDecoder *decoder;
- if (FAILED(IDirectXVideoDecoderService_CreateVideoDecoder(sys->vs,
+ if (FAILED(IDirectXVideoDecoderService_CreateVideoDecoder((IDirectXVideoDecoderService*) sys->d3ddec,
&sys->input,
&dsc,
- &sys->cfg,
- sys->hw_surface,
+ &p_sys->cfg,
+ (LPDIRECT3DSURFACE9*) sys->hw_surface,
sys->surface_count,
&decoder))) {
msg_Err(va, "IDirectXVideoDecoderService_CreateVideoDecoder failed");
return VLC_EGENERIC;
}
- sys->decoder = decoder;
-
- if (IsEqualGUID(&sys->input, &DXVADDI_Intel_ModeH264_E))
- sys->hw.workaround |= FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO;
+ sys->decoder = (IUnknown*) decoder;
msg_Dbg(va, "IDirectXVideoDecoderService_CreateVideoDecoder succeed");
return VLC_SUCCESS;
}
-static void DxDestroyVideoDecoder(vlc_va_sys_t *va)
+static void DxDestroyVideoDecoder(vlc_va_t *va)
{
- if (va->decoder)
- IDirectXVideoDecoder_Release(va->decoder);
- va->decoder = NULL;
-
- for (unsigned i = 0; i < va->surface_count; i++)
- IDirect3DSurface9_Release(va->surface[i].d3d);
- va->surface_count = 0;
+ VLC_UNUSED(va);
}
static int DxResetVideoDecoder(vlc_va_t *va)
@@ -1148,21 +707,3 @@ static int DxResetVideoDecoder(vlc_va_t *va)
return VLC_EGENERIC;
}
-static void DxCreateVideoConversion(vlc_va_sys_t *va)
-{
- switch (va->render) {
- case MAKEFOURCC('N','V','1','2'):
- case MAKEFOURCC('I','M','C','3'):
- va->output = MAKEFOURCC('Y','V','1','2');
- break;
- default:
- va->output = va->render;
- break;
- }
- CopyInitCache(&va->surface_cache, va->surface_width);
-}
-
-static void DxDestroyVideoConversion(vlc_va_sys_t *va)
-{
- CopyCleanCache(&va->surface_cache);
-}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 773a728..f6347ae 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -350,6 +350,8 @@ modules/codec/avcodec/audio.c
modules/codec/avcodec/avcodec.c
modules/codec/avcodec/avcodec.h
modules/codec/avcodec/chroma.c
+modules/codec/avcodec/directx_va.c
+modules/codec/avcodec/directx_va.h
modules/codec/avcodec/dxva2.c
modules/codec/avcodec/encoder.c
modules/codec/avcodec/fourcc.c
--
2.4.0
More information about the vlc-devel
mailing list