diff options
| author | Vincent Penquerc'h <vincent.penquerch@collabora.co.uk> | 2012-01-23 17:47:45 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-01-24 00:07:50 +0000 |
| commit | c38520d66d845f4edd28a6e8ed3b74aa7b0220bf (patch) | |
| tree | 00bd687ac87d1ed4e0f1382bb8bb1345c83fa1d4 | |
| parent | 287e31396cf7a0bcb2f61bc0204b7a0d2b15296a (diff) | |
mpegtsdemux: fix frequent deadlock demuxing MPEG TS
A previous patch to add streams early to fix playback of
low bitrate streams causes frequent deadlock of a nature
I'm at loss how to fix.
I'm not certain whether it's a bug in decodebin2, or in
that mpegtsdemux patch.
Since it causes a major regression, let it be disabled for now.
| -rw-r--r-- | gst/mpegdemux/gstmpegtsdemux.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gst/mpegdemux/gstmpegtsdemux.c b/gst/mpegdemux/gstmpegtsdemux.c index 7d75bbeb0..2c6db7da3 100644 --- a/gst/mpegdemux/gstmpegtsdemux.c +++ b/gst/mpegdemux/gstmpegtsdemux.c @@ -1110,6 +1110,10 @@ gst_mpegts_demux_add_all_streams (GstMpegTSDemux * demux, GstClockTime pts) GstPad *srcpad; gboolean all_added = TRUE; + GST_DEBUG_OBJECT (demux, "Adding streams early fixes a wedge in some low " + "bitrate streams, but causes deadlocks - disabled for now"); + return FALSE; + /* When adding a stream, require either a valid base PCR, or a valid PTS */ if (!gst_mpegts_demux_setup_base_pts (demux, pts)) { GST_ERROR ("Can't set base pts"); |