diff options
author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-07-12 10:13:50 +0200 |
---|---|---|
committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-07-12 10:17:08 +0200 |
commit | bc943ba4b85358eb01b974f41c2d0938147c0382 (patch) | |
tree | 2579210239a595b158778ae813de9e75d1e4e36a | |
parent | 26651759bdd60a01b6b55d2f568e9ac61d055b11 (diff) |
tsdemux: more correctly determine expected PES packet payload size
... particularly considering that packet_length == 0 is possible.
-rw-r--r-- | gst/mpegtsdemux/tsdemux.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c index 3290c24cd..0fbae586d 100644 --- a/gst/mpegtsdemux/tsdemux.c +++ b/gst/mpegtsdemux/tsdemux.c @@ -1322,8 +1322,16 @@ gst_ts_demux_parse_pes_header (GstTSDemux * demux, TSDemuxStream * stream, /* Remove PES headers */ GST_DEBUG ("Moving data forward by %d bytes (packet_size:%d, have:%d)", header.header_size, header.packet_length, length); - g_assert (header.packet_length >= header.header_size); - stream->expected_size = header.packet_length - header.header_size; + stream->expected_size = header.packet_length; + if (stream->expected_size) { + if (G_LIKELY (stream->expected_size > header.header_size)) { + stream->expected_size -= header.header_size; + } else { + /* next packet will have to complete this one */ + GST_ERROR ("invalid header and packet size combination"); + stream->expected_size = 0; + } + } data += header.header_size; length -= header.header_size; |