RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dxva2: make ff_dxva2_get_surface() static and rename it 

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Steve Lhomme 2017-01-04 14:36:41 +01:00 committed by Michael Niedermayer
parent 4068f5fac7
commit fd0716b364
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/dxva2.c
View File

@ -29,7 +29,7 @@
#include "avcodec.h"
#include "dxva2_internal.h"
void *ff_dxva2_get_surface(const AVFrame *frame)
static void *get_surface(const AVFrame *frame)
{
return frame->data[3];
}
@ -38,7 +38,7 @@ unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx,
const AVDXVAContext *ctx,
const AVFrame *frame)
{
void *surface = ff_dxva2_get_surface(frame);
void *surface = get_surface(frame);
unsigned i;
for (i = 0; i < DXVA_CONTEXT_COUNT(avctx, ctx); i++) {
@ -159,14 +159,14 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, AVFrame *frame,
if (D3D11VA_CONTEXT(ctx)->context_mutex != INVALID_HANDLE_VALUE)
WaitForSingleObjectEx(D3D11VA_CONTEXT(ctx)->context_mutex, INFINITE, FALSE);
hr = ID3D11VideoContext_DecoderBeginFrame(D3D11VA_CONTEXT(ctx)->video_context, D3D11VA_CONTEXT(ctx)->decoder,
ff_dxva2_get_surface(frame),
get_surface(frame),
0, NULL);
}
#endif
#if CONFIG_DXVA2
if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD)
hr = IDirectXVideoDecoder_BeginFrame(DXVA2_CONTEXT(ctx)->decoder,
ff_dxva2_get_surface(frame),
get_surface(frame),
NULL);
#endif
if (hr != E_PENDING || ++runs > 50)

2
libavcodec/dxva2_internal.h
View File

@ -96,8 +96,6 @@ typedef union {
#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);