summaryrefslogtreecommitdiffstats
path: root/gst/speexresample
diff options
context:
space:
mode:
Diffstat (limited to 'gst/speexresample')
-rw-r--r--gst/speexresample/gstspeexresample.c235
-rw-r--r--gst/speexresample/resample.c130
-rw-r--r--gst/speexresample/speex_resampler.h65
-rw-r--r--gst/speexresample/speex_resampler_wrapper.h12
4 files changed, 429 insertions, 13 deletions
diff --git a/gst/speexresample/gstspeexresample.c b/gst/speexresample/gstspeexresample.c
index 9c0e7d30..da029c56 100644
--- a/gst/speexresample/gstspeexresample.c
+++ b/gst/speexresample/gstspeexresample.c
@@ -19,11 +19,6 @@
* Boston, MA 02111-1307, USA.
*/
- /* TODO:
- * - Find out what to do about the first n zero samples
- * in the output.
- */
-
/**
* SECTION:element-speexresample
*
@@ -107,6 +102,8 @@ static gboolean gst_speex_resample_event (GstBaseTransform * base,
GstEvent * event);
static gboolean gst_speex_resample_start (GstBaseTransform * base);
static gboolean gst_speex_resample_stop (GstBaseTransform * base);
+static gboolean gst_speex_resample_query (GstPad * pad, GstQuery * query);
+static const GstQueryType *gst_speex_resample_query_type (GstPad * pad);
#define DEBUG_INIT(bla) \
GST_DEBUG_CATEGORY_INIT (speex_resample_debug, "speex_resample", 0, "audio resampling element");
@@ -168,9 +165,15 @@ static void
gst_speex_resample_init (GstSpeexResample * resample,
GstSpeexResampleClass * klass)
{
+ GstBaseTransform *trans = GST_BASE_TRANSFORM (resample);
+
resample->quality = SPEEX_RESAMPLER_QUALITY_DEFAULT;
resample->need_discont = FALSE;
+
+ gst_pad_set_query_function (trans->srcpad, gst_speex_resample_query);
+ gst_pad_set_query_type_function (trans->srcpad,
+ gst_speex_resample_query_type);
}
/* vmethods */
@@ -260,6 +263,11 @@ gst_speex_resample_init_state (guint channels, guint inrate, guint outrate,
return NULL;
}
+ if (fp)
+ resample_float_resampler_skip_zeros (ret);
+ else
+ resample_int_resampler_skip_zeros (ret);
+
return ret;
}
@@ -440,6 +448,7 @@ gst_speex_resample_transform_size (GstBaseTransform * base,
size /= fac;
*othersize = (size * ratio_den + (ratio_num >> 1)) / ratio_num;
*othersize *= fac;
+ size *= fac;
} else {
gint fac = (fp) ? 4 : 2;
@@ -447,6 +456,7 @@ gst_speex_resample_transform_size (GstBaseTransform * base,
size /= fac;
*othersize = (size * ratio_num + (ratio_den >> 1)) / ratio_den;
*othersize *= fac;
+ size *= fac;
}
GST_LOG ("transformed size %d to %d", size, *othersize);
@@ -488,6 +498,102 @@ gst_speex_resample_set_caps (GstBaseTransform * base, GstCaps * incaps,
return TRUE;
}
+static void
+gst_speex_resample_push_drain (GstSpeexResample * resample)
+{
+ GstBuffer *buf;
+ GstBaseTransform *trans = GST_BASE_TRANSFORM (resample);
+ GstFlowReturn res;
+ gint outsize;
+ guint out_len, out_processed;
+ gint err;
+
+ if (!resample->state)
+ return;
+
+ if (resample->fp) {
+ guint num, den;
+
+ resample_float_resampler_get_ratio (resample->state, &num, &den);
+
+ out_len = resample_float_resampler_get_latency (resample->state);
+ out_len = out_processed = (out_len * den + (num >> 1)) / num;
+ outsize = 4 * out_len * resample->channels;
+ } else {
+ guint num, den;
+
+ resample_int_resampler_get_ratio (resample->state, &num, &den);
+
+ out_len = resample_int_resampler_get_latency (resample->state);
+ out_len = out_processed = (out_len * den + (num >> 1)) / num;
+ outsize = 2 * out_len * resample->channels;
+ }
+
+ res = gst_pad_alloc_buffer (trans->srcpad, GST_BUFFER_OFFSET_NONE, outsize,
+ GST_PAD_CAPS (trans->srcpad), &buf);
+
+ if (G_UNLIKELY (res != GST_FLOW_OK)) {
+ GST_WARNING ("failed allocating buffer of %d bytes", outsize);
+ return;
+ }
+
+ if (resample->fp)
+ err = resample_float_resampler_drain_interleaved_float (resample->state,
+ (gfloat *) GST_BUFFER_DATA (buf), &out_processed);
+ else
+ err = resample_int_resampler_drain_interleaved_int (resample->state,
+ (gint16 *) GST_BUFFER_DATA (buf), &out_processed);
+
+ if (err != RESAMPLER_ERR_SUCCESS) {
+ GST_WARNING ("Failed to process drain: %s",
+ resample_resampler_strerror (err));
+ gst_buffer_unref (buf);
+ return;
+ }
+
+ if (out_processed == 0) {
+ GST_WARNING ("Failed to get drain, dropping buffer");
+ gst_buffer_unref (buf);
+ return;
+ }
+
+ GST_BUFFER_OFFSET (buf) = resample->offset;
+ GST_BUFFER_TIMESTAMP (buf) = resample->next_ts;
+ GST_BUFFER_SIZE (buf) =
+ out_processed * resample->channels * ((resample->fp) ? 4 : 2);
+
+ if (resample->ts_offset != -1) {
+ resample->offset += out_processed;
+ resample->ts_offset += out_processed;
+ resample->next_ts =
+ GST_FRAMES_TO_CLOCK_TIME (resample->ts_offset, resample->outrate);
+ GST_BUFFER_OFFSET_END (buf) = resample->offset;
+
+ /* we calculate DURATION as the difference between "next" timestamp
+ * and current timestamp so we ensure a contiguous stream, instead of
+ * having rounding errors. */
+ GST_BUFFER_DURATION (buf) = resample->next_ts - GST_BUFFER_TIMESTAMP (buf);
+ } else {
+ /* no valid offset know, we can still sortof calculate the duration though */
+ GST_BUFFER_DURATION (buf) =
+ GST_FRAMES_TO_CLOCK_TIME (out_processed, resample->outrate);
+ }
+
+ GST_LOG ("Pushing drain buffer of %ld bytes with timestamp %" GST_TIME_FORMAT
+ " duration %" GST_TIME_FORMAT " offset %lld offset_end %lld",
+ GST_BUFFER_SIZE (buf),
+ GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)),
+ GST_TIME_ARGS (GST_BUFFER_DURATION (buf)),
+ GST_BUFFER_OFFSET (buf), GST_BUFFER_OFFSET_END (buf));
+
+ res = gst_pad_push (trans->srcpad, buf);
+
+ if (res != GST_FLOW_OK)
+ GST_WARNING ("Failed to push drain");
+
+ return;
+}
+
static gboolean
gst_speex_resample_event (GstBaseTransform * base, GstEvent * event)
{
@@ -497,15 +603,22 @@ gst_speex_resample_event (GstBaseTransform * base, GstEvent * event)
case GST_EVENT_FLUSH_START:
break;
case GST_EVENT_FLUSH_STOP:
+ gst_speex_resample_reset_state (resample);
+ resample->ts_offset = -1;
+ resample->next_ts = -1;
+ resample->offset = -1;
case GST_EVENT_NEWSEGMENT:
+ gst_speex_resample_push_drain (resample);
gst_speex_resample_reset_state (resample);
resample->ts_offset = -1;
resample->next_ts = -1;
resample->offset = -1;
break;
- case GST_EVENT_EOS:
+ case GST_EVENT_EOS:{
+ gst_speex_resample_push_drain (resample);
gst_speex_resample_reset_state (resample);
break;
+ }
default:
break;
}
@@ -548,7 +661,8 @@ gst_speex_fix_output_buffer (GstSpeexResample * resample, GstBuffer * outbuf,
GST_LOG ("Adjusting buffer by %d samples", diff);
GST_BUFFER_DURATION (outbuf) -= timediff;
- GST_BUFFER_SIZE (outbuf) -= diff * ((resample->fp) ? 4 : 2);
+ GST_BUFFER_SIZE (outbuf) -=
+ diff * ((resample->fp) ? 4 : 2) * resample->channels;
if (resample->ts_offset != -1) {
GST_BUFFER_OFFSET_END (outbuf) -= diff;
@@ -596,19 +710,39 @@ gst_speex_resample_process (GstSpeexResample * resample, GstBuffer * inbuf,
if (out_len != out_processed) {
/* One sample difference is allowed as this will happen
* because of rounding errors */
- if (out_len - out_processed != 1)
+ if (out_processed == 0) {
+ GST_DEBUG ("Converted to 0 samples, buffer dropped");
+
+ if (resample->ts_offset != -1) {
+ GST_BUFFER_OFFSET_END (outbuf) -= out_len;
+ resample->offset -= out_len;
+ resample->ts_offset -= out_len;
+ resample->next_ts =
+ GST_FRAMES_TO_CLOCK_TIME (resample->ts_offset, resample->outrate);
+ }
+
+ return GST_BASE_TRANSFORM_FLOW_DROPPED;
+ } else if (out_len - out_processed != 1)
GST_WARNING ("Converted to %d instead of %d output samples",
out_processed, out_len);
- if (out_len > out_processed)
+ if (out_len > out_processed) {
gst_speex_fix_output_buffer (resample, outbuf, out_len - out_processed);
- else
- g_error ("Wrote more output then allocated!");
+ } else {
+ GST_ERROR ("Wrote more output than allocated!");
+ return GST_FLOW_ERROR;
+ }
}
if (err != RESAMPLER_ERR_SUCCESS) {
GST_ERROR ("Failed to convert data: %s", resample_resampler_strerror (err));
return GST_FLOW_ERROR;
} else {
+ GST_LOG ("Converted to buffer of %ld bytes with timestamp %" GST_TIME_FORMAT
+ ", duration %" GST_TIME_FORMAT ", offset %lld, offset_end %lld",
+ GST_BUFFER_SIZE (outbuf),
+ GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)),
+ GST_TIME_ARGS (GST_BUFFER_DURATION (outbuf)),
+ GST_BUFFER_OFFSET (outbuf), GST_BUFFER_OFFSET_END (outbuf));
return GST_FLOW_OK;
}
}
@@ -705,6 +839,85 @@ gst_speex_resample_transform (GstBaseTransform * base, GstBuffer * inbuf,
return gst_speex_resample_process (resample, inbuf, outbuf);
}
+static gboolean
+gst_speex_resample_query (GstPad * pad, GstQuery * query)
+{
+ GstSpeexResample *resample = GST_SPEEX_RESAMPLE (gst_pad_get_parent (pad));
+ GstBaseTransform *trans = GST_BASE_TRANSFORM (resample);
+ gboolean res = TRUE;
+
+ switch (GST_QUERY_TYPE (query)) {
+ case GST_QUERY_LATENCY:
+ {
+ GstClockTime min, max;
+ gboolean live;
+ guint64 latency;
+ GstPad *peer;
+ gint rate = resample->inrate;
+ gint resampler_latency;
+
+ if (resample->state && resample->fp)
+ resampler_latency =
+ resample_float_resampler_get_latency (resample->state);
+ else if (resample->state && !resample->fp)
+ resampler_latency =
+ resample_int_resampler_get_latency (resample->state);
+ else
+ resampler_latency = 0;
+
+ if (gst_base_transform_is_passthrough (trans))
+ resampler_latency = 0;
+
+ if ((peer = gst_pad_get_peer (trans->sinkpad))) {
+ if ((res = gst_pad_query (peer, query))) {
+ gst_query_parse_latency (query, &live, &min, &max);
+
+ GST_DEBUG ("Peer latency: min %"
+ GST_TIME_FORMAT " max %" GST_TIME_FORMAT,
+ GST_TIME_ARGS (min), GST_TIME_ARGS (max));
+
+ /* add our own latency */
+ if (rate != 0 && resampler_latency != 0)
+ latency =
+ gst_util_uint64_scale (resampler_latency, GST_SECOND, rate);
+ else
+ latency = 0;
+
+ GST_DEBUG ("Our latency: %" GST_TIME_FORMAT, GST_TIME_ARGS (latency));
+
+ min += latency;
+ if (max != GST_CLOCK_TIME_NONE)
+ max += latency;
+
+ GST_DEBUG ("Calculated total latency : min %"
+ GST_TIME_FORMAT " max %" GST_TIME_FORMAT,
+ GST_TIME_ARGS (min), GST_TIME_ARGS (max));
+
+ gst_query_set_latency (query, live, min, max);
+ }
+ gst_object_unref (peer);
+ }
+ break;
+ }
+ default:
+ res = gst_pad_query_default (pad, query);
+ break;
+ }
+ gst_object_unref (resample);
+ return res;
+}
+
+static const GstQueryType *
+gst_speex_resample_query_type (GstPad * pad)
+{
+ static const GstQueryType types[] = {
+ GST_QUERY_LATENCY,
+ 0
+ };
+
+ return types;
+}
+
static void
gst_speex_resample_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec)
diff --git a/gst/speexresample/resample.c b/gst/speexresample/resample.c
index f01574f9..5b20f5ef 100644
--- a/gst/speexresample/resample.c
+++ b/gst/speexresample/resample.c
@@ -1273,6 +1273,136 @@ speex_resampler_get_output_stride (SpeexResamplerState * st,
}
int
+speex_resampler_get_latency (SpeexResamplerState * st)
+{
+ return st->filt_len / 2;
+}
+
+int
+speex_resampler_drain_float (SpeexResamplerState * st,
+ spx_uint32_t channel_index, float *out, spx_uint32_t * out_len)
+{
+ spx_uint32_t in_len;
+ int ret;
+ float *in;
+
+ in_len = speex_resampler_get_latency (st);
+
+ in = speex_alloc (sizeof (float) * in_len);
+ *out_len =
+ MIN (in_len * st->den_rate + (st->num_rate >> 1) / st->num_rate,
+ *out_len);
+
+ ret =
+ speex_resampler_process_float (st, channel_index, in, &in_len, out,
+ out_len);
+
+ speex_free (in);
+
+ speex_resampler_reset_mem (st);
+
+ return ret;
+}
+
+int
+speex_resampler_drain_int (SpeexResamplerState * st,
+ spx_uint32_t channel_index, spx_int16_t * out, spx_uint32_t * out_len)
+{
+ spx_uint32_t in_len;
+ int ret;
+ spx_int16_t *in;
+
+ in_len = speex_resampler_get_latency (st);
+
+ in = speex_alloc (sizeof (spx_int16_t) * in_len);
+ *out_len =
+ MIN (in_len * st->den_rate + (st->num_rate >> 1) / st->num_rate,
+ *out_len);
+
+ ret =
+ speex_resampler_process_int (st, channel_index, in, &in_len, out,
+ out_len);
+
+ speex_free (in);
+
+ speex_resampler_reset_mem (st);
+
+ return ret;
+}
+
+int
+speex_resampler_drain_interleaved_float (SpeexResamplerState * st,
+ float *out, spx_uint32_t * out_len)
+{
+ spx_uint32_t i;
+ int istride_save, ostride_save;
+ spx_uint32_t bak_len;
+ spx_uint32_t in_len;
+ float *in;
+
+ in_len = speex_resampler_get_latency (st);
+
+ in = speex_alloc (sizeof (float) * in_len);
+ *out_len =
+ MIN (in_len * st->den_rate + (st->num_rate >> 1) / st->num_rate,
+ *out_len);
+ bak_len = *out_len;
+
+ istride_save = st->in_stride;
+ ostride_save = st->out_stride;
+ st->in_stride = 1;
+ st->out_stride = st->nb_channels;
+ for (i = 0; i < st->nb_channels; i++) {
+ *out_len = bak_len;
+ speex_resampler_process_float (st, i, in, &in_len, out + i, out_len);
+ }
+ st->in_stride = istride_save;
+ st->out_stride = ostride_save;
+
+ speex_free (in);
+
+ speex_resampler_reset_mem (st);
+
+ return RESAMPLER_ERR_SUCCESS;
+}
+
+int
+speex_resampler_drain_interleaved_int (SpeexResamplerState * st,
+ spx_int16_t * out, spx_uint32_t * out_len)
+{
+ spx_uint32_t i;
+ int istride_save, ostride_save;
+ spx_uint32_t bak_len;
+ spx_uint32_t in_len;
+ spx_int16_t *in;
+
+ in_len = speex_resampler_get_latency (st);
+
+ in = speex_alloc (sizeof (spx_int16_t) * in_len);
+ *out_len =
+ MIN (in_len * st->den_rate + (st->num_rate >> 1) / st->num_rate,
+ *out_len);
+ bak_len = *out_len;
+
+ istride_save = st->in_stride;
+ ostride_save = st->out_stride;
+ st->in_stride = 1;
+ st->out_stride = st->nb_channels;
+ for (i = 0; i < st->nb_channels; i++) {
+ *out_len = bak_len;
+ speex_resampler_process_int (st, i, in, &in_len, out + i, out_len);
+ }
+ st->in_stride = istride_save;
+ st->out_stride = ostride_save;
+
+ speex_free (in);
+
+ speex_resampler_reset_mem (st);
+
+ return RESAMPLER_ERR_SUCCESS;
+}
+
+int
speex_resampler_skip_zeros (SpeexResamplerState * st)
{
spx_uint32_t i;
diff --git a/gst/speexresample/speex_resampler.h b/gst/speexresample/speex_resampler.h
index 7ca6efc0..7c6282b5 100644
--- a/gst/speexresample/speex_resampler.h
+++ b/gst/speexresample/speex_resampler.h
@@ -73,6 +73,11 @@
#define speex_resampler_get_input_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_get_input_stride)
#define speex_resampler_set_output_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_set_output_stride)
#define speex_resampler_get_output_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_get_output_stride)
+#define speex_resampler_get_latency CAT_PREFIX(RANDOM_PREFIX,_resampler_get_latency)
+#define speex_resampler_drain_float CAT_PREFIX(RANDOM_PREFIX,_resampler_drain_float)
+#define speex_resampler_drain_int CAT_PREFIX(RANDOM_PREFIX,_resampler_drain_int)
+#define speex_resampler_drain_interleaved_float CAT_PREFIX(RANDOM_PREFIX,_resampler_drain_interleaved_float)
+#define speex_resampler_drain_interleaved_int CAT_PREFIX(RANDOM_PREFIX,_resampler_drain_interleaved_int)
#define speex_resampler_skip_zeros CAT_PREFIX(RANDOM_PREFIX,_resampler_skip_zeros)
#define speex_resampler_reset_mem CAT_PREFIX(RANDOM_PREFIX,_resampler_reset_mem)
#define speex_resampler_strerror CAT_PREFIX(RANDOM_PREFIX,_resampler_strerror)
@@ -283,7 +288,7 @@ void speex_resampler_set_input_stride(SpeexResamplerState *st,
/** Get the input stride.
* @param st Resampler state
- * @param stride Input stride copied
+ * @param stride Input stride
*/
void speex_resampler_get_input_stride(SpeexResamplerState *st,
spx_uint32_t *stride);
@@ -296,12 +301,68 @@ void speex_resampler_set_output_stride(SpeexResamplerState *st,
spx_uint32_t stride);
/** Get the output stride.
- * @param st Resampler state copied
+ * @param st Resampler state
* @param stride Output stride
*/
void speex_resampler_get_output_stride(SpeexResamplerState *st,
spx_uint32_t *stride);
+/** Get the latency in input samples introduced by the resampler.
+ * @param st Resampler state
+ */
+int speex_resampler_get_latency(SpeexResamplerState *st);
+
+/**
+ * Outputs the remaining samples into a float array.
+ * @param st Resampler state
+ * @param channel_index Index of the channel to process for the multi-channel
+ * base (0 otherwise)
+ * of samples processed
+ * @param out Output buffer
+ * @param out_len Size of the output buffer. Returns the number of samples written
+ */
+int speex_resampler_drain_float(SpeexResamplerState *st,
+ spx_uint32_t channel_index,
+ float *out,
+ spx_uint32_t *out_len);
+/**
+ * Outputs the remaining samples into an int array.
+ * @param st Resampler state
+ * @param channel_index Index of the channel to process for the multi-channel
+ * base (0 otherwise)
+ * of samples processed
+ * @param out Output buffer
+ * @param out_len Size of the output buffer. Returns the number of samples written
+ */
+int speex_resampler_drain_int(SpeexResamplerState *st,
+ spx_uint32_t channel_index,
+ spx_int16_t *out,
+ spx_uint32_t *out_len);
+/**
+ * Outputs the remaining samples into a float array.
+ * @param st Resampler state
+ * @param channel_index Index of the channel to process for the multi-channel
+ * base (0 otherwise)
+ * of samples processed
+ * @param out Output buffer
+ * @param out_len Size of the output buffer. Returns the number of samples written
+ */
+int speex_resampler_drain_interleaved_float(SpeexResamplerState *st,
+ float *out,
+ spx_uint32_t *out_len);
+/**
+ * Outputs the remaining samples into an int array.
+ * @param st Resampler state
+ * @param channel_index Index of the channel to process for the multi-channel
+ * base (0 otherwise)
+ * of samples processed
+ * @param out Output buffer
+ * @param out_len Size of the output buffer. Returns the number of samples written
+ */
+int speex_resampler_drain_interleaved_int(SpeexResamplerState *st,
+ spx_int16_t *out,
+ spx_uint32_t *out_len);
+
/** Make sure that the first samples to go out of the resamplers don't have
* leading zeros. This is only useful before starting to use a newly created
* resampler. It is recommended to use that when resampling an audio file, as
diff --git a/gst/speexresample/speex_resampler_wrapper.h b/gst/speexresample/speex_resampler_wrapper.h
index 25f5576d..bfd0b0a8 100644
--- a/gst/speexresample/speex_resampler_wrapper.h
+++ b/gst/speexresample/speex_resampler_wrapper.h
@@ -67,6 +67,9 @@ void resample_float_resampler_get_ratio (SpeexResamplerState * st,
void resample_int_resampler_get_ratio (SpeexResamplerState * st,
guint32 * ratio_num, guint32 * ratio_den);
+int resample_float_resampler_get_latency (SpeexResamplerState * st);
+int resample_int_resampler_get_latency (SpeexResamplerState * st);
+
int resample_float_resampler_set_quality (SpeexResamplerState * st,
gint quality);
int resample_int_resampler_set_quality (SpeexResamplerState * st, gint quality);
@@ -74,6 +77,15 @@ int resample_int_resampler_set_quality (SpeexResamplerState * st, gint quality);
int resample_float_resampler_reset_mem (SpeexResamplerState * st);
int resample_int_resampler_reset_mem (SpeexResamplerState * st);
+int
+resample_float_resampler_drain_interleaved_float (SpeexResamplerState
+ * st, gfloat * out, guint32 * out_len);
+int resample_int_resampler_drain_interleaved_int (SpeexResamplerState
+ * st, gint16 * out, guint32 * out_len);
+
+int resample_float_resampler_skip_zeros (SpeexResamplerState * st);
+int resample_int_resampler_skip_zeros (SpeexResamplerState * st);
+
#define resample_resampler_strerror resample_int_resampler_strerror
const char *resample_resampler_strerror (gint err);
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-30 16:03:09 +0000