diff options
| author | IBM Thinklab <oblong@wall-center.(none)> | 2014-09-11 19:37:33 -0400 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-09-13 16:44:30 +0300 |
| commit | 1d9519747d8750930e76dedeef5f287a4530b89d (patch) | |
| tree | 4c226bc803af983bcfc6a24f0c7651e88c960e52 | |
| parent | cfb576efc7a316d315a3485a06504a7dfff5d3c5 (diff) | |
| download | gst-libav-1d9519747d8750930e76dedeef5f287a4530b89d.tar.gz | |
avviddec: drain frames until libav doesn't have more data
We use have_data (that comes from libav), instead of only trying 10 times,
to know if there are more frames available. The old code was machine
dependant as different amount of frames could be decoded by different
type of (more powerful) machines, and 10 times was not always sufficient.
https://bugzilla.gnome.org/show_bug.cgi?id=736515
| -rw-r--r-- | ext/libav/gstavviddec.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c index a93f3d4..a9645f2 100644 --- a/ext/libav/gstavviddec.c +++ b/ext/libav/gstavviddec.c @@ -1438,7 +1438,7 @@ gst_ffmpegviddec_drain (GstFFMpegVidDec * ffmpegdec) oclass = (GstFFMpegVidDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec)); if (oclass->in_plugin->capabilities & CODEC_CAP_DELAY) { - gint have_data, len, try = 0; + gint have_data, len; GST_LOG_OBJECT (ffmpegdec, "codec has delay capabilities, calling until ffmpeg has drained everything"); @@ -1448,9 +1448,7 @@ gst_ffmpegviddec_drain (GstFFMpegVidDec * ffmpegdec) len = gst_ffmpegviddec_frame (ffmpegdec, NULL, 0, &have_data, NULL, &ret); - if (len < 0 || have_data == 0) - break; - } while (try++ < 10); + } while (len >= 0 && have_data == 1); avcodec_flush_buffers (ffmpegdec->context); } } |