diff options
author | Sebastian Dröge <slomo@circular-chaos.org> | 2007-11-26 08:43:25 +0000 |
---|---|---|
committer | Sebastian Dröge <slomo@circular-chaos.org> | 2007-11-26 08:43:25 +0000 |
commit | d222cb6c1456a48b90b2887ba8f5f2e9358bc79d (patch) | |
tree | e170a45e371b56416384cb41f3b19270e434482b /gst/speexresample/speex_resampler.h | |
parent | 67d4bcd555dcab6ce38481deecc1c0179915d268 (diff) | |
download | gst-plugins-bad-d222cb6c1456a48b90b2887ba8f5f2e9358bc79d.tar.gz gst-plugins-bad-d222cb6c1456a48b90b2887ba8f5f2e9358bc79d.tar.bz2 gst-plugins-bad-d222cb6c1456a48b90b2887ba8f5f2e9358bc79d.zip |
gst/speexresample/: Update speex resampler to latest SVN. We're now down to only the changes noted in README again.
Original commit message from CVS:
* gst/speexresample/README:
* gst/speexresample/arch.h:
* gst/speexresample/resample.c: (resampler_basic_direct_single),
(resampler_basic_direct_double),
(resampler_basic_interpolate_single),
(resampler_basic_interpolate_double),
(speex_resampler_process_native), (speex_resampler_process_float),
(speex_resampler_process_int),
(speex_resampler_process_interleaved_float),
(speex_resampler_process_interleaved_int),
(speex_resampler_get_input_latency),
(speex_resampler_get_output_latency):
* gst/speexresample/speex_resampler.h:
Update speex resampler to latest SVN. We're now down to only the
changes noted in README again.
* gst/speexresample/speex_resampler_wrapper.h:
* gst/speexresample/gstspeexresample.c:
(gst_speex_resample_push_drain), (gst_speex_resample_query):
Adjust to API changes.
Diffstat (limited to 'gst/speexresample/speex_resampler.h')
-rw-r--r-- | gst/speexresample/speex_resampler.h | 63 |
1 files changed, 7 insertions, 56 deletions
diff --git a/gst/speexresample/speex_resampler.h b/gst/speexresample/speex_resampler.h index 7c6282b5..ad832c54 100644 --- a/gst/speexresample/speex_resampler.h +++ b/gst/speexresample/speex_resampler.h @@ -73,11 +73,8 @@ #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_get_input_latency CAT_PREFIX(RANDOM_PREFIX,_resampler_get_input_latency) +#define speex_resampler_get_output_latency CAT_PREFIX(RANDOM_PREFIX,_resampler_get_output_latency) #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) @@ -288,7 +285,7 @@ void speex_resampler_set_input_stride(SpeexResamplerState *st, /** Get the input stride. * @param st Resampler state - * @param stride Input stride + * @param stride Input stride copied */ void speex_resampler_get_input_stride(SpeexResamplerState *st, spx_uint32_t *stride); @@ -301,7 +298,7 @@ void speex_resampler_set_output_stride(SpeexResamplerState *st, spx_uint32_t stride); /** Get the output stride. - * @param st Resampler state + * @param st Resampler state copied * @param stride Output stride */ void speex_resampler_get_output_stride(SpeexResamplerState *st, @@ -310,58 +307,12 @@ void speex_resampler_get_output_stride(SpeexResamplerState *st, /** Get the latency in input samples introduced by the resampler. * @param st Resampler state */ -int speex_resampler_get_latency(SpeexResamplerState *st); +int speex_resampler_get_input_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. +/** Get the latency in output samples introduced by the resampler. * @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); +int speex_resampler_get_output_latency(SpeexResamplerState *st); /** 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 |