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

androidmedia: Also don't report warnings for queue/dequeue errors during flushing in error cases

Browse source 
... and fix a case where we released an invalid buffer index.
This commit is contained in:
Sebastian Dröge 2014-06-19 11:26:41 +02:00
parent 880f3d8a18
commit aee9d12b86
3 changed files with 42 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sys/androidmedia/gstamcaudiodec.c
View file

@ -684,8 +684,9 @@ invalid_buffer_size:
GST_ELEMENT_ERROR (self, LIBRARY, FAILED, (NULL), GST_ELEMENT_ERROR (self, LIBRARY, FAILED, (NULL),
("Invalid buffer size %u (bfp %d)", buffer_info.size, self->info.bpf)); ("Invalid buffer size %u (bfp %d)", buffer_info.size, self->info.bpf));
gst_amc_codec_release_output_buffer (self->codec, idx, &err); gst_amc_codec_release_output_buffer (self->codec, idx, &err);
if (err) if (err && !self->flushing)
GST_ELEMENT_WARNING_FROM_ERROR (self, err); GST_ELEMENT_WARNING_FROM_ERROR (self, err);
g_clear_error (&err);
gst_pad_push_event (GST_AUDIO_DECODER_SRC_PAD (self), gst_event_new_eos ()); gst_pad_push_event (GST_AUDIO_DECODER_SRC_PAD (self), gst_event_new_eos ());
gst_pad_pause_task (GST_AUDIO_DECODER_SRC_PAD (self)); gst_pad_pause_task (GST_AUDIO_DECODER_SRC_PAD (self));
self->downstream_flow_ret = GST_FLOW_ERROR; self->downstream_flow_ret = GST_FLOW_ERROR;
@ -698,8 +699,9 @@ failed_allocate:
GST_ELEMENT_ERROR (self, LIBRARY, SETTINGS, (NULL), GST_ELEMENT_ERROR (self, LIBRARY, SETTINGS, (NULL),
("Failed to allocate output buffer")); ("Failed to allocate output buffer"));
gst_amc_codec_release_output_buffer (self->codec, idx, &err); gst_amc_codec_release_output_buffer (self->codec, idx, &err);
if (err) if (err && !self->flushing)
GST_ELEMENT_WARNING_FROM_ERROR (self, err); GST_ELEMENT_WARNING_FROM_ERROR (self, err);
g_clear_error (&err);
gst_pad_push_event (GST_AUDIO_DECODER_SRC_PAD (self), gst_event_new_eos ()); gst_pad_push_event (GST_AUDIO_DECODER_SRC_PAD (self), gst_event_new_eos ());
gst_pad_pause_task (GST_AUDIO_DECODER_SRC_PAD (self)); gst_pad_pause_task (GST_AUDIO_DECODER_SRC_PAD (self));
self->downstream_flow_ret = GST_FLOW_ERROR; self->downstream_flow_ret = GST_FLOW_ERROR;
@ -1092,8 +1094,9 @@ gst_amc_audio_dec_handle_frame (GstAudioDecoder * decoder, GstBuffer * inbuf)
if (self->downstream_flow_ret != GST_FLOW_OK) { if (self->downstream_flow_ret != GST_FLOW_OK) {
memset (&buffer_info, 0, sizeof (buffer_info)); memset (&buffer_info, 0, sizeof (buffer_info));
gst_amc_codec_queue_input_buffer (self->codec, idx, &buffer_info, &err); gst_amc_codec_queue_input_buffer (self->codec, idx, &buffer_info, &err);
if (err) if (err && !self->flushing)
GST_ELEMENT_WARNING_FROM_ERROR (self, err); GST_ELEMENT_WARNING_FROM_ERROR (self, err);
g_clear_error (&err);
goto downstream_error; goto downstream_error;
} }
@ -1246,8 +1249,13 @@ gst_amc_audio_dec_drain (GstAmcAudioDec * self)
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
} else { } else {
GST_ERROR_OBJECT (self, "Failed to queue input buffer"); GST_ERROR_OBJECT (self, "Failed to queue input buffer");
GST_ELEMENT_WARNING_FROM_ERROR (self, err); if (self->flushing) {
ret = GST_FLOW_ERROR; g_clear_error (&err);
ret = GST_FLOW_FLUSHING;
} else {
GST_ELEMENT_WARNING_FROM_ERROR (self, err);
ret = GST_FLOW_ERROR;
}
} }
g_mutex_unlock (&self->drain_lock); g_mutex_unlock (&self->drain_lock);

21
sys/androidmedia/gstamcvideodec.c
View file

@ -707,8 +707,9 @@ retry:
if (!gst_amc_codec_release_output_buffer (self->codec, idx, &err)) if (!gst_amc_codec_release_output_buffer (self->codec, idx, &err))
GST_ERROR_OBJECT (self, "Failed to release output buffer index %d", GST_ERROR_OBJECT (self, "Failed to release output buffer index %d",
idx); idx);
if (err) if (err && !self->flushing)
GST_ELEMENT_WARNING_FROM_ERROR (self, err); GST_ELEMENT_WARNING_FROM_ERROR (self, err);
g_clear_error (&err);
goto invalid_buffer; goto invalid_buffer;
} }
@ -723,8 +724,9 @@ retry:
if (!gst_amc_codec_release_output_buffer (self->codec, idx, &err)) if (!gst_amc_codec_release_output_buffer (self->codec, idx, &err))
GST_ERROR_OBJECT (self, "Failed to release output buffer index %d", GST_ERROR_OBJECT (self, "Failed to release output buffer index %d",
idx); idx);
if (err) if (err && !self->flushing)
GST_ELEMENT_WARNING_FROM_ERROR (self, err); GST_ELEMENT_WARNING_FROM_ERROR (self, err);
g_clear_error (&err);
goto flow_error; goto flow_error;
} }
@ -735,8 +737,9 @@ retry:
if (!gst_amc_codec_release_output_buffer (self->codec, idx, &err)) if (!gst_amc_codec_release_output_buffer (self->codec, idx, &err))
GST_ERROR_OBJECT (self, "Failed to release output buffer index %d", GST_ERROR_OBJECT (self, "Failed to release output buffer index %d",
idx); idx);
if (err) if (err && !self->flushing)
GST_ELEMENT_WARNING_FROM_ERROR (self, err); GST_ELEMENT_WARNING_FROM_ERROR (self, err);
g_clear_error (&err);
goto invalid_buffer; goto invalid_buffer;
} }
@ -1197,8 +1200,9 @@ gst_amc_video_dec_handle_frame (GstVideoDecoder * decoder,
if (self->downstream_flow_ret != GST_FLOW_OK) { if (self->downstream_flow_ret != GST_FLOW_OK) {
memset (&buffer_info, 0, sizeof (buffer_info)); memset (&buffer_info, 0, sizeof (buffer_info));
gst_amc_codec_queue_input_buffer (self->codec, idx, &buffer_info, &err); gst_amc_codec_queue_input_buffer (self->codec, idx, &buffer_info, &err);
if (err) if (err && !self->flushing)
GST_ELEMENT_WARNING_FROM_ERROR (self, err); GST_ELEMENT_WARNING_FROM_ERROR (self, err);
g_clear_error (&err);
goto downstream_error; goto downstream_error;
} }
@ -1363,8 +1367,13 @@ gst_amc_video_dec_drain (GstAmcVideoDec * self, gboolean at_eos)
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
} else { } else {
GST_ERROR_OBJECT (self, "Failed to queue input buffer"); GST_ERROR_OBJECT (self, "Failed to queue input buffer");
GST_ELEMENT_WARNING_FROM_ERROR (self, err); if (self->flushing) {
ret = GST_FLOW_ERROR; g_clear_error (&err);
ret = GST_FLOW_FLUSHING;
} else {
GST_ELEMENT_WARNING_FROM_ERROR (self, err);
ret = GST_FLOW_ERROR;
}
} }
g_mutex_unlock (&self->drain_lock); g_mutex_unlock (&self->drain_lock);

23
sys/androidmedia/gstamcvideoenc.c
View file

@ -1042,10 +1042,6 @@ process_buffer:
GST_ERROR_OBJECT (self, "Invalid output buffer index %d of %d", GST_ERROR_OBJECT (self, "Invalid output buffer index %d of %d",
idx, self->n_output_buffers); idx, self->n_output_buffers);
if (!gst_amc_codec_release_output_buffer (self->codec, idx, &err))
GST_ERROR_OBJECT (self, "Failed to release output buffer index %d", idx);
if (err)
GST_ELEMENT_WARNING_FROM_ERROR (self, err);
goto invalid_buffer; goto invalid_buffer;
} }
buf = &self->output_buffers[idx]; buf = &self->output_buffers[idx];
@ -1482,8 +1478,9 @@ again:
if (self->downstream_flow_ret != GST_FLOW_OK) { if (self->downstream_flow_ret != GST_FLOW_OK) {
memset (&buffer_info, 0, sizeof (buffer_info)); memset (&buffer_info, 0, sizeof (buffer_info));
gst_amc_codec_queue_input_buffer (self->codec, idx, &buffer_info, &err); gst_amc_codec_queue_input_buffer (self->codec, idx, &buffer_info, &err);
if (err) if (err && !self->flushing)
GST_ELEMENT_WARNING_FROM_ERROR (self, err); GST_ELEMENT_WARNING_FROM_ERROR (self, err);
g_clear_error (&err);
goto downstream_error; goto downstream_error;
} }
@ -1501,8 +1498,9 @@ again:
&buffer_info)) { &buffer_info)) {
memset (&buffer_info, 0, sizeof (buffer_info)); memset (&buffer_info, 0, sizeof (buffer_info));
gst_amc_codec_queue_input_buffer (self->codec, idx, &buffer_info, &err); gst_amc_codec_queue_input_buffer (self->codec, idx, &buffer_info, &err);
if (err) if (err && !self->flushing)
GST_ELEMENT_WARNING_FROM_ERROR (self, err); GST_ELEMENT_WARNING_FROM_ERROR (self, err);
g_clear_error (&err);
goto buffer_fill_error; goto buffer_fill_error;
} }
@ -1620,7 +1618,9 @@ gst_amc_video_enc_finish (GstVideoEncoder * encoder)
GST_DEBUG_OBJECT (self, "Sent EOS to the codec"); GST_DEBUG_OBJECT (self, "Sent EOS to the codec");
} else { } else {
GST_ERROR_OBJECT (self, "Failed to send EOS to the codec"); GST_ERROR_OBJECT (self, "Failed to send EOS to the codec");
GST_ELEMENT_WARNING_FROM_ERROR (self, err); if (!self->flushing)
GST_ELEMENT_WARNING_FROM_ERROR (self, err);
g_clear_error (&err);
} }
} else if (idx >= self->n_input_buffers) { } else if (idx >= self->n_input_buffers) {
GST_ERROR_OBJECT (self, "Invalid input buffer index %d of %d", GST_ERROR_OBJECT (self, "Invalid input buffer index %d of %d",
@ -1684,8 +1684,13 @@ gst_amc_video_enc_drain (GstAmcVideoEnc * self)
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
} else { } else {
GST_ERROR_OBJECT (self, "Failed to queue input buffer"); GST_ERROR_OBJECT (self, "Failed to queue input buffer");
GST_ELEMENT_WARNING_FROM_ERROR (self, err); if (self->flushing) {
ret = GST_FLOW_ERROR; g_clear_error (&err);
ret = GST_FLOW_FLUSHING;
} else {
GST_ELEMENT_WARNING_FROM_ERROR (self, err);
ret = GST_FLOW_ERROR;
}
} }
g_mutex_unlock (&self->drain_lock); g_mutex_unlock (&self->drain_lock);