mirror of https://git.ffmpeg.org/ffmpeg.git
lavfi/qsvvpp: avoid overriding the returned value
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:
parent
50575e24be
commit
51bad2e6a7
|
@ -833,7 +833,7 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, AVFilterLink *inlink, AVFrame *picr
|
||||||
QSVAsyncFrame aframe;
|
QSVAsyncFrame aframe;
|
||||||
mfxSyncPoint sync;
|
mfxSyncPoint sync;
|
||||||
QSVFrame *in_frame, *out_frame;
|
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) {
|
while (s->eof && av_fifo_read(s->async_fifo, &aframe, 1) >= 0) {
|
||||||
if (MFXVideoCORE_SyncOperation(s->session, aframe.sync, 1000) < 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);
|
av_fifo_read(s->async_fifo, &aframe, 1);
|
||||||
|
|
||||||
do {
|
do {
|
||||||
ret = MFXVideoCORE_SyncOperation(s->session, aframe.sync, 1000);
|
ret1 = MFXVideoCORE_SyncOperation(s->session, aframe.sync, 1000);
|
||||||
} while (ret == MFX_WRN_IN_EXECUTION);
|
} while (ret1 == MFX_WRN_IN_EXECUTION);
|
||||||
|
|
||||||
|
if (ret1 < 0) {
|
||||||
|
ret = ret1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
filter_ret = s->filter_frame(outlink, aframe.frame->frame);
|
filter_ret = s->filter_frame(outlink, aframe.frame->frame);
|
||||||
if (filter_ret < 0) {
|
if (filter_ret < 0) {
|
||||||
|
|
Loading…
Reference in New Issue