diff options
author | Mamadou DIOP <bossiel@yahoo.fr> | 2016-02-23 22:00:35 +0100 |
---|---|---|
committer | Mamadou DIOP <bossiel@yahoo.fr> | 2016-02-23 22:00:35 +0100 |
commit | 50dfb4359619563012997bc3ddafb7667741066c (patch) | |
tree | db234c1edc3240a653363b5735fc4077af4b8720 /tinyDAV/src/audio/waveapi | |
parent | 94b2219209038e05dd26395f6fb700be4d1062c0 (diff) | |
download | doubango-50dfb4359619563012997bc3ddafb7667741066c.zip doubango-50dfb4359619563012997bc3ddafb7667741066c.tar.gz |
Add new QoS implementation
Code formatting
Diffstat (limited to 'tinyDAV/src/audio/waveapi')
-rwxr-xr-x | tinyDAV/src/audio/waveapi/tdav_consumer_waveapi.c | 560 | ||||
-rwxr-xr-x | tinyDAV/src/audio/waveapi/tdav_producer_waveapi.c | 546 |
2 files changed, 552 insertions, 554 deletions
diff --git a/tinyDAV/src/audio/waveapi/tdav_consumer_waveapi.c b/tinyDAV/src/audio/waveapi/tdav_consumer_waveapi.c index 1883fa4..bf95818 100755 --- a/tinyDAV/src/audio/waveapi/tdav_consumer_waveapi.c +++ b/tinyDAV/src/audio/waveapi/tdav_consumer_waveapi.c @@ -1,18 +1,18 @@ /* * Copyright (C) 2010-2015 Mamadou DIOP -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -36,151 +36,151 @@ static void print_last_error(MMRESULT mmrError, const char* func) { - static char buffer_err[TDAV_WAVEAPI_CONSUMER_ERROR_BUFF_COUNT]; + static char buffer_err[TDAV_WAVEAPI_CONSUMER_ERROR_BUFF_COUNT]; - waveOutGetErrorTextA(mmrError, buffer_err, sizeof(buffer_err)); - TSK_DEBUG_ERROR("%s() error: %s", func, buffer_err); + waveOutGetErrorTextA(mmrError, buffer_err, sizeof(buffer_err)); + TSK_DEBUG_ERROR("%s() error: %s", func, buffer_err); } static int free_wavehdr(tdav_consumer_waveapi_t* consumer, tsk_size_t index) { - if(!consumer || index >= sizeof(consumer->hWaveHeaders)/sizeof(LPWAVEHDR)){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } + if(!consumer || index >= sizeof(consumer->hWaveHeaders)/sizeof(LPWAVEHDR)) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } - TSK_FREE(consumer->hWaveHeaders[index]->lpData); - TSK_FREE(consumer->hWaveHeaders[index]); + TSK_FREE(consumer->hWaveHeaders[index]->lpData); + TSK_FREE(consumer->hWaveHeaders[index]); - return 0; + return 0; } static int create_wavehdr(tdav_consumer_waveapi_t* consumer, tsk_size_t index) { - if(!consumer || index >= sizeof(consumer->hWaveHeaders)/sizeof(LPWAVEHDR)){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } - - if(consumer->hWaveHeaders[index]){ - free_wavehdr(consumer, index); - } - - consumer->hWaveHeaders[index] = tsk_calloc(1, sizeof(WAVEHDR)); - consumer->hWaveHeaders[index]->lpData = tsk_calloc(1, consumer->bytes_per_notif); - consumer->hWaveHeaders[index]->dwBufferLength = (DWORD)consumer->bytes_per_notif; - consumer->hWaveHeaders[index]->dwFlags = WHDR_BEGINLOOP | WHDR_ENDLOOP; - consumer->hWaveHeaders[index]->dwLoops = 0x01; - consumer->hWaveHeaders[index]->dwUser = index; - - return 0; + if(!consumer || index >= sizeof(consumer->hWaveHeaders)/sizeof(LPWAVEHDR)) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } + + if(consumer->hWaveHeaders[index]) { + free_wavehdr(consumer, index); + } + + consumer->hWaveHeaders[index] = tsk_calloc(1, sizeof(WAVEHDR)); + consumer->hWaveHeaders[index]->lpData = tsk_calloc(1, consumer->bytes_per_notif); + consumer->hWaveHeaders[index]->dwBufferLength = (DWORD)consumer->bytes_per_notif; + consumer->hWaveHeaders[index]->dwFlags = WHDR_BEGINLOOP | WHDR_ENDLOOP; + consumer->hWaveHeaders[index]->dwLoops = 0x01; + consumer->hWaveHeaders[index]->dwUser = index; + + return 0; } static int write_wavehdr(tdav_consumer_waveapi_t* consumer, tsk_size_t index) { - MMRESULT result; - - if(!consumer || !consumer->hWaveHeaders[index] || !consumer->hWaveOut){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } - - result = waveOutPrepareHeader(consumer->hWaveOut, consumer->hWaveHeaders[index], sizeof(WAVEHDR)); - if(result != MMSYSERR_NOERROR){ - print_last_error(result, "waveOutPrepareHeader"); - return -2; - } - - result = waveOutWrite(consumer->hWaveOut, consumer->hWaveHeaders[index], sizeof(WAVEHDR)); - if(result != MMSYSERR_NOERROR){ - print_last_error(result, "waveOutWrite"); - return -3; - } - - return 0; + MMRESULT result; + + if(!consumer || !consumer->hWaveHeaders[index] || !consumer->hWaveOut) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } + + result = waveOutPrepareHeader(consumer->hWaveOut, consumer->hWaveHeaders[index], sizeof(WAVEHDR)); + if(result != MMSYSERR_NOERROR) { + print_last_error(result, "waveOutPrepareHeader"); + return -2; + } + + result = waveOutWrite(consumer->hWaveOut, consumer->hWaveHeaders[index], sizeof(WAVEHDR)); + if(result != MMSYSERR_NOERROR) { + print_last_error(result, "waveOutWrite"); + return -3; + } + + return 0; } static int play_wavehdr(tdav_consumer_waveapi_t* consumer, LPWAVEHDR lpHdr) { - MMRESULT result; - tsk_size_t out_size; - - if(!consumer || !lpHdr || !consumer->hWaveOut){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } - - result = waveOutUnprepareHeader(consumer->hWaveOut, lpHdr, sizeof(WAVEHDR)); - if(result != MMSYSERR_NOERROR){ - print_last_error(result, "waveOutUnprepareHeader"); - return -2; - } - - // - // - // Fill lpHdr->Data with decoded data - // - // - if((out_size = tdav_consumer_audio_get(TDAV_CONSUMER_AUDIO(consumer), lpHdr->lpData, lpHdr->dwBufferLength))){ - //memcpy(lpHdr->lpData, data, lpHdr->dwBufferLength); - //TSK_FREE(data); - } - else{ - /* Put silence */ - memset(lpHdr->lpData, 0, lpHdr->dwBufferLength); - } - - if(!consumer->started){ - return 0; - } - - result = waveOutPrepareHeader(consumer->hWaveOut, lpHdr, sizeof(WAVEHDR)); - if(result != MMSYSERR_NOERROR){ - print_last_error(result, "waveOutPrepareHeader"); - return -3; - } - - result = waveOutWrite(consumer->hWaveOut, lpHdr, sizeof(WAVEHDR)); - if(result != MMSYSERR_NOERROR){ - print_last_error(result, "waveOutWrite"); - return -4; - } - - return 0; + MMRESULT result; + tsk_size_t out_size; + + if(!consumer || !lpHdr || !consumer->hWaveOut) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } + + result = waveOutUnprepareHeader(consumer->hWaveOut, lpHdr, sizeof(WAVEHDR)); + if(result != MMSYSERR_NOERROR) { + print_last_error(result, "waveOutUnprepareHeader"); + return -2; + } + + // + // + // Fill lpHdr->Data with decoded data + // + // + if((out_size = tdav_consumer_audio_get(TDAV_CONSUMER_AUDIO(consumer), lpHdr->lpData, lpHdr->dwBufferLength))) { + //memcpy(lpHdr->lpData, data, lpHdr->dwBufferLength); + //TSK_FREE(data); + } + else { + /* Put silence */ + memset(lpHdr->lpData, 0, lpHdr->dwBufferLength); + } + + if(!consumer->started) { + return 0; + } + + result = waveOutPrepareHeader(consumer->hWaveOut, lpHdr, sizeof(WAVEHDR)); + if(result != MMSYSERR_NOERROR) { + print_last_error(result, "waveOutPrepareHeader"); + return -3; + } + + result = waveOutWrite(consumer->hWaveOut, lpHdr, sizeof(WAVEHDR)); + if(result != MMSYSERR_NOERROR) { + print_last_error(result, "waveOutWrite"); + return -4; + } + + return 0; } static void* TSK_STDCALL __playback_thread(void *param) { - tdav_consumer_waveapi_t* consumer = (tdav_consumer_waveapi_t*)param; - DWORD dwEvent; - tsk_size_t i; + tdav_consumer_waveapi_t* consumer = (tdav_consumer_waveapi_t*)param; + DWORD dwEvent; + tsk_size_t i; + + TSK_DEBUG_INFO("__playback_thread -- START"); - TSK_DEBUG_INFO("__playback_thread -- START"); + SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST); - SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST); + for(;;) { + dwEvent = WaitForMultipleObjects(2, consumer->events, FALSE, INFINITE); - for(;;){ - dwEvent = WaitForMultipleObjects(2, consumer->events, FALSE, INFINITE); + if (dwEvent == 1) { + break; + } - if (dwEvent == 1){ - break; - } + else if (dwEvent == 0) { + EnterCriticalSection(&consumer->cs); + for(i = 0; i< sizeof(consumer->hWaveHeaders)/sizeof(LPWAVEHDR); i++) { + if(consumer->hWaveHeaders[i] && (consumer->hWaveHeaders[i]->dwFlags & WHDR_DONE)) { + play_wavehdr(consumer, consumer->hWaveHeaders[i]); + } + } + LeaveCriticalSection(&consumer->cs); + } + } - else if (dwEvent == 0){ - EnterCriticalSection(&consumer->cs); - for(i = 0; i< sizeof(consumer->hWaveHeaders)/sizeof(LPWAVEHDR); i++){ - if(consumer->hWaveHeaders[i] && (consumer->hWaveHeaders[i]->dwFlags & WHDR_DONE)){ - play_wavehdr(consumer, consumer->hWaveHeaders[i]); - } - } - LeaveCriticalSection(&consumer->cs); - } - } + TSK_DEBUG_INFO("__playback_thread -- STOP"); - TSK_DEBUG_INFO("__playback_thread -- STOP"); - - return tsk_null; + return tsk_null; } @@ -193,137 +193,137 @@ static void* TSK_STDCALL __playback_thread(void *param) /* ============ Media Consumer Interface ================= */ int tdav_consumer_waveapi_prepare(tmedia_consumer_t* self, const tmedia_codec_t* codec) { - tdav_consumer_waveapi_t* consumer = (tdav_consumer_waveapi_t*)self; - tsk_size_t i; - - if(!consumer || !codec && codec->plugin){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } - - TMEDIA_CONSUMER(consumer)->audio.ptime = TMEDIA_CODEC_PTIME_AUDIO_DECODING(codec); - TMEDIA_CONSUMER(consumer)->audio.in.channels = TMEDIA_CODEC_CHANNELS_AUDIO_DECODING(codec); - TMEDIA_CONSUMER(consumer)->audio.in.rate = TMEDIA_CODEC_RATE_DECODING(codec); - - /* codec should have ptime */ - - - /* Format */ - ZeroMemory(&consumer->wfx, sizeof(WAVEFORMATEX)); - consumer->wfx.wFormatTag = WAVE_FORMAT_PCM; - consumer->wfx.nChannels = TMEDIA_CONSUMER(consumer)->audio.in.channels; - consumer->wfx.nSamplesPerSec = TMEDIA_CONSUMER(consumer)->audio.out.rate ? TMEDIA_CONSUMER(consumer)->audio.out.rate : TMEDIA_CONSUMER(consumer)->audio.in.rate; - consumer->wfx.wBitsPerSample = TMEDIA_CONSUMER(consumer)->audio.bits_per_sample; - consumer->wfx.nBlockAlign = (consumer->wfx.nChannels * consumer->wfx.wBitsPerSample/8); - consumer->wfx.nAvgBytesPerSec = (consumer->wfx.nSamplesPerSec * consumer->wfx.nBlockAlign); - - /* Average bytes (count) for each notification */ - consumer->bytes_per_notif = ((consumer->wfx.nAvgBytesPerSec * TMEDIA_CONSUMER(consumer)->audio.ptime)/1000); - - /* create buffers */ - for(i = 0; i< sizeof(consumer->hWaveHeaders)/sizeof(consumer->hWaveHeaders[0]); i++){ - create_wavehdr(consumer, i); - } - - return 0; + tdav_consumer_waveapi_t* consumer = (tdav_consumer_waveapi_t*)self; + tsk_size_t i; + + if(!consumer || !codec && codec->plugin) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } + + TMEDIA_CONSUMER(consumer)->audio.ptime = TMEDIA_CODEC_PTIME_AUDIO_DECODING(codec); + TMEDIA_CONSUMER(consumer)->audio.in.channels = TMEDIA_CODEC_CHANNELS_AUDIO_DECODING(codec); + TMEDIA_CONSUMER(consumer)->audio.in.rate = TMEDIA_CODEC_RATE_DECODING(codec); + + /* codec should have ptime */ + + + /* Format */ + ZeroMemory(&consumer->wfx, sizeof(WAVEFORMATEX)); + consumer->wfx.wFormatTag = WAVE_FORMAT_PCM; + consumer->wfx.nChannels = TMEDIA_CONSUMER(consumer)->audio.in.channels; + consumer->wfx.nSamplesPerSec = TMEDIA_CONSUMER(consumer)->audio.out.rate ? TMEDIA_CONSUMER(consumer)->audio.out.rate : TMEDIA_CONSUMER(consumer)->audio.in.rate; + consumer->wfx.wBitsPerSample = TMEDIA_CONSUMER(consumer)->audio.bits_per_sample; + consumer->wfx.nBlockAlign = (consumer->wfx.nChannels * consumer->wfx.wBitsPerSample/8); + consumer->wfx.nAvgBytesPerSec = (consumer->wfx.nSamplesPerSec * consumer->wfx.nBlockAlign); + + /* Average bytes (count) for each notification */ + consumer->bytes_per_notif = ((consumer->wfx.nAvgBytesPerSec * TMEDIA_CONSUMER(consumer)->audio.ptime)/1000); + + /* create buffers */ + for(i = 0; i< sizeof(consumer->hWaveHeaders)/sizeof(consumer->hWaveHeaders[0]); i++) { + create_wavehdr(consumer, i); + } + + return 0; } int tdav_consumer_waveapi_start(tmedia_consumer_t* self) { - tdav_consumer_waveapi_t* consumer = (tdav_consumer_waveapi_t*)self; - MMRESULT result; - tsk_size_t i; - - if(!consumer){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } - - if(consumer->started || consumer->hWaveOut){ - TSK_DEBUG_WARN("Consumer already started"); - return 0; - } - - /* create events */ - if(!consumer->events[0]){ - consumer->events[0] = CreateEvent(NULL, FALSE, FALSE, NULL); - } - if(!consumer->events[1]){ - consumer->events[1] = CreateEvent(NULL, FALSE, FALSE, NULL); - } - - /* open */ - result = waveOutOpen((HWAVEOUT *)&consumer->hWaveOut, WAVE_MAPPER, &consumer->wfx, (DWORD)consumer->events[0], (DWORD_PTR)consumer, CALLBACK_EVENT); - if(result != MMSYSERR_NOERROR){ - print_last_error(result, "waveOutOpen"); - return -2; - } - - /* write */ - for(i = 0; i< sizeof(consumer->hWaveHeaders)/sizeof(consumer->hWaveHeaders[0]); i++){ - write_wavehdr(consumer, i); - } - - /* start thread */ - consumer->started = tsk_true; - tsk_thread_create(&consumer->tid[0], __playback_thread, consumer); - - return 0; + tdav_consumer_waveapi_t* consumer = (tdav_consumer_waveapi_t*)self; + MMRESULT result; + tsk_size_t i; + + if(!consumer) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } + + if(consumer->started || consumer->hWaveOut) { + TSK_DEBUG_WARN("Consumer already started"); + return 0; + } + + /* create events */ + if(!consumer->events[0]) { + consumer->events[0] = CreateEvent(NULL, FALSE, FALSE, NULL); + } + if(!consumer->events[1]) { + consumer->events[1] = CreateEvent(NULL, FALSE, FALSE, NULL); + } + + /* open */ + result = waveOutOpen((HWAVEOUT *)&consumer->hWaveOut, WAVE_MAPPER, &consumer->wfx, (DWORD)consumer->events[0], (DWORD_PTR)consumer, CALLBACK_EVENT); + if(result != MMSYSERR_NOERROR) { + print_last_error(result, "waveOutOpen"); + return -2; + } + + /* write */ + for(i = 0; i< sizeof(consumer->hWaveHeaders)/sizeof(consumer->hWaveHeaders[0]); i++) { + write_wavehdr(consumer, i); + } + + /* start thread */ + consumer->started = tsk_true; + tsk_thread_create(&consumer->tid[0], __playback_thread, consumer); + + return 0; } int tdav_consumer_waveapi_consume(tmedia_consumer_t* self, const void* buffer, tsk_size_t size, const tsk_object_t* proto_hdr) { - tdav_consumer_waveapi_t* consumer = (tdav_consumer_waveapi_t*)self; - - if(!consumer || !buffer || !size){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } - /* buffer is already decoded */ - return tdav_consumer_audio_put(TDAV_CONSUMER_AUDIO(consumer), buffer, size, proto_hdr); + tdav_consumer_waveapi_t* consumer = (tdav_consumer_waveapi_t*)self; + + if(!consumer || !buffer || !size) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } + /* buffer is already decoded */ + return tdav_consumer_audio_put(TDAV_CONSUMER_AUDIO(consumer), buffer, size, proto_hdr); } int tdav_consumer_waveapi_pause(tmedia_consumer_t* self) { - tdav_consumer_waveapi_t* consumer = (tdav_consumer_waveapi_t*)self; + tdav_consumer_waveapi_t* consumer = (tdav_consumer_waveapi_t*)self; - if(!consumer){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } + if(!consumer) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } - return 0; + return 0; } int tdav_consumer_waveapi_stop(tmedia_consumer_t* self) { - tdav_consumer_waveapi_t* consumer = (tdav_consumer_waveapi_t*)self; - MMRESULT result; + tdav_consumer_waveapi_t* consumer = (tdav_consumer_waveapi_t*)self; + MMRESULT result; - if(!self){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } + if(!self) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } - if(!consumer->started){ - TSK_DEBUG_WARN("Consumer not started"); - return 0; - } + if(!consumer->started) { + TSK_DEBUG_WARN("Consumer not started"); + return 0; + } - /* stop thread */ - if(consumer->tid[0]){ - SetEvent(consumer->events[1]); - tsk_thread_join(&(consumer->tid[0])); - } + /* stop thread */ + if(consumer->tid[0]) { + SetEvent(consumer->events[1]); + tsk_thread_join(&(consumer->tid[0])); + } - /* should be done here */ - consumer->started = tsk_false; + /* should be done here */ + consumer->started = tsk_false; - if(consumer->hWaveOut && ((result = waveOutReset(consumer->hWaveOut)) != MMSYSERR_NOERROR)){ - print_last_error(result, "waveOutReset"); - } + if(consumer->hWaveOut && ((result = waveOutReset(consumer->hWaveOut)) != MMSYSERR_NOERROR)) { + print_last_error(result, "waveOutReset"); + } - return 0; + return 0; } @@ -333,69 +333,67 @@ int tdav_consumer_waveapi_stop(tmedia_consumer_t* self) /* constructor */ static tsk_object_t* tdav_consumer_waveapi_ctor(tsk_object_t * self, va_list * app) { - tdav_consumer_waveapi_t *consumer = self; - if(consumer){ - /* init base */ - tdav_consumer_audio_init(TDAV_CONSUMER_AUDIO(consumer)); - /* init self */ - InitializeCriticalSection(&consumer->cs); - } - return self; + tdav_consumer_waveapi_t *consumer = self; + if(consumer) { + /* init base */ + tdav_consumer_audio_init(TDAV_CONSUMER_AUDIO(consumer)); + /* init self */ + InitializeCriticalSection(&consumer->cs); + } + return self; } /* destructor */ static tsk_object_t* tdav_consumer_waveapi_dtor(tsk_object_t * self) -{ - tdav_consumer_waveapi_t *consumer = self; - if(consumer){ - tsk_size_t i; - - /* stop */ - if(consumer->started){ - tdav_consumer_waveapi_stop(self); - } - - /* deinit base */ - tdav_consumer_audio_deinit(TDAV_CONSUMER_AUDIO(consumer)); - /* deinit self */ - for(i = 0; i< sizeof(consumer->hWaveHeaders)/sizeof(LPWAVEHDR); i++){ - free_wavehdr(consumer, i); - } - if(consumer->hWaveOut){ - waveOutClose(consumer->hWaveOut); - } - if(consumer->events[0]){ - CloseHandle(consumer->events[0]); - } - if(consumer->events[1]){ - CloseHandle(consumer->events[1]); - } - DeleteCriticalSection(&consumer->cs); - } - - return self; +{ + tdav_consumer_waveapi_t *consumer = self; + if(consumer) { + tsk_size_t i; + + /* stop */ + if(consumer->started) { + tdav_consumer_waveapi_stop(self); + } + + /* deinit base */ + tdav_consumer_audio_deinit(TDAV_CONSUMER_AUDIO(consumer)); + /* deinit self */ + for(i = 0; i< sizeof(consumer->hWaveHeaders)/sizeof(LPWAVEHDR); i++) { + free_wavehdr(consumer, i); + } + if(consumer->hWaveOut) { + waveOutClose(consumer->hWaveOut); + } + if(consumer->events[0]) { + CloseHandle(consumer->events[0]); + } + if(consumer->events[1]) { + CloseHandle(consumer->events[1]); + } + DeleteCriticalSection(&consumer->cs); + } + + return self; } /* object definition */ -static const tsk_object_def_t tdav_consumer_waveapi_def_s = -{ - sizeof(tdav_consumer_waveapi_t), - tdav_consumer_waveapi_ctor, - tdav_consumer_waveapi_dtor, - tdav_consumer_audio_cmp, +static const tsk_object_def_t tdav_consumer_waveapi_def_s = { + sizeof(tdav_consumer_waveapi_t), + tdav_consumer_waveapi_ctor, + tdav_consumer_waveapi_dtor, + tdav_consumer_audio_cmp, }; /* plugin definition*/ -static const tmedia_consumer_plugin_def_t tdav_consumer_waveapi_plugin_def_s = -{ - &tdav_consumer_waveapi_def_s, - - tmedia_audio, - "Microsoft WaveAPI consumer", - - tdav_consumer_waveapi_set, - tdav_consumer_waveapi_prepare, - tdav_consumer_waveapi_start, - tdav_consumer_waveapi_consume, - tdav_consumer_waveapi_pause, - tdav_consumer_waveapi_stop +static const tmedia_consumer_plugin_def_t tdav_consumer_waveapi_plugin_def_s = { + &tdav_consumer_waveapi_def_s, + + tmedia_audio, + "Microsoft WaveAPI consumer", + + tdav_consumer_waveapi_set, + tdav_consumer_waveapi_prepare, + tdav_consumer_waveapi_start, + tdav_consumer_waveapi_consume, + tdav_consumer_waveapi_pause, + tdav_consumer_waveapi_stop }; const tmedia_consumer_plugin_def_t *tdav_consumer_waveapi_plugin_def_t = &tdav_consumer_waveapi_plugin_def_s; diff --git a/tinyDAV/src/audio/waveapi/tdav_producer_waveapi.c b/tinyDAV/src/audio/waveapi/tdav_producer_waveapi.c index d077790..375668c 100755 --- a/tinyDAV/src/audio/waveapi/tdav_producer_waveapi.c +++ b/tinyDAV/src/audio/waveapi/tdav_producer_waveapi.c @@ -1,18 +1,18 @@ /* * Copyright (C) 2010-2015 Mamadou DIOP. -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -35,150 +35,152 @@ static void print_last_error(MMRESULT mmrError, const char* func) { - static char buffer_err[TDAV_WAVEAPI_PRODUCER_ERROR_BUFF_COUNT]; + static char buffer_err[TDAV_WAVEAPI_PRODUCER_ERROR_BUFF_COUNT]; - waveInGetErrorTextA(mmrError, buffer_err, sizeof(buffer_err)); - TSK_DEBUG_ERROR("%s() error: %s", func, buffer_err); + waveInGetErrorTextA(mmrError, buffer_err, sizeof(buffer_err)); + TSK_DEBUG_ERROR("%s() error: %s", func, buffer_err); } static int free_wavehdr(tdav_producer_waveapi_t* producer, tsk_size_t index) { - if(!producer || index >= sizeof(producer->hWaveHeaders)/sizeof(LPWAVEHDR)){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } + if(!producer || index >= sizeof(producer->hWaveHeaders)/sizeof(LPWAVEHDR)) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } - TSK_FREE(producer->hWaveHeaders[index]->lpData); - TSK_FREE(producer->hWaveHeaders[index]); + TSK_FREE(producer->hWaveHeaders[index]->lpData); + TSK_FREE(producer->hWaveHeaders[index]); - return 0; + return 0; } static int create_wavehdr(tdav_producer_waveapi_t* producer, tsk_size_t index) { - if(!producer || index >= sizeof(producer->hWaveHeaders)/sizeof(LPWAVEHDR)){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } - - if(producer->hWaveHeaders[index]){ - free_wavehdr(producer, index); - } - - producer->hWaveHeaders[index] = tsk_calloc(1, sizeof(WAVEHDR)); - producer->hWaveHeaders[index]->lpData = tsk_calloc(1, producer->bytes_per_notif); - producer->hWaveHeaders[index]->dwBufferLength = (DWORD)producer->bytes_per_notif; - producer->hWaveHeaders[index]->dwFlags = WHDR_BEGINLOOP | WHDR_ENDLOOP; - producer->hWaveHeaders[index]->dwLoops = 0x01; - producer->hWaveHeaders[index]->dwUser = index; - - return 0; + if(!producer || index >= sizeof(producer->hWaveHeaders)/sizeof(LPWAVEHDR)) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } + + if(producer->hWaveHeaders[index]) { + free_wavehdr(producer, index); + } + + producer->hWaveHeaders[index] = tsk_calloc(1, sizeof(WAVEHDR)); + producer->hWaveHeaders[index]->lpData = tsk_calloc(1, producer->bytes_per_notif); + producer->hWaveHeaders[index]->dwBufferLength = (DWORD)producer->bytes_per_notif; + producer->hWaveHeaders[index]->dwFlags = WHDR_BEGINLOOP | WHDR_ENDLOOP; + producer->hWaveHeaders[index]->dwLoops = 0x01; + producer->hWaveHeaders[index]->dwUser = index; + + return 0; } static int add_wavehdr(tdav_producer_waveapi_t* producer, tsk_size_t index) { - MMRESULT result; - - if(!producer || !producer->hWaveHeaders[index] || !producer->hWaveIn){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } - - result = waveInPrepareHeader(producer->hWaveIn, producer->hWaveHeaders[index], sizeof(WAVEHDR)); - if(result != MMSYSERR_NOERROR){ - print_last_error(result, "waveInPrepareHeader"); - return -2; - } - - result = waveInAddBuffer(producer->hWaveIn, producer->hWaveHeaders[index], sizeof(WAVEHDR)); - if(result != MMSYSERR_NOERROR){ - print_last_error(result, "waveInAddBuffer"); - return -3; - } - - return 0; + MMRESULT result; + + if(!producer || !producer->hWaveHeaders[index] || !producer->hWaveIn) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } + + result = waveInPrepareHeader(producer->hWaveIn, producer->hWaveHeaders[index], sizeof(WAVEHDR)); + if(result != MMSYSERR_NOERROR) { + print_last_error(result, "waveInPrepareHeader"); + return -2; + } + + result = waveInAddBuffer(producer->hWaveIn, producer->hWaveHeaders[index], sizeof(WAVEHDR)); + if(result != MMSYSERR_NOERROR) { + print_last_error(result, "waveInAddBuffer"); + return -3; + } + + return 0; } static int record_wavehdr(tdav_producer_waveapi_t* producer, LPWAVEHDR lpHdr) { - MMRESULT result; + MMRESULT result; - if(!producer || !lpHdr || !producer->hWaveIn){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } + if(!producer || !lpHdr || !producer->hWaveIn) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } - // - // Alert the session that there is new data to send over the network - // - if(TMEDIA_PRODUCER(producer)->enc_cb.callback){ + // + // Alert the session that there is new data to send over the network + // + if(TMEDIA_PRODUCER(producer)->enc_cb.callback) { #if 0 - { - static FILE* f = NULL; - if(!f) f = fopen("./waveapi_producer.raw", "w+"); - fwrite(lpHdr->lpData, 1, lpHdr->dwBytesRecorded, f); - } + { + static FILE* f = NULL; + if(!f) { + f = fopen("./waveapi_producer.raw", "w+"); + } + fwrite(lpHdr->lpData, 1, lpHdr->dwBytesRecorded, f); + } #endif - TMEDIA_PRODUCER(producer)->enc_cb.callback(TMEDIA_PRODUCER(producer)->enc_cb.callback_data, lpHdr->lpData, lpHdr->dwBytesRecorded); - } - - if(!producer->started){ - return 0; - } - - result = waveInUnprepareHeader(producer->hWaveIn, lpHdr, sizeof(WAVEHDR)); - if(result != MMSYSERR_NOERROR){ - print_last_error(result, "waveInUnprepareHeader"); - return -2; - } - - result = waveInPrepareHeader(producer->hWaveIn, lpHdr, sizeof(WAVEHDR)); - if(result != MMSYSERR_NOERROR){ - print_last_error(result, "waveInPrepareHeader"); - return -3; - } - - result = waveInAddBuffer(producer->hWaveIn, lpHdr, sizeof(WAVEHDR)); - if(result != MMSYSERR_NOERROR){ - print_last_error(result, "waveInAddBuffer"); - return -4; - } - - return 0; + TMEDIA_PRODUCER(producer)->enc_cb.callback(TMEDIA_PRODUCER(producer)->enc_cb.callback_data, lpHdr->lpData, lpHdr->dwBytesRecorded); + } + + if(!producer->started) { + return 0; + } + + result = waveInUnprepareHeader(producer->hWaveIn, lpHdr, sizeof(WAVEHDR)); + if(result != MMSYSERR_NOERROR) { + print_last_error(result, "waveInUnprepareHeader"); + return -2; + } + + result = waveInPrepareHeader(producer->hWaveIn, lpHdr, sizeof(WAVEHDR)); + if(result != MMSYSERR_NOERROR) { + print_last_error(result, "waveInPrepareHeader"); + return -3; + } + + result = waveInAddBuffer(producer->hWaveIn, lpHdr, sizeof(WAVEHDR)); + if(result != MMSYSERR_NOERROR) { + print_last_error(result, "waveInAddBuffer"); + return -4; + } + + return 0; } static void* TSK_STDCALL __record_thread(void *param) { - tdav_producer_waveapi_t* producer = (tdav_producer_waveapi_t*)param; - DWORD dwEvent; - tsk_size_t i; + tdav_producer_waveapi_t* producer = (tdav_producer_waveapi_t*)param; + DWORD dwEvent; + tsk_size_t i; - TSK_DEBUG_INFO("__record_thread -- START"); + TSK_DEBUG_INFO("__record_thread -- START"); - // SetPriorityClass(GetCurrentThread(), REALTIME_PRIORITY_CLASS); + // SetPriorityClass(GetCurrentThread(), REALTIME_PRIORITY_CLASS); - for(;;){ - dwEvent = WaitForMultipleObjects(2, producer->events, FALSE, INFINITE); + for(;;) { + dwEvent = WaitForMultipleObjects(2, producer->events, FALSE, INFINITE); - if (dwEvent == 1){ - break; - } + if (dwEvent == 1) { + break; + } - else if (dwEvent == 0){ - EnterCriticalSection(&producer->cs); - for(i = 0; i< sizeof(producer->hWaveHeaders)/sizeof(producer->hWaveHeaders[0]); i++){ - if(producer->hWaveHeaders[i] && (producer->hWaveHeaders[i]->dwFlags & WHDR_DONE)){ - record_wavehdr(producer, producer->hWaveHeaders[i]); - } - } - LeaveCriticalSection(&producer->cs); - } - } + else if (dwEvent == 0) { + EnterCriticalSection(&producer->cs); + for(i = 0; i< sizeof(producer->hWaveHeaders)/sizeof(producer->hWaveHeaders[0]); i++) { + if(producer->hWaveHeaders[i] && (producer->hWaveHeaders[i]->dwFlags & WHDR_DONE)) { + record_wavehdr(producer, producer->hWaveHeaders[i]); + } + } + LeaveCriticalSection(&producer->cs); + } + } - TSK_DEBUG_INFO("__record_thread() -- STOP"); - + TSK_DEBUG_INFO("__record_thread() -- STOP"); - return tsk_null; + + return tsk_null; } @@ -191,131 +193,131 @@ static void* TSK_STDCALL __record_thread(void *param) /* ============ Media Producer Interface ================= */ int tdav_producer_waveapi_prepare(tmedia_producer_t* self, const tmedia_codec_t* codec) { - tdav_producer_waveapi_t* producer = (tdav_producer_waveapi_t*)self; - tsk_size_t i; - - if(!producer || !codec && codec->plugin){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } - - TMEDIA_PRODUCER(producer)->audio.channels = TMEDIA_CODEC_CHANNELS_AUDIO_ENCODING(codec); - TMEDIA_PRODUCER(producer)->audio.rate = TMEDIA_CODEC_RATE_ENCODING(codec); - TMEDIA_PRODUCER(producer)->audio.ptime = TMEDIA_CODEC_PTIME_AUDIO_ENCODING(codec); - /* codec should have ptime */ - - - /* Format */ - ZeroMemory(&producer->wfx, sizeof(WAVEFORMATEX)); - producer->wfx.wFormatTag = WAVE_FORMAT_PCM; - producer->wfx.nChannels = TMEDIA_PRODUCER(producer)->audio.channels; - producer->wfx.nSamplesPerSec = TMEDIA_PRODUCER(producer)->audio.rate; - producer->wfx.wBitsPerSample = TMEDIA_PRODUCER(producer)->audio.bits_per_sample; - producer->wfx.nBlockAlign = (producer->wfx.nChannels * producer->wfx.wBitsPerSample/8); - producer->wfx.nAvgBytesPerSec = (producer->wfx.nSamplesPerSec * producer->wfx.nBlockAlign); - - /* Average bytes (count) for each notification */ - producer->bytes_per_notif = ((producer->wfx.nAvgBytesPerSec * TMEDIA_PRODUCER(producer)->audio.ptime)/1000); - - /* create buffers */ - for(i = 0; i< sizeof(producer->hWaveHeaders)/sizeof(producer->hWaveHeaders[0]); i++){ - create_wavehdr(producer, i); - } - - return 0; + tdav_producer_waveapi_t* producer = (tdav_producer_waveapi_t*)self; + tsk_size_t i; + + if(!producer || !codec && codec->plugin) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } + + TMEDIA_PRODUCER(producer)->audio.channels = TMEDIA_CODEC_CHANNELS_AUDIO_ENCODING(codec); + TMEDIA_PRODUCER(producer)->audio.rate = TMEDIA_CODEC_RATE_ENCODING(codec); + TMEDIA_PRODUCER(producer)->audio.ptime = TMEDIA_CODEC_PTIME_AUDIO_ENCODING(codec); + /* codec should have ptime */ + + + /* Format */ + ZeroMemory(&producer->wfx, sizeof(WAVEFORMATEX)); + producer->wfx.wFormatTag = WAVE_FORMAT_PCM; + producer->wfx.nChannels = TMEDIA_PRODUCER(producer)->audio.channels; + producer->wfx.nSamplesPerSec = TMEDIA_PRODUCER(producer)->audio.rate; + producer->wfx.wBitsPerSample = TMEDIA_PRODUCER(producer)->audio.bits_per_sample; + producer->wfx.nBlockAlign = (producer->wfx.nChannels * producer->wfx.wBitsPerSample/8); + producer->wfx.nAvgBytesPerSec = (producer->wfx.nSamplesPerSec * producer->wfx.nBlockAlign); + + /* Average bytes (count) for each notification */ + producer->bytes_per_notif = ((producer->wfx.nAvgBytesPerSec * TMEDIA_PRODUCER(producer)->audio.ptime)/1000); + + /* create buffers */ + for(i = 0; i< sizeof(producer->hWaveHeaders)/sizeof(producer->hWaveHeaders[0]); i++) { + create_wavehdr(producer, i); + } + + return 0; } int tdav_producer_waveapi_start(tmedia_producer_t* self) { - tdav_producer_waveapi_t* producer = (tdav_producer_waveapi_t*)self; - MMRESULT result; - tsk_size_t i; - - if(!producer){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } - - if(producer->started || producer->hWaveIn){ - TSK_DEBUG_WARN("Producer already started"); - return 0; - } - - /* create events */ - if(!producer->events[0]){ - producer->events[0] = CreateEvent(NULL, FALSE, FALSE, NULL); - } - if(!producer->events[1]){ - producer->events[1] = CreateEvent(NULL, FALSE, FALSE, NULL); - } - - /* open */ - result = waveInOpen((HWAVEIN *)&producer->hWaveIn, /*WAVE_MAPPER*/0, &producer->wfx, (DWORD)producer->events[0], (DWORD_PTR)producer, CALLBACK_EVENT); - if(result != MMSYSERR_NOERROR){ - print_last_error(result, "waveInOpen"); - return -2; - } - - /* start */ - result = waveInStart(producer->hWaveIn); - if(result != MMSYSERR_NOERROR){ - print_last_error(result, "waveInStart"); - return -2; - } - - /* write */ - for(i = 0; i< sizeof(producer->hWaveHeaders)/sizeof(LPWAVEHDR); i++){ - add_wavehdr(producer, i); - } - - /* start thread */ - producer->started = tsk_true; - tsk_thread_create(&producer->tid[0], __record_thread, producer); - - return 0; + tdav_producer_waveapi_t* producer = (tdav_producer_waveapi_t*)self; + MMRESULT result; + tsk_size_t i; + + if(!producer) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } + + if(producer->started || producer->hWaveIn) { + TSK_DEBUG_WARN("Producer already started"); + return 0; + } + + /* create events */ + if(!producer->events[0]) { + producer->events[0] = CreateEvent(NULL, FALSE, FALSE, NULL); + } + if(!producer->events[1]) { + producer->events[1] = CreateEvent(NULL, FALSE, FALSE, NULL); + } + + /* open */ + result = waveInOpen((HWAVEIN *)&producer->hWaveIn, /*WAVE_MAPPER*/0, &producer->wfx, (DWORD)producer->events[0], (DWORD_PTR)producer, CALLBACK_EVENT); + if(result != MMSYSERR_NOERROR) { + print_last_error(result, "waveInOpen"); + return -2; + } + + /* start */ + result = waveInStart(producer->hWaveIn); + if(result != MMSYSERR_NOERROR) { + print_last_error(result, "waveInStart"); + return -2; + } + + /* write */ + for(i = 0; i< sizeof(producer->hWaveHeaders)/sizeof(LPWAVEHDR); i++) { + add_wavehdr(producer, i); + } + + /* start thread */ + producer->started = tsk_true; + tsk_thread_create(&producer->tid[0], __record_thread, producer); + + return 0; } int tdav_producer_waveapi_pause(tmedia_producer_t* self) { - tdav_producer_waveapi_t* producer = (tdav_producer_waveapi_t*)self; + tdav_producer_waveapi_t* producer = (tdav_producer_waveapi_t*)self; - if(!producer){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } + if(!producer) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } - return 0; + return 0; } int tdav_producer_waveapi_stop(tmedia_producer_t* self) { - tdav_producer_waveapi_t* producer = (tdav_producer_waveapi_t*)self; - MMRESULT result; + tdav_producer_waveapi_t* producer = (tdav_producer_waveapi_t*)self; + MMRESULT result; - if(!self){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } + if(!self) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } - if(!producer->started){ - TSK_DEBUG_WARN("Producer not started"); - return 0; - } + if(!producer->started) { + TSK_DEBUG_WARN("Producer not started"); + return 0; + } - /* stop thread */ - if(producer->tid[0]){ - SetEvent(producer->events[1]); - tsk_thread_join(&(producer->tid[0])); - } + /* stop thread */ + if(producer->tid[0]) { + SetEvent(producer->events[1]); + tsk_thread_join(&(producer->tid[0])); + } - /* should be done here */ - producer->started = tsk_false; + /* should be done here */ + producer->started = tsk_false; - if(producer->hWaveIn && (((result = waveInReset(producer->hWaveIn)) != MMSYSERR_NOERROR) || ((result = waveInClose(producer->hWaveIn)) != MMSYSERR_NOERROR))){ - print_last_error(result, "waveInReset/waveInClose"); - } + if(producer->hWaveIn && (((result = waveInReset(producer->hWaveIn)) != MMSYSERR_NOERROR) || ((result = waveInClose(producer->hWaveIn)) != MMSYSERR_NOERROR))) { + print_last_error(result, "waveInReset/waveInClose"); + } - return 0; + return 0; } @@ -325,68 +327,66 @@ int tdav_producer_waveapi_stop(tmedia_producer_t* self) /* constructor */ static tsk_object_t* tdav_producer_waveapi_ctor(tsk_object_t * self, va_list * app) { - tdav_producer_waveapi_t *producer = self; - if(producer){ - /* init base */ - tdav_producer_audio_init(TDAV_PRODUCER_AUDIO(producer)); - /* init self */ - InitializeCriticalSection(&producer->cs); - } - return self; + tdav_producer_waveapi_t *producer = self; + if(producer) { + /* init base */ + tdav_producer_audio_init(TDAV_PRODUCER_AUDIO(producer)); + /* init self */ + InitializeCriticalSection(&producer->cs); + } + return self; } /* destructor */ static tsk_object_t* tdav_producer_waveapi_dtor(tsk_object_t * self) -{ - tdav_producer_waveapi_t *producer = self; - if(producer){ - tsk_size_t i; - - /* stop */ - if(producer->started){ - tdav_producer_waveapi_stop(self); - } - - /* deinit base */ - tdav_producer_audio_deinit(TDAV_PRODUCER_AUDIO(producer)); - /* deinit self */ - for(i = 0; i< sizeof(producer->hWaveHeaders)/sizeof(LPWAVEHDR); i++){ - free_wavehdr(producer, i); - } - if(producer->hWaveIn){ - waveInClose(producer->hWaveIn); - } - if(producer->events[0]){ - CloseHandle(producer->events[0]); - } - if(producer->events[1]){ - CloseHandle(producer->events[1]); - } - DeleteCriticalSection(&producer->cs); - } - - return self; +{ + tdav_producer_waveapi_t *producer = self; + if(producer) { + tsk_size_t i; + + /* stop */ + if(producer->started) { + tdav_producer_waveapi_stop(self); + } + + /* deinit base */ + tdav_producer_audio_deinit(TDAV_PRODUCER_AUDIO(producer)); + /* deinit self */ + for(i = 0; i< sizeof(producer->hWaveHeaders)/sizeof(LPWAVEHDR); i++) { + free_wavehdr(producer, i); + } + if(producer->hWaveIn) { + waveInClose(producer->hWaveIn); + } + if(producer->events[0]) { + CloseHandle(producer->events[0]); + } + if(producer->events[1]) { + CloseHandle(producer->events[1]); + } + DeleteCriticalSection(&producer->cs); + } + + return self; } /* object definition */ -static const tsk_object_def_t tdav_producer_waveapi_def_s = -{ - sizeof(tdav_producer_waveapi_t), - tdav_producer_waveapi_ctor, - tdav_producer_waveapi_dtor, - tdav_producer_audio_cmp, +static const tsk_object_def_t tdav_producer_waveapi_def_s = { + sizeof(tdav_producer_waveapi_t), + tdav_producer_waveapi_ctor, + tdav_producer_waveapi_dtor, + tdav_producer_audio_cmp, }; /* plugin definition*/ -static const tmedia_producer_plugin_def_t tdav_producer_waveapi_plugin_def_s = -{ - &tdav_producer_waveapi_def_s, - - tmedia_audio, - "Microsoft WaveAPI producer", - - tdav_producer_waveapi_set, - tdav_producer_waveapi_prepare, - tdav_producer_waveapi_start, - tdav_producer_waveapi_pause, - tdav_producer_waveapi_stop +static const tmedia_producer_plugin_def_t tdav_producer_waveapi_plugin_def_s = { + &tdav_producer_waveapi_def_s, + + tmedia_audio, + "Microsoft WaveAPI producer", + + tdav_producer_waveapi_set, + tdav_producer_waveapi_prepare, + tdav_producer_waveapi_start, + tdav_producer_waveapi_pause, + tdav_producer_waveapi_stop }; const tmedia_producer_plugin_def_t *tdav_producer_waveapi_plugin_def_t = &tdav_producer_waveapi_plugin_def_s; |