generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '5b2b23f2d69e05c5fcd1c933e383fe60e185574d'

Browse Source 
* commit '5b2b23f2d69e05c5fcd1c933e383fe60e185574d':
  dxva2: Retry IDirectXVideoDecoder_BeginFrame()

This also adds a missig #include to prevent breaking building

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-21 15:53:40 +01:00
commit 9056d0c94a
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/dxva2.c
View File

@ -21,6 +21,7 @@
*/ */
#include "dxva2_internal.h" #include "dxva2_internal.h"
#include "libavutil/time.h"
void *ff_dxva2_get_surface(const Picture *picture) void *ff_dxva2_get_surface(const Picture *picture)
{ {
@ -87,12 +88,19 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, Picture *pic,
unsigned buffer_count = 0; unsigned buffer_count = 0;
DXVA2_DecodeBufferDesc buffer[4]; DXVA2_DecodeBufferDesc buffer[4];
DXVA2_DecodeExecuteParams exec = { 0 }; DXVA2_DecodeExecuteParams exec = { 0 };
int result; int result, runs = 0;
HRESULT hr;
if (FAILED(IDirectXVideoDecoder_BeginFrame(ctx->decoder, do {
ff_dxva2_get_surface(pic), hr = IDirectXVideoDecoder_BeginFrame(ctx->decoder,
NULL))) { ff_dxva2_get_surface(pic),
av_log(avctx, AV_LOG_ERROR, "Failed to begin frame\n"); NULL);
if (hr == E_PENDING)
av_usleep(2000);
} while (hr == E_PENDING && ++runs < 50);
if (FAILED(hr)) {
av_log(avctx, AV_LOG_ERROR, "Failed to begin frame: 0x%x\n", hr);
return -1; return -1;
} }