From 284516185f90412c22dfa9a28cb93fb344af591b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 18 May 2007 00:10:02 +0000 Subject: really prefix everything with "sa_" git-svn-id: file:///home/lennart/svn/public/libsydney/trunk@28 9ba3c220-e4d3-45a2-8aa3-73fcc9aff6ce --- converter.c | 102 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'converter.c') diff --git a/converter.c b/converter.c index 4f6723d..dda8c10 100644 --- a/converter.c +++ b/converter.c @@ -182,8 +182,8 @@ static sa_pcm_format_t fix_work_format_for_resample(sa_pcm_format_t f) { sa_assert_not_reached(); } -int converter_init( - converter_t *c, +int sa_converter_init( + sa_converter_t *c, const pcm_attrs_t *from, const pcm_attrs_t *to, int dynamic_rate_enabled) { @@ -242,40 +242,40 @@ int converter_init( sa_assert(native_pcm_format_process(c->work_pcm_format)); sa_assert(!resample_required || native_pcm_format_resample(c->work_pcm_format)); - c->from_sample_size = get_pcm_sample_size(c->from_pcm_format); - c->work_sample_size = get_pcm_sample_size(c->work_pcm_format); - c->to_sample_size = get_pcm_sample_size(c->to_pcm_format); + c->from_sample_size = sa_get_pcm_sample_size(c->from_pcm_format); + c->work_sample_size = sa_get_pcm_sample_size(c->work_pcm_format); + c->to_sample_size = sa_get_pcm_sample_size(c->to_pcm_format); /* Get function pointers */ - c->pre_byteswap_func = get_byteswap_func(from->format); + c->pre_byteswap_func = sa_get_byteswap_func(from->format); if (byteswap_fix(from->format) != c->work_pcm_format) { - c->pre_format_func = get_format_func(byteswap_fix(from->format), c->work_pcm_format); + c->pre_format_func = sa_get_format_func(byteswap_fix(from->format), c->work_pcm_format); sa_assert(c->pre_format_func); } - c->volscale_func = get_volscale_func(c->work_pcm_format); + c->volscale_func = sa_get_volscale_func(c->work_pcm_format); sa_assert(c->volscale_func); - c->zero_func = get_zero_func(c->work_pcm_format); + c->zero_func = sa_get_zero_func(c->work_pcm_format); sa_assert(c->zero_func); - c->add_func = get_add_func(c->work_pcm_format); + c->add_func = sa_get_add_func(c->work_pcm_format); sa_assert(c->add_func); if (resample_required) { - c->resample_func = get_resample_func(c->work_pcm_format); + c->resample_func = sa_get_resample_func(c->work_pcm_format); sa_assert(c->resample_func); } if (c->work_pcm_format != byteswap_fix(to->format)) { - c->post_format_func = get_format_func(c->work_pcm_format, byteswap_fix(to->format)); + c->post_format_func = sa_get_format_func(c->work_pcm_format, byteswap_fix(to->format)); sa_assert(c->post_format_func); } - c->post_byteswap_func = get_byteswap_func(to->format); + c->post_byteswap_func = sa_get_byteswap_func(to->format); - c->interleave_func = get_interleave_func(to->format); + c->interleave_func = sa_get_interleave_func(to->format); sa_assert(c->interleave_func); /* Initialize resampler */ @@ -310,34 +310,34 @@ int converter_init( /* Initialize bounce buffers */ - if (bbuffer_init(&c->bb_pre_byteswap, c->from_nchannels, c->from_sample_size) < 0) + if (sa_bbuffer_init(&c->bb_pre_byteswap, c->from_nchannels, c->from_sample_size) < 0) goto fail; - if (bbuffer_init(&c->bb_pre_format, c->from_nchannels, c->work_sample_size) < 0) + if (sa_bbuffer_init(&c->bb_pre_format, c->from_nchannels, c->work_sample_size) < 0) goto fail; - if (bbuffer_init(&c->bb_volscale, c->from_nchannels, c->work_sample_size) < 0) + if (sa_bbuffer_init(&c->bb_volscale, c->from_nchannels, c->work_sample_size) < 0) goto fail; - if (bbuffer_init(&c->bb_remap, c->to_nchannels, c->work_sample_size) < 0) + if (sa_bbuffer_init(&c->bb_remap, c->to_nchannels, c->work_sample_size) < 0) goto fail; - if (bbuffer_init(&c->bb_resample, c->to_nchannels, c->work_sample_size) < 0) + if (sa_bbuffer_init(&c->bb_resample, c->to_nchannels, c->work_sample_size) < 0) goto fail; - if (bbuffer_init(&c->bb_post_format, c->to_nchannels, c->to_sample_size) < 0) + if (sa_bbuffer_init(&c->bb_post_format, c->to_nchannels, c->to_sample_size) < 0) goto fail; - if (bbuffer_init(&c->bb_post_byteswap, c->to_nchannels, c->to_sample_size) < 0) + if (sa_bbuffer_init(&c->bb_post_byteswap, c->to_nchannels, c->to_sample_size) < 0) goto fail; - if (bbuffer_init(&c->bb_interleave, c->to_nchannels, c->to_sample_size) < 0) + if (sa_bbuffer_init(&c->bb_interleave, c->to_nchannels, c->to_sample_size) < 0) goto fail; - if (bbuffer_init(&c->bb_tmp, 1, 1) < 0) + if (sa_bbuffer_init(&c->bb_tmp, 1, 1) < 0) goto fail; return 0; fail: - converter_done(c); + sa_converter_done(c); return SA_ERROR_OOM; } -void converter_done(converter_t *c) { +void sa_converter_done(sa_converter_t *c) { sa_assert(c); sa_free(c->channel_map_table); @@ -347,15 +347,15 @@ void converter_done(converter_t *c) { sa_free(c->from_stride); sa_free(c->to_stride); - bbuffer_done(&c->bb_pre_byteswap); - bbuffer_done(&c->bb_pre_format); - bbuffer_done(&c->bb_volscale); - bbuffer_done(&c->bb_remap); - bbuffer_done(&c->bb_resample); - bbuffer_done(&c->bb_post_format); - bbuffer_done(&c->bb_post_byteswap); - bbuffer_done(&c->bb_interleave); - bbuffer_done(&c->bb_tmp); + sa_bbuffer_done(&c->bb_pre_byteswap); + sa_bbuffer_done(&c->bb_pre_format); + sa_bbuffer_done(&c->bb_volscale); + sa_bbuffer_done(&c->bb_remap); + sa_bbuffer_done(&c->bb_resample); + sa_bbuffer_done(&c->bb_post_format); + sa_bbuffer_done(&c->bb_post_byteswap); + sa_bbuffer_done(&c->bb_interleave); + sa_bbuffer_done(&c->bb_tmp); if (c->speex) speex_resampler_destroy(c->speex); @@ -367,7 +367,7 @@ void converter_done(converter_t *c) { memset(c, 0, sizeof(*c)); } -static void* get_zero_buffer(converter_t *c, size_t size) { +static void* get_zero_buffer(sa_converter_t *c, size_t size) { void *b; sa_assert(c); @@ -385,8 +385,8 @@ static void* get_zero_buffer(converter_t *c, size_t size) { return c->zero_func; } -int converter_go( - converter_t *c, +int sa_converter_go( + sa_converter_t *c, const void *const src[], const size_t sstr[], int sinterleave, void **dst[], size_t *dstr[], int dinterleave, size_t *size) { @@ -423,7 +423,7 @@ int converter_go( for (i = 0; i < c->from_nchannels; i++) { void *b; - if (!(b = bbuffer_get(&c->bb_pre_byteswap, i, *size, dinterleave))) + if (!(b = sa_bbuffer_get(&c->bb_pre_byteswap, i, *size, dinterleave))) return SA_ERROR_OOM; c->pre_byteswap_func(b, k, process_data[i], stride[i], *size); @@ -456,7 +456,7 @@ int converter_go( for (i = 0; i < c->from_nchannels; i++) { void *b; - if (!(b = bbuffer_get(&c->bb_pre_format, i, new_size, dinterleave))) + if (!(b = sa_bbuffer_get(&c->bb_pre_format, i, new_size, dinterleave))) return SA_ERROR_OOM; c->pre_format_func(&c->bb_tmp, b, k, process_data[i], stride[i], *size); @@ -492,7 +492,7 @@ int converter_go( for (i = 0; i < c->from_nchannels; i++) { void *b; - if (!(b = bbuffer_get(&c->bb_volscale, i, *size, dinterleave))) + if (!(b = sa_bbuffer_get(&c->bb_volscale, i, *size, dinterleave))) return SA_ERROR_OOM; c->volscale_func(b, k, process_data[i], stride[i], c->volume_factor[i], c->volume_divisor[i], *size); @@ -539,7 +539,7 @@ int converter_go( /* We have to mix two or more channels */ - if (!(b = bbuffer_get(&c->bb_remap, i, *size, dinterleave))) + if (!(b = sa_bbuffer_get(&c->bb_remap, i, *size, dinterleave))) return SA_ERROR_OOM; c->add_func(b, k, process_data[p[0]], stride[p[0]], process_data[p[1]], stride[p[1]], *size); @@ -569,7 +569,7 @@ int converter_go( for (i = 0; i < c->to_nchannels; i++) { void *b; - if (!(b = bbuffer_get(&c->bb_resample, i, new_size, dinterleave))) + if (!(b = sa_bbuffer_get(&c->bb_resample, i, new_size, dinterleave))) return SA_ERROR_OOM; c->resample_func(c->speex, i, b, k, process_data[i], stride[i], *size, &new_size); @@ -603,7 +603,7 @@ int converter_go( for (i = 0; i < c->to_nchannels; i++) { void *b; - if (!(b = bbuffer_get(&c->bb_post_format, i, new_size, dinterleave))) + if (!(b = sa_bbuffer_get(&c->bb_post_format, i, new_size, dinterleave))) return SA_ERROR_OOM; c->post_format_func(&c->bb_tmp, b, k, process_data[i], stride[i], *size); @@ -637,7 +637,7 @@ int converter_go( for (i = 0; i < c->to_nchannels; i++) { void *b; - if (!(b = bbuffer_get(&c->bb_post_byteswap, i, *size, dinterleave))) + if (!(b = sa_bbuffer_get(&c->bb_post_byteswap, i, *size, dinterleave))) return SA_ERROR_OOM; c->post_byteswap_func(b, k, process_data[i], stride[i], *size); @@ -663,7 +663,7 @@ do_interleave: for (i = 0; i < c->to_nchannels; i++) { void *b; - if (!(b = bbuffer_get(&c->bb_interleave, i, *size, dinterleave))) + if (!(b = sa_bbuffer_get(&c->bb_interleave, i, *size, dinterleave))) return SA_ERROR_OOM; c->interleave_func(b, k, process_data[i], stride[i], *size); @@ -684,7 +684,7 @@ do_interleave: return SA_SUCCESS; } -void converter_set_volume(converter_t *c, const int32_t vol[]) { +void sa_converter_set_volume(sa_converter_t *c, const int32_t vol[]) { unsigned i; int no_volume = 1; @@ -703,7 +703,7 @@ void converter_set_volume(converter_t *c, const int32_t vol[]) { } else { float f = powf(10.0, (float) vol[i] / 2000); - continued_fraction(f, 0x7FFF, &num, &denom); + sa_continued_fraction(f, 0x7FFF, &num, &denom); if (num != 1 || denom != 1) no_volume = 0; @@ -716,8 +716,8 @@ void converter_set_volume(converter_t *c, const int32_t vol[]) { c->no_volume = no_volume; } -int converter_go_interleaved( - converter_t *c, +int sa_converter_go_interleaved( + sa_converter_t *c, const void *const data, void **dst[], size_t *dstr[], int dinterleave, size_t *size) { @@ -732,10 +732,10 @@ int converter_go_interleaved( c->from_stride[i] = stride; } - return converter_go(c, (const void *const*) c->from_process_data, c->from_stride, 1, dst, dstr, dinterleave, size); + return sa_converter_go(c, (const void *const*) c->from_process_data, c->from_stride, 1, dst, dstr, dinterleave, size); } -void converter_set_ratio(converter_t *c, unsigned rate1, unsigned rate2) { +void sa_converter_set_ratio(sa_converter_t *c, unsigned rate1, unsigned rate2) { assert(c); assert(c->speex); -- cgit