diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 17:13:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 17:13:22 +0200 |
| commit | deed77ffeecae9e2ddb8f2955b476cd7e8b9b959 (patch) | |
| tree | aab21f921878ea91797100000423980cdf6cd0f4 /libavcodec/dxva2_internal.h | |
| parent | 3f36607ef0dfa2c11ae6d90959b8f94c8b429d68 (diff) | |
| parent | 28fa58cf5d939151108345d7ddddebbd51d9b684 (diff) | |
| download | ffmpeg-deed77ffeecae9e2ddb8f2955b476cd7e8b9b959.tar.gz | |
Merge commit '28fa58cf5d939151108345d7ddddebbd51d9b684'
* commit '28fa58cf5d939151108345d7ddddebbd51d9b684':
dxva2: Fix build when only D3D11 or DXVA2 is used
Conflicts:
libavcodec/dxva2_internal.h
See: 94d07b314aa516284cc21ea720d4a305f881b6c2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dxva2_internal.h')
| -rw-r--r-- | libavcodec/dxva2_internal.h | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index 381fb1f510..426de9dc16 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -27,8 +27,9 @@ #include "config.h" +#if CONFIG_DXVA2 #include "dxva2.h" - +#endif #if CONFIG_D3D11VA #include "d3d11va.h" #endif @@ -46,13 +47,19 @@ typedef union { #if CONFIG_D3D11VA struct AVD3D11VAContext d3d11va; #endif +#if CONFIG_DXVA2 struct dxva_context dxva2; +#endif } AVDXVAContext; -#define DXVA2_CONTEXT(ctx) (&ctx->dxva2) - #if CONFIG_D3D11VA #define D3D11VA_CONTEXT(ctx) (&ctx->d3d11va) +#endif +#if CONFIG_DXVA2 +#define DXVA2_CONTEXT(ctx) (&ctx->dxva2) +#endif + +#if CONFIG_D3D11VA && CONFIG_DXVA2 #define DXVA_CONTEXT_WORKAROUND(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.workaround : ctx->dxva2.workaround) #define DXVA_CONTEXT_COUNT(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.surface_count : ctx->dxva2.surface_count) #define DXVA_CONTEXT_SURFACE(avctx, ctx, i) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.surface[i] : ctx->dxva2.surface[i]) @@ -62,7 +69,7 @@ typedef union { #define DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.cfg->ConfigBitstreamRaw : ctx->dxva2.cfg->ConfigBitstreamRaw) #define DXVA_CONTEXT_CFG_INTRARESID(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.cfg->ConfigIntraResidUnsigned : ctx->dxva2.cfg->ConfigIntraResidUnsigned) #define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.cfg->ConfigResidDiffAccelerator : ctx->dxva2.cfg->ConfigResidDiffAccelerator) -#else +#elif CONFIG_DXVA2 #define DXVA_CONTEXT_WORKAROUND(avctx, ctx) (ctx->dxva2.workaround) #define DXVA_CONTEXT_COUNT(avctx, ctx) (ctx->dxva2.surface_count) #define DXVA_CONTEXT_SURFACE(avctx, ctx, i) (ctx->dxva2.surface[i]) @@ -72,6 +79,16 @@ typedef union { #define DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) (ctx->dxva2.cfg->ConfigBitstreamRaw) #define DXVA_CONTEXT_CFG_INTRARESID(avctx, ctx) (ctx->dxva2.cfg->ConfigIntraResidUnsigned) #define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) (ctx->dxva2.cfg->ConfigResidDiffAccelerator) +#elif CONFIG_D3D11VA +#define DXVA_CONTEXT_WORKAROUND(avctx, ctx) (ctx->d3d11va.workaround) +#define DXVA_CONTEXT_COUNT(avctx, ctx) (ctx->d3d11va.surface_count) +#define DXVA_CONTEXT_SURFACE(avctx, ctx, i) (ctx->d3d11va.surface[i]) +#define DXVA_CONTEXT_DECODER(avctx, ctx) (ctx->d3d11va.decoder) +#define DXVA_CONTEXT_REPORT_ID(avctx, ctx) (*(&ctx->d3d11va.report_id)) +#define DXVA_CONTEXT_CFG(avctx, ctx) (ctx->d3d11va.cfg) +#define DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) (ctx->d3d11va.cfg->ConfigBitstreamRaw) +#define DXVA_CONTEXT_CFG_INTRARESID(avctx, ctx) (ctx->d3d11va.cfg->ConfigIntraResidUnsigned) +#define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) (ctx->d3d11va.cfg->ConfigResidDiffAccelerator) #endif void *ff_dxva2_get_surface(const AVFrame *frame); |