9b462a0b9d
The slice index expected by D3D11VA is the one from the texture not from the array or texture/slices. In VLC the slices we provide the decoder don't start from 0 and thus pictures appear in bogus order. With possible crashes and corruptions when using an invalid index. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
119 lines
5.2 KiB
C
119 lines
5.2 KiB
C
/*
|
|
* DXVA2 HW acceleration
|
|
*
|
|
* copyright (c) 2010 Laurent Aimar
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef AVCODEC_DXVA2_INTERNAL_H
|
|
#define AVCODEC_DXVA2_INTERNAL_H
|
|
|
|
#define COBJMACROS
|
|
|
|
#include "config.h"
|
|
|
|
/* define the proper COM entries before forcing desktop APIs */
|
|
#include <objbase.h>
|
|
|
|
#if CONFIG_DXVA2
|
|
#include "dxva2.h"
|
|
#endif
|
|
#if CONFIG_D3D11VA
|
|
#include "d3d11va.h"
|
|
#endif
|
|
|
|
#if HAVE_DXVA_H
|
|
/* When targeting WINAPI_FAMILY_PHONE_APP or WINAPI_FAMILY_APP, dxva.h
|
|
* defines nothing. Force the struct definitions to be visible. */
|
|
#undef WINAPI_FAMILY
|
|
#define WINAPI_FAMILY WINAPI_FAMILY_DESKTOP_APP
|
|
#undef _CRT_BUILD_DESKTOP_APP
|
|
#define _CRT_BUILD_DESKTOP_APP 0
|
|
#include <dxva.h>
|
|
#endif
|
|
|
|
#include "avcodec.h"
|
|
|
|
typedef void DECODER_BUFFER_DESC;
|
|
|
|
typedef union {
|
|
#if CONFIG_D3D11VA
|
|
struct AVD3D11VAContext d3d11va;
|
|
#endif
|
|
#if CONFIG_DXVA2
|
|
struct dxva_context dxva2;
|
|
#endif
|
|
} AVDXVAContext;
|
|
|
|
#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_DECODER(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.decoder : ctx->dxva2.decoder)
|
|
#define DXVA_CONTEXT_REPORT_ID(avctx, ctx) (*(avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? &ctx->d3d11va.report_id : &ctx->dxva2.report_id))
|
|
#define DXVA_CONTEXT_CFG(avctx, ctx) (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD ? ctx->d3d11va.cfg : ctx->dxva2.cfg)
|
|
#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)
|
|
#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_DECODER(avctx, ctx) (ctx->dxva2.decoder)
|
|
#define DXVA_CONTEXT_REPORT_ID(avctx, ctx) (*(&ctx->dxva2.report_id))
|
|
#define DXVA_CONTEXT_CFG(avctx, ctx) (ctx->dxva2.cfg)
|
|
#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_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);
|
|
|
|
unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx,
|
|
const AVDXVAContext *,
|
|
const AVFrame *frame);
|
|
|
|
int ff_dxva2_commit_buffer(AVCodecContext *, AVDXVAContext *,
|
|
DECODER_BUFFER_DESC *,
|
|
unsigned type, const void *data, unsigned size,
|
|
unsigned mb_count);
|
|
|
|
|
|
int ff_dxva2_common_end_frame(AVCodecContext *, AVFrame *,
|
|
const void *pp, unsigned pp_size,
|
|
const void *qm, unsigned qm_size,
|
|
int (*commit_bs_si)(AVCodecContext *,
|
|
DECODER_BUFFER_DESC *bs,
|
|
DECODER_BUFFER_DESC *slice));
|
|
|
|
#endif /* AVCODEC_DXVA2_INTERNAL_H */
|