diff options
| author | Steve Lhomme <robux4@videolabs.io> | 2016-06-15 09:25:19 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-07-11 16:27:30 +0200 |
| commit | 99cf943339a2e5171863c48cd1a73dd43dc243e1 (patch) | |
| tree | b0ec728fa08644a284ceb945fd7ae7c861b78d42 /libavcodec/dxva2.c | |
| parent | 2866d108c9e9da7baf53ff57a51d470691049a57 (diff) | |
| download | ffmpeg-streaming-99cf943339a2e5171863c48cd1a73dd43dc243e1.zip ffmpeg-streaming-99cf943339a2e5171863c48cd1a73dd43dc243e1.tar.gz | |
d3d11va: don't keep the context lock while waiting for a frame
also fixes a deadlock found by Денис Кулаков <kudesnik33ra@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/dxva2.c')
| -rw-r--r-- | libavcodec/dxva2.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index 8b0e686..9157094 100644 --- a/libavcodec/dxva2.c +++ b/libavcodec/dxva2.c @@ -158,9 +158,15 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, AVFrame *frame, ff_dxva2_get_surface(frame), NULL); #endif - if (hr == E_PENDING) - av_usleep(2000); - } while (hr == E_PENDING && ++runs < 50); + if (hr != E_PENDING || ++runs > 50) + break; +#if CONFIG_D3D11VA + if (avctx->pix_fmt == AV_PIX_FMT_D3D11VA_VLD) + if (D3D11VA_CONTEXT(ctx)->context_mutex != INVALID_HANDLE_VALUE) + ReleaseMutex(D3D11VA_CONTEXT(ctx)->context_mutex); +#endif + av_usleep(2000); + } while(1); if (FAILED(hr)) { av_log(avctx, AV_LOG_ERROR, "Failed to begin frame: 0x%lx\n", hr); |
