Commit 14424281 authored by Max Kellermann's avatar Max Kellermann

pcm_resample: add internal function _lsr_init()

Let the libsamplerate code initialize itself.
parent 2b3fd0d4
...@@ -58,16 +58,12 @@ pcm_resample_global_init(GError **error_r) ...@@ -58,16 +58,12 @@ pcm_resample_global_init(GError **error_r)
void pcm_resample_init(struct pcm_resample_state *state) void pcm_resample_init(struct pcm_resample_state *state)
{ {
memset(state, 0, sizeof(*state));
#ifdef HAVE_LIBSAMPLERATE #ifdef HAVE_LIBSAMPLERATE
if (pcm_resample_lsr_enabled()) { if (pcm_resample_lsr_enabled())
pcm_buffer_init(&state->in); pcm_resample_lsr_init(state);
pcm_buffer_init(&state->out); else
}
#endif #endif
pcm_resample_fallback_init(state);
pcm_buffer_init(&state->buffer);
} }
void pcm_resample_deinit(struct pcm_resample_state *state) void pcm_resample_deinit(struct pcm_resample_state *state)
......
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
#include <assert.h> #include <assert.h>
void void
pcm_resample_fallback_init(struct pcm_resample_state *state)
{
pcm_buffer_init(&state->buffer);
}
void
pcm_resample_fallback_deinit(struct pcm_resample_state *state) pcm_resample_fallback_deinit(struct pcm_resample_state *state)
{ {
pcm_buffer_deinit(&state->buffer); pcm_buffer_deinit(&state->buffer);
......
...@@ -36,6 +36,9 @@ bool ...@@ -36,6 +36,9 @@ bool
pcm_resample_lsr_global_init(const char *converter, GError **error_r); pcm_resample_lsr_global_init(const char *converter, GError **error_r);
void void
pcm_resample_lsr_init(struct pcm_resample_state *state);
void
pcm_resample_lsr_deinit(struct pcm_resample_state *state); pcm_resample_lsr_deinit(struct pcm_resample_state *state);
const int16_t * const int16_t *
...@@ -58,6 +61,9 @@ pcm_resample_lsr_32(struct pcm_resample_state *state, ...@@ -58,6 +61,9 @@ pcm_resample_lsr_32(struct pcm_resample_state *state,
#endif #endif
void void
pcm_resample_fallback_init(struct pcm_resample_state *state);
void
pcm_resample_fallback_deinit(struct pcm_resample_state *state); pcm_resample_fallback_deinit(struct pcm_resample_state *state);
const int16_t * const int16_t *
......
...@@ -84,6 +84,16 @@ pcm_resample_lsr_global_init(const char *converter, GError **error_r) ...@@ -84,6 +84,16 @@ pcm_resample_lsr_global_init(const char *converter, GError **error_r)
} }
void void
pcm_resample_lsr_init(struct pcm_resample_state *state)
{
memset(state, 0, sizeof(*state));
pcm_buffer_init(&state->in);
pcm_buffer_init(&state->out);
pcm_buffer_init(&state->buffer);
}
void
pcm_resample_lsr_deinit(struct pcm_resample_state *state) pcm_resample_lsr_deinit(struct pcm_resample_state *state)
{ {
if (state->state != NULL) if (state->state != NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment