We can pick the correct slice index directly from the ID3D11VideoDecoderOutputView casted from data[3]. Also added myself as maintainer for DXVA2 and D3D11VA.
Unified · Split
| @@ -260,7 +260,8 @@ Codecs: · 259 unmodified lines | ||
| 260 | 260 | |
| 261 | 261 | Hardware acceleration: |
| 262 | 262 | crystalhd.c Philip Langdale |
| 263 | − dxva2* Hendrik Leppkes, Laurent Aimar | |
| 263 | + dxva2* Hendrik Leppkes, Laurent Aimar, Steve Lhomme | |
| 264 | + d3d11va* Steve Lhomme | |
| 264 | 265 | mediacodec* Matthieu Bouron |
| 265 | 266 | vaapi* Gwenole Beauchesne |
| 266 | 267 | vaapi_encode* Mark Thompson |
| @@ -78,7 +78,7 @@ typedef union { · 77 unmodified lines | ||
| 78 | 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 | 79 | #define DXVA_CONTEXT_VALID(avctx, ctx) (DXVA_CONTEXT_DECODER(avctx, ctx) && \ |
| 80 | 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 | 82 | #elif CONFIG_DXVA2 |
| 83 | 83 | #define DXVA_CONTEXT_WORKAROUND(avctx, ctx) (ctx->dxva2.workaround) |
| 84 | 84 | #define DXVA_CONTEXT_COUNT(avctx, ctx) (ctx->dxva2.surface_count) |
| @@ -98,7 +98,7 @@ typedef union { · 13 unmodified lines | ||
| 98 | 98 | #define DXVA_CONTEXT_CFG_BITSTREAM(avctx, ctx) (ctx->d3d11va.cfg->ConfigBitstreamRaw) |
| 99 | 99 | #define DXVA_CONTEXT_CFG_INTRARESID(avctx, ctx) (ctx->d3d11va.cfg->ConfigIntraResidUnsigned) |
| 100 | 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 | 102 | #endif |
| 103 | 103 | |
| 104 | 104 | unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx, |
| @@ -29,7 +29,7 @@ · 28 unmodified lines | ||
| 29 | 29 | |
| 30 | 30 | #define LIBAVCODEC_VERSION_MAJOR 57 |
| 31 | 31 | #define LIBAVCODEC_VERSION_MINOR 72 |
| 32 | −#define LIBAVCODEC_VERSION_MICRO 100 | |
| 32 | +#define LIBAVCODEC_VERSION_MICRO 101 | |
| 33 | 33 | |
| 34 | 34 | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
| 35 | 35 | LIBAVCODEC_VERSION_MINOR, \ |