mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

flvdemux: If there's no audio stream after 6 seconds of video signal no-more-pads

Browse source 
...and the other way around. Also ignore any audio/video streams that appear
after no-more-pads.

Fixes bug #597091.
This commit is contained in:
Sebastian Dröge 2009-10-02 14:37:54 +02:00
parent f84bc538b5
commit 48b784e715
3 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/flv/gstflvdemux.c
View file

@ -112,6 +112,8 @@ gst_flv_demux_cleanup (GstFLVDemux * demux)
demux->push_tags = FALSE; demux->push_tags = FALSE;
demux->got_par = FALSE; demux->got_par = FALSE;
demux->audio_start = demux->video_start = GST_CLOCK_TIME_NONE;
demux->no_more_pads = FALSE; demux->no_more_pads = FALSE;
gst_segment_init (&demux->segment, GST_FORMAT_TIME); gst_segment_init (&demux->segment, GST_FORMAT_TIME);

2
gst/flv/gstflvdemux.h
View file

@ -93,6 +93,7 @@ struct _GstFLVDemux
gboolean audio_need_segment; gboolean audio_need_segment;
gboolean audio_linked; gboolean audio_linked;
GstBuffer * audio_codec_data; GstBuffer * audio_codec_data;
GstClockTime audio_start;
/* Video infos */ /* Video infos */
guint32 w; guint32 w;
@ -106,6 +107,7 @@ struct _GstFLVDemux
gboolean video_linked; gboolean video_linked;
gboolean got_par; gboolean got_par;
GstBuffer * video_codec_data; GstBuffer * video_codec_data;
GstClockTime video_start;
gboolean random_access; gboolean random_access;
gboolean need_header; gboolean need_header;

41
gst/flv/gstflvparse.c
View file

@ -553,6 +553,12 @@ gst_flv_parse_tag_audio (GstFLVDemux * demux, GstBuffer * buffer)
GST_LOG_OBJECT (demux, "parsing an audio tag"); GST_LOG_OBJECT (demux, "parsing an audio tag");
if (demux->no_more_pads && !demux->audio_pad) {
GST_WARNING_OBJECT (demux,
"Signaled no-more-pads already but had no audio pad -- ignoring");
goto beach;
}
g_return_val_if_fail (GST_BUFFER_SIZE (buffer) == demux->tag_size, g_return_val_if_fail (GST_BUFFER_SIZE (buffer) == demux->tag_size,
GST_FLOW_ERROR); GST_FLOW_ERROR);
@ -784,6 +790,20 @@ gst_flv_parse_tag_audio (GstFLVDemux * demux, GstBuffer * buffer)
GST_BUFFER_SIZE (outbuf), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)), GST_BUFFER_SIZE (outbuf), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)),
GST_TIME_ARGS (GST_BUFFER_DURATION (outbuf)), GST_BUFFER_OFFSET (outbuf)); GST_TIME_ARGS (GST_BUFFER_DURATION (outbuf)), GST_BUFFER_OFFSET (outbuf));
if (!GST_CLOCK_TIME_IS_VALID (demux->audio_start)) {
demux->audio_start = GST_BUFFER_TIMESTAMP (outbuf);
}
if (G_UNLIKELY (!demux->no_more_pads
&& GST_CLOCK_DIFF (demux->audio_start,
GST_BUFFER_TIMESTAMP (outbuf) > 6 * GST_SECOND))) {
GST_DEBUG_OBJECT (demux,
"Signalling no-more-pads because no video stream was found"
" after 6 seconds of audio");
gst_element_no_more_pads (GST_ELEMENT_CAST (demux));
demux->no_more_pads = TRUE;
}
/* Push downstream */ /* Push downstream */
ret = gst_pad_push (demux->audio_pad, outbuf); ret = gst_pad_push (demux->audio_pad, outbuf);
if (G_UNLIKELY (ret != GST_FLOW_OK)) { if (G_UNLIKELY (ret != GST_FLOW_OK)) {
@ -889,9 +909,16 @@ gst_flv_parse_tag_video (GstFLVDemux * demux, GstBuffer * buffer)
GST_LOG_OBJECT (demux, "parsing a video tag"); GST_LOG_OBJECT (demux, "parsing a video tag");
GST_LOG_OBJECT (demux, "pts bytes %02X %02X %02X %02X", data[0], data[1], GST_LOG_OBJECT (demux, "pts bytes %02X %02X %02X %02X", data[0], data[1],
data[2], data[3]); data[2], data[3]);
if (demux->no_more_pads && !demux->video_pad) {
GST_WARNING_OBJECT (demux,
"Signaled no-more-pads already but had no audio pad -- ignoring");
goto beach;
}
/* Grab information about video tag */ /* Grab information about video tag */
pts = GST_READ_UINT24_BE (data); pts = GST_READ_UINT24_BE (data);
/* read the pts extension to 32 bits integer */ /* read the pts extension to 32 bits integer */
@ -1114,6 +1141,20 @@ gst_flv_parse_tag_video (GstFLVDemux * demux, GstBuffer * buffer)
GST_TIME_ARGS (GST_BUFFER_DURATION (outbuf)), GST_BUFFER_OFFSET (outbuf), GST_TIME_ARGS (GST_BUFFER_DURATION (outbuf)), GST_BUFFER_OFFSET (outbuf),
keyframe); keyframe);
if (!GST_CLOCK_TIME_IS_VALID (demux->video_start)) {
demux->video_start = GST_BUFFER_TIMESTAMP (outbuf);
}
if (G_UNLIKELY (!demux->no_more_pads
&& GST_CLOCK_DIFF (demux->video_start,
GST_BUFFER_TIMESTAMP (outbuf) > 6 * GST_SECOND))) {
GST_DEBUG_OBJECT (demux,
"Signalling no-more-pads because no audio stream was found"
" after 6 seconds of video");
gst_element_no_more_pads (GST_ELEMENT_CAST (demux));
demux->no_more_pads = TRUE;
}
/* Push downstream */ /* Push downstream */
ret = gst_pad_push (demux->video_pad, outbuf); ret = gst_pad_push (demux->video_pad, outbuf);