mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

audiodecoder: Move max_errors out of GstAudioDecoderContext

Browse source 
Currently max-errors gets set during init to default or via property.
However, if a decoder element calls gst_audio_decoder_reset with 'full'
argument set to TRUE, it would result in all the fields of context being
zeroed with memset. This effectively results in max-errors getting a
value of 0 overriding the default or user requested value set during
init.

This would result in calls to GST_AUDIO_DECODER_ERROR which track error
counts and allow max-errors, to be ineffective.

To fix this move max-errors out of GstAudioDecoderContext, as changes to
context should not affect this. The error_count is anyways also in
GstAudioDecoderPrivate and not in context.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/946>
This commit is contained in:
Sanchayan Maity 2020-11-27 11:41:36 +05:30
parent 20d541368a
commit 5aa836848e
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst-libs/gst/audio/gstaudiodecoder.c
View file

@ -176,7 +176,6 @@ typedef struct _GstAudioDecoderContext
/* output */
gboolean do_plc;
gboolean do_estimate_rate;
gint max_errors;
GstCaps *allocation_caps;
/* MT-protected (with LOCK) */
GstClockTime min_latency;
@ -235,6 +234,8 @@ struct _GstAudioDecoderPrivate
guint sync_flush;
/* error count */
gint error_count;
/* max errors */
gint max_errors;
/* upstream stream tags (global tags are passed through as-is) */
GstTagList *upstream_tags;
@ -497,7 +498,7 @@ gst_audio_decoder_init (GstAudioDecoder * dec, GstAudioDecoderClass * klass)
dec->priv->plc = DEFAULT_PLC;
dec->priv->drainable = DEFAULT_DRAINABLE;
dec->priv->needs_format = DEFAULT_NEEDS_FORMAT;
dec->priv->ctx.max_errors = GST_AUDIO_DECODER_MAX_ERRORS;
dec->priv->max_errors = GST_AUDIO_DECODER_MAX_ERRORS;
/* init state */
dec->priv->ctx.min_latency = 0;
@ -3254,8 +3255,8 @@ _gst_audio_decoder_error (GstAudioDecoder * dec, gint weight,
GST_WARNING_OBJECT (dec, "error: %s", dbg);
dec->priv->error_count += weight;
dec->priv->discont = TRUE;
if (dec->priv->ctx.max_errors >= 0
&& dec->priv->ctx.max_errors < dec->priv->error_count) {
if (dec->priv->max_errors >= 0
&& dec->priv->max_errors < dec->priv->error_count) {
gst_element_message_full (GST_ELEMENT (dec), GST_MESSAGE_ERROR, domain,
code, txt, dbg, file, function, line);
return GST_FLOW_ERROR;
@ -3367,7 +3368,7 @@ gst_audio_decoder_set_max_errors (GstAudioDecoder * dec, gint num)
{
g_return_if_fail (GST_IS_AUDIO_DECODER (dec));
dec->priv->ctx.max_errors = num;
dec->priv->max_errors = num;
}
/**
@ -3381,7 +3382,7 @@ gst_audio_decoder_get_max_errors (GstAudioDecoder * dec)
{
g_return_val_if_fail (GST_IS_AUDIO_DECODER (dec), 0);
return dec->priv->ctx.max_errors;
return dec->priv->max_errors;
}
/**