oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

pcm_resample_lsr: move common code to lsr_process()

Browse Source
This commit is contained in:
Max Kellermann 2011-10-08 14:06:24 +02:00
parent 8dd83a2cf3
commit 3057d19cdf
1 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/pcm_resample_libsamplerate.c
View File

@ -142,6 +142,21 @@ pcm_resample_set(struct pcm_resample_state *state,
return true; return true;
} }
static bool
lsr_process(struct pcm_resample_state *state, GError **error_r)
{
if (state->error == 0)
state->error = src_process(state->state, &state->data);
if (state->error) {
g_set_error(error_r, libsamplerate_quark(), state->error,
"libsamplerate has failed: %s",
src_strerror(state->error));
return false;
}
return true;
}
const int16_t * const int16_t *
pcm_resample_lsr_16(struct pcm_resample_state *state, pcm_resample_lsr_16(struct pcm_resample_state *state,
uint8_t channels, uint8_t channels,
@ -154,7 +169,6 @@ pcm_resample_lsr_16(struct pcm_resample_state *state,
SRC_DATA *data = &state->data; SRC_DATA *data = &state->data;
size_t data_in_size; size_t data_in_size;
size_t data_out_size; size_t data_out_size;
int error;
int16_t *dest_buffer; int16_t *dest_buffer;
assert((src_size % (sizeof(*src_buffer) * channels)) == 0); assert((src_size % (sizeof(*src_buffer) * channels)) == 0);
@ -164,14 +178,6 @@ pcm_resample_lsr_16(struct pcm_resample_state *state,
if (!success) if (!success)
return NULL; return NULL;
/* there was an error previously, and nothing has changed */
if (state->error) {
g_set_error(error_r, libsamplerate_quark(), state->error,
"libsamplerate has failed: %s",
src_strerror(state->error));
return NULL;
}
data->input_frames = src_size / sizeof(*src_buffer) / channels; data->input_frames = src_size / sizeof(*src_buffer) / channels;
data_in_size = data->input_frames * sizeof(float) * channels; data_in_size = data->input_frames * sizeof(float) * channels;
data->data_in = pcm_buffer_get(&state->in, data_in_size); data->data_in = pcm_buffer_get(&state->in, data_in_size);
@ -183,14 +189,8 @@ pcm_resample_lsr_16(struct pcm_resample_state *state,
src_short_to_float_array(src_buffer, data->data_in, src_short_to_float_array(src_buffer, data->data_in,
data->input_frames * channels); data->input_frames * channels);
error = src_process(state->state, data); if (!lsr_process(state, error_r))
if (error) {
g_set_error(error_r, libsamplerate_quark(), error,
"libsamplerate has failed: %s",
src_strerror(error));
state->error = error;
return NULL; return NULL;
}
*dest_size_r = data->output_frames_gen * *dest_size_r = data->output_frames_gen *
sizeof(*dest_buffer) * channels; sizeof(*dest_buffer) * channels;
@ -233,7 +233,6 @@ pcm_resample_lsr_32(struct pcm_resample_state *state,
SRC_DATA *data = &state->data; SRC_DATA *data = &state->data;
size_t data_in_size; size_t data_in_size;
size_t data_out_size; size_t data_out_size;
int error;
int32_t *dest_buffer; int32_t *dest_buffer;
assert((src_size % (sizeof(*src_buffer) * channels)) == 0); assert((src_size % (sizeof(*src_buffer) * channels)) == 0);
@ -243,14 +242,6 @@ pcm_resample_lsr_32(struct pcm_resample_state *state,
if (!success) if (!success)
return NULL; return NULL;
/* there was an error previously, and nothing has changed */
if (state->error) {
g_set_error(error_r, libsamplerate_quark(), state->error,
"libsamplerate has failed: %s",
src_strerror(state->error));
return NULL;
}
data->input_frames = src_size / sizeof(*src_buffer) / channels; data->input_frames = src_size / sizeof(*src_buffer) / channels;
data_in_size = data->input_frames * sizeof(float) * channels; data_in_size = data->input_frames * sizeof(float) * channels;
data->data_in = pcm_buffer_get(&state->in, data_in_size); data->data_in = pcm_buffer_get(&state->in, data_in_size);
@ -262,14 +253,8 @@ pcm_resample_lsr_32(struct pcm_resample_state *state,
src_int_to_float_array(src_buffer, data->data_in, src_int_to_float_array(src_buffer, data->data_in,
data->input_frames * channels); data->input_frames * channels);
error = src_process(state->state, data); if (!lsr_process(state, error_r))
if (error) {
g_set_error(error_r, libsamplerate_quark(), error,
"libsamplerate has failed: %s",
src_strerror(error));
state->error = error;
return NULL; return NULL;
}
*dest_size_r = data->output_frames_gen * *dest_size_r = data->output_frames_gen *
sizeof(*dest_buffer) * channels; sizeof(*dest_buffer) * channels;