From 9a808ad30ae1de953b0c6813a53c02d14994de70 Mon Sep 17 00:00:00 2001 From: Zaheer Abbas Merali Date: Thu, 16 Oct 2008 08:13:49 +0000 Subject: gst/mpegdemux/gstmpegtsdemux.c: Fixes a segfault in the adaptation buffer size strategy. Original commit message from CVS: patch by: Josep Torra * gst/mpegdemux/gstmpegtsdemux.c: Fixes a segfault in the adaptation buffer size strategy. Fixes #556440 --- ChangeLog | 8 ++++++++ gst/mpegdemux/gstmpegtsdemux.c | 11 +++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16969a11..b428b3d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-10-15 Zaheer Abbas Merali + + patch by: Josep Torra + + * gst/mpegdemux/gstmpegtsdemux.c: + Fixes a segfault in the adaptation buffer size strategy. + Fixes #556440 + 2008-10-15 Edward Hervey * gst/selector/gstinputselector.c: (gst_input_selector_event), diff --git a/gst/mpegdemux/gstmpegtsdemux.c b/gst/mpegdemux/gstmpegtsdemux.c index 7ccbab8b..6ac05031 100644 --- a/gst/mpegdemux/gstmpegtsdemux.c +++ b/gst/mpegdemux/gstmpegtsdemux.c @@ -2206,19 +2206,22 @@ gst_fluts_demux_parse_stream (GstFluTSDemux * demux, GstFluTSStream * stream, GST_DEBUG_OBJECT (demux, "new PES start for PID 0x%04x, used %u" "bytes of %u bytes in the PES buffer", PID, stream->pes_buffer_used, stream->pes_buffer_size); + /* Flush buffered PES data */ + ret = gst_fluts_stream_pes_buffer_flush (stream); + gst_pes_filter_drain (&stream->filter); /* Resize the buffer to half if no overflow detected and * had been used less than half of it */ if (stream->pes_buffer_overflow == FALSE && stream->pes_buffer_used < (stream->pes_buffer_size >> 1)) { stream->pes_buffer_size >>= 1; + if (stream->pes_buffer_size < FLUTS_MIN_PES_BUFFER_SIZE) + stream->pes_buffer_size = FLUTS_MIN_PES_BUFFER_SIZE; GST_DEBUG_OBJECT (demux, "PES buffer size reduced to %u bytes", stream->pes_buffer_size); } + if (ret == GST_FLOW_LOST_SYNC) + goto done; stream->pes_buffer_overflow = FALSE; - - /* Flush buffered PES data */ - gst_fluts_stream_pes_buffer_flush (stream); - gst_pes_filter_drain (&stream->filter); } GST_LOG_OBJECT (demux, "Elementary packet of size %u for PID 0x%04x", datalen, PID); -- cgit v1.2.1