mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/ffmpeg/gstffmpegdec.c: Flush delayed frames on DISCONT if we have them.

Browse source 
Original commit message from CVS:
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_drain),
(gst_ffmpegdec_sink_event), (gst_ffmpegdec_chain):
Flush delayed frames on DISCONT if we have them.
This commit is contained in:
Wim Taymans 2008-01-18 17:48:21 +00:00
parent c0bed4bd8d
commit c7d5be2b69
3 changed files with 38 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-01-18 Wim Taymans <wim.taymans@collabora.co.uk>
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_drain),
(gst_ffmpegdec_sink_event), (gst_ffmpegdec_chain):
Flush delayed frames on DISCONT if we have them.
2008-01-18 Wim Taymans <wim.taymans@collabora.co.uk> 2008-01-18 Wim Taymans <wim.taymans@collabora.co.uk>
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_video_frame), * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_video_frame),

2
common

@ -1 +1 @@
Subproject commit 9aa2dcf8d6855932e9e91006d6be96f55fd9f1a3 Subproject commit b6bd1a35b641237d016496039e474dee4230de76

56
ext/ffmpeg/gstffmpegdec.c
View file

@ -1743,6 +1743,34 @@ no_codec:
} }
} }
static void
gst_ffmpegdec_drain (GstFFMpegDec * ffmpegdec)
{
GstFFMpegDecClass *oclass;
oclass = (GstFFMpegDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec));
if (oclass->in_plugin->capabilities & CODEC_CAP_DELAY) {
gint have_data, len, try = 0;
GST_LOG_OBJECT (ffmpegdec,
"codec has delay capabilities, calling until ffmpeg has drained everything");
do {
GstFlowReturn ret;
len = gst_ffmpegdec_frame (ffmpegdec, NULL, 0, &have_data,
GST_CLOCK_TIME_NONE, GST_CLOCK_TIME_NONE, &ret);
if (len < 0 || have_data == 0)
break;
} while (try++ < 10);
}
if (ffmpegdec->segment.rate < 0.0) {
/* if we have some queued frames for reverse playback, flush them now */
flush_queued (ffmpegdec);
}
}
static void static void
gst_ffmpegdec_flush_pcache (GstFFMpegDec * ffmpegdec) gst_ffmpegdec_flush_pcache (GstFFMpegDec * ffmpegdec)
{ {
@ -1776,25 +1804,7 @@ gst_ffmpegdec_sink_event (GstPad * pad, GstEvent * event)
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_EOS: case GST_EVENT_EOS:
{ {
if (oclass->in_plugin->capabilities & CODEC_CAP_DELAY) { gst_ffmpegdec_drain (ffmpegdec);
gint have_data, len, try = 0;
GST_LOG_OBJECT (ffmpegdec,
"codec has delay capabilities, calling until ffmpeg has drained everything");
do {
GstFlowReturn ret;
len = gst_ffmpegdec_frame (ffmpegdec, NULL, 0, &have_data,
GST_CLOCK_TIME_NONE, GST_CLOCK_TIME_NONE, &ret);
if (len < 0 || have_data == 0)
break;
} while (try++ < 10);
}
if (ffmpegdec->segment.rate < 0.0) {
/* if we have some queued frames for reverse playback, flush them now */
flush_queued (ffmpegdec);
}
break; break;
} }
case GST_EVENT_FLUSH_STOP: case GST_EVENT_FLUSH_STOP:
@ -1921,17 +1931,13 @@ gst_ffmpegdec_chain (GstPad * pad, GstBuffer * inbuf)
* case of a network error, better show the errors than to drop all data.. */ * case of a network error, better show the errors than to drop all data.. */
if (G_UNLIKELY (discont)) { if (G_UNLIKELY (discont)) {
GST_DEBUG_OBJECT (ffmpegdec, "received DISCONT"); GST_DEBUG_OBJECT (ffmpegdec, "received DISCONT");
/* drain what we have queued */
gst_ffmpegdec_drain (ffmpegdec);
gst_ffmpegdec_flush_pcache (ffmpegdec); gst_ffmpegdec_flush_pcache (ffmpegdec);
avcodec_flush_buffers (ffmpegdec->context); avcodec_flush_buffers (ffmpegdec->context);
ffmpegdec->waiting_for_key = TRUE; ffmpegdec->waiting_for_key = TRUE;
ffmpegdec->discont = TRUE; ffmpegdec->discont = TRUE;
ffmpegdec->next_ts = GST_CLOCK_TIME_NONE; ffmpegdec->next_ts = GST_CLOCK_TIME_NONE;
/* flush on discont */
if (ffmpegdec->segment.rate < 0.0) {
/* flush out queued reverse frames */
ret = flush_queued (ffmpegdec);
}
} }
oclass = (GstFFMpegDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec)); oclass = (GstFFMpegDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec));