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

Try to handle format changes more gracefully

Browse source 
And make stop() faster and more robust
This commit is contained in:
Sebastian Dröge 2012-10-09 10:56:30 +02:00
parent b0b642d8ab
commit 31f0f163bd
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sys/androidmedia/gstamcaudiodec.c
View file

@ -772,7 +772,7 @@ gst_amc_audio_dec_stop (GstAudioDecoder * decoder)
self = GST_AMC_AUDIO_DEC (decoder); self = GST_AMC_AUDIO_DEC (decoder);
GST_DEBUG_OBJECT (self, "Stopping decoder"); GST_DEBUG_OBJECT (self, "Stopping decoder");
gst_pad_stop_task (GST_AUDIO_DECODER_SRC_PAD (decoder)); self->flushing = TRUE;
if (self->started) { if (self->started) {
gst_amc_codec_flush (self->codec); gst_amc_codec_flush (self->codec);
gst_amc_codec_stop (self->codec); gst_amc_codec_stop (self->codec);
@ -784,6 +784,7 @@ gst_amc_audio_dec_stop (GstAudioDecoder * decoder)
gst_amc_codec_free_buffers (self->output_buffers, self->n_output_buffers); gst_amc_codec_free_buffers (self->output_buffers, self->n_output_buffers);
self->output_buffers = NULL; self->output_buffers = NULL;
} }
gst_pad_stop_task (GST_AUDIO_DECODER_SRC_PAD (decoder));
g_free (self->positions); g_free (self->positions);
self->positions = NULL; self->positions = NULL;
@ -799,7 +800,6 @@ gst_amc_audio_dec_stop (GstAudioDecoder * decoder)
g_cond_broadcast (self->drain_cond); g_cond_broadcast (self->drain_cond);
g_mutex_unlock (self->drain_lock); g_mutex_unlock (self->drain_lock);
gst_buffer_replace (&self->codec_data, NULL); gst_buffer_replace (&self->codec_data, NULL);
self->flushing = TRUE;
GST_DEBUG_OBJECT (self, "Stopped decoder"); GST_DEBUG_OBJECT (self, "Stopped decoder");
return TRUE; return TRUE;
} }
@ -845,6 +845,15 @@ gst_amc_audio_dec_set_format (GstAudioDecoder * decoder, GstCaps * caps)
GST_AUDIO_DECODER_STREAM_UNLOCK (self); GST_AUDIO_DECODER_STREAM_UNLOCK (self);
gst_amc_audio_dec_stop (GST_AUDIO_DECODER (self)); gst_amc_audio_dec_stop (GST_AUDIO_DECODER (self));
GST_AUDIO_DECODER_STREAM_LOCK (self); GST_AUDIO_DECODER_STREAM_LOCK (self);
gst_amc_audio_dec_close (GST_AUDIO_DECODER (self));
if (!gst_amc_audio_dec_open (GST_AUDIO_DECODER (self))) {
GST_ERROR_OBJECT (self, "Failed to open codec again");
return FALSE;
}
if (!gst_amc_audio_dec_start (GST_AUDIO_DECODER (self))) {
GST_ERROR_OBJECT (self, "Failed to start codec again");
}
} }
/* srcpad task is not running at this point */ /* srcpad task is not running at this point */

13
sys/androidmedia/gstamcvideodec.c
View file

@ -1202,7 +1202,7 @@ gst_amc_video_dec_stop (GstVideoDecoder * decoder)
self = GST_AMC_VIDEO_DEC (decoder); self = GST_AMC_VIDEO_DEC (decoder);
GST_DEBUG_OBJECT (self, "Stopping decoder"); GST_DEBUG_OBJECT (self, "Stopping decoder");
gst_pad_stop_task (GST_VIDEO_DECODER_SRC_PAD (decoder)); self->flushing = TRUE;
if (self->started) { if (self->started) {
gst_amc_codec_flush (self->codec); gst_amc_codec_flush (self->codec);
gst_amc_codec_stop (self->codec); gst_amc_codec_stop (self->codec);
@ -1214,6 +1214,7 @@ gst_amc_video_dec_stop (GstVideoDecoder * decoder)
gst_amc_codec_free_buffers (self->output_buffers, self->n_output_buffers); gst_amc_codec_free_buffers (self->output_buffers, self->n_output_buffers);
self->output_buffers = NULL; self->output_buffers = NULL;
} }
gst_pad_stop_task (GST_VIDEO_DECODER_SRC_PAD (decoder));
self->downstream_flow_ret = GST_FLOW_WRONG_STATE; self->downstream_flow_ret = GST_FLOW_WRONG_STATE;
self->eos = FALSE; self->eos = FALSE;
@ -1222,7 +1223,6 @@ gst_amc_video_dec_stop (GstVideoDecoder * decoder)
g_cond_broadcast (self->drain_cond); g_cond_broadcast (self->drain_cond);
g_mutex_unlock (self->drain_lock); g_mutex_unlock (self->drain_lock);
gst_buffer_replace (&self->codec_data, NULL); gst_buffer_replace (&self->codec_data, NULL);
self->flushing = TRUE;
GST_DEBUG_OBJECT (self, "Stopped decoder"); GST_DEBUG_OBJECT (self, "Stopped decoder");
return TRUE; return TRUE;
} }
@ -1268,6 +1268,15 @@ gst_amc_video_dec_set_format (GstVideoDecoder * decoder,
GST_VIDEO_DECODER_STREAM_UNLOCK (self); GST_VIDEO_DECODER_STREAM_UNLOCK (self);
gst_amc_video_dec_stop (GST_VIDEO_DECODER (self)); gst_amc_video_dec_stop (GST_VIDEO_DECODER (self));
GST_VIDEO_DECODER_STREAM_LOCK (self); GST_VIDEO_DECODER_STREAM_LOCK (self);
gst_amc_video_dec_close (GST_VIDEO_DECODER (self));
if (!gst_amc_video_dec_open (GST_VIDEO_DECODER (self))) {
GST_ERROR_OBJECT (self, "Failed to open codec again");
return FALSE;
}
if (!gst_amc_video_dec_start (GST_VIDEO_DECODER (self))) {
GST_ERROR_OBJECT (self, "Failed to start codec again");
}
} }
/* srcpad task is not running at this point */ /* srcpad task is not running at this point */