From 3f71761cab8a08e4ae9e4cf8cb8f1b82643825b2 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Sun, 4 Nov 2012 18:49:14 -0800 Subject: improve resample test - handle stereo input - input file can now be ommited, in this case a linear chirp will be used automatically - better usage information Change-Id: I5d62a6c26a9054a1c1a517a065b4df5a2cdcda22 --- services/audioflinger/test-resample.cpp | 163 ++++++++++++++++++++------------ 1 file changed, 102 insertions(+), 61 deletions(-) (limited to 'services/audioflinger/test-resample.cpp') diff --git a/services/audioflinger/test-resample.cpp b/services/audioflinger/test-resample.cpp index 151313b..e6d5cbe 100644 --- a/services/audioflinger/test-resample.cpp +++ b/services/audioflinger/test-resample.cpp @@ -25,6 +25,7 @@ #include #include #include +#include using namespace android; @@ -61,31 +62,34 @@ struct HeaderWav { }; static int usage(const char* name) { - fprintf(stderr,"Usage: %s [-p] [-h] [-q ] [-i ] " - "[-o ] \n", name); - fprintf(stderr,"-p - enable profiling\n"); - fprintf(stderr,"-h - create wav file\n"); - fprintf(stderr,"-q - resampler quality\n"); - fprintf(stderr," dq : default quality\n"); - fprintf(stderr," lq : low quality\n"); - fprintf(stderr," mq : medium quality\n"); - fprintf(stderr," hq : high quality\n"); - fprintf(stderr," vhq : very high quality\n"); - fprintf(stderr,"-i - input file sample rate\n"); - fprintf(stderr,"-o - output file sample rate\n"); + fprintf(stderr,"Usage: %s [-p] [-h] [-s] [-q {dq|lq|mq|hq|vhq}] [-i input-sample-rate] " + "[-o output-sample-rate] [] \n", name); + fprintf(stderr," -p enable profiling\n"); + fprintf(stderr," -h create wav file\n"); + fprintf(stderr," -s stereo\n"); + fprintf(stderr," -q resampler quality\n"); + fprintf(stderr," dq : default quality\n"); + fprintf(stderr," lq : low quality\n"); + fprintf(stderr," mq : medium quality\n"); + fprintf(stderr," hq : high quality\n"); + fprintf(stderr," vhq : very high quality\n"); + fprintf(stderr," -i input file sample rate\n"); + fprintf(stderr," -o output file sample rate\n"); return -1; } int main(int argc, char* argv[]) { + const char* const progname = argv[0]; bool profiling = false; bool writeHeader = false; + int channels = 1; int input_freq = 0; int output_freq = 0; AudioResampler::src_quality quality = AudioResampler::DEFAULT_QUALITY; int ch; - while ((ch = getopt(argc, argv, "phq:i:o:")) != -1) { + while ((ch = getopt(argc, argv, "phsq:i:o:")) != -1) { switch (ch) { case 'p': profiling = true; @@ -93,6 +97,9 @@ int main(int argc, char* argv[]) { case 'h': writeHeader = true; break; + case 's': + channels = 2; + break; case 'q': if (!strcmp(optarg, "dq")) quality = AudioResampler::DEFAULT_QUALITY; @@ -105,7 +112,7 @@ int main(int argc, char* argv[]) { else if (!strcmp(optarg, "vhq")) quality = AudioResampler::VERY_HIGH_QUALITY; else { - usage(argv[0]); + usage(progname); return -1; } break; @@ -117,54 +124,74 @@ int main(int argc, char* argv[]) { break; case '?': default: - usage(argv[0]); + usage(progname); return -1; } } argc -= optind; + argv += optind; - if (argc != 2) { - usage(argv[0]); + const char* file_in = NULL; + const char* file_out = NULL; + if (argc == 1) { + file_out = argv[0]; + } else if (argc == 2) { + file_in = argv[0]; + file_out = argv[1]; + } else { + usage(progname); return -1; } - argv += optind; - // ---------------------------------------------------------- - struct stat st; - if (stat(argv[0], &st) < 0) { - fprintf(stderr, "stat: %s\n", strerror(errno)); - return -1; - } + size_t input_size; + void* input_vaddr; + if (argc == 2) { + struct stat st; + if (stat(file_in, &st) < 0) { + fprintf(stderr, "stat: %s\n", strerror(errno)); + return -1; + } - int input_fd = open(argv[0], O_RDONLY); - if (input_fd < 0) { - fprintf(stderr, "open: %s\n", strerror(errno)); - return -1; - } + int input_fd = open(file_in, O_RDONLY); + if (input_fd < 0) { + fprintf(stderr, "open: %s\n", strerror(errno)); + return -1; + } - size_t input_size = st.st_size; - void* input_vaddr = mmap(0, input_size, PROT_READ, MAP_PRIVATE, input_fd, - 0); - if (input_vaddr == MAP_FAILED ) { - fprintf(stderr, "mmap: %s\n", strerror(errno)); - return -1; + input_size = st.st_size; + input_vaddr = mmap(0, input_size, PROT_READ, MAP_PRIVATE, input_fd, 0); + if (input_vaddr == MAP_FAILED ) { + fprintf(stderr, "mmap: %s\n", strerror(errno)); + return -1; + } + } else { + double k = 1000; // Hz / s + double time = (input_freq / 2) / k; + size_t input_frames = size_t(input_freq * time); + input_size = channels * sizeof(int16_t) * input_frames; + input_vaddr = malloc(input_size); + int16_t* in = (int16_t*)input_vaddr; + for (size_t i=0 ; isetSampleRate(input_freq); - resampler->setVolume(0x1000, 0x1000); - resampler->resample((int*) output_vaddr, out_frames, &provider); + size_t out_frames = output_size/8; + resampler->setSampleRate(input_freq); + resampler->setVolume(0x1000, 0x1000); - if (profiling) { memset(output_vaddr, 0, output_size); timespec start, end; clock_gettime(CLOCK_MONOTONIC_HR, &start); resampler->resample((int*) output_vaddr, out_frames, &provider); + resampler->resample((int*) output_vaddr, out_frames, &provider); + resampler->resample((int*) output_vaddr, out_frames, &provider); + resampler->resample((int*) output_vaddr, out_frames, &provider); clock_gettime(CLOCK_MONOTONIC_HR, &end); int64_t start_ns = start.tv_sec * 1000000000LL + start.tv_nsec; int64_t end_ns = end.tv_sec * 1000000000LL + end.tv_nsec; - int64_t time = end_ns - start_ns; + int64_t time = (end_ns - start_ns)/4; printf("%f Mspl/s\n", out_frames/(time/1e9)/1e6); + + delete resampler; } + AudioResampler* resampler = AudioResampler::create(16, channels, + output_freq, quality); + size_t out_frames = output_size/8; + resampler->setSampleRate(input_freq); + resampler->setVolume(0x1000, 0x1000); + + memset(output_vaddr, 0, output_size); + resampler->resample((int*) output_vaddr, out_frames, &provider); + // down-mix (we just truncate and keep the left channel) int32_t* out = (int32_t*) output_vaddr; - int16_t* convert = (int16_t*) malloc(out_frames * sizeof(int16_t)); + int16_t* convert = (int16_t*) malloc(out_frames * channels * sizeof(int16_t)); for (size_t i = 0; i < out_frames; i++) { - int32_t s = out[i * 2] >> 12; - if (s > 32767) s = 32767; - else if (s < -32768) s = -32768; - convert[i] = int16_t(s); + for (int j=0 ; j> 12; + if (s > 32767) s = 32767; + else if (s < -32768) s = -32768; + convert[i * channels + j] = int16_t(s); + } } // write output to disk - int output_fd = open(argv[1], O_WRONLY | O_CREAT | O_TRUNC, + int output_fd = open(file_out, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if (output_fd < 0) { fprintf(stderr, "open: %s\n", strerror(errno)); @@ -222,11 +263,11 @@ int main(int argc, char* argv[]) { } if (writeHeader) { - HeaderWav wav(out_frames*sizeof(int16_t), 1, output_freq, 16); + HeaderWav wav(out_frames * channels * sizeof(int16_t), channels, output_freq, 16); write(output_fd, &wav, sizeof(wav)); } - write(output_fd, convert, out_frames * sizeof(int16_t)); + write(output_fd, convert, out_frames * channels * sizeof(int16_t)); close(output_fd); return 0; -- cgit v1.1