dxva2: allow an empty array of ID3D11VideoDecoderOutputView

We can pick the correct slice index directly from the ID3D11VideoDecoderOutputView casted from data[3]. Also added myself as maintainer for DXVA2 and D3D11VA.

Steve Lhomme committed 9 years ago

Commit 8fb48651 parent 153b36f3 files · +5 −4Browse files

Unified · Split

3 files

MAINTAINERS +2 −1
libavcodec/dxva2_internal.h +2 −2
libavcodec/version.h +1 −1

MAINTAINERS+2−1

@@ -260,7 +260,8 @@ Codecs: · 259 unmodified lines
260		260
261	Hardware acceleration:	261	Hardware acceleration:
262	crystalhd.c Philip Langdale	262	crystalhd.c Philip Langdale
263	dxva2* Hendrik Leppkes, Laurent Aimar	263	dxva2* Hendrik Leppkes, Laurent Aimar, Steve Lhomme
		264	d3d11va* Steve Lhomme
264	mediacodec* Matthieu Bouron	265	mediacodec* Matthieu Bouron
265	vaapi* Gwenole Beauchesne	266	vaapi* Gwenole Beauchesne
266	vaapi_encode* Mark Thompson	267	vaapi_encode* Mark Thompson

libavcodec/dxva2_internal.h+2−2

libavcodec/version.h+1−1

@@ -29,7 +29,7 @@ · 28 unmodified lines
29		29
30	#define LIBAVCODEC_VERSION_MAJOR 57	30	#define LIBAVCODEC_VERSION_MAJOR 57
31	#define LIBAVCODEC_VERSION_MINOR 72	31	#define LIBAVCODEC_VERSION_MINOR 72
32	#define LIBAVCODEC_VERSION_MICRO 100	32	#define LIBAVCODEC_VERSION_MICRO 101
33		33
34	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \	34	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
35	LIBAVCODEC_VERSION_MINOR, \	35	LIBAVCODEC_VERSION_MINOR, \

dxva2: allow an empty array of ID3D11VideoDecoderOutputView

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -78,7 +78,7 @@ typedef union { · 77 unmodified lines
78	#define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.cfg->ConfigResidDiffAccelerator : ctx->dxva2.cfg->ConfigResidDiffAccelerator)	78	#define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.cfg->ConfigResidDiffAccelerator : ctx->dxva2.cfg->ConfigResidDiffAccelerator)
79	#define DXVA_CONTEXT_VALID(avctx, ctx) (DXVA_CONTEXT_DECODER(avctx, ctx) && \	79	#define DXVA_CONTEXT_VALID(avctx, ctx) (DXVA_CONTEXT_DECODER(avctx, ctx) && \
80	DXVA_CONTEXT_CFG(avctx, ctx) && \	80	DXVA_CONTEXT_CFG(avctx, ctx) && \
81	DXVA_CONTEXT_COUNT(avctx, ctx))	81	(avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD \|\| ctx->dxva2.surface_count))
82	#elif CONFIG_DXVA2	82	#elif CONFIG_DXVA2
83	#define DXVA_CONTEXT_WORKAROUND(avctx, ctx) (ctx->dxva2.workaround)	83	#define DXVA_CONTEXT_WORKAROUND(avctx, ctx) (ctx->dxva2.workaround)
84	#define DXVA_CONTEXT_COUNT(avctx, ctx) (ctx->dxva2.surface_count)	84	#define DXVA_CONTEXT_COUNT(avctx, ctx) (ctx->dxva2.surface_count)
@@ -98,7 +98,7 @@ typedef union { · 13 unmodified lines
98	#define DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) (ctx->d3d11va.cfg->ConfigBitstreamRaw)	98	#define DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) (ctx->d3d11va.cfg->ConfigBitstreamRaw)
99	#define DXVA_CONTEXT_CFG_INTRARESID(avctx, ctx) (ctx->d3d11va.cfg->ConfigIntraResidUnsigned)	99	#define DXVA_CONTEXT_CFG_INTRARESID(avctx, ctx) (ctx->d3d11va.cfg->ConfigIntraResidUnsigned)
100	#define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) (ctx->d3d11va.cfg->ConfigResidDiffAccelerator)	100	#define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) (ctx->d3d11va.cfg->ConfigResidDiffAccelerator)
101	#define DXVA_CONTEXT_VALID(avctx, ctx) (ctx->d3d11va.decoder && ctx->d3d11va.cfg && ctx->d3d11va.surface_count)	101	#define DXVA_CONTEXT_VALID(avctx, ctx) (ctx->d3d11va.decoder && ctx->d3d11va.cfg)
102	#endif	102	#endif
103		103
104	unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx,	104	unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx,