Commit b38dcf52 authored by Sebastian Dröge's avatar Sebastian Dröge
Browse files

oggdemux: Don't strip all 0-bytes from the end of OGM packets

This fixes broken packets pushed downstream by oggdemux for
MPEG4 streams for example.
parent 592bc87d
......@@ -481,7 +481,6 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet)
GstOggChain *chain;
gint64 duration;
gint offset;
gint trim;
GstClockTime out_timestamp, out_duration;
guint64 out_offset, out_offset_end;
......@@ -531,15 +530,8 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet)
}
offset = 1 + (((data[0] & 0xc0) >> 6) | ((data[0] & 0x02) << 1));
trim = 0;
while (bytes && data[bytes - 1] == 0) {
trim++;
bytes--;
}
} else {
offset = 0;
trim = 0;
}
/* get timing info for the packet */
......@@ -600,13 +592,12 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet)
}
/* check for invalid buffer sizes */
if (G_UNLIKELY (offset + trim >= packet->bytes))
if (G_UNLIKELY (offset >= packet->bytes))
goto empty_packet;
ret =
gst_pad_alloc_buffer_and_set_caps (GST_PAD_CAST (pad),
GST_BUFFER_OFFSET_NONE, packet->bytes - offset - trim,
GST_PAD_CAPS (pad), &buf);
GST_BUFFER_OFFSET_NONE, packet->bytes - offset, GST_PAD_CAPS (pad), &buf);
/* combine flows */
cret = gst_ogg_demux_combine_flows (ogg, pad, ret);
......@@ -614,7 +605,7 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet)
goto no_buffer;
/* copy packet in buffer */
memcpy (buf->data, packet->packet + offset, packet->bytes - offset - trim);
memcpy (buf->data, packet->packet + offset, packet->bytes - offset);
GST_BUFFER_TIMESTAMP (buf) = out_timestamp;
GST_BUFFER_DURATION (buf) = out_duration;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment