mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-23 07:38:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

tsdemux: Post an error message on the bus if we activated a program without pads

Browse source 
Otherwise decodebin and applications are going to wait forever for pads
to appear, which is never going to happen.

Happens on this stream, which probably just need support for it added:
https://samples.mplayerhq.hu/3D/AVC_codec_in_m2ts_not_recognized/AVC_codec_not_recognized_right_video_sample.m2ts
This commit is contained in:
Sebastian Dröge 2016-11-28 10:27:56 +02:00
parent 024e92afe7
commit b0a6b5eac8
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/mpegtsdemux/tsdemux.c
View file

@ -1870,6 +1870,7 @@ gst_ts_demux_program_started (MpegTSBase * base, MpegTSBaseProgram * program)
if (demux->requested_program_number == program->program_number ||
(demux->requested_program_number == -1 && demux->program_number == -1)) {
GList *tmp;
gboolean have_pads = FALSE;
GST_LOG ("program %d started", program->program_number);
demux->program_number = program->program_number;
@ -1906,6 +1907,8 @@ gst_ts_demux_program_started (MpegTSBase * base, MpegTSBaseProgram * program)
for (tmp = program->stream_list; tmp; tmp = tmp->next) {
TSDemuxStream *stream = (TSDemuxStream *) tmp->data;
activate_pad_for_stream (demux, stream);
if (stream->pad)
have_pads = TRUE;
}
/* If there was a previous program, now is the time to deactivate it
@ -1915,6 +1918,16 @@ gst_ts_demux_program_started (MpegTSBase * base, MpegTSBaseProgram * program)
mpegts_base_deactivate_and_free_program (base, demux->previous_program);
demux->previous_program = NULL;
}
if (!have_pads) {
/* If we had no pads, this stream is likely corrupted or unsupported and
* there's not much we can do at this point */
GST_ELEMENT_ERROR (demux, STREAM, WRONG_TYPE,
("This stream contains no valid or supported streams."),
("activating program but got no pads"));
return;
}
/* If any of the stream is sparse, push a GAP event before anything else
* This is done here, and not in activate_pad_for_stream() because pushing
* a GAP event *is* considering data, and we want to ensure the (potential)
@ -1930,6 +1943,7 @@ gst_ts_demux_program_started (MpegTSBase * base, MpegTSBaseProgram * program)
gst_pad_push_event (stream->pad, gst_event_new_gap (0, 0));
}
}
gst_element_no_more_pads ((GstElement *) demux);
}
}