mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsdemux: Avoid passing the custom GST_FLOW_NEED_MORE_DATA upstream

Browse source 
Don't return GST_FLOW_NEED_MORE_DATA from the chain function at the end
of files.
This commit is contained in:
Jan Schmidt 2009-06-04 16:11:16 +01:00
parent a0ad632320
commit b8eb0d5dbb
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/mpegdemux/gstmpegtsdemux.c
View file

@ -923,8 +923,8 @@ gst_mpegts_demux_data_cb (GstPESFilter * filter, gboolean first,
* to drop. */ * to drop. */
if (stream->PMT_pid <= MPEGTS_MAX_PID && demux->streams[stream->PMT_pid] if (stream->PMT_pid <= MPEGTS_MAX_PID && demux->streams[stream->PMT_pid]
&& demux->streams[demux->streams[stream->PMT_pid]->PMT.PCR_PID] && demux->streams[demux->streams[stream->PMT_pid]->PMT.PCR_PID]
&& demux->streams[demux->streams[stream->PMT_pid]->PMT. && demux->streams[demux->streams[stream->PMT_pid]->PMT.PCR_PID]->
PCR_PID]->discont_PCR) { discont_PCR) {
GST_WARNING_OBJECT (demux, "middle of discont, dropping"); GST_WARNING_OBJECT (demux, "middle of discont, dropping");
goto bad_timestamp; goto bad_timestamp;
} }
@ -946,8 +946,8 @@ gst_mpegts_demux_data_cb (GstPESFilter * filter, gboolean first,
*/ */
if (stream->PMT_pid <= MPEGTS_MAX_PID && demux->streams[stream->PMT_pid] if (stream->PMT_pid <= MPEGTS_MAX_PID && demux->streams[stream->PMT_pid]
&& demux->streams[demux->streams[stream->PMT_pid]->PMT.PCR_PID] && demux->streams[demux->streams[stream->PMT_pid]->PMT.PCR_PID]
&& demux->streams[demux->streams[stream->PMT_pid]->PMT. && demux->streams[demux->streams[stream->PMT_pid]->PMT.PCR_PID]->
PCR_PID]->last_PCR > 0) { last_PCR > 0) {
GST_DEBUG_OBJECT (demux, "timestamps wrapped before noticed in PCR"); GST_DEBUG_OBJECT (demux, "timestamps wrapped before noticed in PCR");
time = MPEGTIME_TO_GSTTIME (pts) + stream->base_time + time = MPEGTIME_TO_GSTTIME (pts) + stream->base_time +
MPEGTIME_TO_GSTTIME ((guint64) (1) << 33); MPEGTIME_TO_GSTTIME ((guint64) (1) << 33);
@ -2884,7 +2884,8 @@ gst_mpegts_demux_chain (GstPad * pad, GstBuffer * buffer)
/* process all packets */ /* process all packets */
for (i = 0; i < sync_count; i++) { for (i = 0; i < sync_count; i++) {
ret = gst_mpegts_demux_parse_transport_packet (demux, demux->sync_lut[i]); ret = gst_mpegts_demux_parse_transport_packet (demux, demux->sync_lut[i]);
if (G_UNLIKELY (ret == GST_FLOW_LOST_SYNC)) { if (G_UNLIKELY (ret == GST_FLOW_LOST_SYNC
|| ret == GST_FLOW_NEED_MORE_DATA)) {
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
continue; continue;
} }