MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi/qsvvpp: avoid overriding the returned value

Browse Source 
It means more than one output is ready when
MFXVideoVPP_RunFrameVPPAsync() returns MFX_ERR_MORE_SURFACE [1].
Currently the returned value from MFXVideoVPP_RunFrameVPPAsync() might
be overridden, so the check of 'ret == MFX_ERR_MORE_SURFACE' is always
false when MFX_ERR_MORE_SURFACE is returned from
MFXVideoVPP_RunFrameVPPAsync()

[1] https://github.com/Intel-Media-SDK/MediaSDK/blob/master/doc/mediasdk-man.md#video-processing-procedures

Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
This commit is contained in:
Haihao Xiang 2022-11-28 12:43:19 +08:00
parent 50575e24be
commit 51bad2e6a7
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavfilter/qsvvpp.c
View File

@ -833,7 +833,7 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, AVFilterLink *inlink, AVFrame *picr
QSVAsyncFrame aframe;
mfxSyncPoint sync;
QSVFrame *in_frame, *out_frame;
int ret, filter_ret;
int ret, ret1, filter_ret;
while (s->eof && av_fifo_read(s->async_fifo, &aframe, 1) >= 0) {
if (MFXVideoCORE_SyncOperation(s->session, aframe.sync, 1000) < 0)
@ -890,8 +890,13 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, AVFilterLink *inlink, AVFrame *picr
av_fifo_read(s->async_fifo, &aframe, 1);
do {
ret = MFXVideoCORE_SyncOperation(s->session, aframe.sync, 1000);
} while (ret == MFX_WRN_IN_EXECUTION);
ret1 = MFXVideoCORE_SyncOperation(s->session, aframe.sync, 1000);
} while (ret1 == MFX_WRN_IN_EXECUTION);
if (ret1 < 0) {
ret = ret1;
break;
}
filter_ret = s->filter_frame(outlink, aframe.frame->frame);
if (filter_ret < 0) {