From 98fc0f69e97e4c33399173df694a6edf1d66dcfc Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Tue, 17 Jul 2018 20:49:15 +0900 Subject: [PATCH] Revise testsuite remove unnecessary glib header include [Version] 0.5.10 [Issue Type] Revision Change-Id: Ie232cd33c38b205a0cb1795c220a0265b46e199a --- packaging/capi-media-audio-io.spec | 2 +- src/cpp/CAudioIO.cpp | 1 - test/audio_io_test.c | 389 +++++++++++++++++------------ 3 files changed, 229 insertions(+), 163 deletions(-) diff --git a/packaging/capi-media-audio-io.spec b/packaging/capi-media-audio-io.spec index baec8b5..2cac7c8 100644 --- a/packaging/capi-media-audio-io.spec +++ b/packaging/capi-media-audio-io.spec @@ -1,6 +1,6 @@ Name: capi-media-audio-io Summary: An Audio Input & Audio Output library in Tizen Native API -Version: 0.5.9 +Version: 0.5.10 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/cpp/CAudioIO.cpp b/src/cpp/CAudioIO.cpp index 8d8cf89..e8b6ab7 100644 --- a/src/cpp/CAudioIO.cpp +++ b/src/cpp/CAudioIO.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include "CAudioIODef.h" #include diff --git a/test/audio_io_test.c b/test/audio_io_test.c index 0d9ba34..6e6d748 100644 --- a/test/audio_io_test.c +++ b/test/audio_io_test.c @@ -35,22 +35,23 @@ typedef struct { test_wav_t test_wav; static int ch_table[3] = { 0, AUDIO_CHANNEL_MONO, AUDIO_CHANNEL_STEREO }; - static char *state_str[] = { "IDLE", "RUNNING", "PAUSED" }; -static void _audio_in_state_cb(audio_in_h handle, audio_io_state_e previous, audio_io_state_e current, bool by_policy, void *user_data) +static void _audio_in_state_cb(audio_in_h handle, audio_io_state_e previous, audio_io_state_e current, + bool by_policy, void *user_data) { - printf(">>> _audio_in_state_cb() : handle(%p), previous(%d,%s) => current(%d,%s), by_policy(%d), user_data(%p)\n", + printf(">>> _audio_in_state_cb() : handle(%p), (%d,%s) => (%d,%s), by_policy(%d), user_data(%p)\n", handle, previous, state_str[previous], current, state_str[current], by_policy, user_data); } -static void _audio_out_state_cb(audio_in_h handle, audio_io_state_e previous, audio_io_state_e current, bool by_policy, void *user_data) +static void _audio_out_state_cb(audio_out_h handle, audio_io_state_e previous, audio_io_state_e current, + bool by_policy, void *user_data) { - printf(">>> _audio_out_state_cb() : handle(%p), previous(%d,%s) => current(%d,%s), by_policy(%d), user_data(%p)\n", + printf(">>> _audio_out_state_cb() : handle(%p), (%d,%s) => (%d,%s), by_policy(%d), user_data(%p)\n", handle, previous, state_str[previous], current, state_str[current], by_policy, user_data); } -void play_file(char *file, int length, int num, int ch) +static void _play_file(char *file, int length, int num, int ch) { int i = 0; int ret = 0; @@ -69,10 +70,10 @@ void play_file(char *file, int length, int num, int ch) return; } - printf("start to play [%s][%d][%d]\n", file, total_length, ch); - printf("create\n"); + printf("# start to play [%s][%d][%d]\n", file, total_length, ch); + printf(" > create\n"); audio_out_create_new(44100, ch_table[ch], AUDIO_SAMPLE_TYPE_S16_LE, &output); - if (fread(buf, 1, total_length, fp) != length) + if (fread(buf, 1, total_length, fp) != total_length) printf("error!!!!\n"); ret = audio_out_set_state_changed_cb(output, _audio_out_state_cb, NULL); @@ -80,7 +81,7 @@ void play_file(char *file, int length, int num, int ch) printf("audio_out_set_state_changed_cb failed. \n"); } - printf("prepare\n"); + printf(" > prepare\n"); audio_out_prepare(output); char *pbuf = buf; @@ -90,33 +91,95 @@ void play_file(char *file, int length, int num, int ch) pbuf += length; } - printf("unprepare\n"); + printf(" < unprepare\n"); audio_out_drain(output); audio_out_unprepare(output); - printf("destroy\n"); + printf(" < destroy\n"); audio_out_destroy(output); fclose(fp); free(buf); - printf("play done\n"); + printf("# play done\n"); } #define DUMP_FILE "/root/test.raw" -void play_file_sample(char *file, int frequency, int ch, int type) +FILE *fp = NULL; + +static void _audio_out_stream_cb(audio_out_h handle, size_t nbytes, void *user_data) +{ + char *buf = NULL; + int read_bytes = 0; + int written = 0; + + if (fp == NULL) { + printf("FILE is NULL\n"); + return; + } + + buf = (char *)malloc(nbytes); + + read_bytes = fread(buf, 1, nbytes, fp); + + written = audio_out_write(handle, buf, read_bytes); + printf("written : %6d/%6d (requested %d)\n", written, read_bytes, nbytes); + + if (read_bytes < nbytes) { + printf("EOS!!!!\n"); + fclose(fp); + fp = NULL; + } + free(buf); +} + +static void _play_file_sample_async(char *file, int frequency, int ch, int type) +{ + audio_out_h output; + int file_size = 0; + + if (ch < 0 || ch > 2) + ch = 0; + + fp = fopen(file, "r"); + if (fp == NULL) { + printf("open failed\n"); + return; + } + printf("start to play [%s] of size [%d] with [%d][%d][%d]\n", file, file_size, frequency, ch, type); + audio_out_create_new(frequency, ch_table[ch], AUDIO_SAMPLE_TYPE_U8 + type, &output); + + audio_out_set_state_changed_cb(output, _audio_out_state_cb, NULL); + audio_out_set_stream_cb(output, _audio_out_stream_cb, fp); + audio_out_prepare(output); + + while (fp) { + usleep(10000); /* 10ms */ + } + + printf("FINISHED!!!\n"); + + audio_out_unprepare(output); + audio_out_destroy(output); + + printf("play done\n"); +} + +static void _play_file_sample_sync(char *file, int frequency, int ch, int type) { audio_out_h output; int file_size = 0; int read_bytes = 0; int buffer_size = 0; char *buf = NULL; + FILE *fp = NULL; + int i = 0; if (ch < 0 || ch > 2) ch = 0; - FILE *fp = fopen(file, "r"); + fp = fopen(file, "r"); if (fp == NULL) { printf("open failed\n"); return; @@ -126,141 +189,123 @@ void play_file_sample(char *file, int frequency, int ch, int type) file_size = ftell(fp); fseek(fp, 0, SEEK_SET); - printf("start to play [%s] of size [%d] with [%d][%d][%d]\n", file, file_size, frequency, ch, type); + printf("Play [%s] of size [%d] with [%d][%d][%d]\n", file, file_size, frequency, ch, type); audio_out_create_new(frequency, ch_table[ch], AUDIO_SAMPLE_TYPE_U8 + type, &output); + audio_out_set_state_changed_cb(output, _audio_out_state_cb, NULL); audio_out_prepare(output); - audio_out_get_buffer_size(output, &buffer_size); + audio_out_get_buffer_size(output, &buffer_size); buf = (char *)malloc(buffer_size); if (buf == NULL) { printf("malloc failed\n"); - audio_out_unprepare(output); - audio_out_destroy(output); - fclose(fp); - return; + goto EXIT; } + printf("Press any key to continue....\n"); getchar(); + printf("Start to read[%d] from file and write : \n", buffer_size); while (file_size > 0) { read_bytes = fread(buf, 1, buffer_size, fp); - printf("Read %d Requested - %d\n", read_bytes, buffer_size); + printf("."); + i++; + if (i % 10 == 0) + printf("|"); + if (i % 100 == 0) { + printf("\n"); + i = 0; + } audio_out_write(output, buf, read_bytes); file_size = file_size - read_bytes; + usleep(10000); } +EXIT: audio_out_unprepare(output); audio_out_destroy(output); - free(buf); - fclose(fp); - printf("play done\n"); + if (buf) + free(buf); + if (fp) + fclose(fp); + + printf("\nEOS!!!! Play done\n"); } -int audio_io_test(int length, int num, int ch) +static int _record_and_play(int length, int num, int ch) { int ret, size, i; - audio_in_h input; - if ((ret = audio_in_create(44100, ch_table[ch], AUDIO_SAMPLE_TYPE_S16_LE, &input)) == AUDIO_IO_ERROR_NONE) { - ret = audio_in_set_state_changed_cb(input, _audio_in_state_cb, NULL); - if (ret != AUDIO_IO_ERROR_NONE) { - printf("audio_in_set_state_changed_cb failed. \n"); - goto error; - } - - ret = audio_in_prepare(input); - if (ret != 0) { - printf("ERROR, prepare\n"); - goto error; - } - - FILE *fp = fopen(DUMP_FILE, "wb+"); - if (fp == NULL) { - printf("ERROR, file open failed\n"); - goto error; - } - - if ((ret = audio_in_get_buffer_size(input, &size)) == AUDIO_IO_ERROR_NONE) { - size = length; - char *buffer = alloca(size); - - for (i = 0; i < num; i++) { - printf("### read = (%d/%d) ============== ", i, num); - if ((ret = audio_in_read(input, (void *)buffer, size)) > AUDIO_IO_ERROR_NONE) { - fwrite(buffer, size, sizeof(char), fp); - printf("PASS, size=%d, ret=0x%x\n", size, ret); - } else { - printf("FAIL, size=%d, ret=0x%x\n", size, ret); - } - } - } - - fclose(fp); + audio_in_h input = NULL; + FILE *fp = NULL; + char *buffer = NULL; - audio_in_unprepare(input); - audio_in_destroy(input); + ret = audio_in_create(44100, ch_table[ch], AUDIO_SAMPLE_TYPE_S16_LE, &input); + if (ret != AUDIO_IO_ERROR_NONE) { + printf("audio in create error = 0x%x\n", ret); + return -1; } - play_file(DUMP_FILE, length, num, ch); - - return 0; -error: - audio_in_destroy(input); - return -1; -} + ret = audio_in_set_state_changed_cb(input, _audio_in_state_cb, NULL); + if (ret != AUDIO_IO_ERROR_NONE) { + printf("audio_in_set_state_changed_cb failed. \n"); + goto error; + } -int audio_io_loopback_in_test() -{ - int ret, size; - audio_in_h input; - FILE *fp = fopen("/tmp/dump_test.raw", "wb+"); + ret = audio_in_prepare(input); + if (ret != AUDIO_IO_ERROR_NONE) { + printf("ERROR, prepare\n"); + goto error; + } + fp = fopen(DUMP_FILE, "wb+"); if (fp == NULL) { - printf("open failed \n"); - return -1; + printf("ERROR, file open failed\n"); + goto error; } - if ((ret = audio_in_create(16000, AUDIO_CHANNEL_MONO, AUDIO_SAMPLE_TYPE_S16_LE, &input)) == AUDIO_IO_ERROR_NONE) { - ret = audio_in_prepare(input); - if (ret != 0) { - printf("ERROR, prepare\n"); - goto exit; - } - - ret = audio_in_get_buffer_size(input, &size); - if (ret != AUDIO_IO_ERROR_NONE) { - printf("audio_in_get_buffer_size failed.\n"); - goto exit; - } + ret = audio_in_get_buffer_size(input, &size); + if (ret != AUDIO_IO_ERROR_NONE) { + printf("ERROR, prepare\n"); + goto error; + } - char *buffer = alloca(size); + size = length; + buffer = alloca(size); - while (1) { - if ((ret = audio_in_read(input, (void *)buffer, size)) > AUDIO_IO_ERROR_NONE) { - fwrite(buffer, size, sizeof(char), fp); - printf("PASS, size=%d, ret=0x%x\n", size, ret); - } else { - printf("FAIL, size=%d, ret=0x%x\n", size, ret); - } + for (i = 0; i < num; i++) { + printf("### read = (%d/%d) ============== ", i, num); + if ((ret = audio_in_read(input, (void *)buffer, size)) > AUDIO_IO_ERROR_NONE) { + fwrite(buffer, size, sizeof(char), fp); + printf("PASS, size=%d, ret=0x%x\n", size, ret); + } else { + printf("FAIL, size=%d, ret=0x%x\n", size, ret); } } - exit: + fclose(fp); + + audio_in_unprepare(input); audio_in_destroy(input); - fclose(fp); + _play_file(DUMP_FILE, length, num, ch); - return ret; + return 0; +error: + audio_in_destroy(input); + if (fp) + fclose(fp); + return -1; } -int audio_io_loopback_test() +static int _direct_loopback() { int ret, size; audio_in_h input = NULL; audio_out_h output = NULL; char *buffer = NULL; + int i = 0; ret = audio_in_create(16000, AUDIO_CHANNEL_MONO, AUDIO_SAMPLE_TYPE_S16_LE, &input); if (ret != AUDIO_IO_ERROR_NONE) { @@ -277,17 +322,17 @@ int audio_io_loopback_test() if (ret != 0) { printf("audio_in_prepare failed, err(0x%x)\n", ret); goto exit; - } else { - ret = audio_in_get_buffer_size(input, &size); - if (ret != AUDIO_IO_ERROR_NONE) { - printf("audio_in_get_buffer_size failed, err(0x%x)\n", ret); - goto exit; - } else { - printf("size(%d)\n", size); - buffer = alloca(size); - } } + ret = audio_in_get_buffer_size(input, &size); + if (ret != AUDIO_IO_ERROR_NONE) { + printf("audio_in_get_buffer_size failed, err(0x%x)\n", ret); + goto exit; + } + + printf("size(%d)\n", size); + buffer = alloca(size); + ret = audio_out_prepare(output); if (ret != 0) { printf("audio_out_prepare failed, err(0x%x)\n", ret); @@ -300,16 +345,28 @@ int audio_io_loopback_test() goto exit; } + printf("Start to loopback(read/write) with [16kHz/MONO/S16LE]!!!\n"); + while (1) { ret = audio_in_read(input, (void *)buffer, size); if (ret > AUDIO_IO_ERROR_NONE) { ret = audio_out_write(output, buffer, size); - if (ret > AUDIO_IO_ERROR_NONE) - printf("audio read/write success. buffer(%p), size(%d)\n", buffer, size); - else + if (ret > AUDIO_IO_ERROR_NONE) { + printf("."); + i++; + if (i % 10 == 0) + printf("|"); + if (i % 100 == 0) { + printf("\n"); + i = 0; + } + } else { printf("audio read success, write failed. buffer(%p), size(%d)\n", buffer, size); - } else + } + } else { printf("audio read/write failed. buffer(%p), size(%d)\n", buffer, size); + } + usleep(10000); } exit: @@ -330,11 +387,15 @@ FILE *fp_w = NULL; sound_stream_info_h g_stream_info_read_h = NULL; sound_stream_info_h g_stream_info_write_h = NULL; -static void focus_callback(sound_stream_info_h stream_info, sound_stream_focus_mask_e focus_mask, sound_stream_focus_state_e focus_state, - sound_stream_focus_change_reason_e reason_for_change, int sound_behavior, const char *additional_info, void *user_data) +static void _focus_cb(sound_stream_info_h stream_info, sound_stream_focus_mask_e focus_mask, + sound_stream_focus_state_e focus_state, + sound_stream_focus_change_reason_e reason_for_change, int sound_behavior, + const char *additional_info, void *user_data) { - printf("*** focus_callback_read is called, stream_info(%p, read(%p)/write(%p)) ***\n", stream_info, g_stream_info_read_h, g_stream_info_write_h); - printf(" - reason_for_change(%d), additional_info(%s), user_data(%p)\n", reason_for_change, additional_info, user_data); + printf("*** focus_callback_read is called, stream_info(%p, read(%p)/write(%p)) ***\n", + stream_info, g_stream_info_read_h, g_stream_info_write_h); + printf(" - reason_for_change(%d), additional_info(%s), user_data(%p)\n", + reason_for_change, additional_info, user_data); printf(" - focus_state is :%d \n", focus_state); return; @@ -345,12 +406,13 @@ static void _audio_io_stream_read_cb(audio_in_h handle, size_t nbytes, void *use const void *buffer = NULL; unsigned int len = (unsigned int)nbytes; - if (len > 0) { - audio_in_peek(handle, &buffer, &len); - if (fp_w) - fwrite(buffer, sizeof(char), len, fp_w); - audio_in_drop(handle); - } + if (len == 0) + return; + + audio_in_peek(handle, &buffer, &len); + if (fp_w) + fwrite(buffer, sizeof(char), len, fp_w); + audio_in_drop(handle); } static void _audio_io_stream_write_cb(audio_out_h handle, size_t nbytes, void *user_data) @@ -358,29 +420,30 @@ static void _audio_io_stream_write_cb(audio_out_h handle, size_t nbytes, void *u short *buffer = NULL; int i = 0; - if (nbytes > 0) { - buffer = (short *)malloc(nbytes); - if (buffer == NULL) { - printf("malloc failed\n"); - return; - } - memset(buffer, 0, nbytes); - - for (i = 0; i < nbytes / 2; i += 2) { - buffer[i] = (short)32768 *test_wav.sine[test_wav.left_channel]; /* left */ - buffer[i + 1] = (short)32768 *test_wav.sine[test_wav.right_channel]; /* right */ - test_wav.left_channel += 1; - if (test_wav.left_channel >= TABLE_SIZE) - test_wav.left_channel -= TABLE_SIZE; - test_wav.right_channel += 3; - if (test_wav.right_channel >= TABLE_SIZE) - test_wav.right_channel -= TABLE_SIZE; - } - - audio_out_write(handle, buffer, nbytes); + if (nbytes == 0) + return; - free(buffer); + buffer = (short *)malloc(nbytes); + if (buffer == NULL) { + printf("malloc failed\n"); + return; } + memset(buffer, 0, nbytes); + + for (i = 0; i < nbytes / 2; i += 2) { + buffer[i] = (short)32768 *test_wav.sine[test_wav.left_channel]; /* left */ + buffer[i + 1] = (short)32768 *test_wav.sine[test_wav.right_channel]; /* right */ + test_wav.left_channel += 1; + if (test_wav.left_channel >= TABLE_SIZE) + test_wav.left_channel -= TABLE_SIZE; + test_wav.right_channel += 3; + if (test_wav.right_channel >= TABLE_SIZE) + test_wav.right_channel -= TABLE_SIZE; + } + + audio_out_write(handle, buffer, nbytes); + + free(buffer); } int _convert_cmd_and_run(char cmd, int mode) @@ -422,11 +485,11 @@ int _convert_cmd_and_run(char cmd, int mode) ret = audio_in_flush(input); break; case 'i': - ret = sound_manager_create_stream_information(SOUND_STREAM_TYPE_MEDIA, focus_callback, NULL, &g_stream_info_write_h); + ret = sound_manager_create_stream_information(SOUND_STREAM_TYPE_MEDIA, _focus_cb, NULL, &g_stream_info_write_h); if (ret) printf("fail to sound_manager_create_stream_information(), ret(0x%x)\n", ret); break; - case 'q': /* quit */ + case 'q': /* quit */ ret = 1; break; default: @@ -480,7 +543,7 @@ int audio_io_async_test(int mode) } printf("audio_out_set_state_changed_cb success!!! [%p]\n", input); - ret = sound_manager_create_stream_information(SOUND_STREAM_TYPE_MEDIA, focus_callback, NULL, &g_stream_info_read_h); + ret = sound_manager_create_stream_information(SOUND_STREAM_TYPE_MEDIA, _focus_cb, NULL, &g_stream_info_read_h); if (ret) { printf("fail to sound_manager_create_stream_information(), ret(0x%x)\n", ret); goto EXIT; @@ -524,7 +587,7 @@ int audio_io_async_test(int mode) } printf("audio_out_set_state_changed_cb success!!! [%p]\n", output); - ret = sound_manager_create_stream_information(SOUND_STREAM_TYPE_MEDIA, focus_callback, NULL, &g_stream_info_write_h); + ret = sound_manager_create_stream_information(SOUND_STREAM_TYPE_MEDIA, _focus_cb, NULL, &g_stream_info_write_h); if (ret) { printf("fail to sound_manager_create_stream_information(), ret(0x%x)\n", ret); goto EXIT; @@ -652,10 +715,10 @@ EXIT: int main(int argc, char **argv) { - if (argc == 2 && !strcmp(argv[1], "call-forwarding-loop")) { - audio_io_loopback_test(); - } else if (argc == 2 && !strcmp(argv[1], "call-forwarding-in")) { - audio_io_loopback_in_test(); + setbuf(stdout, NULL); + + if (argc == 2 && !strcmp(argv[1], "loopback")) { + _direct_loopback(); } else if (argc == 3 && !strcmp(argv[1], "async")) { audio_io_async_test(atoi(argv[2])); } else if (argc == 4) { @@ -665,15 +728,19 @@ int main(int argc, char **argv) return 0; } printf("run with [%s][%s][%s]\n", argv[1], argv[2], argv[3]); - audio_io_test(atoi(argv[1]), atoi(argv[2]), channel_idx); + _record_and_play(atoi(argv[1]), atoi(argv[2]), channel_idx); } else if (argc == 6) { - play_file_sample(argv[2], atoi(argv[3]), atoi(argv[4]), atoi(argv[5])); + if (strcmp(argv[1], "play") == 0) + _play_file_sample_sync(argv[2], atoi(argv[3]), atoi(argv[4]), atoi(argv[5])); + else if (strcmp(argv[1], "playasync") == 0) + _play_file_sample_async(argv[2], atoi(argv[3]), atoi(argv[4]), atoi(argv[5])); } else { - printf("1. usage : audio_io_test call-forwarding-loop\n"); - printf("2. usage : audio_io_test call-forwarding-in\n"); - printf("3. usage : audio_io_test [length to read] [number of iteration] [channels]\n"); - printf("4. usage : audio_io_test async [write(1) | read(2)]\n"); - printf("5. Uasge : audio_io_test play [filename] [sample rate] [channels] [type(0:U8,1:S16LE,2:S24LE,3:S24_32LE)]\n"); + printf("- Usages :\n"); + printf("- # audio_io_test loopback\n"); + printf("- # audio_io_test [length to read] [number of iteration] [channels]\n"); + printf("- # audio_io_test async [write(1) | read(2)]\n"); + printf("- # audio_io_test play [filename] [sample rate] [channels] [type(0:U8,1:S16LE,2:S24LE,3:S24_32LE)]\n"); + printf("- # audio_io_test playasync [filename] [sample rate] [channels] [type(0:U8,1:S16LE,2:S24LE,3:S24_32LE)]\n"); } return 0; } -- 2.34.1