X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcpp%2FCPulseAudioClient.cpp;h=db411b4841511028093398835ca454fe7060ce3c;hb=06a5daa9b842ffd4e4ae0d56915e43f382776ca8;hp=ca3eb6132af979ed181ddbcf2fc6c2a9508170cb;hpb=e2e925a07ae1b75aa8300aeed0419d16c4eccb2c;p=platform%2Fcore%2Fapi%2Faudio-io.git diff --git a/src/cpp/CPulseAudioClient.cpp b/src/cpp/CPulseAudioClient.cpp index ca3eb61..db411b4 100644 --- a/src/cpp/CPulseAudioClient.cpp +++ b/src/cpp/CPulseAudioClient.cpp @@ -15,10 +15,10 @@ */ -#include #include "CAudioIODef.h" +#include +#include #ifdef ENABLE_DPM -#include #include #endif @@ -30,6 +30,8 @@ using namespace tizen_media_audio; * class CPulseAudioClient */ const char* CPulseAudioClient::CLIENT_NAME = "AUDIO_IO_PA_CLIENT"; +static const unsigned int drain_wait_interval = 10000; +static const unsigned int drain_wait_max_count = 30; CPulseAudioClient::CPulseAudioClient( EStreamDirection direction, @@ -47,7 +49,10 @@ CPulseAudioClient::CPulseAudioClient( __mpSyncReadDataPtr(NULL), __mSyncReadIndex(0), __mSyncReadLength(0), - __mIsUsedSyncRead(false) { + __mIsUsedSyncRead(false), + __mIsFirstStream(false), + __mIsDraining(false), + __mIsStarted(false) { } CPulseAudioClient::~CPulseAudioClient() { @@ -93,21 +98,18 @@ void CPulseAudioClient::__successContextCb(pa_context* c, int success, void* use static bool __is_microphone_restricted(void) { int state = 1; #ifdef ENABLE_DPM - dpm_context_h dpm_ctx_h; - dpm_restriction_policy_h dpm_policy_h; + device_policy_manager_h dpm_h = NULL; int ret = 0; - if ((dpm_ctx_h = dpm_context_create())) { - if ((dpm_policy_h = dpm_context_acquire_restriction_policy(dpm_ctx_h))) { - /* state: 0(disallowed), 1(allowed) */ - if ((ret = dpm_restriction_get_microphone_state(dpm_policy_h, &state))) - AUDIO_IO_LOGE("Failed to dpm_restriction_get_microphone_state(), ret(0x%x)", ret); - dpm_context_release_restriction_policy(dpm_ctx_h, dpm_policy_h); - } else - AUDIO_IO_LOGE("Failed to dpm_context_acquire_restriction_policy()"); - dpm_context_destroy(dpm_ctx_h); - } else - AUDIO_IO_LOGE("Failed to dpm_context_create()"); + if ((dpm_h = dpm_manager_create())) { + /* state: 0(disallowed), 1(allowed) */ + if ((ret = dpm_restriction_get_microphone_state(dpm_h, &state))) + AUDIO_IO_LOGE("Failed to dpm_restriction_get_microphone_state(), ret(0x%x)", ret); + dpm_manager_destroy(dpm_h); + AUDIO_IO_LOGD("microphone restriction state: %d(1:allowed, 0:disallowed)", state); + } else { + AUDIO_IO_LOGE("Failed to dpm_manager_create()"); + } #endif return (state ? false : true); } @@ -122,6 +124,9 @@ void CPulseAudioClient::__streamStateChangeCb(pa_stream* s, void* user_data) { case PA_STREAM_READY: AUDIO_IO_LOGD("The stream is ready"); pClient->__mpListener->onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_RUNNING); + if (pClient->__mDirection == EStreamDirection::STREAM_DIRECTION_PLAYBACK) + pClient->__mIsFirstStream = true; + pClient->__mIsInit = true; pa_threaded_mainloop_signal(pClient->__mpMainloop, 0); break; @@ -159,6 +164,15 @@ void CPulseAudioClient::__streamCaptureCb(pa_stream* s, size_t length, void* use pClient->__mpListener->onStream(pClient, length); } +#ifndef DISABLE_MOBILE_BACK_COMP +static void __dummy_write(pa_stream* s, size_t length) { + char* dummy = new char[length]; + memset(dummy, 0, length); + pa_stream_write(s, dummy, length, NULL, 0LL, PA_SEEK_RELATIVE); + delete [] dummy; +} +#endif + void CPulseAudioClient::__streamPlaybackCb(pa_stream* s, size_t length, void* user_data) { assert(s); assert(user_data); @@ -166,18 +180,31 @@ void CPulseAudioClient::__streamPlaybackCb(pa_stream* s, size_t length, void* us CPulseAudioClient* pClient = static_cast(user_data); assert(pClient->__mpListener); +#ifndef DISABLE_MOBILE_BACK_COMP if (pClient->__mIsInit == false) { - AUDIO_IO_LOGD("Occurred this listener when an out stream is on the way to create : Write dummy, length[%d]", length); - - char* dummy = new char[length]; - memset(dummy, 0, length); - pa_stream_write(s, dummy, length, NULL, 0LL, PA_SEEK_RELATIVE); - delete [] dummy; - + AUDIO_IO_LOGD("Occurred this listener when an out stream is on the way to create : Write dummy, length[%zu]", length); + __dummy_write(s, length); return; } + if (pClient->isCorked()) { + AUDIO_IO_LOGD("Occurred this listener when an out stream is CORKED : Write dummy, length[%zu]", length); + __dummy_write(s, length); + return; + } +#endif pClient->__mpListener->onStream(pClient, length); + +#ifndef DISABLE_MOBILE_BACK_COMP + /* If stream is not written in first callback during prepare, + then write dummy data to ensure the start */ + if (pClient->__mSpec.getStreamLatency() == CPulseStreamSpec::EStreamLatency::STREAM_LATENCY_OUTPUT_DEFAULT_ASYNC && + pClient->__mIsFirstStream) { + AUDIO_IO_LOGW("[async] Write dummy of length[%zu] since not written in first callback during prepare", length); + __dummy_write(s, length); + pClient->__mIsFirstStream = false; + } +#endif } void CPulseAudioClient::__streamLatencyUpdateCb(pa_stream* s, void* user_data) { @@ -189,6 +216,41 @@ void CPulseAudioClient::__streamLatencyUpdateCb(pa_stream* s, void* user_data) { pa_threaded_mainloop_signal(pClient->__mpMainloop, 0); } +void CPulseAudioClient::__streamStartedCb(pa_stream* s, void* user_data) { + assert(s); + assert(user_data); + + CPulseAudioClient* pClient = static_cast(user_data); + + AUDIO_IO_LOGD("stream %p started.", pClient); + + pClient->__mIsStarted = true; +} + +void CPulseAudioClient::__streamUnderflowCb(pa_stream* s, void* user_data) { + assert(s); + assert(user_data); + + CPulseAudioClient* pClient = static_cast(user_data); + + AUDIO_IO_LOGD("stream %p UnderFlow...", pClient); + + pClient->__mIsStarted = false; +} + +void CPulseAudioClient::__streamEventCb(pa_stream* s, const char *name, pa_proplist *pl, void *user_data) { + assert(s); + assert(user_data); + + AUDIO_IO_LOGE("NAME : %s, Prop : %p", name, pl); + + CPulseAudioClient* pClient = static_cast(user_data); + if (strcmp(name, PA_STREAM_EVENT_POP_TIMEOUT) == 0) { + pa_operation_unref(pa_stream_cork(pClient->__mpStream, 1, NULL, NULL)); + } +} + + void CPulseAudioClient::__successStreamCb(pa_stream* s, int success, void* user_data) { AUDIO_IO_LOGD("pa_stream[%p], success[%d], user_data[%p]", s, success, user_data); assert(s); @@ -200,8 +262,29 @@ void CPulseAudioClient::__successStreamCb(pa_stream* s, int success, void* user_ pa_threaded_mainloop_signal(pClient->__mpMainloop, 0); } -void CPulseAudioClient::initialize() throw(CAudioError) { - AUDIO_IO_LOGD(""); +void CPulseAudioClient::__successDrainCbInThread(pa_stream* s, int success, void* user_data) { + AUDIO_IO_LOGD("pa_stream[%p], success[%d], user_data[%p]", s, success, user_data); + assert(s); + assert(user_data); + + CPulseAudioClient* pClient = static_cast(user_data); + pClient->__mIsOperationSuccess = static_cast(success); + pClient->__mIsDraining = false; +} + +void CPulseAudioClient::__successDrainCb(pa_stream* s, int success, void* user_data) { + AUDIO_IO_LOGD("pa_stream[%p], success[%d], user_data[%p]", s, success, user_data); + assert(s); + assert(user_data); + + CPulseAudioClient* pClient = static_cast(user_data); + pClient->__mIsOperationSuccess = static_cast(success); + pClient->__mIsDraining = false; + + pa_threaded_mainloop_signal(pClient->__mpMainloop, 0); +} + +void CPulseAudioClient::initialize() { if (__mIsInit == true) { return; } @@ -228,7 +311,7 @@ void CPulseAudioClient::initialize() throw(CAudioError) { } // Adds latency on proplist for delivery to PULSEAUDIO - AUDIO_IO_LOGD("LATENCY : %s[%d]", __mSpec.getStreamLatencyToString(), __mSpec.getStreamLatency()); + AUDIO_IO_LOGD("LATENCY : %s[%d]", __mSpec.getStreamLatencyToString(), static_cast(__mSpec.getStreamLatency())); pa_proplist_setf(__mpPropList, PA_PROP_MEDIA_TIZEN_AUDIO_LATENCY, "%s", __mSpec.getStreamLatencyToString()); // Allocates PA mainloop @@ -296,6 +379,11 @@ void CPulseAudioClient::initialize() throw(CAudioError) { pa_stream_set_read_callback(__mpStream, __streamCaptureCb, this); pa_stream_set_write_callback(__mpStream, __streamPlaybackCb, this); pa_stream_set_latency_update_callback(__mpStream, __streamLatencyUpdateCb, this); + pa_stream_set_event_callback(__mpStream, __streamEventCb, this); + if (__mDirection == EStreamDirection::STREAM_DIRECTION_PLAYBACK) { + pa_stream_set_started_callback(__mpStream, __streamStartedCb, this); + pa_stream_set_underflow_callback(__mpStream, __streamUnderflowCb, this); + } // Connect stream with PA Server @@ -303,6 +391,9 @@ void CPulseAudioClient::initialize() throw(CAudioError) { pa_stream_flags_t flags = static_cast( PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_ADJUST_LATENCY | +#ifndef DISABLE_MOBILE_BACK_COMP + PA_STREAM_START_CORKED | +#endif PA_STREAM_AUTO_TIMING_UPDATE); ret = pa_stream_connect_playback(__mpStream, NULL, NULL, flags, NULL, NULL); @@ -310,6 +401,9 @@ void CPulseAudioClient::initialize() throw(CAudioError) { pa_stream_flags_t flags = static_cast( PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_ADJUST_LATENCY | +#ifndef DISABLE_MOBILE_BACK_COMP + PA_STREAM_START_CORKED | +#endif PA_STREAM_AUTO_TIMING_UPDATE); ret = pa_stream_connect_record(__mpStream, NULL, NULL, flags); @@ -333,7 +427,11 @@ void CPulseAudioClient::initialize() throw(CAudioError) { if (!PA_STREAM_IS_GOOD(state)) { err = pa_context_errno(__mpContext); pa_threaded_mainloop_unlock(__mpMainloop); - THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INTERNAL_OPERATION, "pa_stream's state is not good : err[%d]", err); + if (err == PA_ERR_ACCESS) { + THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_DEVICE_POLICY_RESTRICTION, "pa_stream's state is not good : err[%d]", err); + } else { + THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INTERNAL_OPERATION, "pa_stream's state is not good : err[%d]", err); + } } /* Wait until the stream is ready */ @@ -343,17 +441,40 @@ void CPulseAudioClient::initialize() throw(CAudioError) { // End of synchronous pa_threaded_mainloop_unlock(__mpMainloop); - __mIsInit = true; - } catch (CAudioError e) { + // __mIsInit = true; // Moved to __streamStateChangeCb() + } catch (CAudioError& e) { finalize(); - throw e; + throw; } } void CPulseAudioClient::finalize() { AUDIO_IO_LOGD(""); - if (__mIsInit == false) { - return; + + if (__mpMainloop && isInThread() == false) + pa_threaded_mainloop_lock(__mpMainloop); + + /* clear callbacks */ + if (__mpStream) { + if (__mDirection == EStreamDirection::STREAM_DIRECTION_PLAYBACK) + pa_stream_set_write_callback(__mpStream, NULL, NULL); + else + pa_stream_set_read_callback(__mpStream, NULL, NULL); + pa_stream_set_latency_update_callback(__mpStream, NULL, NULL); + pa_stream_set_event_callback(__mpStream, NULL, NULL); + } + + if (__mpMainloop && isInThread() == false) + pa_threaded_mainloop_unlock(__mpMainloop); + + /* Wait for drain complete if draining before finalize */ + if (__mIsDraining) { + unsigned int drain_wait_count = 0; + while (__mIsDraining && drain_wait_count++ < drain_wait_max_count) { + usleep(drain_wait_interval); + } + AUDIO_IO_LOGD("wait for drain complete!!!! [%d * %d usec]", + drain_wait_count, drain_wait_interval); } if (__mpMainloop != NULL) { @@ -385,7 +506,7 @@ void CPulseAudioClient::finalize() { __mIsInit = false; } -int CPulseAudioClient::read(void* buffer, size_t length) throw(CAudioError) { +int CPulseAudioClient::read(void* buffer, size_t length) { if (__mIsInit == false) { THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient"); } @@ -419,7 +540,7 @@ int CPulseAudioClient::read(void* buffer, size_t length) throw(CAudioError) { if (__mSyncReadLength <= 0) { #ifdef _AUDIO_IO_DEBUG_TIMING_ - AUDIO_IO_LOGD("readLength(%d byte) is not valid. wait...", __mSyncReadLength); + AUDIO_IO_LOGD("readLength(%zu byte) is not valid. wait...", __mSyncReadLength); #endif pa_threaded_mainloop_wait(__mpMainloop); } else if (__mpSyncReadDataPtr == NULL) { @@ -441,7 +562,7 @@ int CPulseAudioClient::read(void* buffer, size_t length) throw(CAudioError) { // Copy partial pcm data on out parameter #ifdef _AUDIO_IO_DEBUG_TIMING_ - AUDIO_IO_LOGD("memcpy() that a peeked buffer[%], index[%d], length[%d] on out buffer", (const uint8_t*)(__mpSyncReadDataPtr) + __mSyncReadIndex, __mSyncReadIndex, l); + AUDIO_IO_LOGD("memcpy() that a peeked buffer[%p], index[%zu], length[%zu] on out buffer", (const uint8_t*)(__mpSyncReadDataPtr) + __mSyncReadIndex, __mSyncReadIndex, l); #endif memcpy(buffer, (const uint8_t*)__mpSyncReadDataPtr + __mSyncReadIndex, l); @@ -471,16 +592,16 @@ int CPulseAudioClient::read(void* buffer, size_t length) throw(CAudioError) { pa_threaded_mainloop_unlock(__mpMainloop); __mIsUsedSyncRead = false; - } catch (CAudioError e) { + } catch (CAudioError& e) { pa_threaded_mainloop_unlock(__mpMainloop); __mIsUsedSyncRead = false; - throw e; + throw; } return length; } -int CPulseAudioClient::peek(const void** buffer, size_t* length) throw(CAudioError) { +int CPulseAudioClient::peek(const void** buffer, size_t* length) { if (__mIsInit == false) { THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient"); } @@ -506,7 +627,7 @@ int CPulseAudioClient::peek(const void** buffer, size_t* length) throw(CAudioErr } #ifdef _AUDIO_IO_DEBUG_TIMING_ - AUDIO_IO_LOGD("buffer[%p], length[%d]", *buffer, *length); + AUDIO_IO_LOGD("buffer[%p], length[%zu]", *buffer, *length); #endif if (ret < 0) { @@ -516,7 +637,7 @@ int CPulseAudioClient::peek(const void** buffer, size_t* length) throw(CAudioErr return ret; } -int CPulseAudioClient::drop() throw(CAudioError) { +int CPulseAudioClient::drop() { if (__mIsInit == false) { THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient"); } @@ -548,13 +669,7 @@ int CPulseAudioClient::drop() throw(CAudioError) { return ret; } -int CPulseAudioClient::write(const void* data, size_t length) throw(CAudioError) { - if (__mIsInit == false) { - THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient"); - } - - checkRunningState(); - +int CPulseAudioClient::write(const void* data, size_t length) { if (data == NULL) { THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_ARGUMENT, "The parameter is invalid"); } @@ -566,14 +681,39 @@ int CPulseAudioClient::write(const void* data, size_t length) throw(CAudioError) int ret = 0; #ifdef _AUDIO_IO_DEBUG_TIMING_ - AUDIO_IO_LOGD("data[%p], length[%d]", data, length); + AUDIO_IO_LOGD("data[%p], length[%zu], First[%d]", data, length, __mIsFirstStream); #endif if (isInThread() == false) { pa_threaded_mainloop_lock(__mpMainloop); + if (pa_stream_is_corked(__mpStream)) { + AUDIO_IO_LOGW("stream is corked...do uncork here first!!!!"); + pa_operation_unref(pa_stream_cork(__mpStream, 0, NULL, this)); + } + ret = pa_stream_write(__mpStream, data, length, NULL, 0LL, PA_SEEK_RELATIVE); pa_threaded_mainloop_unlock(__mpMainloop); } else { + if (pa_stream_is_corked(__mpStream)) { + AUDIO_IO_LOGW("stream is corked...do uncork here first!!!!"); + pa_operation_unref(pa_stream_cork(__mpStream, 0, NULL, this)); + } + + if (__mIsFirstStream) { + const pa_buffer_attr* attr = pa_stream_get_buffer_attr(__mpStream); + uint32_t prebuf = attr->prebuf; + // Compensate amount of prebuf in first stream callback when audio-io use prebuf(-1) + // Because a stream will never start when an application wrote less than prebuf at first + if (length < prebuf) { + char* dummy = new char[prebuf - length]; + memset(dummy, 0, prebuf - length); + pa_stream_write(__mpStream, dummy, prebuf - length, NULL, 0LL, PA_SEEK_RELATIVE); + delete [] dummy; + } + __mIsFirstStream = false; + AUDIO_IO_LOGW("FIRST STREAM CALLBACK : length[%zu], prebuf[%d], dummy[%zu]", + length, prebuf, (length < prebuf) ? prebuf - length : 0); + } ret = pa_stream_write(__mpStream, data, length, NULL, 0LL, PA_SEEK_RELATIVE); } @@ -584,7 +724,7 @@ int CPulseAudioClient::write(const void* data, size_t length) throw(CAudioError) return ret; } -void CPulseAudioClient::cork(bool cork) throw(CAudioError) { +void CPulseAudioClient::cork(bool cork) { AUDIO_IO_LOGD("cork[%d]", cork); if (__mIsInit == false) { @@ -597,6 +737,10 @@ void CPulseAudioClient::cork(bool cork) throw(CAudioError) { checkRunningState(); + // Set __mIsFirstStream flag when uncork(resume) stream, because prebuf will be enable again + if (cork == false) + __mIsFirstStream = true; + if (isInThread() == false) { pa_threaded_mainloop_lock(__mpMainloop); pa_operation_unref(pa_stream_cork(__mpStream, static_cast(cork), __successStreamCb, this)); @@ -608,7 +752,7 @@ void CPulseAudioClient::cork(bool cork) throw(CAudioError) { return; } -bool CPulseAudioClient::isCorked() throw(CAudioError) { +bool CPulseAudioClient::isCorked() { if (__mIsInit == false) { THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient"); } @@ -625,33 +769,55 @@ bool CPulseAudioClient::isCorked() throw(CAudioError) { isCork = pa_stream_is_corked(__mpStream); } +#ifdef _AUDIO_IO_DEBUG_TIMING_ AUDIO_IO_LOGD("isCork[%d]", isCork); +#endif return static_cast(isCork); } -bool CPulseAudioClient::drain() throw(CAudioError) { - AUDIO_IO_LOGD("drain"); - +bool CPulseAudioClient::drain() { if (__mIsInit == false) { THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient"); } checkRunningState(); + if (isCorked()) { + AUDIO_IO_LOGW("Corked..."); + return true; + } + + if (__mIsDraining) { + AUDIO_IO_LOGW("already draining..."); + return true; + } + + if (!__mIsStarted) { + AUDIO_IO_LOGW("stream not started yet...skip drain"); + return true; + } + if (isInThread() == false) { + AUDIO_IO_LOGD("drain"); pa_threaded_mainloop_lock(__mpMainloop); - pa_operation_unref(pa_stream_drain(__mpStream, __successStreamCb, this)); + pa_operation* o = pa_stream_drain(__mpStream, __successDrainCb, this); + __mIsDraining = true; + while (pa_operation_get_state(o) == PA_OPERATION_RUNNING) { + pa_threaded_mainloop_wait(__mpMainloop); + } + pa_operation_unref(o); pa_threaded_mainloop_unlock(__mpMainloop); + AUDIO_IO_LOGD("drain done"); } else { - pa_operation_unref(pa_stream_drain(__mpStream, __successStreamCb, this)); + AUDIO_IO_LOGD("drain in thread"); + pa_operation_unref(pa_stream_drain(__mpStream, __successDrainCbInThread, this)); + __mIsDraining = true; } return true; } -bool CPulseAudioClient::flush() throw(CAudioError) { - AUDIO_IO_LOGD("flush"); - +bool CPulseAudioClient::flush() { if (__mIsInit == false) { THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient"); } @@ -659,17 +825,19 @@ bool CPulseAudioClient::flush() throw(CAudioError) { checkRunningState(); if (isInThread() == false) { + AUDIO_IO_LOGD("flush"); pa_threaded_mainloop_lock(__mpMainloop); pa_operation_unref(pa_stream_flush(__mpStream, __successStreamCb, this)); pa_threaded_mainloop_unlock(__mpMainloop); } else { + AUDIO_IO_LOGD("flush in thread"); pa_operation_unref(pa_stream_flush(__mpStream, __successStreamCb, this)); } return true; } -size_t CPulseAudioClient::getWritableSize() throw(CAudioError) { +size_t CPulseAudioClient::getWritableSize() { if (__mIsInit == false) { THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient"); } @@ -693,18 +861,14 @@ size_t CPulseAudioClient::getWritableSize() throw(CAudioError) { return ret; } -void CPulseAudioClient::checkRunningState() throw(CAudioError) { - if (__mIsInit == false) { - THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient"); - } - +void CPulseAudioClient::checkRunningState() { if (__mpContext == NULL || PA_CONTEXT_IS_GOOD(pa_context_get_state(__mpContext)) == 0) { THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_NOT_INITIALIZED, "The context[%p] is not created or not good state", __mpContext); } if (__mpStream == NULL || PA_STREAM_IS_GOOD(pa_stream_get_state(__mpStream)) == 0) { THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_NOT_INITIALIZED, "The stream[%p] is not created or not good state", __mpStream); } - if (pa_context_get_state(__mpContext) != PA_CONTEXT_READY || pa_stream_get_state(__mpStream) != PA_STREAM_READY) { + if (pa_context_get_state(__mpContext) != PA_CONTEXT_READY || pa_stream_get_state(__mpStream) != PA_STREAM_READY) { THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_NOT_INITIALIZED, "The context[%p] or stream[%p] state is not ready", __mpContext, __mpStream); } @@ -713,11 +877,7 @@ void CPulseAudioClient::checkRunningState() throw(CAudioError) { #endif } -bool CPulseAudioClient::isInThread() throw(CAudioError) { - if (__mIsInit == false) { - THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient"); - } - +bool CPulseAudioClient::isInThread() { int ret = pa_threaded_mainloop_in_thread(__mpMainloop); #ifdef _AUDIO_IO_DEBUG_TIMING_ @@ -726,7 +886,7 @@ bool CPulseAudioClient::isInThread() throw(CAudioError) { return static_cast(ret); } -size_t CPulseAudioClient::getReadableSize() throw(CAudioError) { +size_t CPulseAudioClient::getReadableSize() { if (__mIsInit == false) { THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient"); } @@ -750,7 +910,7 @@ size_t CPulseAudioClient::getReadableSize() throw(CAudioError) { return ret; } -size_t CPulseAudioClient::getBufferSize() throw(CAudioError) { +size_t CPulseAudioClient::getBufferSize() { if (__mIsInit == false) { THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient"); } @@ -772,16 +932,16 @@ size_t CPulseAudioClient::getBufferSize() throw(CAudioError) { if (__mDirection == EStreamDirection::STREAM_DIRECTION_PLAYBACK) { ret = attr->tlength; - AUDIO_IO_LOGD("PLAYBACK buffer size[%d]", ret); + AUDIO_IO_LOGD("PLAYBACK buffer size[%zu]", ret); } else { ret = attr->fragsize; - AUDIO_IO_LOGD("RECORD buffer size[%d]", ret); + AUDIO_IO_LOGD("RECORD buffer size[%zu]", ret); } - } catch (CAudioError err) { + } catch (CAudioError& e) { if (isInThread() == false) { pa_threaded_mainloop_unlock(__mpMainloop); } - throw err; + throw; } if (isInThread() == false) { @@ -791,7 +951,7 @@ size_t CPulseAudioClient::getBufferSize() throw(CAudioError) { return ret; } -pa_usec_t CPulseAudioClient::getLatency() throw(CAudioError) { +pa_usec_t CPulseAudioClient::getLatency() { if (__mIsInit == false) { THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient"); } @@ -827,9 +987,9 @@ pa_usec_t CPulseAudioClient::getLatency() throw(CAudioError) { /* Wait until latency data is available again */ pa_threaded_mainloop_wait(__mpMainloop); } - } catch (CAudioError e) { + } catch (CAudioError& e) { pa_threaded_mainloop_unlock(__mpMainloop); - throw e; + throw; } pa_threaded_mainloop_unlock(__mpMainloop); @@ -837,7 +997,7 @@ pa_usec_t CPulseAudioClient::getLatency() throw(CAudioError) { return negative ? 0 : ret; } -pa_usec_t CPulseAudioClient::getFinalLatency() throw(CAudioError) { +pa_usec_t CPulseAudioClient::getFinalLatency() { if (__mIsInit == false) { THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient"); } @@ -865,10 +1025,10 @@ pa_usec_t CPulseAudioClient::getFinalLatency() throw(CAudioError) { if (__mDirection == EStreamDirection::STREAM_DIRECTION_PLAYBACK) { ret = (pa_bytes_to_usec(buffer_attr->tlength, sample_spec) + timing_info->configured_sink_usec); - AUDIO_IO_LOGD("FINAL PLAYBACK LATENCY[%d]", ret); + AUDIO_IO_LOGD("FINAL PLAYBACK LATENCY[%" PRIu64 "]", ret); } else { ret = (pa_bytes_to_usec(buffer_attr->fragsize, sample_spec) + timing_info->configured_source_usec); - AUDIO_IO_LOGD("FINAL RECORD LATENCY[%d]", ret); + AUDIO_IO_LOGD("FINAL RECORD LATENCY[%" PRIu64 "]", ret); } } else { THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_NOT_SUPPORTED, "This version(ver.%d) is not supported", ver); @@ -877,11 +1037,11 @@ pa_usec_t CPulseAudioClient::getFinalLatency() throw(CAudioError) { if (isInThread() == false) { pa_threaded_mainloop_unlock(__mpMainloop); } - } catch (CAudioError e) { + } catch (CAudioError& e) { if (isInThread() == false) { pa_threaded_mainloop_unlock(__mpMainloop); } - throw e; + throw; } return ret;