dxva: add support for new dxva2 and d3d11 hwaccel APIs

This also adds support to avconv (which is trivial due to the new hwaccel API being generic enough). The new decoder setup code in dxva2.c is significantly based on work by Steve Lhomme <robux4@gmail.com>, but with heavy changes/rewrites. Signed-off-by: Diego Biurrun <diego@biurrun.de>
FFmpeg · Jun 8, 2017 · f9e7a2f · f9e7a2f
1 parent 831cfe1
commit f9e7a2f
Show file tree

Hide file tree

Showing 20 changed files with 853 additions and 461 deletions.
diff --git a/Changelog b/Changelog
@@ -15,6 +15,7 @@ version <next>:
 - VP9 superframe split/merge bitstream filters
 - FM Screen Capture Codec decoder
 - ClearVideo decoder (I-frames only)
+- support for decoding through D3D11VA in avconv
 
 
 version 12:

diff --git a/avtools/Makefile b/avtools/Makefile
@@ -12,7 +12,6 @@ OBJS-avconv                   += avtools/avconv_opt.o avtools/avconv_filter.o \
                                  avtools/avconv_hw.o
 OBJS-avconv-$(CONFIG_LIBMFX)  += avtools/avconv_qsv.o
 OBJS-avconv-$(CONFIG_VDA)     += avtools/avconv_vda.o
-OBJS-avconv-$(HAVE_DXVA2_LIB) += avtools/avconv_dxva2.o
 
 define DOAVTOOL
 OBJS-$(1) += avtools/cmdutils.o avtools/$(1).o $(OBJS-$(1)-yes)

diff --git a/avtools/avconv.h b/avtools/avconv.h
@@ -57,6 +57,7 @@ enum HWAccelID {
     HWACCEL_VDA,
     HWACCEL_QSV,
     HWACCEL_VAAPI,
+    HWACCEL_D3D11VA,
 };
 
 typedef struct HWAccel {