mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-28 01:05:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/avi/gstavidemux.c: Fix quite humiliating bug in omitting 0-sized index chunks but forgetting to count them for ti...

Browse source 
Original commit message from CVS:
* gst/avi/gstavidemux.c: (gst_avi_demux_stream_index),
(gst_avi_demux_massage_index):
Fix quite humiliating bug in omitting 0-sized index chunks but
forgetting to count them for timestamps.
This commit is contained in:
Ronald S. Bultje 2004-11-29 12:41:03 +00:00
parent 1b3995f5c2
commit 9506620fe2
2 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-11-29 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/avi/gstavidemux.c: (gst_avi_demux_stream_index),
(gst_avi_demux_massage_index):
Fix quite humiliating bug in omitting 0-sized index chunks but
forgetting to count them for timestamps.
2004-11-29 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2004-11-29 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/a52dec/gsta52dec.c: (gst_a52dec_loop): * ext/a52dec/gsta52dec.c: (gst_a52dec_loop):

29
gst/avi/gstavidemux.c
View file

@ -1244,7 +1244,7 @@ gst_avi_demux_stream_index (GstAviDemux * avi,
entry.size = GUINT32_FROM_LE (_entry->size); entry.size = GUINT32_FROM_LE (_entry->size);
target = &index_entries[i]; target = &index_entries[i];
if (entry.id == GST_RIFF_rec || entry.id == 0 || entry.size == 0) if (entry.id == GST_RIFF_rec || entry.id == 0)
continue; continue;
stream_nr = CHUNKID_TO_STREAMNR (entry.id); stream_nr = CHUNKID_TO_STREAMNR (entry.id);
@ -1296,8 +1296,11 @@ gst_avi_demux_stream_index (GstAviDemux * avi,
stream->total_bytes += target->size; stream->total_bytes += target->size;
stream->total_frames++; stream->total_frames++;
GST_DEBUG ("Adding index entry of size %u at offset %" GST_DEBUG ("Adding index entry %d (%d) for stream %d of size %u "
G_GUINT64_FORMAT, target->size, target->offset); "at offset %" G_GUINT64_FORMAT " and time %" GST_TIME_FORMAT,
target->index_nr, stream->total_frames - 1,
target->stream_nr, target->size, target->offset,
GST_TIME_ARGS (target->ts));
list = g_list_prepend (list, target); list = g_list_prepend (list, target);
} }
@ -1623,16 +1626,24 @@ gst_avi_demux_massage_index (GstAviDemux * avi,
/* init frames */ /* init frames */
for (i = 0; i < avi->num_streams; i++) { for (i = 0; i < avi->num_streams; i++) {
GstFormat fmt = GST_FORMAT_TIME;
stream = &avi->stream[i]; stream = &avi->stream[i];
if (stream->strh->type == GST_RIFF_FCC_vids) { if (stream->strh->type == GST_RIFF_FCC_vids) {
if (stream->strh->rate != 0) if (!gst_pad_convert (stream->pad,
stream->delay = stream->strh->init_frames * GST_SECOND * GST_FORMAT_DEFAULT, stream->strh->init_frames,
stream->strh->scale / stream->strh->rate; &fmt, &stream->delay)) {
stream->delay = 0;
}
} else { } else {
if (stream->total_frames * stream->bitrate != 0) if (!gst_pad_convert (stream->pad,
stream->delay = GST_SECOND * stream->strh->init_frames * GST_FORMAT_DEFAULT, stream->strh->init_frames,
stream->strh->length / (stream->total_frames * stream->bitrate); &fmt, &stream->delay)) {
stream->delay = 0;
}
} }
GST_LOG ("Adding init_time=%" GST_TIME_FORMAT " to stream %d",
GST_TIME_ARGS (stream->delay), i);
} }
for (one = list; one != NULL; one = one->next) { for (one = list; one != NULL; one = one->next) {
entry = one->data; entry = one->data;