mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-08-01 19:25:10 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/speexresample/gstspeexresample.*: Some random cleanup, add G_LIKELY and friends, use GST_DEBUG_OBJECT instead of ...

Browse source 
Original commit message from CVS:
* gst/speexresample/gstspeexresample.c:
(gst_speex_resample_get_unit_size),
(gst_speex_resample_fixate_caps), (gst_speex_resample_init_state),
(gst_speex_resample_update_state), (gst_speex_resample_parse_caps),
(gst_speex_resample_transform_size), (gst_speex_resample_set_caps),
(gst_speex_resample_push_drain), (gst_speex_resample_event),
(gst_speex_resample_check_discont), (gst_speex_fix_output_buffer),
(gst_speex_resample_process), (gst_speex_resample_transform),
(gst_speex_resample_query), (gst_speex_resample_set_property):
* gst/speexresample/gstspeexresample.h:
Some random cleanup, add G_LIKELY and friends, use GST_DEBUG_OBJECT
instead of GST_DEBUG, ...
This commit is contained in:
Sebastian Dröge 2008-10-28 19:30:33 +00:00
parent 6e70ab7d40
commit b33f9f49ab
3 changed files with 90 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2008-10-28 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/speexresample/gstspeexresample.c:
(gst_speex_resample_get_unit_size),
(gst_speex_resample_fixate_caps), (gst_speex_resample_init_state),
(gst_speex_resample_update_state), (gst_speex_resample_parse_caps),
(gst_speex_resample_transform_size), (gst_speex_resample_set_caps),
(gst_speex_resample_push_drain), (gst_speex_resample_event),
(gst_speex_resample_check_discont), (gst_speex_fix_output_buffer),
(gst_speex_resample_process), (gst_speex_resample_transform),
(gst_speex_resample_query), (gst_speex_resample_set_property):
* gst/speexresample/gstspeexresample.h:
Some random cleanup, add G_LIKELY and friends, use GST_DEBUG_OBJECT
instead of GST_DEBUG, ...
2008-10-28 Sebastian Dröge <sebastian.droege@collabora.co.uk> 2008-10-28 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/flv/gstflvdemux.c: (gst_flv_demux_query): * gst/flv/gstflvdemux.c: (gst_flv_demux_query):

129
gst/speexresample/gstspeexresample.c
View file

@ -220,7 +220,9 @@ gst_speex_resample_get_unit_size (GstBaseTransform * base, GstCaps * caps,
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
ret = gst_structure_get_int (structure, "width", &width); ret = gst_structure_get_int (structure, "width", &width);
ret &= gst_structure_get_int (structure, "channels", &channels); ret &= gst_structure_get_int (structure, "channels", &channels);
g_return_val_if_fail (ret, FALSE);
if (G_UNLIKELY (!ret))
return FALSE;
*size = width * channels / 8; *size = width * channels / 8;
@ -252,7 +254,7 @@ gst_speex_resample_fixate_caps (GstBaseTransform * base,
gint rate; gint rate;
s = gst_caps_get_structure (caps, 0); s = gst_caps_get_structure (caps, 0);
if (!gst_structure_get_int (s, "rate", &rate)) if (G_UNLIKELY (!gst_structure_get_int (s, "rate", &rate)))
return; return;
s = gst_caps_get_structure (othercaps, 0); s = gst_caps_get_structure (othercaps, 0);
@ -260,8 +262,8 @@ gst_speex_resample_fixate_caps (GstBaseTransform * base,
} }
static SpeexResamplerState * static SpeexResamplerState *
gst_speex_resample_init_state (guint channels, guint inrate, guint outrate, gst_speex_resample_init_state (gint channels, gint inrate, gint outrate,
guint quality, gboolean fp) gint quality, gboolean fp)
{ {
SpeexResamplerState *ret = NULL; SpeexResamplerState *ret = NULL;
gint err = RESAMPLER_ERR_SUCCESS; gint err = RESAMPLER_ERR_SUCCESS;
@ -274,7 +276,7 @@ gst_speex_resample_init_state (guint channels, guint inrate, guint outrate,
ret = ret =
resample_int_resampler_init (channels, inrate, outrate, quality, &err); resample_int_resampler_init (channels, inrate, outrate, quality, &err);
if (err != RESAMPLER_ERR_SUCCESS) { if (G_UNLIKELY (err != RESAMPLER_ERR_SUCCESS)) {
GST_ERROR ("Failed to create resampler state: %s", GST_ERROR ("Failed to create resampler state: %s",
resample_resampler_strerror (err)); resample_resampler_strerror (err));
return NULL; return NULL;
@ -315,8 +317,8 @@ gst_speex_resample_update_state (GstSpeexResample * resample, gint channels,
else else
err = resample_int_resampler_set_rate (resample->state, inrate, outrate); err = resample_int_resampler_set_rate (resample->state, inrate, outrate);
if (err != RESAMPLER_ERR_SUCCESS) if (G_UNLIKELY (err != RESAMPLER_ERR_SUCCESS))
GST_ERROR ("Failed to update rate: %s", GST_ERROR_OBJECT (resample, "Failed to update rate: %s",
resample_resampler_strerror (err)); resample_resampler_strerror (err));
ret = (err == RESAMPLER_ERR_SUCCESS); ret = (err == RESAMPLER_ERR_SUCCESS);
@ -328,8 +330,8 @@ gst_speex_resample_update_state (GstSpeexResample * resample, gint channels,
else else
err = resample_int_resampler_set_quality (resample->state, quality); err = resample_int_resampler_set_quality (resample->state, quality);
if (err != RESAMPLER_ERR_SUCCESS) if (G_UNLIKELY (err != RESAMPLER_ERR_SUCCESS))
GST_ERROR ("Failed to update quality: %s", GST_ERROR_OBJECT (resample, "Failed to update quality: %s",
resample_resampler_strerror (err)); resample_resampler_strerror (err));
ret = (err == RESAMPLER_ERR_SUCCESS); ret = (err == RESAMPLER_ERR_SUCCESS);
@ -379,12 +381,12 @@ gst_speex_resample_parse_caps (GstCaps * incaps,
ret = gst_structure_get_int (structure, "rate", &myinrate); ret = gst_structure_get_int (structure, "rate", &myinrate);
ret &= gst_structure_get_int (structure, "channels", &mychannels); ret &= gst_structure_get_int (structure, "channels", &mychannels);
if (!ret) if (G_UNLIKELY (!ret))
goto no_in_rate_channels; goto no_in_rate_channels;
structure = gst_caps_get_structure (outcaps, 0); structure = gst_caps_get_structure (outcaps, 0);
ret = gst_structure_get_int (structure, "rate", &myoutrate); ret = gst_structure_get_int (structure, "rate", &myoutrate);
if (!ret) if (G_UNLIKELY (!ret))
goto no_out_rate; goto no_out_rate;
if (channels) if (channels)
@ -425,7 +427,7 @@ gst_speex_resample_transform_size (GstBaseTransform * base,
guint32 ratio_den, ratio_num; guint32 ratio_den, ratio_num;
gboolean fp; gboolean fp;
GST_LOG ("asked to transform size %d in direction %s", GST_LOG_OBJECT (resample, "asked to transform size %d in direction %s",
size, direction == GST_PAD_SINK ? "SINK" : "SRC"); size, direction == GST_PAD_SINK ? "SINK" : "SRC");
if (direction == GST_PAD_SINK) { if (direction == GST_PAD_SINK) {
sinkcaps = caps; sinkcaps = caps;
@ -445,19 +447,19 @@ gst_speex_resample_transform_size (GstBaseTransform * base,
} else { } else {
gint inrate, outrate, channels; gint inrate, outrate, channels;
GST_DEBUG ("Can't use internal state, creating state"); GST_DEBUG_OBJECT (resample, "Can't use internal state, creating state");
ret = ret =
gst_speex_resample_parse_caps (caps, othercaps, &channels, &inrate, gst_speex_resample_parse_caps (caps, othercaps, &channels, &inrate,
&outrate, &fp); &outrate, &fp);
if (!ret) { if (G_UNLIKELY (!ret)) {
GST_ERROR ("Wrong caps"); GST_ERROR_OBJECT (resample, "Wrong caps");
return FALSE; return FALSE;
} }
state = gst_speex_resample_init_state (channels, inrate, outrate, 0, TRUE); state = gst_speex_resample_init_state (channels, inrate, outrate, 0, TRUE);
if (!state) if (G_UNLIKELY (!state))
return FALSE; return FALSE;
} }
@ -484,7 +486,7 @@ gst_speex_resample_transform_size (GstBaseTransform * base,
size *= fac; size *= fac;
} }
GST_LOG ("transformed size %d to %d", size, *othersize); GST_LOG_OBJECT (resample, "transformed size %d to %d", size, *othersize);
if (!use_internal) if (!use_internal)
resample_resampler_destroy (state); resample_resampler_destroy (state);
@ -507,13 +509,15 @@ gst_speex_resample_set_caps (GstBaseTransform * base, GstCaps * incaps,
ret = gst_speex_resample_parse_caps (incaps, outcaps, ret = gst_speex_resample_parse_caps (incaps, outcaps,
&channels, &inrate, &outrate, &fp); &channels, &inrate, &outrate, &fp);
g_return_val_if_fail (ret, FALSE); if (G_UNLIKELY (!ret))
return FALSE;
ret = ret =
gst_speex_resample_update_state (resample, channels, inrate, outrate, gst_speex_resample_update_state (resample, channels, inrate, outrate,
resample->quality, fp); resample->quality, fp);
g_return_val_if_fail (ret, FALSE); if (G_UNLIKELY (!ret))
return FALSE;
/* save caps so we can short-circuit in the size_transform if the caps /* save caps so we can short-circuit in the size_transform if the caps
* are the same */ * are the same */
@ -554,11 +558,13 @@ gst_speex_resample_push_drain (GstSpeexResample * resample)
outsize = 2 * out_len * resample->channels; outsize = 2 * out_len * resample->channels;
} }
res = gst_pad_alloc_buffer (trans->srcpad, GST_BUFFER_OFFSET_NONE, outsize, res =
GST_PAD_CAPS (trans->srcpad), &buf); gst_pad_alloc_buffer_and_set_caps (trans->srcpad, GST_BUFFER_OFFSET_NONE,
outsize, GST_PAD_CAPS (trans->srcpad), &buf);
if (G_UNLIKELY (res != GST_FLOW_OK)) { if (G_UNLIKELY (res != GST_FLOW_OK)) {
GST_WARNING ("failed allocating buffer of %d bytes", outsize); GST_WARNING_OBJECT (resample, "failed allocating buffer of %d bytes",
outsize);
return; return;
} }
@ -576,15 +582,15 @@ gst_speex_resample_push_drain (GstSpeexResample * resample)
&len, (gint16 *) GST_BUFFER_DATA (buf), &out_processed); &len, (gint16 *) GST_BUFFER_DATA (buf), &out_processed);
} }
if (err != RESAMPLER_ERR_SUCCESS) { if (G_UNLIKELY (err != RESAMPLER_ERR_SUCCESS)) {
GST_WARNING ("Failed to process drain: %s", GST_WARNING_OBJECT (resample, "Failed to process drain: %s",
resample_resampler_strerror (err)); resample_resampler_strerror (err));
gst_buffer_unref (buf); gst_buffer_unref (buf);
return; return;
} }
if (out_processed == 0) { if (G_UNLIKELY (out_processed == 0)) {
GST_WARNING ("Failed to get drain, dropping buffer"); GST_WARNING_OBJECT (resample, "Failed to get drain, dropping buffer");
gst_buffer_unref (buf); gst_buffer_unref (buf);
return; return;
} }
@ -611,18 +617,19 @@ gst_speex_resample_push_drain (GstSpeexResample * resample)
GST_FRAMES_TO_CLOCK_TIME (out_processed, resample->outrate); GST_FRAMES_TO_CLOCK_TIME (out_processed, resample->outrate);
} }
GST_LOG ("Pushing drain buffer of %u bytes with timestamp %" GST_TIME_FORMAT GST_LOG_OBJECT (resample,
" duration %" GST_TIME_FORMAT " offset %" G_GUINT64_FORMAT "Pushing drain buffer of %u bytes with timestamp %" GST_TIME_FORMAT
" offset_end %" G_GUINT64_FORMAT, " duration %" GST_TIME_FORMAT " offset %" G_GUINT64_FORMAT " offset_end %"
GST_BUFFER_SIZE (buf), G_GUINT64_FORMAT, GST_BUFFER_SIZE (buf),
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)),
GST_TIME_ARGS (GST_BUFFER_DURATION (buf)), GST_TIME_ARGS (GST_BUFFER_DURATION (buf)), GST_BUFFER_OFFSET (buf),
GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET_END (buf)); GST_BUFFER_OFFSET_END (buf));
res = gst_pad_push (trans->srcpad, buf); res = gst_pad_push (trans->srcpad, buf);
if (res != GST_FLOW_OK) if (G_UNLIKELY (res != GST_FLOW_OK))
GST_WARNING ("Failed to push drain"); GST_WARNING_OBJECT (resample, "Failed to push drain: %s",
gst_flow_get_name (res));
return; return;
} }
@ -655,9 +662,8 @@ gst_speex_resample_event (GstBaseTransform * base, GstEvent * event)
default: default:
break; break;
} }
parent_class->event (base, event);
return TRUE; return parent_class->event (base, event);
} }
static gboolean static gboolean
@ -676,8 +682,8 @@ gst_speex_resample_check_discont (GstSpeexResample * resample,
(resample->prev_ts + resample->prev_duration); (resample->prev_ts + resample->prev_duration);
if (ABS (diff) > GST_SECOND / resample->inrate) { if (ABS (diff) > GST_SECOND / resample->inrate) {
GST_WARNING ("encountered timestamp discontinuity of %" G_GINT64_FORMAT, GST_WARNING_OBJECT (resample,
diff); "encountered timestamp discontinuity of %" G_GINT64_FORMAT, diff);
return TRUE; return TRUE;
} }
} }
@ -691,7 +697,7 @@ gst_speex_fix_output_buffer (GstSpeexResample * resample, GstBuffer * outbuf,
{ {
GstClockTime timediff = GST_FRAMES_TO_CLOCK_TIME (diff, resample->outrate); GstClockTime timediff = GST_FRAMES_TO_CLOCK_TIME (diff, resample->outrate);
GST_LOG ("Adjusting buffer by %d samples", diff); GST_LOG_OBJECT (resample, "Adjusting buffer by %d samples", diff);
GST_BUFFER_DURATION (outbuf) -= timediff; GST_BUFFER_DURATION (outbuf) -= timediff;
GST_BUFFER_SIZE (outbuf) -= GST_BUFFER_SIZE (outbuf) -=
@ -737,14 +743,15 @@ gst_speex_resample_process (GstSpeexResample * resample, GstBuffer * inbuf,
(const gint16 *) GST_BUFFER_DATA (inbuf), &in_processed, (const gint16 *) GST_BUFFER_DATA (inbuf), &in_processed,
(gint16 *) GST_BUFFER_DATA (outbuf), &out_processed); (gint16 *) GST_BUFFER_DATA (outbuf), &out_processed);
if (in_len != in_processed) if (G_UNLIKELY (in_len != in_processed))
GST_WARNING ("Converted %d of %d input samples", in_processed, in_len); GST_WARNING_OBJECT (resample, "Converted %d of %d input samples",
in_processed, in_len);
if (out_len != out_processed) { if (out_len != out_processed) {
/* One sample difference is allowed as this will happen /* One sample difference is allowed as this will happen
* because of rounding errors */ * because of rounding errors */
if (out_processed == 0) { if (out_processed == 0) {
GST_DEBUG ("Converted to 0 samples, buffer dropped"); GST_DEBUG_OBJECT (resample, "Converted to 0 samples, buffer dropped");
if (resample->ts_offset != -1) { if (resample->ts_offset != -1) {
GST_BUFFER_OFFSET_END (outbuf) -= out_len; GST_BUFFER_OFFSET_END (outbuf) -= out_len;
@ -756,26 +763,28 @@ gst_speex_resample_process (GstSpeexResample * resample, GstBuffer * inbuf,
return GST_BASE_TRANSFORM_FLOW_DROPPED; return GST_BASE_TRANSFORM_FLOW_DROPPED;
} else if (out_len - out_processed != 1) { } else if (out_len - out_processed != 1) {
GST_WARNING ("Converted to %d instead of %d output samples", GST_WARNING_OBJECT (resample,
out_processed, out_len); "Converted to %d instead of %d output samples", out_processed,
out_len);
} }
if (out_len > out_processed) { if (G_LIKELY (out_len > out_processed)) {
gst_speex_fix_output_buffer (resample, outbuf, out_len - out_processed); gst_speex_fix_output_buffer (resample, outbuf, out_len - out_processed);
} else { } else {
GST_ERROR ("Wrote more output than allocated!"); GST_ERROR_OBJECT (resample, "Wrote more output than allocated!");
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
} }
if (err != RESAMPLER_ERR_SUCCESS) { if (G_UNLIKELY (err != RESAMPLER_ERR_SUCCESS)) {
GST_ERROR ("Failed to convert data: %s", resample_resampler_strerror (err)); GST_ERROR_OBJECT (resample, "Failed to convert data: %s",
resample_resampler_strerror (err));
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} else { } else {
GST_LOG ("Converted to buffer of %u bytes with timestamp %" GST_TIME_FORMAT GST_LOG_OBJECT (resample,
"Converted to buffer of %u bytes with timestamp %" GST_TIME_FORMAT
", duration %" GST_TIME_FORMAT ", offset %" G_GUINT64_FORMAT ", duration %" GST_TIME_FORMAT ", offset %" G_GUINT64_FORMAT
", offset_end %" G_GUINT64_FORMAT, ", offset_end %" G_GUINT64_FORMAT, GST_BUFFER_SIZE (outbuf),
GST_BUFFER_SIZE (outbuf),
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)),
GST_TIME_ARGS (GST_BUFFER_DURATION (outbuf)), GST_TIME_ARGS (GST_BUFFER_DURATION (outbuf)),
GST_BUFFER_OFFSET (outbuf), GST_BUFFER_OFFSET_END (outbuf)); GST_BUFFER_OFFSET (outbuf), GST_BUFFER_OFFSET_END (outbuf));
@ -795,16 +804,17 @@ gst_speex_resample_transform (GstBaseTransform * base, GstBuffer * inbuf,
gint outsamples; gint outsamples;
if (resample->state == NULL) if (resample->state == NULL)
if (!(resample->state = gst_speex_resample_init_state (resample->channels, if (G_UNLIKELY (!(resample->state =
gst_speex_resample_init_state (resample->channels,
resample->inrate, resample->outrate, resample->quality, resample->inrate, resample->outrate, resample->quality,
resample->fp))) resample->fp))))
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
data = GST_BUFFER_DATA (inbuf); data = GST_BUFFER_DATA (inbuf);
size = GST_BUFFER_SIZE (inbuf); size = GST_BUFFER_SIZE (inbuf);
timestamp = GST_BUFFER_TIMESTAMP (inbuf); timestamp = GST_BUFFER_TIMESTAMP (inbuf);
GST_LOG ("transforming buffer of %ld bytes, ts %" GST_LOG_OBJECT (resample, "transforming buffer of %ld bytes, ts %"
GST_TIME_FORMAT ", duration %" GST_TIME_FORMAT ", offset %" GST_TIME_FORMAT ", duration %" GST_TIME_FORMAT ", offset %"
G_GINT64_FORMAT ", offset_end %" G_GINT64_FORMAT, G_GINT64_FORMAT ", offset_end %" G_GINT64_FORMAT,
size, GST_TIME_ARGS (timestamp), size, GST_TIME_ARGS (timestamp),
@ -868,7 +878,7 @@ gst_speex_resample_transform (GstBaseTransform * base, GstBuffer * inbuf,
} }
if (G_UNLIKELY (resample->need_discont)) { if (G_UNLIKELY (resample->need_discont)) {
GST_DEBUG ("marking this buffer with the DISCONT flag"); GST_DEBUG_OBJECT (resample, "marking this buffer with the DISCONT flag");
GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT); GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_DISCONT);
resample->need_discont = FALSE; resample->need_discont = FALSE;
} }
@ -909,7 +919,7 @@ gst_speex_resample_query (GstPad * pad, GstQuery * query)
if ((res = gst_pad_query (peer, query))) { if ((res = gst_pad_query (peer, query))) {
gst_query_parse_latency (query, &live, &min, &max); gst_query_parse_latency (query, &live, &min, &max);
GST_DEBUG ("Peer latency: min %" GST_DEBUG_OBJECT (resample, "Peer latency: min %"
GST_TIME_FORMAT " max %" GST_TIME_FORMAT, GST_TIME_FORMAT " max %" GST_TIME_FORMAT,
GST_TIME_ARGS (min), GST_TIME_ARGS (max)); GST_TIME_ARGS (min), GST_TIME_ARGS (max));
@ -920,13 +930,14 @@ gst_speex_resample_query (GstPad * pad, GstQuery * query)
else else
latency = 0; latency = 0;
GST_DEBUG ("Our latency: %" GST_TIME_FORMAT, GST_TIME_ARGS (latency)); GST_DEBUG_OBJECT (resample, "Our latency: %" GST_TIME_FORMAT,
GST_TIME_ARGS (latency));
min += latency; min += latency;
if (max != GST_CLOCK_TIME_NONE) if (max != GST_CLOCK_TIME_NONE)
max += latency; max += latency;
GST_DEBUG ("Calculated total latency : min %" GST_DEBUG_OBJECT (resample, "Calculated total latency : min %"
GST_TIME_FORMAT " max %" GST_TIME_FORMAT, GST_TIME_FORMAT " max %" GST_TIME_FORMAT,
GST_TIME_ARGS (min), GST_TIME_ARGS (max)); GST_TIME_ARGS (min), GST_TIME_ARGS (max));
@ -966,7 +977,7 @@ gst_speex_resample_set_property (GObject * object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_QUALITY: case PROP_QUALITY:
resample->quality = g_value_get_int (value); resample->quality = g_value_get_int (value);
GST_DEBUG ("new quality %d", resample->quality); GST_DEBUG_OBJECT (resample, "new quality %d", resample->quality);
gst_speex_resample_update_state (resample, resample->channels, gst_speex_resample_update_state (resample, resample->channels,
resample->inrate, resample->outrate, resample->quality, resample->fp); resample->inrate, resample->outrate, resample->quality, resample->fp);

8
gst/speexresample/gstspeexresample.h
View file

@ -63,10 +63,10 @@ struct _GstSpeexResample {
GstClockTime prev_ts, prev_duration; GstClockTime prev_ts, prev_duration;
gboolean fp; gboolean fp;
int channels; gint channels;
int inrate; gint inrate;
int outrate; gint outrate;
int quality; gint quality;
SpeexResamplerState *state; SpeexResamplerState *state;
}; };