mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 16:21:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

ffmpeg: Don't enter infinite loops in the timestamp tracking

Browse source 
Avoid an infinite loop consuming buffer timestamp info when
the video frames contain only GST_CLOCK_TIME_NONE timestamps.

Add some debug logging in the timestamp tracking paths.

Fixes: #585845
This commit is contained in:
Jan Schmidt 2009-06-18 01:11:25 +01:00
parent cb245b7504
commit 473d7391a9
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ext/ffmpeg/gstffmpegdec.c
View file

@ -61,7 +61,7 @@ struct _GstTSHandler
/* ts list indexes */
gint buf_head;
gint buf_tail;
guint64 buf_count;
guint buf_count;
/* incomming buffer timestamp tracking */
GstTSMap buffers[TS_MAP_COUNT + 1];
@ -2820,7 +2820,7 @@ gst_ts_handler_append (GstFFMpegDec * ffmpegdec, GstBuffer * buffer)
gint size = GST_BUFFER_SIZE (buffer);
gint ind = ts_handler->buf_head;
if ((ts != -1) || (!ts && !ts_handler->buf_count)) {
if ((ts != -1) || (ts == -1 && !ts_handler->buf_count)) {
/* null timestamps are only valid for the first entry */
TS_MAP_INC (ind);
/** debugging trace
@ -2828,12 +2828,19 @@ gst_ts_handler_append (GstFFMpegDec * ffmpegdec, GstBuffer * buffer)
ind, ts_handler->buf_count,
ts != -1 ? (double) ts / GST_SECOND : -1.0, size);
**/
GST_LOG_OBJECT (ffmpegdec, "store timestamp @ index [%02X] buf_count: %d"
" ts: %" GST_TIME_FORMAT " size: %d",
ind, ts_handler->buf_count, GST_TIME_ARGS (ts), size);
ts_handler->buffers[ind].ts = ts;
ts_handler->buffers[ind].size = size;
ts_handler->buf_head = ind;
ts_handler->buf_count++;
} else {
/* append size to existing entry */
GST_LOG_OBJECT (ffmpegdec, "Extending index [%02X] buf_count: %d"
" ts: %" GST_TIME_FORMAT " new size: %d",
ind, ts_handler->buf_count,
ts_handler->buffers[ind].ts, ts_handler->buffers[ind].size);
ts_handler->buffers[ind].size += size;
}
}
@ -2846,12 +2853,16 @@ gst_ts_handler_consume (GstFFMpegDec * ffmpegdec, gint size)
gint buf = ts_handler->buf_tail;
/* eat some bytes from the buffer map */
while (size > 0) {
while (size > 0 && ts_handler->buf_count > 0) {
GST_LOG_OBJECT (ffmpegdec, "Stepping over %d bytes @ index %d has %d bytes",
size, buf, ts_handler->buffers[buf].size);
if (size >= ts_handler->buffers[buf].size) {
size -= ts_handler->buffers[buf].size;
/* reset this entry */
memset (ts_handler->buffers + buf, -1, sizeof (GstTSMap));
TS_MAP_INC (buf);
/* Decrement the active buffer count */
ts_handler->buf_count--;
/* update the buffer tail */
ts_handler->buf_tail = buf;
} else {
@ -2859,9 +2870,13 @@ gst_ts_handler_consume (GstFFMpegDec * ffmpegdec, gint size)
size = 0;
}
}
if (size == -1) {
if (size == -1 && ts_handler->buf_count > 0) {
GST_LOG_OBJECT (ffmpegdec, "Stepping over %d bytes @ index %d has %d bytes",
size, buf, ts_handler->buffers[buf].size);
/* just consume the one buffer regardless */
memset (ts_handler->buffers + buf, -1, sizeof (GstTSMap));
/* Decrement the active buffer count */
ts_handler->buf_count--;
TS_MAP_INC (buf);
/* update the buffer tail */
ts_handler->buf_tail = buf;
@ -2875,6 +2890,8 @@ gst_ts_handler_get_ts (GstFFMpegDec * ffmpegdec)
{
GstTSHandler *ts_handler = &ffmpegdec->ts_handler;
guint64 ts = ts_handler->buffers[ts_handler->buf_tail].ts;
GST_LOG_OBJECT (ffmpegdec, "Index %d yielded ts %" GST_TIME_FORMAT,
ts_handler->buf_tail, GST_TIME_ARGS (ts));
ts_handler->buffers[ts_handler->buf_tail].ts = -1;
return ts;
}