mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

audio{enc,dec}oder: Always directly post latency messages on the bus when the subclass sets the latency

Browse source 
Instead of doing it only in setcaps for the encoder, and never at all for the
decoder.
This commit is contained in:
Sebastian Dröge 2015-02-03 12:15:25 +01:00
parent f2a762a3a0
commit 823cb40642
2 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3012,6 +3012,10 @@ gst_audio_decoder_set_latency (GstAudioDecoder * dec,
dec->priv->ctx.min_latency = min; dec->priv->ctx.min_latency = min;
dec->priv->ctx.max_latency = max; dec->priv->ctx.max_latency = max;
GST_OBJECT_UNLOCK (dec); GST_OBJECT_UNLOCK (dec);
/* post latency message on the bus */
gst_element_post_message (GST_ELEMENT (dec),
gst_message_new_latency (GST_OBJECT (dec)));
} }
/** /**

24
gst-libs/gst/audio/gstaudioencoder.c
View file

@ -1250,8 +1250,6 @@ gst_audio_encoder_sink_setcaps (GstAudioEncoder * enc, GstCaps * caps)
GstAudioInfo state; GstAudioInfo state;
gboolean res = TRUE; gboolean res = TRUE;
guint old_rate; guint old_rate;
GstClockTime old_min_latency;
GstClockTime old_max_latency;
klass = GST_AUDIO_ENCODER_GET_CLASS (enc); klass = GST_AUDIO_ENCODER_GET_CLASS (enc);
@ -1294,12 +1292,6 @@ gst_audio_encoder_sink_setcaps (GstAudioEncoder * enc, GstCaps * caps)
enc->priv->ctx.frame_max = 0; enc->priv->ctx.frame_max = 0;
enc->priv->ctx.lookahead = 0; enc->priv->ctx.lookahead = 0;
/* element might report latency */
GST_OBJECT_LOCK (enc);
old_min_latency = ctx->min_latency;
old_max_latency = ctx->max_latency;
GST_OBJECT_UNLOCK (enc);
if (klass->set_format) if (klass->set_format)
res = klass->set_format (enc, &state); res = klass->set_format (enc, &state);
@ -1313,18 +1305,6 @@ gst_audio_encoder_sink_setcaps (GstAudioEncoder * enc, GstCaps * caps)
goto exit; goto exit;
} }
/* notify if new latency */
GST_OBJECT_LOCK (enc);
if ((ctx->min_latency > 0 && ctx->min_latency != old_min_latency) ||
(ctx->max_latency > 0 && ctx->max_latency != old_max_latency)) {
GST_OBJECT_UNLOCK (enc);
/* post latency message on the bus */
gst_element_post_message (GST_ELEMENT (enc),
gst_message_new_latency (GST_OBJECT (enc)));
GST_OBJECT_LOCK (enc);
}
GST_OBJECT_UNLOCK (enc);
exit: exit:
GST_AUDIO_ENCODER_STREAM_UNLOCK (enc); GST_AUDIO_ENCODER_STREAM_UNLOCK (enc);
@ -2152,6 +2132,10 @@ gst_audio_encoder_set_latency (GstAudioEncoder * enc,
GST_LOG_OBJECT (enc, "set to %" GST_TIME_FORMAT "-%" GST_TIME_FORMAT, GST_LOG_OBJECT (enc, "set to %" GST_TIME_FORMAT "-%" GST_TIME_FORMAT,
GST_TIME_ARGS (min), GST_TIME_ARGS (max)); GST_TIME_ARGS (min), GST_TIME_ARGS (max));
/* post latency message on the bus */
gst_element_post_message (GST_ELEMENT (enc),
gst_message_new_latency (GST_OBJECT (enc)));
} }
/** /**