From 40a4f2f8aaa10e6ba87050956842814867e89f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 30 Mar 2012 11:51:47 +0200 Subject: [PATCH] audiodecoder: Rename _byte_time() to _estimate_rate() Which is telling more about what this actually does and is more consistent with the video base classes. --- docs/libs/gst-plugins-base-libs-sections.txt | 4 ++-- gst-libs/gst/audio/gstaudiodecoder.c | 18 +++++++++--------- gst-libs/gst/audio/gstaudiodecoder.h | 4 ++-- win32/common/libgstaudio.def | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt index 160987625e..a0bd922f22 100644 --- a/docs/libs/gst-plugins-base-libs-sections.txt +++ b/docs/libs/gst-plugins-base-libs-sections.txt @@ -180,7 +180,7 @@ GST_AUDIO_DECODER_SRC_NAME GST_AUDIO_DECODER_SRC_PAD gst_audio_decoder_finish_frame gst_audio_decoder_get_audio_info -gst_audio_decoder_get_byte_time +gst_audio_decoder_get_estimate_rate gst_audio_decoder_get_delay gst_audio_decoder_get_drainable gst_audio_decoder_get_latency @@ -191,7 +191,7 @@ gst_audio_decoder_get_parse_state gst_audio_decoder_get_plc gst_audio_decoder_get_plc_aware gst_audio_decoder_get_tolerance -gst_audio_decoder_set_byte_time +gst_audio_decoder_set_estimate_rate gst_audio_decoder_set_drainable gst_audio_decoder_set_latency gst_audio_decoder_set_max_errors diff --git a/gst-libs/gst/audio/gstaudiodecoder.c b/gst-libs/gst/audio/gstaudiodecoder.c index 53bf819b2e..882f071130 100644 --- a/gst-libs/gst/audio/gstaudiodecoder.c +++ b/gst-libs/gst/audio/gstaudiodecoder.c @@ -195,7 +195,7 @@ typedef struct _GstAudioDecoderContext /* output */ gboolean do_plc; - gboolean do_byte_time; + gboolean do_estimate_rate; gint max_errors; /* MT-protected (with LOCK) */ GstClockTime min_latency; @@ -1460,7 +1460,7 @@ not_negotiated: static inline gboolean gst_audio_decoder_do_byte (GstAudioDecoder * dec) { - return dec->priv->ctx.do_byte_time && dec->priv->ctx.info.bpf && + return dec->priv->ctx.do_estimate_rate && dec->priv->ctx.info.bpf && dec->priv->ctx.info.rate <= dec->priv->samples_out; } @@ -1486,7 +1486,7 @@ gst_audio_decoder_sink_eventfunc (GstAudioDecoder * dec, GstEvent * event) /* handle newsegment resulting from legacy simple seeking */ /* note that we need to convert this whether or not enough data * to handle initial newsegment */ - if (dec->priv->ctx.do_byte_time && + if (dec->priv->ctx.do_estimate_rate && gst_pad_query_convert (dec->sinkpad, GST_FORMAT_BYTES, seg.start, GST_FORMAT_TIME, &nstart)) { /* best attempt convert */ @@ -2240,7 +2240,7 @@ gst_audio_decoder_get_plc_aware (GstAudioDecoder * dec) } /** - * gst_audio_decoder_set_byte_time: + * gst_audio_decoder_set_estimate_rate: * @dec: a #GstAudioDecoder * @enabled: whether to enable byte to time conversion * @@ -2249,15 +2249,15 @@ gst_audio_decoder_get_plc_aware (GstAudioDecoder * dec) * Since: 0.10.36 */ void -gst_audio_decoder_set_byte_time (GstAudioDecoder * dec, gboolean enabled) +gst_audio_decoder_set_estimate_rate (GstAudioDecoder * dec, gboolean enabled) { g_return_if_fail (GST_IS_AUDIO_DECODER (dec)); - dec->priv->ctx.do_byte_time = enabled; + dec->priv->ctx.do_estimate_rate = enabled; } /** - * gst_audio_decoder_get_byte_time: + * gst_audio_decoder_get_estimate_rate: * @dec: a #GstAudioDecoder * * Returns: currently configured byte to time conversion setting @@ -2265,11 +2265,11 @@ gst_audio_decoder_set_byte_time (GstAudioDecoder * dec, gboolean enabled) * Since: 0.10.36 */ gint -gst_audio_decoder_get_byte_time (GstAudioDecoder * dec) +gst_audio_decoder_get_estimate_rate (GstAudioDecoder * dec) { g_return_val_if_fail (GST_IS_AUDIO_DECODER (dec), 0); - return dec->priv->ctx.do_byte_time; + return dec->priv->ctx.do_estimate_rate; } /** diff --git a/gst-libs/gst/audio/gstaudiodecoder.h b/gst-libs/gst/audio/gstaudiodecoder.h index 4971ea29b1..42606fd182 100644 --- a/gst-libs/gst/audio/gstaudiodecoder.h +++ b/gst-libs/gst/audio/gstaudiodecoder.h @@ -267,10 +267,10 @@ void gst_audio_decoder_set_plc_aware (GstAudioDecoder * dec, gint gst_audio_decoder_get_plc_aware (GstAudioDecoder * dec); -void gst_audio_decoder_set_byte_time (GstAudioDecoder * dec, +void gst_audio_decoder_set_estimate_rate (GstAudioDecoder * dec, gboolean enabled); -gint gst_audio_decoder_get_byte_time (GstAudioDecoder * dec); +gint gst_audio_decoder_get_estimate_rate (GstAudioDecoder * dec); gint gst_audio_decoder_get_delay (GstAudioDecoder * dec); diff --git a/win32/common/libgstaudio.def b/win32/common/libgstaudio.def index 36c2f7f6f3..2e8d38d647 100644 --- a/win32/common/libgstaudio.def +++ b/win32/common/libgstaudio.def @@ -38,7 +38,7 @@ EXPORTS gst_audio_clock_reset gst_audio_decoder_finish_frame gst_audio_decoder_get_audio_info - gst_audio_decoder_get_byte_time + gst_audio_decoder_get_estimate_rate gst_audio_decoder_get_delay gst_audio_decoder_get_drainable gst_audio_decoder_get_latency @@ -51,7 +51,7 @@ EXPORTS gst_audio_decoder_get_tolerance gst_audio_decoder_get_type gst_audio_decoder_merge_tags - gst_audio_decoder_set_byte_time + gst_audio_decoder_set_estimate_rate gst_audio_decoder_set_drainable gst_audio_decoder_set_latency gst_audio_decoder_set_max_errors