History

D3D11va: add a Direct3D11 video decoder similar to DXVA2

Steve Lhomme committed 11 years ago

Commit d8039ef1 parent 4e1794619 files · +682 −156Browse files

Unified · Split

19 files
  1. Changelog +1 −0
  2. configure +30 −1
  3. libavcodec/Makefile +7 −0
  4. libavcodec/allcodecs.c +5 −0
  5. libavcodec/d3d11va.h +98 −0
  6. libavcodec/dxva2.c +130 −31
  7. libavcodec/dxva2_h264.c +98 −40
  8. libavcodec/dxva2_hevc.c +83 −25
  9. libavcodec/dxva2_internal.h +27 −5
  10. libavcodec/dxva2_mpeg2.c +80 −22
  11. libavcodec/dxva2_vc1.c +101 −30
  12. libavcodec/h264_slice.c +3 −0
  13. libavcodec/hevc.c +3 −0
  14. libavcodec/mpeg12dec.c +3 −0
  15. libavcodec/vc1dec.c +3 −0
  16. libavcodec/version.h +1 −1
  17. libavutil/pixdesc.c +6 −0
  18. libavutil/pixfmt.h +2 −0
  19. libavutil/version.h +1 −1
Changelog+1−0
@@ -12,6 +12,7 @@ version <next>: · 11 unmodified lines
12- VP8 in Ogg demuxing12- VP8 in Ogg demuxing
13- OpenH264 encoder wrapper13- OpenH264 encoder wrapper
14- Support DNx100 (960x720@8)14- Support DNx100 (960x720@8)
15- Direct3D11-accelerated decoding
15- DXVA2-accelerated HEVC decoding16- DXVA2-accelerated HEVC decoding
16- AAC ELD 480 decoding17- AAC ELD 480 decoding
17- Intel QSV-accelerated H.264 decoding18- Intel QSV-accelerated H.264 decoding
configure+30−1
@@ -133,6 +133,7 @@ Component options: · 132 unmodified lines
133 --disable-faan disable floating point AAN (I)DCT code133 --disable-faan disable floating point AAN (I)DCT code
134 134
135Hardware accelerators:135Hardware accelerators:
136 --enable-d3d11va enable D3D11VA code
136 --enable-dxva2 enable DXVA2 code137 --enable-dxva2 enable DXVA2 code
137 --enable-vaapi enable VAAPI code138 --enable-vaapi enable VAAPI code
138 --enable-vda enable VDA code139 --enable-vda enable VDA code
@@ -1206,6 +1207,7 @@ FEATURE_LIST=" · 1067 unmodified lines
1206"1207"
1207 1208
1208HWACCEL_LIST="1209HWACCEL_LIST="
1210 d3d11va
1209 dxva21211 dxva2
1210 vaapi1212 vaapi
1211 vda1213 vda
@@ -1396,6 +1398,7 @@ HEADERS_LIST=" · 184 unmodified lines
1396 dev_video_meteor_ioctl_meteor_h1398 dev_video_meteor_ioctl_meteor_h
1397 direct_h1399 direct_h
1398 dlfcn_h1400 dlfcn_h
1401 d3d11_h
1399 dxva_h1402 dxva_h
1400 gsm_h1403 gsm_h
1401 io_h1404 io_h
@@ -1551,6 +1554,8 @@ HAVE_LIST=" · 149 unmodified lines
1551 $TYPES_LIST1554 $TYPES_LIST
1552 atomics_native1555 atomics_native
1553 dos_paths1556 dos_paths
1557 d3d11_cobj
1558 d3d11va_lib
1554 dxva2_lib1559 dxva2_lib
1555 libc_msvcrt1560 libc_msvcrt
1556 libdc1394_11561 libdc1394_1
@@ -1965,6 +1970,7 @@ zmbv_decoder_deps="zlib" · 408 unmodified lines
1965zmbv_encoder_deps="zlib"1970zmbv_encoder_deps="zlib"
1966 1971
1967# hardware accelerators1972# hardware accelerators
1973d3d11va_deps="d3d11_h dxva_h"
1968dxva2_deps="dxva2api_h"1974dxva2_deps="dxva2api_h"
1969vaapi_deps="va_va_h"1975vaapi_deps="va_va_h"
1970vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"1976vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
@@ -1975,6 +1981,8 @@ h263_vaapi_hwaccel_deps="vaapi" · 4 unmodified lines
1975h263_vaapi_hwaccel_select="h263_decoder"1981h263_vaapi_hwaccel_select="h263_decoder"
1976h263_vdpau_hwaccel_deps="vdpau"1982h263_vdpau_hwaccel_deps="vdpau"
1977h263_vdpau_hwaccel_select="h263_decoder"1983h263_vdpau_hwaccel_select="h263_decoder"
1984h264_d3d11va_hwaccel_deps="d3d11va"
1985h264_d3d11va_hwaccel_select="h264_decoder"
1978h264_dxva2_hwaccel_deps="dxva2"1986h264_dxva2_hwaccel_deps="dxva2"
1979h264_dxva2_hwaccel_select="h264_decoder"1987h264_dxva2_hwaccel_select="h264_decoder"
1980h264_mmal_decoder_deps="mmal"1988h264_mmal_decoder_deps="mmal"
@@ -1990,10 +1998,14 @@ h264_vda_old_hwaccel_deps="vda" · 9 unmodified lines
1990h264_vda_old_hwaccel_select="h264_decoder"1998h264_vda_old_hwaccel_select="h264_decoder"
1991h264_vdpau_hwaccel_deps="vdpau"1999h264_vdpau_hwaccel_deps="vdpau"
1992h264_vdpau_hwaccel_select="h264_decoder"2000h264_vdpau_hwaccel_select="h264_decoder"
2001hevc_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_HEVC"
2002hevc_d3d11va_hwaccel_select="hevc_decoder"
1993hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC"2003hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC"
1994hevc_dxva2_hwaccel_select="hevc_decoder"2004hevc_dxva2_hwaccel_select="hevc_decoder"
1995mpeg1_vdpau_hwaccel_deps="vdpau"2005mpeg1_vdpau_hwaccel_deps="vdpau"
1996mpeg1_vdpau_hwaccel_select="mpeg1video_decoder"2006mpeg1_vdpau_hwaccel_select="mpeg1video_decoder"
2007mpeg2_d3d11va_hwaccel_deps="d3d11va"
2008mpeg2_d3d11va_hwaccel_select="mpeg2video_decoder"
1997mpeg2_dxva2_hwaccel_deps="dxva2"2009mpeg2_dxva2_hwaccel_deps="dxva2"
1998mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"2010mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
1999mpeg2_vaapi_hwaccel_deps="vaapi"2011mpeg2_vaapi_hwaccel_deps="vaapi"
@@ -2004,12 +2016,15 @@ mpeg4_vaapi_hwaccel_deps="vaapi" · 4 unmodified lines
2004mpeg4_vaapi_hwaccel_select="mpeg4_decoder"2016mpeg4_vaapi_hwaccel_select="mpeg4_decoder"
2005mpeg4_vdpau_hwaccel_deps="vdpau"2017mpeg4_vdpau_hwaccel_deps="vdpau"
2006mpeg4_vdpau_hwaccel_select="mpeg4_decoder"2018mpeg4_vdpau_hwaccel_select="mpeg4_decoder"
2019vc1_d3d11va_hwaccel_deps="d3d11va"
2020vc1_d3d11va_hwaccel_select="vc1_decoder"
2007vc1_dxva2_hwaccel_deps="dxva2"2021vc1_dxva2_hwaccel_deps="dxva2"
2008vc1_dxva2_hwaccel_select="vc1_decoder"2022vc1_dxva2_hwaccel_select="vc1_decoder"
2009vc1_vaapi_hwaccel_deps="vaapi"2023vc1_vaapi_hwaccel_deps="vaapi"
2010vc1_vaapi_hwaccel_select="vc1_decoder"2024vc1_vaapi_hwaccel_select="vc1_decoder"
2011vc1_vdpau_hwaccel_deps="vdpau"2025vc1_vdpau_hwaccel_deps="vdpau"
2012vc1_vdpau_hwaccel_select="vc1_decoder"2026vc1_vdpau_hwaccel_select="vc1_decoder"
2027wmv3_d3d11va_hwaccel_select="vc1_d3d11va_hwaccel"
2013wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel"2028wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel"
2014wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"2029wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
2015wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"2030wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
@@ -2288,7 +2303,7 @@ enable swscale_alpha · 272 unmodified lines
2288enable valgrind_backtrace2303enable valgrind_backtrace
2289 2304
2290# By default, enable only those hwaccels that have no external dependencies.2305# By default, enable only those hwaccels that have no external dependencies.
2291enable dxva2 vda vdpau2306enable d3d11va dxva2 vda vdpau
2292 2307
2293# build settings2308# build settings
2294SHFLAGS='-shared -Wl,-soname,$$(@F)'2309SHFLAGS='-shared -Wl,-soname,$$(@F)'
@@ -4155,6 +4170,7 @@ check_struct windows.h "CONDITION_VARIABLE" Ptr · 1860 unmodified lines
4155 4170
4156check_header direct.h4171check_header direct.h
4157check_header dlfcn.h4172check_header dlfcn.h
4173check_header d3d11.h
4158check_header dxva.h4174check_header dxva.h
4159check_header dxva2api.h4175check_header dxva2api.h
4160check_header io.h4176check_header io.h
@@ -4372,6 +4388,15 @@ if enabled x11grab; then · 211 unmodified lines
4372 require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage -lXfixes4388 require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage -lXfixes
4373fi4389fi
4374 4390
4391enabled d3d11_h &&
4392 check_cc <<EOF && enable d3d11_cobj
4393#define _WIN32_WINNT 0x0600
4394#define COBJMACROS
4395#include <windows.h>
4396#include <d3d11.h>
4397int main(void) { ID3D11VideoDecoder *o = NULL; ID3D11VideoDecoder_Release(o); return 0; }
4398EOF
4399
4375enabled vaapi && enabled xlib &&4400enabled vaapi && enabled xlib &&
4376 check_lib2 "va/va.h va/va_x11.h" vaGetDisplay -lva -lva-x11 &&4401 check_lib2 "va/va.h va/va_x11.h" vaGetDisplay -lva -lva-x11 &&
4377 enable vaapi_x114402 enable vaapi_x11
@@ -4593,6 +4618,10 @@ check_deps $CONFIG_LIST \ · 215 unmodified lines
4593 $HAVE_LIST \4618 $HAVE_LIST \
4594 $ALL_COMPONENTS \4619 $ALL_COMPONENTS \
4595 4620
4621enabled_all d3d11va d3d11_cobj CoTaskMemFree &&
4622 prepend avconv_libs $($ldflags_filter "-lole32") &&
4623 enable d3d11va_lib
4624
4596enabled_all dxva2 CoTaskMemFree &&4625enabled_all dxva2 CoTaskMemFree &&
4597 prepend avconv_libs $($ldflags_filter "-lole32") &&4626 prepend avconv_libs $($ldflags_filter "-lole32") &&
4598 enable dxva2_lib4627 enable dxva2_lib
libavcodec/Makefile+7−0
@@ -3,6 +3,7 @@ NAME = avcodec · 2 unmodified lines
3HEADERS = avcodec.h \3HEADERS = avcodec.h \
4 avfft.h \4 avfft.h \
5 dv_profile.h \5 dv_profile.h \
6 d3d11va.h \
6 dxva2.h \7 dxva2.h \
7 qsv.h \8 qsv.h \
8 vaapi.h \9 vaapi.h \
@@ -557,6 +558,7 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.o adpcm_data.o · 548 unmodified lines
557OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcmenc.o adpcm_data.o558OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcmenc.o adpcm_data.o
558 559
559# hardware accelerators560# hardware accelerators
561OBJS-$(CONFIG_D3D11VA) += dxva2.o
560OBJS-$(CONFIG_DXVA2) += dxva2.o562OBJS-$(CONFIG_DXVA2) += dxva2.o
561OBJS-$(CONFIG_VAAPI) += vaapi.o563OBJS-$(CONFIG_VAAPI) += vaapi.o
562OBJS-$(CONFIG_VDA) += vda.o564OBJS-$(CONFIG_VDA) += vda.o
@@ -564,17 +566,21 @@ OBJS-$(CONFIG_VDPAU) += vdpau.o · 1 unmodified line
564 566
565OBJS-$(CONFIG_H263_VAAPI_HWACCEL) += vaapi_mpeg4.o567OBJS-$(CONFIG_H263_VAAPI_HWACCEL) += vaapi_mpeg4.o
566OBJS-$(CONFIG_H263_VDPAU_HWACCEL) += vdpau_mpeg4.o568OBJS-$(CONFIG_H263_VDPAU_HWACCEL) += vdpau_mpeg4.o
569OBJS-$(CONFIG_H264_D3D11VA_HWACCEL) += dxva2_h264.o
567OBJS-$(CONFIG_H264_DXVA2_HWACCEL) += dxva2_h264.o570OBJS-$(CONFIG_H264_DXVA2_HWACCEL) += dxva2_h264.o
568OBJS-$(CONFIG_H264_VAAPI_HWACCEL) += vaapi_h264.o571OBJS-$(CONFIG_H264_VAAPI_HWACCEL) += vaapi_h264.o
569OBJS-$(CONFIG_H264_VDA_HWACCEL) += vda_h264.o572OBJS-$(CONFIG_H264_VDA_HWACCEL) += vda_h264.o
570OBJS-$(CONFIG_H264_VDPAU_HWACCEL) += vdpau_h264.o573OBJS-$(CONFIG_H264_VDPAU_HWACCEL) += vdpau_h264.o
574OBJS-$(CONFIG_HEVC_D3D11VA_HWACCEL) += dxva2_hevc.o
571OBJS-$(CONFIG_HEVC_DXVA2_HWACCEL) += dxva2_hevc.o575OBJS-$(CONFIG_HEVC_DXVA2_HWACCEL) += dxva2_hevc.o
572OBJS-$(CONFIG_MPEG1_VDPAU_HWACCEL) += vdpau_mpeg12.o576OBJS-$(CONFIG_MPEG1_VDPAU_HWACCEL) += vdpau_mpeg12.o
577OBJS-$(CONFIG_MPEG2_D3D11VA_HWACCEL) += dxva2_mpeg2.o
573OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL) += dxva2_mpeg2.o578OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL) += dxva2_mpeg2.o
574OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL) += vaapi_mpeg2.o579OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL) += vaapi_mpeg2.o
575OBJS-$(CONFIG_MPEG2_VDPAU_HWACCEL) += vdpau_mpeg12.o580OBJS-$(CONFIG_MPEG2_VDPAU_HWACCEL) += vdpau_mpeg12.o
576OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += vaapi_mpeg4.o581OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += vaapi_mpeg4.o
577OBJS-$(CONFIG_MPEG4_VDPAU_HWACCEL) += vdpau_mpeg4.o582OBJS-$(CONFIG_MPEG4_VDPAU_HWACCEL) += vdpau_mpeg4.o
583OBJS-$(CONFIG_VC1_D3D11VA_HWACCEL) += dxva2_vc1.o
578OBJS-$(CONFIG_VC1_DXVA2_HWACCEL) += dxva2_vc1.o584OBJS-$(CONFIG_VC1_DXVA2_HWACCEL) += dxva2_vc1.o
579OBJS-$(CONFIG_VC1_VAAPI_HWACCEL) += vaapi_vc1.o585OBJS-$(CONFIG_VC1_VAAPI_HWACCEL) += vaapi_vc1.o
580OBJS-$(CONFIG_VC1_VDPAU_HWACCEL) += vdpau_vc1.o586OBJS-$(CONFIG_VC1_VDPAU_HWACCEL) += vdpau_vc1.o
@@ -723,6 +729,7 @@ SKIPHEADERS += %_tablegen.h \ · 142 unmodified lines
723 tableprint.h \729 tableprint.h \
724 $(ARCH)/vp56_arith.h \730 $(ARCH)/vp56_arith.h \
725 731
732SKIPHEADERS-$(CONFIG_D3D11VA) += d3d11va.h dxva2_internal.h
726SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h733SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h
727SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h734SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h
728SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h735SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
libavcodec/allcodecs.c+5−0
@@ -76,6 +76,7 @@ void avcodec_register_all(void) · 75 unmodified lines
76 /* hardware accelerators */76 /* hardware accelerators */
77 REGISTER_HWACCEL(H263_VAAPI, h263_vaapi);77 REGISTER_HWACCEL(H263_VAAPI, h263_vaapi);
78 REGISTER_HWACCEL(H263_VDPAU, h263_vdpau);78 REGISTER_HWACCEL(H263_VDPAU, h263_vdpau);
79 REGISTER_HWACCEL(H264_D3D11VA, h264_d3d11va);
79 REGISTER_HWACCEL(H264_DXVA2, h264_dxva2);80 REGISTER_HWACCEL(H264_DXVA2, h264_dxva2);
80 REGISTER_HWACCEL(H264_MMAL, h264_mmal);81 REGISTER_HWACCEL(H264_MMAL, h264_mmal);
81 REGISTER_HWACCEL(H264_QSV, h264_qsv);82 REGISTER_HWACCEL(H264_QSV, h264_qsv);
@@ -83,16 +84,20 @@ void avcodec_register_all(void) · 1 unmodified line
83 REGISTER_HWACCEL(H264_VDA, h264_vda);84 REGISTER_HWACCEL(H264_VDA, h264_vda);
84 REGISTER_HWACCEL(H264_VDA_OLD, h264_vda_old);85 REGISTER_HWACCEL(H264_VDA_OLD, h264_vda_old);
85 REGISTER_HWACCEL(H264_VDPAU, h264_vdpau);86 REGISTER_HWACCEL(H264_VDPAU, h264_vdpau);
87 REGISTER_HWACCEL(HEVC_D3D11VA, hevc_d3d11va);
86 REGISTER_HWACCEL(HEVC_DXVA2, hevc_dxva2);88 REGISTER_HWACCEL(HEVC_DXVA2, hevc_dxva2);
87 REGISTER_HWACCEL(MPEG1_VDPAU, mpeg1_vdpau);89 REGISTER_HWACCEL(MPEG1_VDPAU, mpeg1_vdpau);
90 REGISTER_HWACCEL(MPEG2_D3D11VA, mpeg2_d3d11va);
88 REGISTER_HWACCEL(MPEG2_DXVA2, mpeg2_dxva2);91 REGISTER_HWACCEL(MPEG2_DXVA2, mpeg2_dxva2);
89 REGISTER_HWACCEL(MPEG2_VAAPI, mpeg2_vaapi);92 REGISTER_HWACCEL(MPEG2_VAAPI, mpeg2_vaapi);
90 REGISTER_HWACCEL(MPEG2_VDPAU, mpeg2_vdpau);93 REGISTER_HWACCEL(MPEG2_VDPAU, mpeg2_vdpau);
91 REGISTER_HWACCEL(MPEG4_VAAPI, mpeg4_vaapi);94 REGISTER_HWACCEL(MPEG4_VAAPI, mpeg4_vaapi);
92 REGISTER_HWACCEL(MPEG4_VDPAU, mpeg4_vdpau);95 REGISTER_HWACCEL(MPEG4_VDPAU, mpeg4_vdpau);
96 REGISTER_HWACCEL(VC1_D3D11VA, vc1_d3d11va);
93 REGISTER_HWACCEL(VC1_DXVA2, vc1_dxva2);97 REGISTER_HWACCEL(VC1_DXVA2, vc1_dxva2);
94 REGISTER_HWACCEL(VC1_VAAPI, vc1_vaapi);98 REGISTER_HWACCEL(VC1_VAAPI, vc1_vaapi);
95 REGISTER_HWACCEL(VC1_VDPAU, vc1_vdpau);99 REGISTER_HWACCEL(VC1_VDPAU, vc1_vdpau);
100 REGISTER_HWACCEL(WMV3_D3D11VA, wmv3_d3d11va);
96 REGISTER_HWACCEL(WMV3_DXVA2, wmv3_dxva2);101 REGISTER_HWACCEL(WMV3_DXVA2, wmv3_dxva2);
97 REGISTER_HWACCEL(WMV3_VAAPI, wmv3_vaapi);102 REGISTER_HWACCEL(WMV3_VAAPI, wmv3_vaapi);
98 REGISTER_HWACCEL(WMV3_VDPAU, wmv3_vdpau);103 REGISTER_HWACCEL(WMV3_VDPAU, wmv3_vdpau);
libavcodec/d3d11va.h+98−0
@@ -0,0 +1,98 @@
1/*
2 * Direct3D11 HW acceleration
3 *
4 * copyright (c) 2009 Laurent Aimar
5 * copyright (c) 2015 Steve Lhomme
6 *
7 * This file is part of Libav.
8 *
9 * Libav is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Lesser General Public
11 * License as published by the Free Software Foundation; either
12 * version 2.1 of the License, or (at your option) any later version.
13 *
14 * Libav is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17 * Lesser General Public License for more details.
18 *
19 * You should have received a copy of the GNU Lesser General Public
20 * License along with Libav; if not, write to the Free Software
21 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22 */
23
24#ifndef AVCODEC_D3D11VA_H
25#define AVCODEC_D3D11VA_H
26
27/**
28 * @file
29 * @ingroup lavc_codec_hwaccel_d3d11va
30 * Public libavcodec D3D11VA header.
31 */
32
33#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600
34#undef _WIN32_WINNT
35#define _WIN32_WINNT 0x0600
36#endif
37
38#include <stdint.h>
39#include <d3d11.h>
40
41/**
42 * @defgroup lavc_codec_hwaccel_d3d11va Direct3D11
43 * @ingroup lavc_codec_hwaccel
44 *
45 * @{
46 */
47
48#define FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG 1 ///< Work around for Direct3D11 and old UVD/UVD+ ATI video cards
49#define FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO 2 ///< Work around for Direct3D11 and old Intel GPUs with ClearVideo interface
50
51/**
52 * This structure is used to provides the necessary configurations and data
53 * to the Direct3D11 Libav HWAccel implementation.
54 *
55 * The application must make it available as AVCodecContext.hwaccel_context.
56 */
57struct AVD3D11VAContext {
58 /**
59 * D3D11 decoder object
60 */
61 ID3D11VideoDecoder *decoder;
62
63 /**
64 * D3D11 VideoContext
65 */
66 ID3D11VideoContext *video_context;
67
68 /**
69 * D3D11 configuration used to create the decoder
70 */
71 D3D11_VIDEO_DECODER_CONFIG *cfg;
72
73 /**
74 * The number of surface in the surface array
75 */
76 unsigned surface_count;
77
78 /**
79 * The array of Direct3D surfaces used to create the decoder
80 */
81 ID3D11VideoDecoderOutputView **surface;
82
83 /**
84 * A bit field configuring the workarounds needed for using the decoder
85 */
86 uint64_t workaround;
87
88 /**
89 * Private to the Libav AVHWAccel implementation
90 */
91 unsigned report_id;
92};
93
94/**
95 * @}
96 */
97
98#endif /* AVCODEC_D3D11VA_H */
libavcodec/dxva2.c+130−31
@@ -35,14 +35,15 @@ void *ff_dxva2_get_surface(const AVFrame *frame) · 34 unmodified lines
35 return frame->data[3];35 return frame->data[3];
36}36}
37 37
38unsigned ff_dxva2_get_surface_index(const struct dxva_context *ctx,38unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx,
39 const AVDXVAContext *ctx,
39 const AVFrame *frame)40 const AVFrame *frame)
40{41{
41 void *surface = ff_dxva2_get_surface(frame);42 void *surface = ff_dxva2_get_surface(frame);
42 unsigned i;43 unsigned i;
43 44
44 for (i = 0; i < ctx->surface_count; i++)45 for (i = 0; i < DXVA_CONTEXT_COUNT(avctx, ctx); i++)
45 if (ctx->surface[i] == surface)46 if (DXVA_CONTEXT_SURFACE(avctx, ctx, i) == surface)
46 return i;47 return i;
47 48
48 assert(0);49 assert(0);
@@ -50,8 +51,8 @@ unsigned ff_dxva2_get_surface_index(const struct dxva_context *ctx, · 1 unmodified line
50}51}
51 52
52int ff_dxva2_commit_buffer(AVCodecContext *avctx,53int ff_dxva2_commit_buffer(AVCodecContext *avctx,
53 struct dxva_context *ctx,54 AVDXVAContext *ctx,
54 DXVA2_DecodeBufferDesc *dsc,55 DECODER_BUFFER_DESC *dsc,
55 unsigned type, const void *data, unsigned size,56 unsigned type, const void *data, unsigned size,
56 unsigned mb_count)57 unsigned mb_count)
57{58{
@@ -60,8 +61,18 @@ int ff_dxva2_commit_buffer(AVCodecContext *avctx, · 2 unmodified lines
60 int result;61 int result;
61 HRESULT hr;62 HRESULT hr;
62 63
63 hr = IDirectXVideoDecoder_GetBuffer(ctx->decoder, type,64#if CONFIG_D3D11VA
64 &dxva_data, &dxva_size);65 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD)
66 hr = ID3D11VideoContext_GetDecoderBuffer(D3D11VA_CONTEXT(ctx)->video_context,
67 D3D11VA_CONTEXT(ctx)->decoder,
68 type,
69 &dxva_size, &dxva_data);
70#endif
71#if CONFIG_DXVA2
72 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD)
73 hr = IDirectXVideoDecoder_GetBuffer(DXVA2_CONTEXT(ctx)->decoder, type,
74 &dxva_data, &dxva_size);
75#endif
65 if (FAILED(hr)) {76 if (FAILED(hr)) {
66 av_log(avctx, AV_LOG_ERROR, "Failed to get a buffer for %u: 0x%lx\n",77 av_log(avctx, AV_LOG_ERROR, "Failed to get a buffer for %u: 0x%lx\n",
67 type, hr);78 type, hr);
@@ -70,10 +81,24 @@ int ff_dxva2_commit_buffer(AVCodecContext *avctx, · 2 unmodified lines
70 if (size <= dxva_size) {81 if (size <= dxva_size) {
71 memcpy(dxva_data, data, size);82 memcpy(dxva_data, data, size);
72 83
73 memset(dsc, 0, sizeof(*dsc));84#if CONFIG_D3D11VA
74 dsc->CompressedBufferType = type;85 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) {
75 dsc->DataSize = size;86 D3D11_VIDEO_DECODER_BUFFER_DESC *dsc11 = dsc;
76 dsc->NumMBsInBuffer = mb_count;87 memset(dsc11, 0, sizeof(*dsc11));
88 dsc11->BufferType = type;
89 dsc11->DataSize = size;
90 dsc11->NumMBsInBuffer = mb_count;
91 }
92#endif
93#if CONFIG_DXVA2
94 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) {
95 DXVA2_DecodeBufferDesc *dsc2 = dsc;
96 memset(dsc2, 0, sizeof(*dsc2));
97 dsc2->CompressedBufferType = type;
98 dsc2->DataSize = size;
99 dsc2->NumMBsInBuffer = mb_count;
100 }
101#endif
77 102
78 result = 0;103 result = 0;
79 } else {104 } else {
@@ -81,7 +106,14 @@ int ff_dxva2_commit_buffer(AVCodecContext *avctx, · 1 unmodified line
81 result = -1;106 result = -1;
82 }107 }
83 108
84 hr = IDirectXVideoDecoder_ReleaseBuffer(ctx->decoder, type);109#if CONFIG_D3D11VA
110 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD)
111 hr = ID3D11VideoContext_ReleaseDecoderBuffer(D3D11VA_CONTEXT(ctx)->video_context, D3D11VA_CONTEXT(ctx)->decoder, type);
112#endif
113#if CONFIG_DXVA2
114 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD)
115 hr = IDirectXVideoDecoder_ReleaseBuffer(DXVA2_CONTEXT(ctx)->decoder, type);
116#endif
85 if (FAILED(hr)) {117 if (FAILED(hr)) {
86 av_log(avctx, AV_LOG_ERROR,118 av_log(avctx, AV_LOG_ERROR,
87 "Failed to release buffer type %u: 0x%lx\n",119 "Failed to release buffer type %u: 0x%lx\n",
@@ -95,20 +127,31 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, AVFrame *frame, · 7 unmodified lines
95 const void *pp, unsigned pp_size,127 const void *pp, unsigned pp_size,
96 const void *qm, unsigned qm_size,128 const void *qm, unsigned qm_size,
97 int (*commit_bs_si)(AVCodecContext *,129 int (*commit_bs_si)(AVCodecContext *,
98 DXVA2_DecodeBufferDesc *bs,130 DECODER_BUFFER_DESC *bs,
99 DXVA2_DecodeBufferDesc *slice))131 DECODER_BUFFER_DESC *slice))
100{132{
101 struct dxva_context *ctx = avctx->hwaccel_context;133 AVDXVAContext *ctx = avctx->hwaccel_context;
102 unsigned buffer_count = 0;134 unsigned buffer_count = 0;
103 DXVA2_DecodeBufferDesc buffer[4];135 D3D11_VIDEO_DECODER_BUFFER_DESC buffer11[4];
104 DXVA2_DecodeExecuteParams exec = { 0 };136 DXVA2_DecodeBufferDesc buffer2[4];
137 DECODER_BUFFER_DESC *buffer,*buffer_slice;
105 int result, runs = 0;138 int result, runs = 0;
106 HRESULT hr;139 HRESULT hr;
140 unsigned type;
107 141
108 do {142 do {
109 hr = IDirectXVideoDecoder_BeginFrame(ctx->decoder,143#if CONFIG_D3D11VA
110 ff_dxva2_get_surface(frame),144 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD)
111 NULL);145 hr = ID3D11VideoContext_DecoderBeginFrame(D3D11VA_CONTEXT(ctx)->video_context, D3D11VA_CONTEXT(ctx)->decoder,
146 ff_dxva2_get_surface(frame),
147 0, NULL);
148#endif
149#if CONFIG_DXVA2
150 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD)
151 hr = IDirectXVideoDecoder_BeginFrame(DXVA2_CONTEXT(ctx)->decoder,
152 ff_dxva2_get_surface(frame),
153 NULL);
154#endif
112 if (hr == E_PENDING)155 if (hr == E_PENDING)
113 av_usleep(2000);156 av_usleep(2000);
114 } while (hr == E_PENDING && ++runs < 50);157 } while (hr == E_PENDING && ++runs < 50);
@@ -118,8 +161,20 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, AVFrame *frame, · 3 unmodified lines
118 return -1;161 return -1;
119 }162 }
120 163
121 result = ff_dxva2_commit_buffer(avctx, ctx, &buffer[buffer_count],164#if CONFIG_D3D11VA
122 DXVA2_PictureParametersBufferType,165 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) {
166 buffer = &buffer11[buffer_count];
167 type = D3D11_VIDEO_DECODER_BUFFER_PICTURE_PARAMETERS;
168 }
169#endif
170#if CONFIG_DXVA2
171 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) {
172 buffer = &buffer2[buffer_count];
173 type = DXVA2_PictureParametersBufferType;
174 }
175#endif
176 result = ff_dxva2_commit_buffer(avctx, ctx, buffer,
177 type,
123 pp, pp_size, 0);178 pp, pp_size, 0);
124 if (result) {179 if (result) {
125 av_log(avctx, AV_LOG_ERROR,180 av_log(avctx, AV_LOG_ERROR,
@@ -129,8 +184,20 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, AVFrame *frame, · 3 unmodified lines
129 buffer_count++;184 buffer_count++;
130 185
131 if (qm_size > 0) {186 if (qm_size > 0) {
132 result = ff_dxva2_commit_buffer(avctx, ctx, &buffer[buffer_count],187#if CONFIG_D3D11VA
133 DXVA2_InverseQuantizationMatrixBufferType,188 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) {
189 buffer = &buffer11[buffer_count];
190 type = D3D11_VIDEO_DECODER_BUFFER_INVERSE_QUANTIZATION_MATRIX;
191 }
192#endif
193#if CONFIG_DXVA2
194 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) {
195 buffer = &buffer2[buffer_count];
196 type = DXVA2_InverseQuantizationMatrixBufferType;
197 }
198#endif
199 result = ff_dxva2_commit_buffer(avctx, ctx, buffer,
200 type,
134 qm, qm_size, 0);201 qm, qm_size, 0);
135 if (result) {202 if (result) {
136 av_log(avctx, AV_LOG_ERROR,203 av_log(avctx, AV_LOG_ERROR,
@@ -140,9 +207,22 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, AVFrame *frame, · 3 unmodified lines
140 buffer_count++;207 buffer_count++;
141 }208 }
142 209
210#if CONFIG_D3D11VA
211 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) {
212 buffer = &buffer11[buffer_count + 0];
213 buffer_slice = &buffer11[buffer_count + 1];
214 }
215#endif
216#if CONFIG_DXVA2
217 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) {
218 buffer = &buffer2[buffer_count + 0];
219 buffer_slice = &buffer2[buffer_count + 1];
220 }
221#endif
222
143 result = commit_bs_si(avctx,223 result = commit_bs_si(avctx,
144 &buffer[buffer_count + 0],224 buffer,
145 &buffer[buffer_count + 1]);225 buffer_slice);
146 if (result) {226 if (result) {
147 av_log(avctx, AV_LOG_ERROR,227 av_log(avctx, AV_LOG_ERROR,
148 "Failed to add bitstream or slice control buffer\n");228 "Failed to add bitstream or slice control buffer\n");
@@ -154,17 +234,36 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, AVFrame *frame, · 5 unmodified lines
154 234
155 assert(buffer_count == 1 + (qm_size > 0) + 2);235 assert(buffer_count == 1 + (qm_size > 0) + 2);
156 236
157 exec.NumCompBuffers = buffer_count;237#if CONFIG_D3D11VA
158 exec.pCompressedBuffers = buffer;238 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD)
159 exec.pExtensionData = NULL;239 hr = ID3D11VideoContext_SubmitDecoderBuffers(D3D11VA_CONTEXT(ctx)->video_context,
160 hr = IDirectXVideoDecoder_Execute(ctx->decoder, &exec);240 D3D11VA_CONTEXT(ctx)->decoder,
241 buffer_count, buffer11);
242#endif
243#if CONFIG_DXVA2
244 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) {
245 DXVA2_DecodeExecuteParams exec = {
246 .NumCompBuffers = buffer_count,
247 .pCompressedBuffers = buffer2,
248 .pExtensionData = NULL,
249 };
250 hr = IDirectXVideoDecoder_Execute(DXVA2_CONTEXT(ctx)->decoder, &exec);
251 }
252#endif
161 if (FAILED(hr)) {253 if (FAILED(hr)) {
162 av_log(avctx, AV_LOG_ERROR, "Failed to execute: 0x%lx\n", hr);254 av_log(avctx, AV_LOG_ERROR, "Failed to execute: 0x%lx\n", hr);
163 result = -1;255 result = -1;
164 }256 }
165 257
166end:258end:
167 hr = IDirectXVideoDecoder_EndFrame(ctx->decoder, NULL);259#if CONFIG_D3D11VA
260 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD)
261 hr = ID3D11VideoContext_DecoderEndFrame(D3D11VA_CONTEXT(ctx)->video_context, D3D11VA_CONTEXT(ctx)->decoder);
262#endif
263#if CONFIG_DXVA2
264 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD)
265 hr = IDirectXVideoDecoder_EndFrame(DXVA2_CONTEXT(ctx)->decoder, NULL);
266#endif
168 if (FAILED(hr)) {267 if (FAILED(hr)) {
169 av_log(avctx, AV_LOG_ERROR, "Failed to end frame: 0x%lx\n", hr);268 av_log(avctx, AV_LOG_ERROR, "Failed to end frame: 0x%lx\n", hr);
170 result = -1;269 result = -1;
libavcodec/dxva2_h264.c+98−40
@@ -42,7 +42,7 @@ static void fill_picture_entry(DXVA_PicEntry_H264 *pic, · 41 unmodified lines
42 pic->bPicEntry = index | (flag << 7);42 pic->bPicEntry = index | (flag << 7);
43}43}
44 44
45static void fill_picture_parameters(struct dxva_context *ctx, const H264Context *h,45static void fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext *ctx, const H264Context *h,
46 DXVA_PicParams_H264 *pp)46 DXVA_PicParams_H264 *pp)
47{47{
48 const H264Picture *current_picture = h->cur_pic_ptr;48 const H264Picture *current_picture = h->cur_pic_ptr;
@@ -51,7 +51,7 @@ static void fill_picture_parameters(struct dxva_context *ctx, const H264Context · 2 unmodified lines
51 memset(pp, 0, sizeof(*pp));51 memset(pp, 0, sizeof(*pp));
52 /* Configure current picture */52 /* Configure current picture */
53 fill_picture_entry(&pp->CurrPic,53 fill_picture_entry(&pp->CurrPic,
54 ff_dxva2_get_surface_index(ctx, current_picture->f),54 ff_dxva2_get_surface_index(avctx, ctx, current_picture->f),
55 h->picture_structure == PICT_BOTTOM_FIELD);55 h->picture_structure == PICT_BOTTOM_FIELD);
56 /* Configure the set of references */56 /* Configure the set of references */
57 pp->UsedForReferenceFlags = 0;57 pp->UsedForReferenceFlags = 0;
@@ -67,7 +67,7 @@ static void fill_picture_parameters(struct dxva_context *ctx, const H264Context · 9 unmodified lines
67 }67 }
68 if (r) {68 if (r) {
69 fill_picture_entry(&pp->RefFrameList[i],69 fill_picture_entry(&pp->RefFrameList[i],
70 ff_dxva2_get_surface_index(ctx, r->f),70 ff_dxva2_get_surface_index(avctx, ctx, r->f),
71 r->long_ref != 0);71 r->long_ref != 0);
72 72
73 if ((r->reference & PICT_TOP_FIELD) && r->field_poc[0] != INT_MAX)73 if ((r->reference & PICT_TOP_FIELD) && r->field_poc[0] != INT_MAX)
@@ -114,13 +114,13 @@ static void fill_picture_parameters(struct dxva_context *ctx, const H264Context · 40 unmodified lines
114 114
115 pp->bit_depth_luma_minus8 = h->sps.bit_depth_luma - 8;115 pp->bit_depth_luma_minus8 = h->sps.bit_depth_luma - 8;
116 pp->bit_depth_chroma_minus8 = h->sps.bit_depth_chroma - 8;116 pp->bit_depth_chroma_minus8 = h->sps.bit_depth_chroma - 8;
117 if (ctx->workaround & FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG)117 if (DXVA_CONTEXT_WORKAROUND(avctx, ctx) & FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG)
118 pp->Reserved16Bits = 0;118 pp->Reserved16Bits = 0;
119 else if (ctx->workaround & FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO)119 else if (DXVA_CONTEXT_WORKAROUND(avctx, ctx) & FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO)
120 pp->Reserved16Bits = 0x34c;120 pp->Reserved16Bits = 0x34c;
121 else121 else
122 pp->Reserved16Bits = 3; /* FIXME is there a way to detect the right mode ? */122 pp->Reserved16Bits = 3; /* FIXME is there a way to detect the right mode ? */
123 pp->StatusReportFeedbackNumber = 1 + ctx->report_id++;123 pp->StatusReportFeedbackNumber = 1 + DXVA_CONTEXT_REPORT_ID(avctx, ctx)++;
124 pp->CurrFieldOrderCnt[0] = 0;124 pp->CurrFieldOrderCnt[0] = 0;
125 if ((h->picture_structure & PICT_TOP_FIELD) &&125 if ((h->picture_structure & PICT_TOP_FIELD) &&
126 current_picture->field_poc[0] != INT_MAX)126 current_picture->field_poc[0] != INT_MAX)
@@ -156,11 +156,11 @@ static void fill_picture_parameters(struct dxva_context *ctx, const H264Context · 29 unmodified lines
156 //pp->SliceGroupMap[810]; /* XXX not implemented by Libav */156 //pp->SliceGroupMap[810]; /* XXX not implemented by Libav */
157}157}
158 158
159static void fill_scaling_lists(struct dxva_context *ctx, const H264Context *h, DXVA_Qmatrix_H264 *qm)159static void fill_scaling_lists(const AVCodecContext *avctx, AVDXVAContext *ctx, const H264Context *h, DXVA_Qmatrix_H264 *qm)
160{160{
161 unsigned i, j;161 unsigned i, j;
162 memset(qm, 0, sizeof(*qm));162 memset(qm, 0, sizeof(*qm));
163 if (ctx->workaround & FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG) {163 if (DXVA_CONTEXT_WORKAROUND(avctx, ctx) & FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG) {
164 for (i = 0; i < 6; i++)164 for (i = 0; i < 6; i++)
165 for (j = 0; j < 16; j++)165 for (j = 0; j < 16; j++)
166 qm->bScalingLists4x4[i][j] = h->pps.scaling_matrix4[i][j];166 qm->bScalingLists4x4[i][j] = h->pps.scaling_matrix4[i][j];
@@ -181,11 +181,11 @@ static void fill_scaling_lists(struct dxva_context *ctx, const H264Context *h, D · 14 unmodified lines
181 }181 }
182}182}
183 183
184static int is_slice_short(struct dxva_context *ctx)184static int is_slice_short(const AVCodecContext *avctx, AVDXVAContext *ctx)
185{185{
186 assert(ctx->cfg->ConfigBitstreamRaw == 1 ||186 assert(DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) == 1 ||
187 ctx->cfg->ConfigBitstreamRaw == 2);187 DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) == 2);
188 return ctx->cfg->ConfigBitstreamRaw == 2;188 return DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) == 2;
189}189}
190 190
191static void fill_slice_short(DXVA_Slice_H264_Short *slice,191static void fill_slice_short(DXVA_Slice_H264_Short *slice,
@@ -212,7 +212,7 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice, · 20 unmodified lines
212{212{
213 const H264Context *h = avctx->priv_data;213 const H264Context *h = avctx->priv_data;
214 H264SliceContext *sl = &h->slice_ctx[0];214 H264SliceContext *sl = &h->slice_ctx[0];
215 struct dxva_context *ctx = avctx->hwaccel_context;215 AVDXVAContext *ctx = avctx->hwaccel_context;
216 unsigned list;216 unsigned list;
217 217
218 memset(slice, 0, sizeof(*slice));218 memset(slice, 0, sizeof(*slice));
@@ -243,10 +243,10 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice, · 24 unmodified lines
243 const H264Picture *r = sl->ref_list[list][i].parent;243 const H264Picture *r = sl->ref_list[list][i].parent;
244 unsigned plane;244 unsigned plane;
245 unsigned index;245 unsigned index;
246 if (ctx->workaround & FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO)246 if (DXVA_CONTEXT_WORKAROUND(avctx, ctx) & FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO)
247 index = ff_dxva2_get_surface_index(ctx, r->f);247 index = ff_dxva2_get_surface_index(avctx, ctx, r->f);
248 else248 else
249 index = get_refpic_index(pp, ff_dxva2_get_surface_index(ctx, r->f));249 index = get_refpic_index(pp, ff_dxva2_get_surface_index(avctx, ctx, r->f));
250 fill_picture_entry(&slice->RefPicList[list][i], index,250 fill_picture_entry(&slice->RefPicList[list][i], index,
251 r->reference == PICT_BOTTOM_FIELD);251 r->reference == PICT_BOTTOM_FIELD);
252 for (plane = 0; plane < 3; plane++) {252 for (plane = 0; plane < 3; plane++) {
@@ -289,12 +289,12 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice, · 36 unmodified lines
289}289}
290 290
291static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,291static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
292 DXVA2_DecodeBufferDesc *bs,292 DECODER_BUFFER_DESC *bs,
293 DXVA2_DecodeBufferDesc *sc)293 DECODER_BUFFER_DESC *sc)
294{294{
295 const H264Context *h = avctx->priv_data;295 const H264Context *h = avctx->priv_data;
296 const unsigned mb_count = h->mb_width * h->mb_height;296 const unsigned mb_count = h->mb_width * h->mb_height;
297 struct dxva_context *ctx = avctx->hwaccel_context;297 AVDXVAContext *ctx = avctx->hwaccel_context;
298 const H264Picture *current_picture = h->cur_pic_ptr;298 const H264Picture *current_picture = h->cur_pic_ptr;
299 struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private;299 struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private;
300 DXVA_Slice_H264_Short *slice = NULL;300 DXVA_Slice_H264_Short *slice = NULL;
@@ -305,12 +305,28 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, · 4 unmodified lines
305 unsigned slice_size;305 unsigned slice_size;
306 unsigned padding;306 unsigned padding;
307 unsigned i;307 unsigned i;
308 unsigned type;
308 309
309 /* Create an annex B bitstream buffer with only slice NAL and finalize slice */310 /* Create an annex B bitstream buffer with only slice NAL and finalize slice */
310 if (FAILED(IDirectXVideoDecoder_GetBuffer(ctx->decoder,311#if CONFIG_D3D11VA
311 DXVA2_BitStreamDateBufferType,312 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) {
312 &dxva_data_ptr, &dxva_size)))313 type = D3D11_VIDEO_DECODER_BUFFER_BITSTREAM;
313 return -1;314 if (FAILED(ID3D11VideoContext_GetDecoderBuffer(D3D11VA_CONTEXT(ctx)->video_context,
315 D3D11VA_CONTEXT(ctx)->decoder,
316 type,
317 &dxva_size, &dxva_data_ptr)))
318 return -1;
319 }
320#endif
321#if CONFIG_DXVA2
322 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) {
323 type = DXVA2_BitStreamDateBufferType;
324 if (FAILED(IDirectXVideoDecoder_GetBuffer(DXVA2_CONTEXT(ctx)->decoder,
325 type,
326 &dxva_data_ptr, &dxva_size)))
327 return -1;
328 }
329#endif
314 330
315 dxva_data = dxva_data_ptr;331 dxva_data = dxva_data_ptr;
316 current = dxva_data;332 current = dxva_data;
@@ -326,7 +342,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, · 9 unmodified lines
326 assert(offsetof(DXVA_Slice_H264_Short, SliceBytesInBuffer) ==342 assert(offsetof(DXVA_Slice_H264_Short, SliceBytesInBuffer) ==
327 offsetof(DXVA_Slice_H264_Long, SliceBytesInBuffer));343 offsetof(DXVA_Slice_H264_Long, SliceBytesInBuffer));
328 344
329 if (is_slice_short(ctx))345 if (is_slice_short(avctx, ctx))
330 slice = &ctx_pic->slice_short[i];346 slice = &ctx_pic->slice_short[i];
331 else347 else
332 slice = (DXVA_Slice_H264_Short*)&ctx_pic->slice_long[i];348 slice = (DXVA_Slice_H264_Short*)&ctx_pic->slice_long[i];
@@ -341,7 +357,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, · 8 unmodified lines
341 slice->BSNALunitDataLocation = current - dxva_data;357 slice->BSNALunitDataLocation = current - dxva_data;
342 slice->SliceBytesInBuffer = start_code_size + size;358 slice->SliceBytesInBuffer = start_code_size + size;
343 359
344 if (!is_slice_short(ctx)) {360 if (!is_slice_short(avctx, ctx)) {
345 DXVA_Slice_H264_Long *slice_long = (DXVA_Slice_H264_Long*)slice;361 DXVA_Slice_H264_Long *slice_long = (DXVA_Slice_H264_Long*)slice;
346 if (i < ctx_pic->slice_count - 1)362 if (i < ctx_pic->slice_count - 1)
347 slice_long->NumMbsForSlice =363 slice_long->NumMbsForSlice =
@@ -363,18 +379,43 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, · 15 unmodified lines
363 379
364 slice->SliceBytesInBuffer += padding;380 slice->SliceBytesInBuffer += padding;
365 }381 }
366 if (FAILED(IDirectXVideoDecoder_ReleaseBuffer(ctx->decoder,382#if CONFIG_D3D11VA
367 DXVA2_BitStreamDateBufferType)))383 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD)
368 return -1;384 if (FAILED(ID3D11VideoContext_ReleaseDecoderBuffer(D3D11VA_CONTEXT(ctx)->video_context, D3D11VA_CONTEXT(ctx)->decoder, type)))
385 return -1;
386#endif
387#if CONFIG_DXVA2
388 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD)
389 if (FAILED(IDirectXVideoDecoder_ReleaseBuffer(DXVA2_CONTEXT(ctx)->decoder, type)))
390 return -1;
391#endif
369 if (i < ctx_pic->slice_count)392 if (i < ctx_pic->slice_count)
370 return -1;393 return -1;
371 394
372 memset(bs, 0, sizeof(*bs));395#if CONFIG_D3D11VA
373 bs->CompressedBufferType = DXVA2_BitStreamDateBufferType;396 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) {
374 bs->DataSize = current - dxva_data;397 D3D11_VIDEO_DECODER_BUFFER_DESC *dsc11 = bs;
375 bs->NumMBsInBuffer = mb_count;398 memset(dsc11, 0, sizeof(*dsc11));
399 dsc11->BufferType = type;
400 dsc11->DataSize = current - dxva_data;
401 dsc11->NumMBsInBuffer = mb_count;
376 402
377 if (is_slice_short(ctx)) {403 type = D3D11_VIDEO_DECODER_BUFFER_SLICE_CONTROL;
404 }
405#endif
406#if CONFIG_DXVA2
407 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) {
408 DXVA2_DecodeBufferDesc *dsc2 = bs;
409 memset(dsc2, 0, sizeof(*dsc2));
410 dsc2->CompressedBufferType = type;
411 dsc2->DataSize = current - dxva_data;
412 dsc2->NumMBsInBuffer = mb_count;
413
414 type = DXVA2_SliceControlBufferType;
415 }
416#endif
417
418 if (is_slice_short(avctx, ctx)) {
378 slice_data = ctx_pic->slice_short;419 slice_data = ctx_pic->slice_short;
379 slice_size = ctx_pic->slice_count * sizeof(*ctx_pic->slice_short);420 slice_size = ctx_pic->slice_count * sizeof(*ctx_pic->slice_short);
380 } else {421 } else {
@@ -383,7 +424,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, · 2 unmodified lines
383 }424 }
384 assert((bs->DataSize & 127) == 0);425 assert((bs->DataSize & 127) == 0);
385 return ff_dxva2_commit_buffer(avctx, ctx, sc,426 return ff_dxva2_commit_buffer(avctx, ctx, sc,
386 DXVA2_SliceControlBufferType,427 type,
387 slice_data, slice_size, mb_count);428 slice_data, slice_size, mb_count);
388}429}
389 430
@@ -393,18 +434,20 @@ static int dxva2_h264_start_frame(AVCodecContext *avctx, · 3 unmodified lines
393 av_unused uint32_t size)434 av_unused uint32_t size)
394{435{
395 const H264Context *h = avctx->priv_data;436 const H264Context *h = avctx->priv_data;
396 struct dxva_context *ctx = avctx->hwaccel_context;437 AVDXVAContext *ctx = avctx->hwaccel_context;
397 struct dxva2_picture_context *ctx_pic = h->cur_pic_ptr->hwaccel_picture_private;438 struct dxva2_picture_context *ctx_pic = h->cur_pic_ptr->hwaccel_picture_private;
398 439
399 if (!ctx->decoder || !ctx->cfg || ctx->surface_count <= 0)440 if (DXVA_CONTEXT_DECODER(avctx, ctx) == NULL ||
441 DXVA_CONTEXT_CFG(avctx, ctx) == NULL ||
442 DXVA_CONTEXT_COUNT(avctx, ctx) <= 0)
400 return -1;443 return -1;
401 assert(ctx_pic);444 assert(ctx_pic);
402 445
403 /* Fill up DXVA_PicParams_H264 */446 /* Fill up DXVA_PicParams_H264 */
404 fill_picture_parameters(ctx, h, &ctx_pic->pp);447 fill_picture_parameters(avctx, ctx, h, &ctx_pic->pp);
405 448
406 /* Fill up DXVA_Qmatrix_H264 */449 /* Fill up DXVA_Qmatrix_H264 */
407 fill_scaling_lists(ctx, h, &ctx_pic->qm);450 fill_scaling_lists(avctx, ctx, h, &ctx_pic->qm);
408 451
409 ctx_pic->slice_count = 0;452 ctx_pic->slice_count = 0;
410 ctx_pic->bitstream_size = 0;453 ctx_pic->bitstream_size = 0;
@@ -418,7 +461,7 @@ static int dxva2_h264_decode_slice(AVCodecContext *avctx, · 7 unmodified lines
418{461{
419 const H264Context *h = avctx->priv_data;462 const H264Context *h = avctx->priv_data;
420 const H264SliceContext *sl = &h->slice_ctx[0];463 const H264SliceContext *sl = &h->slice_ctx[0];
421 struct dxva_context *ctx = avctx->hwaccel_context;464 AVDXVAContext *ctx = avctx->hwaccel_context;
422 const H264Picture *current_picture = h->cur_pic_ptr;465 const H264Picture *current_picture = h->cur_pic_ptr;
423 struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private;466 struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private;
424 unsigned position;467 unsigned position;
@@ -431,7 +474,7 @@ static int dxva2_h264_decode_slice(AVCodecContext *avctx, · 6 unmodified lines
431 ctx_pic->bitstream_size += size;474 ctx_pic->bitstream_size += size;
432 475
433 position = buffer - ctx_pic->bitstream;476 position = buffer - ctx_pic->bitstream;
434 if (is_slice_short(ctx))477 if (is_slice_short(avctx, ctx))
435 fill_slice_short(&ctx_pic->slice_short[ctx_pic->slice_count],478 fill_slice_short(&ctx_pic->slice_short[ctx_pic->slice_count],
436 position, size);479 position, size);
437 else480 else
@@ -463,6 +506,7 @@ static int dxva2_h264_end_frame(AVCodecContext *avctx) · 25 unmodified lines
463 return ret;506 return ret;
464}507}
465 508
509#if CONFIG_H264_DXVA2_HWACCEL
466AVHWAccel ff_h264_dxva2_hwaccel = {510AVHWAccel ff_h264_dxva2_hwaccel = {
467 .name = "h264_dxva2",511 .name = "h264_dxva2",
468 .type = AVMEDIA_TYPE_VIDEO,512 .type = AVMEDIA_TYPE_VIDEO,
@@ -473,3 +517,17 @@ AVHWAccel ff_h264_dxva2_hwaccel = { · 4 unmodified lines
473 .end_frame = dxva2_h264_end_frame,517 .end_frame = dxva2_h264_end_frame,
474 .frame_priv_data_size = sizeof(struct dxva2_picture_context),518 .frame_priv_data_size = sizeof(struct dxva2_picture_context),
475};519};
520#endif
521
522#if CONFIG_H264_D3D11VA_HWACCEL
523AVHWAccel ff_h264_d3d11va_hwaccel = {
524 .name = "h264_d3d11va",
525 .type = AVMEDIA_TYPE_VIDEO,
526 .id = AV_CODEC_ID_H264,
527 .pix_fmt = AV_PIX_FMT_D3D11VA_VLD,
528 .start_frame = dxva2_h264_start_frame,
529 .decode_slice = dxva2_h264_decode_slice,
530 .end_frame = dxva2_h264_end_frame,
531 .frame_priv_data_size = sizeof(struct dxva2_picture_context),
532};
533#endif
libavcodec/dxva2_hevc.c+83−25
@@ -53,7 +53,7 @@ static int get_refpic_index(const DXVA_PicParams_HEVC *pp, int surface_index) · 52 unmodified lines
53 return 0xff;53 return 0xff;
54}54}
55 55
56static void fill_picture_parameters(struct dxva_context *ctx, const HEVCContext *h,56static void fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext *ctx, const HEVCContext *h,
57 DXVA_PicParams_HEVC *pp)57 DXVA_PicParams_HEVC *pp)
58{58{
59 const HEVCFrame *current_picture = h->ref;59 const HEVCFrame *current_picture = h->ref;
@@ -73,7 +73,7 @@ static void fill_picture_parameters(struct dxva_context *ctx, const HEVCContext · 13 unmodified lines
73 (0 << 14) |73 (0 << 14) |
74 (0 << 15);74 (0 << 15);
75 75
76 fill_picture_entry(&pp->CurrPic, ff_dxva2_get_surface_index(ctx, current_picture->frame), 0);76 fill_picture_entry(&pp->CurrPic, ff_dxva2_get_surface_index(avctx, ctx, current_picture->frame), 0);
77 77
78 pp->sps_max_dec_pic_buffering_minus1 = h->sps->temporal_layer[h->sps->max_sub_layers - 1].max_dec_pic_buffering - 1;78 pp->sps_max_dec_pic_buffering_minus1 = h->sps->temporal_layer[h->sps->max_sub_layers - 1].max_dec_pic_buffering - 1;
79 pp->log2_min_luma_coding_block_size_minus3 = h->sps->log2_min_cb_size - 3;79 pp->log2_min_luma_coding_block_size_minus3 = h->sps->log2_min_cb_size - 3;
@@ -165,7 +165,7 @@ static void fill_picture_parameters(struct dxva_context *ctx, const HEVCContext · 85 unmodified lines
165 for (i = 0, j = 0; i < FF_ARRAY_ELEMS(h->DPB); i++) {165 for (i = 0, j = 0; i < FF_ARRAY_ELEMS(h->DPB); i++) {
166 const HEVCFrame *frame = &h->DPB[i];166 const HEVCFrame *frame = &h->DPB[i];
167 if (frame != current_picture && (frame->flags & (HEVC_FRAME_FLAG_LONG_REF | HEVC_FRAME_FLAG_SHORT_REF))) {167 if (frame != current_picture && (frame->flags & (HEVC_FRAME_FLAG_LONG_REF | HEVC_FRAME_FLAG_SHORT_REF))) {
168 fill_picture_entry(&pp->RefPicList[j], ff_dxva2_get_surface_index(ctx, frame->frame), !!(frame->flags & HEVC_FRAME_FLAG_LONG_REF));168 fill_picture_entry(&pp->RefPicList[j], ff_dxva2_get_surface_index(avctx, ctx, frame->frame), !!(frame->flags & HEVC_FRAME_FLAG_LONG_REF));
169 pp->PicOrderCntValList[j] = frame->poc;169 pp->PicOrderCntValList[j] = frame->poc;
170 j++;170 j++;
171 }171 }
@@ -176,7 +176,7 @@ static void fill_picture_parameters(struct dxva_context *ctx, const HEVCContext · 4 unmodified lines
176 av_assert0(rpl->nb_refs <= FF_ARRAY_ELEMS(pp->ref_list)); \176 av_assert0(rpl->nb_refs <= FF_ARRAY_ELEMS(pp->ref_list)); \
177 for (j = 0, k = 0; j < rpl->nb_refs; j++) { \177 for (j = 0, k = 0; j < rpl->nb_refs; j++) { \
178 if (rpl->ref[j]) { \178 if (rpl->ref[j]) { \
179 pp->ref_list[k] = get_refpic_index(pp, ff_dxva2_get_surface_index(ctx, rpl->ref[j]->frame)); \179 pp->ref_list[k] = get_refpic_index(pp, ff_dxva2_get_surface_index(avctx, ctx, rpl->ref[j]->frame)); \
180 k++; \180 k++; \
181 } \181 } \
182 } \182 } \
@@ -187,10 +187,10 @@ static void fill_picture_parameters(struct dxva_context *ctx, const HEVCContext · 4 unmodified lines
187 DO_REF_LIST(ST_CURR_AFT, RefPicSetStCurrAfter);187 DO_REF_LIST(ST_CURR_AFT, RefPicSetStCurrAfter);
188 DO_REF_LIST(LT_CURR, RefPicSetLtCurr);188 DO_REF_LIST(LT_CURR, RefPicSetLtCurr);
189 189
190 pp->StatusReportFeedbackNumber = 1 + ctx->report_id++;190 pp->StatusReportFeedbackNumber = 1 + DXVA_CONTEXT_REPORT_ID(avctx, ctx)++;
191}191}
192 192
193static void fill_scaling_lists(struct dxva_context *ctx, const HEVCContext *h, DXVA_Qmatrix_HEVC *qm)193static void fill_scaling_lists(AVDXVAContext *ctx, const HEVCContext *h, DXVA_Qmatrix_HEVC *qm)
194{194{
195 unsigned i, j, pos;195 unsigned i, j, pos;
196 const ScalingList *sl = h->pps->scaling_list_data_present_flag ?196 const ScalingList *sl = h->pps->scaling_list_data_present_flag ?
@@ -228,11 +228,11 @@ static void fill_slice_short(DXVA_Slice_HEVC_Short *slice, · 31 unmodified lines
228}228}
229 229
230static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,230static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
231 DXVA2_DecodeBufferDesc *bs,231 DECODER_BUFFER_DESC *bs,
232 DXVA2_DecodeBufferDesc *sc)232 DECODER_BUFFER_DESC *sc)
233{233{
234 const HEVCContext *h = avctx->priv_data;234 const HEVCContext *h = avctx->priv_data;
235 struct dxva_context *ctx = avctx->hwaccel_context;235 AVDXVAContext *ctx = avctx->hwaccel_context;
236 const HEVCFrame *current_picture = h->ref;236 const HEVCFrame *current_picture = h->ref;
237 struct hevc_dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private;237 struct hevc_dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private;
238 DXVA_Slice_HEVC_Short *slice = NULL;238 DXVA_Slice_HEVC_Short *slice = NULL;
@@ -243,12 +243,28 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, · 4 unmodified lines
243 unsigned slice_size;243 unsigned slice_size;
244 unsigned padding;244 unsigned padding;
245 unsigned i;245 unsigned i;
246 unsigned type;
246 247
247 /* Create an annex B bitstream buffer with only slice NAL and finalize slice */248 /* Create an annex B bitstream buffer with only slice NAL and finalize slice */
248 if (FAILED(IDirectXVideoDecoder_GetBuffer(ctx->decoder,249#if CONFIG_D3D11VA
249 DXVA2_BitStreamDateBufferType,250 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) {
250 &dxva_data_ptr, &dxva_size)))251 type = D3D11_VIDEO_DECODER_BUFFER_BITSTREAM;
251 return -1;252 if (FAILED(ID3D11VideoContext_GetDecoderBuffer(D3D11VA_CONTEXT(ctx)->video_context,
253 D3D11VA_CONTEXT(ctx)->decoder,
254 type,
255 &dxva_size, &dxva_data_ptr)))
256 return -1;
257 }
258#endif
259#if CONFIG_DXVA2
260 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) {
261 type = DXVA2_BitStreamDateBufferType;
262 if (FAILED(IDirectXVideoDecoder_GetBuffer(DXVA2_CONTEXT(ctx)->decoder,
263 type,
264 &dxva_data_ptr, &dxva_size)))
265 return -1;
266 }
267#endif
252 268
253 dxva_data = dxva_data_ptr;269 dxva_data = dxva_data_ptr;
254 current = dxva_data;270 current = dxva_data;
@@ -284,23 +300,48 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, · 29 unmodified lines
284 300
285 slice->SliceBytesInBuffer += padding;301 slice->SliceBytesInBuffer += padding;
286 }302 }
287 if (FAILED(IDirectXVideoDecoder_ReleaseBuffer(ctx->decoder,303#if CONFIG_D3D11VA
288 DXVA2_BitStreamDateBufferType)))304 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD)
289 return -1;305 if (FAILED(ID3D11VideoContext_ReleaseDecoderBuffer(D3D11VA_CONTEXT(ctx)->video_context, D3D11VA_CONTEXT(ctx)->decoder, type)))
306 return -1;
307#endif
308#if CONFIG_DXVA2
309 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD)
310 if (FAILED(IDirectXVideoDecoder_ReleaseBuffer(DXVA2_CONTEXT(ctx)->decoder, type)))
311 return -1;
312#endif
290 if (i < ctx_pic->slice_count)313 if (i < ctx_pic->slice_count)
291 return -1;314 return -1;
292 315
293 memset(bs, 0, sizeof(*bs));316#if CONFIG_D3D11VA
294 bs->CompressedBufferType = DXVA2_BitStreamDateBufferType;317 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) {
295 bs->DataSize = current - dxva_data;318 D3D11_VIDEO_DECODER_BUFFER_DESC *dsc11 = bs;
296 bs->NumMBsInBuffer = 0;319 memset(dsc11, 0, sizeof(*dsc11));
320 dsc11->BufferType = type;
321 dsc11->DataSize = current - dxva_data;
322 dsc11->NumMBsInBuffer = 0;
323
324 type = D3D11_VIDEO_DECODER_BUFFER_SLICE_CONTROL;
325 }
326#endif
327#if CONFIG_DXVA2
328 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) {
329 DXVA2_DecodeBufferDesc *dsc2 = bs;
330 memset(dsc2, 0, sizeof(*dsc2));
331 dsc2->CompressedBufferType = type;
332 dsc2->DataSize = current - dxva_data;
333 dsc2->NumMBsInBuffer = 0;
334
335 type = DXVA2_SliceControlBufferType;
336 }
337#endif
297 338
298 slice_data = ctx_pic->slice_short;339 slice_data = ctx_pic->slice_short;
299 slice_size = ctx_pic->slice_count * sizeof(*ctx_pic->slice_short);340 slice_size = ctx_pic->slice_count * sizeof(*ctx_pic->slice_short);
300 341
301 av_assert0((bs->DataSize & 127) == 0);342 av_assert0(((current - dxva_data) & 127) == 0);
302 return ff_dxva2_commit_buffer(avctx, ctx, sc,343 return ff_dxva2_commit_buffer(avctx, ctx, sc,
303 DXVA2_SliceControlBufferType,344 type,
304 slice_data, slice_size, 0);345 slice_data, slice_size, 0);
305}346}
306 347
@@ -310,15 +351,17 @@ static int dxva2_hevc_start_frame(AVCodecContext *avctx, · 3 unmodified lines
310 av_unused uint32_t size)351 av_unused uint32_t size)
311{352{
312 const HEVCContext *h = avctx->priv_data;353 const HEVCContext *h = avctx->priv_data;
313 struct dxva_context *ctx = avctx->hwaccel_context;354 AVDXVAContext *ctx = avctx->hwaccel_context;
314 struct hevc_dxva2_picture_context *ctx_pic = h->ref->hwaccel_picture_private;355 struct hevc_dxva2_picture_context *ctx_pic = h->ref->hwaccel_picture_private;
315 356
316 if (!ctx->decoder || !ctx->cfg || ctx->surface_count <= 0)357 if (DXVA_CONTEXT_DECODER(avctx, ctx) == NULL ||
358 DXVA_CONTEXT_CFG(avctx, ctx) == NULL ||
359 DXVA_CONTEXT_COUNT(avctx, ctx) <= 0)
317 return -1;360 return -1;
318 av_assert0(ctx_pic);361 av_assert0(ctx_pic);
319 362
320 /* Fill up DXVA_PicParams_HEVC */363 /* Fill up DXVA_PicParams_HEVC */
321 fill_picture_parameters(ctx, h, &ctx_pic->pp);364 fill_picture_parameters(avctx, ctx, h, &ctx_pic->pp);
322 365
323 /* Fill up DXVA_Qmatrix_HEVC */366 /* Fill up DXVA_Qmatrix_HEVC */
324 fill_scaling_lists(ctx, h, &ctx_pic->qm);367 fill_scaling_lists(ctx, h, &ctx_pic->qm);
@@ -369,6 +412,7 @@ static int dxva2_hevc_end_frame(AVCodecContext *avctx) · 44 unmodified lines
369 return ret;412 return ret;
370}413}
371 414
415#if CONFIG_HEVC_DXVA2_HWACCEL
372AVHWAccel ff_hevc_dxva2_hwaccel = {416AVHWAccel ff_hevc_dxva2_hwaccel = {
373 .name = "hevc_dxva2",417 .name = "hevc_dxva2",
374 .type = AVMEDIA_TYPE_VIDEO,418 .type = AVMEDIA_TYPE_VIDEO,
@@ -379,3 +423,17 @@ AVHWAccel ff_hevc_dxva2_hwaccel = { · 4 unmodified lines
379 .end_frame = dxva2_hevc_end_frame,423 .end_frame = dxva2_hevc_end_frame,
380 .frame_priv_data_size = sizeof(struct hevc_dxva2_picture_context),424 .frame_priv_data_size = sizeof(struct hevc_dxva2_picture_context),
381};425};
426#endif
427
428#if CONFIG_HEVC_D3D11VA_HWACCEL
429AVHWAccel ff_hevc_d3d11va_hwaccel = {
430 .name = "hevc_d3d11va",
431 .type = AVMEDIA_TYPE_VIDEO,
432 .id = AV_CODEC_ID_HEVC,
433 .pix_fmt = AV_PIX_FMT_D3D11VA_VLD,
434 .start_frame = dxva2_hevc_start_frame,
435 .decode_slice = dxva2_hevc_decode_slice,
436 .end_frame = dxva2_hevc_end_frame,
437 .frame_priv_data_size = sizeof(struct hevc_dxva2_picture_context),
438};
439#endif
libavcodec/dxva2_internal.h+27−5
@@ -28,6 +28,7 @@ · 27 unmodified lines
28#include "config.h"28#include "config.h"
29 29
30#include "dxva2.h"30#include "dxva2.h"
31#include "d3d11va.h"
31#if HAVE_DXVA_H32#if HAVE_DXVA_H
32#include <dxva.h>33#include <dxva.h>
33#endif34#endif
@@ -35,13 +36,34 @@ · 1 unmodified line
35#include "avcodec.h"36#include "avcodec.h"
36#include "mpegvideo.h"37#include "mpegvideo.h"
37 38
39typedef void DECODER_BUFFER_DESC;
40
41typedef union {
42 struct AVD3D11VAContext d3d11va;
43 struct dxva_context dxva2;
44} AVDXVAContext;
45
46#define D3D11VA_CONTEXT(ctx) (&ctx->d3d11va)
47#define DXVA2_CONTEXT(ctx) (&ctx->dxva2)
48
49#define DXVA_CONTEXT_WORKAROUND(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.workaround : ctx->dxva2.workaround)
50#define DXVA_CONTEXT_COUNT(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.surface_count : ctx->dxva2.surface_count)
51#define DXVA_CONTEXT_SURFACE(avctx, ctx, i) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.surface[i] : ctx->dxva2.surface[i])
52#define DXVA_CONTEXT_DECODER(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.decoder : ctx->dxva2.decoder)
53#define DXVA_CONTEXT_REPORT_ID(avctx, ctx) (*(avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? &ctx->d3d11va.report_id : &ctx->dxva2.report_id))
54#define DXVA_CONTEXT_CFG(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.cfg : ctx->dxva2.cfg)
55#define DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.cfg->ConfigBitstreamRaw : ctx->dxva2.cfg->ConfigBitstreamRaw)
56#define DXVA_CONTEXT_CFG_INTRARESID(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.cfg->ConfigIntraResidUnsigned : ctx->dxva2.cfg->ConfigIntraResidUnsigned)
57#define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.cfg->ConfigResidDiffAccelerator : ctx->dxva2.cfg->ConfigResidDiffAccelerator)
58
38void *ff_dxva2_get_surface(const AVFrame *frame);59void *ff_dxva2_get_surface(const AVFrame *frame);
39 60
40unsigned ff_dxva2_get_surface_index(const struct dxva_context *,61unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx,
62 const AVDXVAContext *,
41 const AVFrame *frame);63 const AVFrame *frame);
42 64
43int ff_dxva2_commit_buffer(AVCodecContext *, struct dxva_context *,65int ff_dxva2_commit_buffer(AVCodecContext *, AVDXVAContext *,
44 DXVA2_DecodeBufferDesc *,66 DECODER_BUFFER_DESC *,
45 unsigned type, const void *data, unsigned size,67 unsigned type, const void *data, unsigned size,
46 unsigned mb_count);68 unsigned mb_count);
47 69
@@ -50,7 +72,7 @@ int ff_dxva2_common_end_frame(AVCodecContext *, AVFrame *, · 2 unmodified lines
50 const void *pp, unsigned pp_size,72 const void *pp, unsigned pp_size,
51 const void *qm, unsigned qm_size,73 const void *qm, unsigned qm_size,
52 int (*commit_bs_si)(AVCodecContext *,74 int (*commit_bs_si)(AVCodecContext *,
53 DXVA2_DecodeBufferDesc *bs,75 DECODER_BUFFER_DESC *bs,
54 DXVA2_DecodeBufferDesc *slice));76 DECODER_BUFFER_DESC *slice));
55 77
56#endif /* AVCODEC_DXVA_INTERNAL_H */78#endif /* AVCODEC_DXVA_INTERNAL_H */
libavcodec/dxva2_mpeg2.c+80−22
@@ -36,7 +36,7 @@ struct dxva2_picture_context { · 35 unmodified lines
36};36};
37 37
38static void fill_picture_parameters(AVCodecContext *avctx,38static void fill_picture_parameters(AVCodecContext *avctx,
39 struct dxva_context *ctx,39 AVDXVAContext *ctx,
40 const struct MpegEncContext *s,40 const struct MpegEncContext *s,
41 DXVA_PictureParameters *pp)41 DXVA_PictureParameters *pp)
42{42{
@@ -44,14 +44,14 @@ static void fill_picture_parameters(AVCodecContext *avctx, · 1 unmodified line
44 int is_field = s->picture_structure != PICT_FRAME;44 int is_field = s->picture_structure != PICT_FRAME;
45 45
46 memset(pp, 0, sizeof(*pp));46 memset(pp, 0, sizeof(*pp));
47 pp->wDecodedPictureIndex = ff_dxva2_get_surface_index(ctx, current_picture->f);47 pp->wDecodedPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, current_picture->f);
48 pp->wDeblockedPictureIndex = 0;48 pp->wDeblockedPictureIndex = 0;
49 if (s->pict_type != AV_PICTURE_TYPE_I)49 if (s->pict_type != AV_PICTURE_TYPE_I)
50 pp->wForwardRefPictureIndex = ff_dxva2_get_surface_index(ctx, s->last_picture.f);50 pp->wForwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->last_picture.f);
51 else51 else
52 pp->wForwardRefPictureIndex = 0xffff;52 pp->wForwardRefPictureIndex = 0xffff;
53 if (s->pict_type == AV_PICTURE_TYPE_B)53 if (s->pict_type == AV_PICTURE_TYPE_B)
54 pp->wBackwardRefPictureIndex = ff_dxva2_get_surface_index(ctx, s->next_picture.f);54 pp->wBackwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->next_picture.f);
55 else55 else
56 pp->wBackwardRefPictureIndex = 0xffff;56 pp->wBackwardRefPictureIndex = 0xffff;
57 pp->wPicWidthInMBminus1 = s->mb_width - 1;57 pp->wPicWidthInMBminus1 = s->mb_width - 1;
@@ -102,7 +102,7 @@ static void fill_picture_parameters(AVCodecContext *avctx, · 44 unmodified lines
102}102}
103 103
104static void fill_quantization_matrices(AVCodecContext *avctx,104static void fill_quantization_matrices(AVCodecContext *avctx,
105 struct dxva_context *ctx,105 AVDXVAContext *ctx,
106 const struct MpegEncContext *s,106 const struct MpegEncContext *s,
107 DXVA_QmatrixData *qm)107 DXVA_QmatrixData *qm)
108{108{
@@ -147,11 +147,11 @@ static void fill_slice(AVCodecContext *avctx, · 38 unmodified lines
147 slice->wMBbitOffset = 4 * 8 + get_bits_count(&gb);147 slice->wMBbitOffset = 4 * 8 + get_bits_count(&gb);
148}148}
149static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,149static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
150 DXVA2_DecodeBufferDesc *bs,150 DECODER_BUFFER_DESC *bs,
151 DXVA2_DecodeBufferDesc *sc)151 DECODER_BUFFER_DESC *sc)
152{152{
153 const struct MpegEncContext *s = avctx->priv_data;153 const struct MpegEncContext *s = avctx->priv_data;
154 struct dxva_context *ctx = avctx->hwaccel_context;154 AVDXVAContext *ctx = avctx->hwaccel_context;
155 struct dxva2_picture_context *ctx_pic =155 struct dxva2_picture_context *ctx_pic =
156 s->current_picture_ptr->hwaccel_picture_private;156 s->current_picture_ptr->hwaccel_picture_private;
157 const int is_field = s->picture_structure != PICT_FRAME;157 const int is_field = s->picture_structure != PICT_FRAME;
@@ -160,11 +160,27 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, · 2 unmodified lines
160 uint8_t *dxva_data, *current, *end;160 uint8_t *dxva_data, *current, *end;
161 unsigned dxva_size;161 unsigned dxva_size;
162 unsigned i;162 unsigned i;
163 unsigned type;
163 164
164 if (FAILED(IDirectXVideoDecoder_GetBuffer(ctx->decoder,165#if CONFIG_D3D11VA
165 DXVA2_BitStreamDateBufferType,166 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) {
166 &dxva_data_ptr, &dxva_size)))167 type = D3D11_VIDEO_DECODER_BUFFER_BITSTREAM;
167 return -1;168 if (FAILED(ID3D11VideoContext_GetDecoderBuffer(D3D11VA_CONTEXT(ctx)->video_context,
169 D3D11VA_CONTEXT(ctx)->decoder,
170 type,
171 &dxva_size, &dxva_data_ptr)))
172 return -1;
173 }
174#endif
175#if CONFIG_DXVA2
176 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) {
177 type = DXVA2_BitStreamDateBufferType;
178 if (FAILED(IDirectXVideoDecoder_GetBuffer(DXVA2_CONTEXT(ctx)->decoder,
179 type,
180 &dxva_data_ptr, &dxva_size)))
181 return -1;
182 }
183#endif
168 184
169 dxva_data = dxva_data_ptr;185 dxva_data = dxva_data_ptr;
170 current = dxva_data;186 current = dxva_data;
@@ -190,19 +206,44 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, · 19 unmodified lines
190 memcpy(current, &ctx_pic->bitstream[position], size);206 memcpy(current, &ctx_pic->bitstream[position], size);
191 current += size;207 current += size;
192 }208 }
193 if (FAILED(IDirectXVideoDecoder_ReleaseBuffer(ctx->decoder,209#if CONFIG_D3D11VA
194 DXVA2_BitStreamDateBufferType)))210 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD)
195 return -1;211 if (FAILED(ID3D11VideoContext_ReleaseDecoderBuffer(D3D11VA_CONTEXT(ctx)->video_context, D3D11VA_CONTEXT(ctx)->decoder, type)))
212 return -1;
213#endif
214#if CONFIG_DXVA2
215 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD)
216 if (FAILED(IDirectXVideoDecoder_ReleaseBuffer(DXVA2_CONTEXT(ctx)->decoder, type)))
217 return -1;
218#endif
196 if (i < ctx_pic->slice_count)219 if (i < ctx_pic->slice_count)
197 return -1;220 return -1;
198 221
199 memset(bs, 0, sizeof(*bs));222#if CONFIG_D3D11VA
200 bs->CompressedBufferType = DXVA2_BitStreamDateBufferType;223 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) {
201 bs->DataSize = current - dxva_data;224 D3D11_VIDEO_DECODER_BUFFER_DESC *dsc11 = bs;
202 bs->NumMBsInBuffer = mb_count;225 memset(dsc11, 0, sizeof(*dsc11));
226 dsc11->BufferType = type;
227 dsc11->DataSize = current - dxva_data;
228 dsc11->NumMBsInBuffer = mb_count;
229
230 type = D3D11_VIDEO_DECODER_BUFFER_SLICE_CONTROL;
231 }
232#endif
233#if CONFIG_DXVA2
234 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) {
235 DXVA2_DecodeBufferDesc *dsc2 = bs;
236 memset(dsc2, 0, sizeof(*dsc2));
237 dsc2->CompressedBufferType = type;
238 dsc2->DataSize = current - dxva_data;
239 dsc2->NumMBsInBuffer = mb_count;
240
241 type = DXVA2_SliceControlBufferType;
242 }
243#endif
203 244
204 return ff_dxva2_commit_buffer(avctx, ctx, sc,245 return ff_dxva2_commit_buffer(avctx, ctx, sc,
205 DXVA2_SliceControlBufferType,246 type,
206 ctx_pic->slice,247 ctx_pic->slice,
207 ctx_pic->slice_count * sizeof(*ctx_pic->slice),248 ctx_pic->slice_count * sizeof(*ctx_pic->slice),
208 mb_count);249 mb_count);
@@ -213,11 +254,13 @@ static int dxva2_mpeg2_start_frame(AVCodecContext *avctx, · 4 unmodified lines
213 av_unused uint32_t size)254 av_unused uint32_t size)
214{255{
215 const struct MpegEncContext *s = avctx->priv_data;256 const struct MpegEncContext *s = avctx->priv_data;
216 struct dxva_context *ctx = avctx->hwaccel_context;257 AVDXVAContext *ctx = avctx->hwaccel_context;
217 struct dxva2_picture_context *ctx_pic =258 struct dxva2_picture_context *ctx_pic =
218 s->current_picture_ptr->hwaccel_picture_private;259 s->current_picture_ptr->hwaccel_picture_private;
219 260
220 if (!ctx->decoder || !ctx->cfg || ctx->surface_count <= 0)261 if (DXVA_CONTEXT_DECODER(avctx, ctx) == NULL ||
262 DXVA_CONTEXT_CFG(avctx, ctx) == NULL ||
263 DXVA_CONTEXT_COUNT(avctx, ctx) <= 0)
221 return -1;264 return -1;
222 assert(ctx_pic);265 assert(ctx_pic);
223 266
@@ -271,6 +314,7 @@ static int dxva2_mpeg2_end_frame(AVCodecContext *avctx) · 47 unmodified lines
271 return ret;314 return ret;
272}315}
273 316
317#if CONFIG_MPEG2_DXVA2_HWACCEL
274AVHWAccel ff_mpeg2_dxva2_hwaccel = {318AVHWAccel ff_mpeg2_dxva2_hwaccel = {
275 .name = "mpeg2_dxva2",319 .name = "mpeg2_dxva2",
276 .type = AVMEDIA_TYPE_VIDEO,320 .type = AVMEDIA_TYPE_VIDEO,
@@ -281,3 +325,17 @@ AVHWAccel ff_mpeg2_dxva2_hwaccel = { · 4 unmodified lines
281 .end_frame = dxva2_mpeg2_end_frame,325 .end_frame = dxva2_mpeg2_end_frame,
282 .frame_priv_data_size = sizeof(struct dxva2_picture_context),326 .frame_priv_data_size = sizeof(struct dxva2_picture_context),
283};327};
328#endif
329
330#if CONFIG_MPEG2_D3D11VA_HWACCEL
331AVHWAccel ff_mpeg2_d3d11va_hwaccel = {
332 .name = "mpeg2_d3d11va",
333 .type = AVMEDIA_TYPE_VIDEO,
334 .id = AV_CODEC_ID_MPEG2VIDEO,
335 .pix_fmt = AV_PIX_FMT_D3D11VA_VLD,
336 .start_frame = dxva2_mpeg2_start_frame,
337 .decode_slice = dxva2_mpeg2_decode_slice,
338 .end_frame = dxva2_mpeg2_end_frame,
339 .frame_priv_data_size = sizeof(struct dxva2_picture_context),
340};
341#endif
libavcodec/dxva2_vc1.c+101−30
@@ -34,7 +34,7 @@ struct dxva2_picture_context { · 33 unmodified lines
34};34};
35 35
36static void fill_picture_parameters(AVCodecContext *avctx,36static void fill_picture_parameters(AVCodecContext *avctx,
37 struct dxva_context *ctx, const VC1Context *v,37 AVDXVAContext *ctx, const VC1Context *v,
38 DXVA_PictureParameters *pp)38 DXVA_PictureParameters *pp)
39{39{
40 const MpegEncContext *s = &v->s;40 const MpegEncContext *s = &v->s;
@@ -42,13 +42,13 @@ static void fill_picture_parameters(AVCodecContext *avctx, · 1 unmodified line
42 42
43 memset(pp, 0, sizeof(*pp));43 memset(pp, 0, sizeof(*pp));
44 pp->wDecodedPictureIndex =44 pp->wDecodedPictureIndex =
45 pp->wDeblockedPictureIndex = ff_dxva2_get_surface_index(ctx, current_picture->f);45 pp->wDeblockedPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, current_picture->f);
46 if (s->pict_type != AV_PICTURE_TYPE_I && !v->bi_type)46 if (s->pict_type != AV_PICTURE_TYPE_I && !v->bi_type)
47 pp->wForwardRefPictureIndex = ff_dxva2_get_surface_index(ctx, s->last_picture.f);47 pp->wForwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->last_picture.f);
48 else48 else
49 pp->wForwardRefPictureIndex = 0xffff;49 pp->wForwardRefPictureIndex = 0xffff;
50 if (s->pict_type == AV_PICTURE_TYPE_B && !v->bi_type)50 if (s->pict_type == AV_PICTURE_TYPE_B && !v->bi_type)
51 pp->wBackwardRefPictureIndex = ff_dxva2_get_surface_index(ctx, s->next_picture.f);51 pp->wBackwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->next_picture.f);
52 else52 else
53 pp->wBackwardRefPictureIndex = 0xffff;53 pp->wBackwardRefPictureIndex = 0xffff;
54 if (v->profile == PROFILE_ADVANCED) {54 if (v->profile == PROFILE_ADVANCED) {
@@ -73,8 +73,8 @@ static void fill_picture_parameters(AVCodecContext *avctx, · 18 unmodified lines
73 pp->bPicIntra = s->pict_type == AV_PICTURE_TYPE_I || v->bi_type;73 pp->bPicIntra = s->pict_type == AV_PICTURE_TYPE_I || v->bi_type;
74 pp->bPicBackwardPrediction = s->pict_type == AV_PICTURE_TYPE_B && !v->bi_type;74 pp->bPicBackwardPrediction = s->pict_type == AV_PICTURE_TYPE_B && !v->bi_type;
75 pp->bBidirectionalAveragingMode = (1 << 7) |75 pp->bBidirectionalAveragingMode = (1 << 7) |
76 ((ctx->cfg->ConfigIntraResidUnsigned != 0) << 6) |76 ((DXVA_CONTEXT_CFG_INTRARESID(avctx, ctx) != 0) << 6) |
77 ((ctx->cfg->ConfigResidDiffAccelerator != 0) << 5) |77 ((DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) != 0) << 5) |
78 ((v->lumscale != 32 || v->lumshift != 0) << 4) |78 ((v->lumscale != 32 || v->lumshift != 0) << 4) |
79 ((v->profile == PROFILE_ADVANCED) << 3);79 ((v->profile == PROFILE_ADVANCED) << 3);
80 pp->bMVprecisionAndChromaRelation = ((v->mv_mode == MV_PMODE_1MV_HPEL_BILIN) << 3) |80 pp->bMVprecisionAndChromaRelation = ((v->mv_mode == MV_PMODE_1MV_HPEL_BILIN) << 3) |
@@ -82,11 +82,11 @@ static void fill_picture_parameters(AVCodecContext *avctx, · 1 unmodified line
82 (0 << 1) |82 (0 << 1) |
83 (!s->quarter_sample );83 (!s->quarter_sample );
84 pp->bChromaFormat = v->chromaformat;84 pp->bChromaFormat = v->chromaformat;
85 ctx->report_id++;85 DXVA_CONTEXT_REPORT_ID(avctx, ctx)++;
86 if (ctx->report_id >= (1 << 16))86 if (DXVA_CONTEXT_REPORT_ID(avctx, ctx) >= (1 << 16))
87 ctx->report_id = 1;87 DXVA_CONTEXT_REPORT_ID(avctx, ctx) = 1;
88 pp->bPicScanFixed = ctx->report_id >> 8;88 pp->bPicScanFixed = DXVA_CONTEXT_REPORT_ID(avctx, ctx) >> 8;
89 pp->bPicScanMethod = ctx->report_id & 0xff;89 pp->bPicScanMethod = DXVA_CONTEXT_REPORT_ID(avctx, ctx) & 0xff;
90 pp->bPicReadbackRequests = 0;90 pp->bPicReadbackRequests = 0;
91 pp->bRcontrol = v->rnd;91 pp->bRcontrol = v->rnd;
92 pp->bPicSpatialResid8 = (v->panscanflag << 7) |92 pp->bPicSpatialResid8 = (v->panscanflag << 7) |
@@ -157,11 +157,11 @@ static void fill_slice(AVCodecContext *avctx, DXVA_SliceInfo *slice, · 64 unmodified lines
157}157}
158 158
159static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,159static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
160 DXVA2_DecodeBufferDesc *bs,160 DECODER_BUFFER_DESC *bs,
161 DXVA2_DecodeBufferDesc *sc)161 DECODER_BUFFER_DESC *sc)
162{162{
163 const VC1Context *v = avctx->priv_data;163 const VC1Context *v = avctx->priv_data;
164 struct dxva_context *ctx = avctx->hwaccel_context;164 AVDXVAContext *ctx = avctx->hwaccel_context;
165 const MpegEncContext *s = &v->s;165 const MpegEncContext *s = &v->s;
166 struct dxva2_picture_context *ctx_pic = s->current_picture_ptr->hwaccel_picture_private;166 struct dxva2_picture_context *ctx_pic = s->current_picture_ptr->hwaccel_picture_private;
167 167
@@ -177,11 +177,27 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, · 9 unmodified lines
177 uint8_t *dxva_data;177 uint8_t *dxva_data;
178 unsigned dxva_size;178 unsigned dxva_size;
179 int result;179 int result;
180 unsigned type;
180 181
181 if (FAILED(IDirectXVideoDecoder_GetBuffer(ctx->decoder,182#if CONFIG_D3D11VA
182 DXVA2_BitStreamDateBufferType,183 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) {
183 &dxva_data_ptr, &dxva_size)))184 type = D3D11_VIDEO_DECODER_BUFFER_BITSTREAM;
184 return -1;185 if (FAILED(ID3D11VideoContext_GetDecoderBuffer(D3D11VA_CONTEXT(ctx)->video_context,
186 D3D11VA_CONTEXT(ctx)->decoder,
187 type,
188 &dxva_size, &dxva_data_ptr)))
189 return -1;
190 }
191#endif
192#if CONFIG_DXVA2
193 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) {
194 type = DXVA2_BitStreamDateBufferType;
195 if (FAILED(IDirectXVideoDecoder_GetBuffer(DXVA2_CONTEXT(ctx)->decoder,
196 type,
197 &dxva_data_ptr, &dxva_size)))
198 return -1;
199 }
200#endif
185 201
186 dxva_data = dxva_data_ptr;202 dxva_data = dxva_data_ptr;
187 result = data_size <= dxva_size ? 0 : -1;203 result = data_size <= dxva_size ? 0 : -1;
@@ -194,21 +210,46 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, · 6 unmodified lines
194 memset(dxva_data + start_code_size + slice_size, 0, padding);210 memset(dxva_data + start_code_size + slice_size, 0, padding);
195 slice->dwSliceBitsInBuffer = 8 * data_size;211 slice->dwSliceBitsInBuffer = 8 * data_size;
196 }212 }
197 if (FAILED(IDirectXVideoDecoder_ReleaseBuffer(ctx->decoder,213#if CONFIG_D3D11VA
198 DXVA2_BitStreamDateBufferType)))214 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD)
199 return -1;215 if (FAILED(ID3D11VideoContext_ReleaseDecoderBuffer(D3D11VA_CONTEXT(ctx)->video_context, D3D11VA_CONTEXT(ctx)->decoder, type)))
216 return -1;
217#endif
218#if CONFIG_DXVA2
219 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD)
220 if (FAILED(IDirectXVideoDecoder_ReleaseBuffer(DXVA2_CONTEXT(ctx)->decoder, type)))
221 return -1;
222#endif
200 if (result)223 if (result)
201 return result;224 return result;
202 225
203 memset(bs, 0, sizeof(*bs));226#if CONFIG_D3D11VA
204 bs->CompressedBufferType = DXVA2_BitStreamDateBufferType;227 if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) {
205 bs->DataSize = data_size;228 D3D11_VIDEO_DECODER_BUFFER_DESC *dsc11 = bs;
206 bs->NumMBsInBuffer = s->mb_width * s->mb_height;229 memset(dsc11, 0, sizeof(*dsc11));
207 assert((bs->DataSize & 127) == 0);230 dsc11->BufferType = type;
231 dsc11->DataSize = data_size;
232 dsc11->NumMBsInBuffer = s->mb_width * s->mb_height;
233
234 type = D3D11_VIDEO_DECODER_BUFFER_SLICE_CONTROL;
235 }
236#endif
237#if CONFIG_DXVA2
238 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) {
239 DXVA2_DecodeBufferDesc *dsc2 = bs;
240 memset(dsc2, 0, sizeof(*dsc2));
241 dsc2->CompressedBufferType = type;
242 dsc2->DataSize = data_size;
243 dsc2->NumMBsInBuffer = s->mb_width * s->mb_height;
244
245 type = DXVA2_SliceControlBufferType;
246 }
247#endif
248 assert((data_size & 127) == 0);
208 249
209 return ff_dxva2_commit_buffer(avctx, ctx, sc,250 return ff_dxva2_commit_buffer(avctx, ctx, sc,
210 DXVA2_SliceControlBufferType,251 type,
211 slice, sizeof(*slice), bs->NumMBsInBuffer);252 slice, sizeof(*slice), s->mb_width * s->mb_height);
212}253}
213 254
214static int dxva2_vc1_start_frame(AVCodecContext *avctx,255static int dxva2_vc1_start_frame(AVCodecContext *avctx,
@@ -216,10 +257,12 @@ static int dxva2_vc1_start_frame(AVCodecContext *avctx, · 1 unmodified line
216 av_unused uint32_t size)257 av_unused uint32_t size)
217{258{
218 const VC1Context *v = avctx->priv_data;259 const VC1Context *v = avctx->priv_data;
219 struct dxva_context *ctx = avctx->hwaccel_context;260 AVDXVAContext *ctx = avctx->hwaccel_context;
220 struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->hwaccel_picture_private;261 struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->hwaccel_picture_private;
221 262
222 if (!ctx->decoder || !ctx->cfg || ctx->surface_count <= 0)263 if (DXVA_CONTEXT_DECODER(avctx, ctx) == NULL ||
264 DXVA_CONTEXT_CFG(avctx, ctx) == NULL ||
265 DXVA_CONTEXT_COUNT(avctx, ctx) <= 0)
223 return -1;266 return -1;
224 assert(ctx_pic);267 assert(ctx_pic);
225 268
@@ -285,6 +328,7 @@ AVHWAccel ff_wmv3_dxva2_hwaccel = { · 59 unmodified lines
285};328};
286#endif329#endif
287 330
331#if CONFIG_VC1_DXVA2_HWACCEL
288AVHWAccel ff_vc1_dxva2_hwaccel = {332AVHWAccel ff_vc1_dxva2_hwaccel = {
289 .name = "vc1_dxva2",333 .name = "vc1_dxva2",
290 .type = AVMEDIA_TYPE_VIDEO,334 .type = AVMEDIA_TYPE_VIDEO,
@@ -295,3 +339,30 @@ AVHWAccel ff_vc1_dxva2_hwaccel = { · 4 unmodified lines
295 .end_frame = dxva2_vc1_end_frame,339 .end_frame = dxva2_vc1_end_frame,
296 .frame_priv_data_size = sizeof(struct dxva2_picture_context),340 .frame_priv_data_size = sizeof(struct dxva2_picture_context),
297};341};
342#endif
343
344#if CONFIG_WMV3_D3D11VA_HWACCEL
345AVHWAccel ff_wmv3_d3d11va_hwaccel = {
346 .name = "wmv3_d3d11va",
347 .type = AVMEDIA_TYPE_VIDEO,
348 .id = AV_CODEC_ID_WMV3,
349 .pix_fmt = AV_PIX_FMT_D3D11VA_VLD,
350 .start_frame = dxva2_vc1_start_frame,
351 .decode_slice = dxva2_vc1_decode_slice,
352 .end_frame = dxva2_vc1_end_frame,
353 .frame_priv_data_size = sizeof(struct dxva2_picture_context),
354};
355#endif
356
357#if CONFIG_VC1_D3D11VA_HWACCEL
358AVHWAccel ff_vc1_d3d11va_hwaccel = {
359 .name = "vc1_d3d11va",
360 .type = AVMEDIA_TYPE_VIDEO,
361 .id = AV_CODEC_ID_VC1,
362 .pix_fmt = AV_PIX_FMT_D3D11VA_VLD,
363 .start_frame = dxva2_vc1_start_frame,
364 .decode_slice = dxva2_vc1_decode_slice,
365 .end_frame = dxva2_vc1_end_frame,
366 .frame_priv_data_size = sizeof(struct dxva2_picture_context),
367};
368#endif
libavcodec/h264_slice.c+3−0
@@ -861,6 +861,9 @@ static enum AVPixelFormat get_pixel_format(H264Context *h) · 860 unmodified lines
861#if CONFIG_H264_DXVA2_HWACCEL861#if CONFIG_H264_DXVA2_HWACCEL
862 *fmt++ = AV_PIX_FMT_DXVA2_VLD;862 *fmt++ = AV_PIX_FMT_DXVA2_VLD;
863#endif863#endif
864#if CONFIG_H264_D3D11VA_HWACCEL
865 *fmt++ = AV_PIX_FMT_D3D11VA_VLD;
866#endif
864#if CONFIG_H264_VAAPI_HWACCEL867#if CONFIG_H264_VAAPI_HWACCEL
865 *fmt++ = AV_PIX_FMT_VAAPI_VLD;868 *fmt++ = AV_PIX_FMT_VAAPI_VLD;
866#endif869#endif
libavcodec/hevc.c+3−0
@@ -445,6 +445,9 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps) · 444 unmodified lines
445 if (sps->pix_fmt == AV_PIX_FMT_YUV420P || sps->pix_fmt == AV_PIX_FMT_YUVJ420P) {445 if (sps->pix_fmt == AV_PIX_FMT_YUV420P || sps->pix_fmt == AV_PIX_FMT_YUVJ420P) {
446#if CONFIG_HEVC_DXVA2_HWACCEL446#if CONFIG_HEVC_DXVA2_HWACCEL
447 *fmt++ = AV_PIX_FMT_DXVA2_VLD;447 *fmt++ = AV_PIX_FMT_DXVA2_VLD;
448#endif
449#if CONFIG_HEVC_D3D11VA_HWACCEL
450 *fmt++ = AV_PIX_FMT_D3D11VA_VLD;
448#endif451#endif
449 }452 }
450 453
libavcodec/mpeg12dec.c+3−0
@@ -1173,6 +1173,9 @@ static const enum AVPixelFormat mpeg12_hwaccel_pixfmt_list_420[] = { · 1172 unmodified lines
1173#if CONFIG_MPEG2_DXVA2_HWACCEL1173#if CONFIG_MPEG2_DXVA2_HWACCEL
1174 AV_PIX_FMT_DXVA2_VLD,1174 AV_PIX_FMT_DXVA2_VLD,
1175#endif1175#endif
1176#if CONFIG_MPEG2_D3D11VA_HWACCEL
1177 AV_PIX_FMT_D3D11VA_VLD,
1178#endif
1176#if CONFIG_MPEG2_VAAPI_HWACCEL1179#if CONFIG_MPEG2_VAAPI_HWACCEL
1177 AV_PIX_FMT_VAAPI_VLD,1180 AV_PIX_FMT_VAAPI_VLD,
1178#endif1181#endif
libavcodec/vc1dec.c+3−0
@@ -954,6 +954,9 @@ static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = { · 953 unmodified lines
954#if CONFIG_VC1_DXVA2_HWACCEL954#if CONFIG_VC1_DXVA2_HWACCEL
955 AV_PIX_FMT_DXVA2_VLD,955 AV_PIX_FMT_DXVA2_VLD,
956#endif956#endif
957#if CONFIG_VC1_D3D11VA_HWACCEL
958 AV_PIX_FMT_D3D11VA_VLD,
959#endif
957#if CONFIG_VC1_VAAPI_HWACCEL960#if CONFIG_VC1_VAAPI_HWACCEL
958 AV_PIX_FMT_VAAPI_VLD,961 AV_PIX_FMT_VAAPI_VLD,
959#endif962#endif
libavcodec/version.h+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
29#include "libavutil/version.h"29#include "libavutil/version.h"
30 30
31#define LIBAVCODEC_VERSION_MAJOR 5631#define LIBAVCODEC_VERSION_MAJOR 56
32#define LIBAVCODEC_VERSION_MINOR 2432#define LIBAVCODEC_VERSION_MINOR 25
33#define LIBAVCODEC_VERSION_MICRO 033#define LIBAVCODEC_VERSION_MICRO 0
34 34
35#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \35#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
libavutil/pixdesc.c+6−0
@@ -1333,6 +1333,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 1332 unmodified lines
1333 },1333 },
1334 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,1334 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
1335 },1335 },
1336 [AV_PIX_FMT_D3D11VA_VLD] = {
1337 .name = "d3d11va_vld",
1338 .log2_chroma_w = 1,
1339 .log2_chroma_h = 1,
1340 .flags = AV_PIX_FMT_FLAG_HWACCEL,
1341 },
1336 [AV_PIX_FMT_DXVA2_VLD] = {1342 [AV_PIX_FMT_DXVA2_VLD] = {
1337 .name = "dxva2_vld",1343 .name = "dxva2_vld",
1338 .log2_chroma_w = 1,1344 .log2_chroma_w = 1,
libavutil/pixfmt.h+2−0
@@ -220,6 +220,8 @@ enum AVPixelFormat { · 219 unmodified lines
220 */220 */
221 AV_PIX_FMT_MMAL,221 AV_PIX_FMT_MMAL,
222 222
223 AV_PIX_FMT_D3D11VA_VLD, ///< HW decoding through Direct3D11, Picture.data[3] contains a ID3D11VideoDecoderOutputView pointer
224
223 AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions225 AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
224 226
225#if FF_API_PIX_FMT227#if FF_API_PIX_FMT
libavutil/version.h+1−1
@@ -54,7 +54,7 @@ · 53 unmodified lines
54 */54 */
55 55
56#define LIBAVUTIL_VERSION_MAJOR 5456#define LIBAVUTIL_VERSION_MAJOR 54
57#define LIBAVUTIL_VERSION_MINOR 1257#define LIBAVUTIL_VERSION_MINOR 13
58#define LIBAVUTIL_VERSION_MICRO 158#define LIBAVUTIL_VERSION_MICRO 1
59 59
60#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \60#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t