mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-02 13:38:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

Set correct timestamps on audio laces, fixes playback of mp3 from matroska.

Browse source 
Original commit message from CVS:
Set correct timestamps on audio laces, fixes playback of mp3 from matroska.
This commit is contained in:
Arwed v. Merkatz 2005-12-12 18:14:58 +00:00
parent 40dee5b0da
commit fe8b19e160
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-12-12 Arwed v. Merkatz <v.merkatz@gmx.net>
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_parse_blockgroup_or_simpleblock):
Set correct timestamps on audio laces, fixes playback of mp3 from
matroska.
2005-12-12 Tim-Philipp Müller <tim at centricular dot net> 2005-12-12 Tim-Philipp Müller <tim at centricular dot net>
* gst/auparse/gstauparse.c: (gst_au_parse_base_init), * gst/auparse/gstauparse.c: (gst_au_parse_base_init),

22
gst/matroska/matroska-demux.c
View file

@ -2101,6 +2101,7 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux,
guint size = 0; guint size = 0;
gint *lace_size = NULL; gint *lace_size = NULL;
gint64 time = 0; gint64 time = 0;
gint64 lace_time = 0;
gint flags = 0; gint flags = 0;
while (!got_error) { while (!got_error) {
@ -2295,6 +2296,15 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux,
} }
} }
if (cluster_time != GST_CLOCK_TIME_NONE) {
if (time < 0 && (-time) > cluster_time)
lace_time = cluster_time;
else
lace_time = cluster_time + time;
} else {
lace_time = GST_CLOCK_TIME_NONE;
}
if (!got_error && readblock) { if (!got_error && readblock) {
guint64 duration = 0; guint64 duration = 0;
@ -2316,14 +2326,10 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux,
sub = gst_buffer_create_sub (buf, sub = gst_buffer_create_sub (buf,
GST_BUFFER_SIZE (buf) - size, lace_size[n]); GST_BUFFER_SIZE (buf) - size, lace_size[n]);
if (cluster_time != GST_CLOCK_TIME_NONE) { GST_BUFFER_TIMESTAMP (sub) = lace_time;
if (time < 0 && (-time) > cluster_time) if (lace_time != GST_CLOCK_TIME_NONE)
GST_BUFFER_TIMESTAMP (sub) = cluster_time; demux->pos = lace_time;
else
GST_BUFFER_TIMESTAMP (sub) = cluster_time + time;
demux->pos = GST_BUFFER_TIMESTAMP (sub);
}
stream->pos = demux->pos; stream->pos = demux->pos;
gst_matroska_demux_sync_streams (demux); gst_matroska_demux_sync_streams (demux);
@ -2358,6 +2364,8 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux,
got_error = TRUE; got_error = TRUE;
size -= lace_size[n]; size -= lace_size[n];
if (lace_time != GST_CLOCK_TIME_NONE)
lace_time += duration;
} }
} }