[FFmpeg-cvslog] qsvenc: do not re-execute encoding on all positive status codes

Anton Khirnov git at videolan.org
Fri Nov 4 21:01:33 EET 2016


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Jul 14 12:52:20 2016 +0200| [fb240a6276fa36fe120aadd67b4ca774e354f22b] | committer: Mark Thompson

qsvenc: do not re-execute encoding on all positive status codes

It should only be done for DEVICE_BUSY/IN_EXECUTION

(cherry picked from commit 0956fd460681e8ccbdae19f135f0d3970bf95c2f)
Fixes ticket #5924.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb240a6276fa36fe120aadd67b4ca774e354f22b
---

 libavcodec/qsvenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 7445d5b..ac443c1 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -982,7 +982,7 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q,
         ret = MFXVideoENCODE_EncodeFrameAsync(q->session, enc_ctrl, surf, bs, sync);
         if (ret == MFX_WRN_DEVICE_BUSY)
             av_usleep(500);
-    } while (ret > 0);
+    } while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_WRN_IN_EXECUTION);
 
     if (ret < 0) {
         av_packet_unref(&new_pkt);



More information about the ffmpeg-cvslog mailing list