mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-03 13:16:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

oggdemux: Allow start clipping for Opus

Browse source 
The granulepos does not have the pre-skip subtracted while timestamps do,
and the last granulepos will be shorter by the number of samples that should
be dropped because of padding in the end.

As such, extrapolating the granule of the beginning of the first frame will
lead to a negative value, which is not a problem but intentional.

https://bugzilla.gnome.org/show_bug.cgi?id=757153
This commit is contained in:
Sebastian Dröge 2015-11-02 11:19:23 +02:00
parent 1f2fdd3789
commit 8a3be7323a
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ext/ogg/gstoggdemux.c
View file

@ -1058,14 +1058,8 @@ gst_ogg_pad_submit_packet (GstOggPad * pad, ogg_packet * packet)
if (granule >= pad->map.accumulated_granule) if (granule >= pad->map.accumulated_granule)
start_granule = granule - pad->map.accumulated_granule; start_granule = granule - pad->map.accumulated_granule;
else { else
if (pad->map.forbid_start_clamping) { start_granule = 0;
GST_ERROR_OBJECT (ogg, "Start of stream maps to negative time");
return GST_FLOW_ERROR;
} else {
start_granule = 0;
}
}
pad->start_time = gst_ogg_stream_granule_to_time (&pad->map, pad->start_time = gst_ogg_stream_granule_to_time (&pad->map,
start_granule); start_granule);
@ -1294,6 +1288,7 @@ gst_ogg_demux_setup_first_granule (GstOggDemux * ogg, GstOggPad * pad,
GST_DEBUG_OBJECT (pad, GST_DEBUG_OBJECT (pad,
"This page completes %d packets, granule %" G_GINT64_FORMAT, packets, "This page completes %d packets, granule %" G_GINT64_FORMAT, packets,
granule); granule);
if (packets > 0) { if (packets > 0) {
ogg_stream_state os; ogg_stream_state os;
ogg_packet op; ogg_packet op;

1
ext/ogg/gstoggstream.c
View file

@ -2000,7 +2000,6 @@ setup_opus_mapper (GstOggStream * pad, ogg_packet * packet)
pad->granuleshift = 0; pad->granuleshift = 0;
pad->n_header_packets = 2; pad->n_header_packets = 2;
pad->first_granpos = -1; pad->first_granpos = -1;
pad->forbid_start_clamping = TRUE;
/* pre-skip is in samples at 48000 Hz, which matches granule one for one */ /* pre-skip is in samples at 48000 Hz, which matches granule one for one */
pad->granule_offset = -GST_READ_UINT16_LE (packet->packet + 10); pad->granule_offset = -GST_READ_UINT16_LE (packet->packet + 10);

1
ext/ogg/gstoggstream.h
View file

@ -70,7 +70,6 @@ struct _GstOggStream
gint bitrate; gint bitrate;
guint64 total_time; guint64 total_time;
gboolean is_sparse; gboolean is_sparse;
gboolean forbid_start_clamping;
GstCaps *caps; GstCaps *caps;