mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

oggdemux: fix last buffer timestamp when samples are clipped

Browse source 
The end of a stream can be clipped by setting the granulepos of
the last page to a lower value that it otherwise would be.
This commit is contained in:
Vincent Penquerc'h 2014-06-05 11:26:08 +01:00
parent f5b9a26e0d
commit a93cc13d42
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/ogg/gstoggdemux.c
View file

@ -177,6 +177,7 @@ gst_ogg_pad_init (GstOggPad * pad)
gst_pad_use_fixed_caps (GST_PAD (pad));
pad->current_granule = -1;
pad->prev_granule = -1;
pad->keyframe_granule = -1;
pad->start_time = GST_CLOCK_TIME_NONE;
@ -458,6 +459,7 @@ gst_ogg_pad_reset (GstOggPad * pad)
pad->last_ret = GST_FLOW_OK;
pad->position = GST_CLOCK_TIME_NONE;
pad->current_granule = -1;
pad->prev_granule = -1;
pad->keyframe_granule = -1;
pad->is_eos = FALSE;
}
@ -639,9 +641,22 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet,
out_duration = gst_util_uint64_scale (duration,
GST_SECOND * pad->map.granulerate_d, pad->map.granulerate_n);
}
} else {
/* The last packet may be clipped. This will be represented
by the last granule being smaller than what it would otherwise
have been, had no content been clipped. In that case, we
cannot calculate the PTS of the audio from the packet length
and granule. */
if (packet->e_o_s) {
if (pad->prev_granule >= 0)
out_timestamp = gst_ogg_stream_granule_to_time (&pad->map,
pad->prev_granule);
else
out_timestamp = 0;
} else {
out_timestamp = gst_ogg_stream_granule_to_time (&pad->map,
pad->current_granule - duration);
}
out_duration =
gst_ogg_stream_granule_to_time (&pad->map,
pad->current_granule) - out_timestamp;
@ -652,6 +667,7 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet,
out_offset =
gst_ogg_stream_granule_to_time (&pad->map, pad->current_granule);
}
pad->prev_granule = pad->current_granule;
}
if (pad->map.is_ogm_text) {

1
ext/ogg/gstoggdemux.h
View file

@ -89,6 +89,7 @@ struct _GstOggPad
gint64 packetno;
gint64 current_granule;
gint64 prev_granule;
gint64 keyframe_granule;
GstClockTime start_time; /* the timestamp of the first sample */