mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 20:51:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

oggdemux: Strip trailing \0 for subtitle OGM streams

Browse source 
Fixes bug #607870.
This commit is contained in:
Sebastian Dröge 2010-01-24 08:57:13 +01:00
parent a66ce94adc
commit 1652005f26
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ext/ogg/gstoggdemux.c
View file

@ -481,6 +481,7 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet)
GstOggChain *chain; GstOggChain *chain;
gint64 duration; gint64 duration;
gint offset; gint offset;
gint trim;
GstClockTime out_timestamp, out_duration; GstClockTime out_timestamp, out_duration;
guint64 out_offset, out_offset_end; guint64 out_offset, out_offset_end;
gboolean delta_unit = FALSE; gboolean delta_unit = FALSE;
@ -532,8 +533,19 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet)
offset = 1 + (((data[0] & 0xc0) >> 6) | ((data[0] & 0x02) << 1)); offset = 1 + (((data[0] & 0xc0) >> 6) | ((data[0] & 0x02) << 1));
delta_unit = (((data[0] & 0x08) >> 3) == 0); delta_unit = (((data[0] & 0x08) >> 3) == 0);
trim = 0;
/* Strip trailing \0 for subtitles */
if (pad->map.is_ogm_text) {
while (bytes && data[bytes - 1] == 0) {
trim++;
bytes--;
}
}
} else { } else {
offset = 0; offset = 0;
trim = 0;
} }
/* get timing info for the packet */ /* get timing info for the packet */
@ -594,12 +606,13 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet)
} }
/* check for invalid buffer sizes */ /* check for invalid buffer sizes */
if (G_UNLIKELY (offset >= packet->bytes)) if (G_UNLIKELY (offset + trim >= packet->bytes))
goto empty_packet; goto empty_packet;
ret = ret =
gst_pad_alloc_buffer_and_set_caps (GST_PAD_CAST (pad), gst_pad_alloc_buffer_and_set_caps (GST_PAD_CAST (pad),
GST_BUFFER_OFFSET_NONE, packet->bytes - offset, GST_PAD_CAPS (pad), &buf); GST_BUFFER_OFFSET_NONE, packet->bytes - offset - trim,
GST_PAD_CAPS (pad), &buf);
/* combine flows */ /* combine flows */
cret = gst_ogg_demux_combine_flows (ogg, pad, ret); cret = gst_ogg_demux_combine_flows (ogg, pad, ret);
@ -611,7 +624,7 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet)
GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT); GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT);
/* copy packet in buffer */ /* copy packet in buffer */
memcpy (buf->data, packet->packet + offset, packet->bytes - offset); memcpy (buf->data, packet->packet + offset, packet->bytes - offset - trim);
GST_BUFFER_TIMESTAMP (buf) = out_timestamp; GST_BUFFER_TIMESTAMP (buf) = out_timestamp;
GST_BUFFER_DURATION (buf) = out_duration; GST_BUFFER_DURATION (buf) = out_duration;