highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dxva2: Make ff_dxva2_get_surface() static and drop its name prefix

Browse Source 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Steve Lhomme 2017-01-03 17:31:48 +01:00 committed by Diego Biurrun
parent 9026ec8aaf
commit f8a42d4f26
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 "avcodec.h"
#include "dxva2_internal.h" #include "dxva2_internal.h"
void *ff_dxva2_get_surface(const AVFrame *frame) static void *get_surface(const AVFrame *frame)
{ {
return frame->data[3]; return frame->data[3];
} }
@ -38,7 +38,7 @@ unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx,
const AVDXVAContext *ctx, const AVDXVAContext *ctx,
const AVFrame *frame) const AVFrame *frame)
{ {
void *surface = ff_dxva2_get_surface(frame); void *surface = get_surface(frame);
unsigned i; unsigned i;
for (i = 0; i < DXVA_CONTEXT_COUNT(avctx, ctx); i++) { for (i = 0; i < DXVA_CONTEXT_COUNT(avctx, ctx); i++) {
@ -158,14 +158,14 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, AVFrame *frame,
if (D3D11VA_CONTEXT(ctx)->context_mutex != INVALID_HANDLE_VALUE) if (D3D11VA_CONTEXT(ctx)->context_mutex != INVALID_HANDLE_VALUE)
WaitForSingleObjectEx(D3D11VA_CONTEXT(ctx)->context_mutex, INFINITE, FALSE); WaitForSingleObjectEx(D3D11VA_CONTEXT(ctx)->context_mutex, INFINITE, FALSE);
hr = ID3D11VideoContext_DecoderBeginFrame(D3D11VA_CONTEXT(ctx)->video_context, D3D11VA_CONTEXT(ctx)->decoder, hr = ID3D11VideoContext_DecoderBeginFrame(D3D11VA_CONTEXT(ctx)->video_context, D3D11VA_CONTEXT(ctx)->decoder,
ff_dxva2_get_surface(frame), get_surface(frame),
0, NULL); 0, NULL);
} }
#endif #endif
#if CONFIG_DXVA2 #if CONFIG_DXVA2
if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD)
hr = IDirectXVideoDecoder_BeginFrame(DXVA2_CONTEXT(ctx)->decoder, hr = IDirectXVideoDecoder_BeginFrame(DXVA2_CONTEXT(ctx)->decoder,
ff_dxva2_get_surface(frame), get_surface(frame),
NULL); NULL);
#endif #endif
if (hr != E_PENDING || ++runs > 50) if (hr != E_PENDING || ++runs > 50)

2
libavcodec/dxva2_internal.h
View File

@ -91,8 +91,6 @@ typedef union {
#define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) (ctx->d3d11va.cfg->ConfigResidDiffAccelerator) #define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) (ctx->d3d11va.cfg->ConfigResidDiffAccelerator)
#endif #endif
void *ff_dxva2_get_surface(const AVFrame *frame);
unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx, unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx,
const AVDXVAContext *, const AVDXVAContext *,
const AVFrame *frame); const AVFrame *frame);