mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

oggmux: set correct granpos on last page when samples are clipped

Browse source 
Samples may be clipped at the end, and this is conveyed by a
granulepos that's smaller than it would otherwise be. Use the
segment stop time to detect this, and calculate the right
granulepos.
This commit is contained in:
Vincent Penquerc'h 2014-06-05 14:54:31 +01:00
parent a93cc13d42
commit aa5b5b9085
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ext/ogg/gstoggmux.c
View file

@ -816,7 +816,7 @@ static GstBuffer *
gst_ogg_mux_decorate_buffer (GstOggMux * ogg_mux, GstOggPadData * pad, gst_ogg_mux_decorate_buffer (GstOggMux * ogg_mux, GstOggPadData * pad,
GstBuffer * buf) GstBuffer * buf)
{ {
GstClockTime time; GstClockTime time, end_time;
gint64 duration, granule, limit; gint64 duration, granule, limit;
GstClockTime next_time; GstClockTime next_time;
GstClockTimeDiff diff; GstClockTimeDiff diff;
@ -866,6 +866,24 @@ gst_ogg_mux_decorate_buffer (GstOggMux * ogg_mux, GstOggPadData * pad,
goto no_granule; goto no_granule;
} }
/* The last packet may have clipped samples. We need to test against
* the segment to ensure we do not use a granpos that encompasses those.
*/
end_time =
gst_ogg_stream_granule_to_time (&pad->map, pad->next_granule + duration);
if (!GST_CLOCK_TIME_IS_VALID (gst_segment_to_running_time (&pad->segment,
GST_FORMAT_TIME, end_time))) {
gint64 actual_duration =
gst_util_uint64_scale_round (pad->segment.stop - time,
pad->map.granulerate_n,
GST_SECOND * pad->map.granulerate_d);
GST_INFO_OBJECT (ogg_mux,
"Got clipped last packet of duration %" G_GINT64_FORMAT " (%"
G_GINT64_FORMAT " clipped)", actual_duration,
duration - actual_duration);
duration = actual_duration;
}
GST_LOG_OBJECT (pad->collect.pad, "buffer ts %" GST_TIME_FORMAT GST_LOG_OBJECT (pad->collect.pad, "buffer ts %" GST_TIME_FORMAT
", duration %" GST_TIME_FORMAT ", granule duration %" G_GINT64_FORMAT, ", duration %" GST_TIME_FORMAT ", granule duration %" G_GINT64_FORMAT,
GST_TIME_ARGS (time), GST_TIME_ARGS (GST_BUFFER_DURATION (buf)), GST_TIME_ARGS (time), GST_TIME_ARGS (GST_BUFFER_DURATION (buf)),