X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcpp%2FCAudioInput.cpp;h=40521fbf6bef474f56ae33b149f5a5a7a482777b;hb=907fc08da90dfa673c95794b5bf7b7980e8c3d76;hp=e2c2b77936a8353e95edbc17caaa9ba073829425;hpb=aae671cb5d6dcc26137b13873182ff83802d0de0;p=platform%2Fcore%2Fapi%2Faudio-io.git diff --git a/src/cpp/CAudioInput.cpp b/src/cpp/CAudioInput.cpp index e2c2b77..40521fb 100644 --- a/src/cpp/CAudioInput.cpp +++ b/src/cpp/CAudioInput.cpp @@ -15,33 +15,41 @@ */ +#include + +#include #include "CAudioIODef.h" +#include +#define RECORDER_PRIVILEGE "http://tizen.org/privilege/recorder" +#define CLIENT_NAME "AUDIO_IO_PA_CLIENT" using namespace std; using namespace tizen_media_audio; +struct PrivilegeData { + bool isPrivilegeAllowed; + pa_threaded_mainloop *paMainloop; +}; /** * class CAudioInput inherited by CAudioIO */ -CAudioInput::CAudioInput(CAudioInfo& info) - : CAudioIO(info), - mpSyncReadDataPtr(NULL), - mSyncReadIndex(0), - mSyncReadLength(0), - mIsUsedSyncRead(true) { +CAudioInput::CAudioInput(CAudioInfo& info) : + CAudioIO(info), + __mIsUsedSyncRead(true), + __mIsInit(false) { + mDirection = CAudioInfo::EAudioDirection::AUDIO_DIRECTION_IN; } CAudioInput::CAudioInput( unsigned int sampleRate, CAudioInfo::EChannel channel, CAudioInfo::ESampleType type, - CAudioInfo::EAudioType audioType) - : mpSyncReadDataPtr(NULL), - mSyncReadIndex(0), - mSyncReadLength(0), - mIsUsedSyncRead(true) { + CAudioInfo::EAudioType audioType) : + __mIsUsedSyncRead(true), + __mIsInit(false) { + mDirection = CAudioInfo::EAudioDirection::AUDIO_DIRECTION_IN; mAudioInfo = CAudioInfo(sampleRate, channel, type, audioType, -1); } @@ -55,11 +63,10 @@ void CAudioInput::onStream(CPulseAudioClient* pClient, size_t length) { * Does not call CAudioIO::onStream() for synchronization * if a user is using read() */ - if (mIsUsedSyncRead == true) { + if (__mIsUsedSyncRead == true) { #ifdef _AUDIO_IO_DEBUG_TIMING_ - AUDIO_IO_LOGD("Sync Read Mode! - signal! - pClient:[%p], length:[%d]", pClient, length); + AUDIO_IO_LOGD("Sync Read Mode! - pClient:[%p], length:[%d]", pClient, length); #endif - internalSignal(); return; } @@ -72,427 +79,350 @@ void CAudioInput::onStream(CPulseAudioClient* pClient, size_t length) { CAudioIO::onStream(pClient, length); } -void CAudioInput::onInterrupt(CAudioSessionHandler* pHandler, int id, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e state, const char *reason_for_change, const char *additional_info) { - assert(pHandler); - AUDIO_IO_LOGD("[pHandler:0x%x], [focus_type:%d], [state:%d], [reason_for_change:%s], [additional_info:%s]", pHandler, focus_type, state, reason_for_change, additional_info); - CAudioIO::onInterrupt(pHandler, id, focus_type, state, reason_for_change, additional_info); +void CAudioInput::__setInit(bool flag) { + __mIsInit = flag; } -void CAudioInput::onSignal(CAudioSessionHandler* pHandler, mm_sound_signal_name_t signal, int value) { - assert(pHandler); - AUDIO_IO_LOGD("[pHandler:0x%x], [signal:%d], [value:%d]", pHandler, signal, value); - CAudioIO::onSignal(pHandler, signal, value); +bool CAudioInput::__IsInit() { + return (CAudioIO::isInit() == true && __mIsInit == true); } -void CAudioInput::setInit(bool flag) { - mIsInit = flag; +bool CAudioInput::__IsReady() { + return CAudioIO::IsReady(); } -bool CAudioInput::IsInit() { - return (CAudioIO::isInit() == true && mIsInit == true); +static void __contextStateChangeCb(pa_context* c, void* user_data) { + pa_threaded_mainloop *paMainloop = static_cast(user_data); + assert(paMainloop); + assert(c); + + switch (pa_context_get_state(c)) { + case PA_CONTEXT_READY: + AUDIO_IO_LOGD("The context is ready"); + pa_threaded_mainloop_signal(paMainloop, 0); + break; + + case PA_CONTEXT_FAILED: + case PA_CONTEXT_TERMINATED: + AUDIO_IO_LOGD("The context is lost"); + pa_threaded_mainloop_signal(paMainloop, 0); + break; + + case PA_CONTEXT_UNCONNECTED: + case PA_CONTEXT_CONNECTING: + case PA_CONTEXT_AUTHORIZING: + case PA_CONTEXT_SETTING_NAME: + break; + } } -bool CAudioInput::IsReady() { - return CAudioIO::IsReady(); +static void __checkPrivilegeCb(pa_context *c, int success, void *user_data) { + AUDIO_IO_LOGD("pa_context[%p], success[%d], user_data[%p]", c, success, user_data); + assert(c); + assert(user_data); + + PrivilegeData *prData = static_cast(user_data); + prData->isPrivilegeAllowed = success ? true : false; + + pa_threaded_mainloop_signal(prData->paMainloop, 0); } -void CAudioInput::initialize() throw (CAudioError) { - if (IsInit() == true) { - return; +static bool __IsPrivilegeAllowed() { + pa_operation *o; + pa_context *c; + int err = 0; + PrivilegeData prData; + + prData.paMainloop = pa_threaded_mainloop_new(); + if (prData.paMainloop == NULL) + THROW_ERROR_MSG(CAudioError::EError::ERROR_OUT_OF_MEMORY, "Failed pa_threaded_mainloop_new()"); + + c = pa_context_new(pa_threaded_mainloop_get_api(prData.paMainloop), CLIENT_NAME); + if (c == NULL) + THROW_ERROR_MSG(CAudioError::EError::ERROR_OUT_OF_MEMORY, "Failed pa_context_new()"); + + pa_context_set_state_callback(c, __contextStateChangeCb, prData.paMainloop); + + if (pa_context_connect(c, NULL, PA_CONTEXT_NOFLAGS, NULL) < 0) + THROW_ERROR_MSG(CAudioError::EError::ERROR_OUT_OF_MEMORY, "Failed pa_context_connect()"); + + pa_threaded_mainloop_lock(prData.paMainloop); + + if (pa_threaded_mainloop_start(prData.paMainloop) < 0) { + pa_threaded_mainloop_unlock(prData.paMainloop); + THROW_ERROR_MSG(CAudioError::EError::ERROR_FAILED_OPERATION, "Failed pa_threaded_mainloop_start()"); } - try { - CAudioIO::initialize(); + while (true) { + pa_context_state_t state; + state = pa_context_get_state(c); - // Create ASM Handler - mpAudioSessionHandler = new CAudioSessionHandler(CAudioSessionHandler::AUDIO_SESSION_TYPE_CAPTURE, mAudioInfo, this); - if (mpAudioSessionHandler == NULL) { - THROW_ERROR_MSG(CAudioError::ERROR_OUT_OF_MEMORY, "Failed to allocate CAudioSessionHandler object"); + if (state == PA_CONTEXT_READY) + break; + + if (!PA_CONTEXT_IS_GOOD(state)) { + err = pa_context_errno(c); + pa_threaded_mainloop_unlock(prData.paMainloop); + THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INTERNAL_OPERATION, + "pa_context's state is not good : err[%d]", err); } - // Initialize ASM Handler - mpAudioSessionHandler->initialize(); + /* Wait until the context is ready */ + pa_threaded_mainloop_wait(prData.paMainloop); + } + + o = pa_context_check_privilege(c, RECORDER_PRIVILEGE, __checkPrivilegeCb, &prData); + if (!o) { + pa_threaded_mainloop_unlock(prData.paMainloop); + THROW_ERROR_MSG(CAudioError::EError::ERROR_FAILED_OPERATION, "Failed to pa_context_check_privilege()"); + } + while (pa_operation_get_state(o) == PA_OPERATION_RUNNING) + pa_threaded_mainloop_wait(prData.paMainloop); + pa_operation_unref(o); + + pa_threaded_mainloop_unlock(prData.paMainloop); + pa_threaded_mainloop_stop(prData.paMainloop); + pa_context_disconnect(c); + pa_context_unref(c); + pa_threaded_mainloop_free(prData.paMainloop); + + return prData.isPrivilegeAllowed; +} - setInit(true); - CAudioIO::onStateChanged(CAudioInfo::AUDIO_IO_STATE_IDLE); - } catch (CAudioError err) { +void CAudioInput::initialize() { + if (__IsInit() == true) + return; + + if (__IsPrivilegeAllowed() == false) + THROW_ERROR_MSG(CAudioError::EError::ERROR_PERMISSION_DENIED, "No privilege for record"); + + try { + CAudioIO::initialize(); + __setInit(true); + } catch (CAudioError& e) { finalize(); - throw err; + throw; } + + CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_IDLE); } void CAudioInput::finalize() { - if (IsInit() == false) { + if (__IsInit() == false) { AUDIO_IO_LOGD("Did not initialize"); return; } - SAFE_FINALIZE(mpAudioSessionHandler); - SAFE_DELETE(mpAudioSessionHandler); - CAudioIO::finalize(); - setInit(false); + __setInit(false); } -void CAudioInput::prepare() throw (CAudioError) { - if (IsInit() == false) { - THROW_ERROR_MSG(CAudioError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput"); - } +void CAudioInput::prepare() { + if (__IsInit() == false) + THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput"); - if (IsReady() == true) { + if (__IsReady() == true) { AUDIO_IO_LOGD("Already prepared CAudioInput"); + CAudioIO::prepare(); return; } - try { - internalLock(); - - // Check to invalid AudioType - CAudioInfo::EAudioType audioType = mAudioInfo.getAudioType(); - if (audioType < CAudioInfo::AUDIO_IN_TYPE_MEDIA || audioType > CAudioInfo::AUDIO_IN_TYPE_LOOPBACK) { - THROW_ERROR_MSG_FORMAT(CAudioError::ERROR_INVALID_ARGUMENT, "The audioType is invalid [type:%d]", static_cast(audioType)); - } - - if (mpAudioSessionHandler->getId() < 0) { //Did not registerSound() - // Check session to skip registration - if (isForceIgnore() == false && mpAudioSessionHandler->isSkipSessionEvent() == false) { - // Register ASM Listener - AUDIO_IO_LOGD("Register ASM Listener"); - mpAudioSessionHandler->registerSound(); - } - } + /* Check invalid AudioType */ + CAudioInfo::EAudioType audioType = mAudioInfo.getAudioType(); + if (audioType < CAudioInfo::EAudioType::AUDIO_IN_TYPE_MEDIA || + audioType >= CAudioInfo::EAudioType::AUDIO_OUT_TYPE_MEDIA) + THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_ARGUMENT, + "The audioType is invalid [type:%d]", static_cast(audioType)); - // Init StreamSpec - AUDIO_IO_LOGD("Set Strem Spec : CPulseStreamSpec::STREAM_LATENCY_INPUT_MID"); - CPulseStreamSpec::EStreamLatency streamSpec = CPulseStreamSpec::STREAM_LATENCY_INPUT_MID; + try { + /* Init StreamSpec */ + AUDIO_IO_LOGD("Set Stream Spec : CPulseStreamSpec::STREAM_LATENCY_INPUT_DEFAULT"); + CPulseStreamSpec::EStreamLatency streamSpec = CPulseStreamSpec::EStreamLatency::STREAM_LATENCY_INPUT_DEFAULT; CPulseStreamSpec spec(streamSpec, mAudioInfo); - // Create PulseAudio Handler - mpPulseAudioClient = new CPulseAudioClient(CPulseAudioClient::STREAM_DIRECTION_RECORD, spec, this); - if (mpPulseAudioClient == NULL) { - THROW_ERROR_MSG(CAudioError::ERROR_OUT_OF_MEMORY, "Failed to allocate CPulseAudioClient object"); - } - - // Initialize PulseAudio Handler + internalLock(); + mpPulseAudioClient = new CPulseAudioClient(CPulseAudioClient::EStreamDirection::STREAM_DIRECTION_RECORD, spec, this); mpPulseAudioClient->initialize(); - - if (isForceIgnore() == false && mpAudioSessionHandler->isSkipSessionEvent() == false) { - /* Updates ASM to PLAYING */ - mpAudioSessionHandler->updatePlaying(); - } - +#ifndef DISABLE_MOBILE_BACK_COMP + /* Uncork stream which is created with CORKED flag */ + mpPulseAudioClient->cork(false); +#endif internalUnlock(); - // Do Prepare CAudioIO::prepare(); - } catch (CAudioError e) { + } catch (CAudioError& e) { + SAFE_FINALIZE(mpPulseAudioClient); + SAFE_DELETE(mpPulseAudioClient); internalUnlock(); - throw e; + throw; + } catch (const std::bad_alloc&) { +//LCOV_EXCL_START + internalUnlock(); + THROW_ERROR_MSG(CAudioError::EError::ERROR_OUT_OF_MEMORY, "Failed to allocate CPulseAudioClient object"); +//LCOV_EXCL_STOP } } -void CAudioInput::unprepare() throw (CAudioError) { - if (IsInit() == false) { - THROW_ERROR_MSG(CAudioError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput"); - } +void CAudioInput::unprepare() { + if (__IsInit() == false) + THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, + "Did not initialize CAudioInput"); - if (IsReady() == false) { + if (__IsReady() == false) { AUDIO_IO_LOGD("Already unprepared"); return; } - try{ - // Do unprepare - CAudioIO::unprepare(); + CAudioIO::unprepare(); + try { internalLock(); - + if (mpPulseAudioClient && mpPulseAudioClient->isInThread()) + THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_OPERATION, "Can't unprepare inside pulseaudio thread"); SAFE_FINALIZE(mpPulseAudioClient); SAFE_DELETE(mpPulseAudioClient); - - if (mpAudioSessionHandler->getId() >= 0) { - /* Updates ASM to STOP */ - if (isForceIgnore() == false && mpAudioSessionHandler->isSkipSessionEvent() == false) { - mpAudioSessionHandler->updateStop(); - } - - bool isSkip = mpAudioSessionHandler->isSkipSessionEvent(); - if (isSkip == false) { - mpAudioSessionHandler->unregisterSound(); - } - } - internalUnlock(); - - CAudioIO::onStateChanged(CAudioInfo::AUDIO_IO_STATE_IDLE); - } catch (CAudioError e) { + } catch (CAudioError& e) { internalUnlock(); - throw e; + throw; } + + CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_IDLE); } -void CAudioInput::pause() throw (CAudioError) { - if (IsInit() == false || IsReady() == false) { - THROW_ERROR_MSG(CAudioError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput"); - } +void CAudioInput::pause() { + if (__IsInit() == false || __IsReady() == false) + THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, + "Did not initialize or prepare CAudioInput"); - try{ - CAudioIO::pause(); + if (CAudioIO::getState() != CAudioInfo::EAudioIOState::AUDIO_IO_STATE_RUNNING) + THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_STATE, + "Can't pause if not in Running state"); - internalLock(); + if (mpPulseAudioClient->isInThread() == true) + THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_OPERATION, "Can't pause in thread"); - /* Updates ASM to STOP */ - if (isForceIgnore() == false && mpAudioSessionHandler->isSkipSessionEvent() == false) { - mpAudioSessionHandler->updateStop(); - } - - internalUnlock(); - - CAudioIO::onStateChanged(CAudioInfo::AUDIO_IO_STATE_PAUSED); - } catch (CAudioError e) { - internalUnlock(); - throw e; - } + CAudioIO::pause(); + CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_PAUSED); } -void CAudioInput::resume() throw (CAudioError) { - if (IsInit() == false || IsReady() == false) { - THROW_ERROR_MSG(CAudioError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput"); - } +void CAudioInput::resume() { + if (__IsInit() == false || __IsReady() == false) + THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, + "Did not initialize or prepare CAudioInput"); - try { - internalLock(); + if (CAudioIO::getState() != CAudioInfo::EAudioIOState::AUDIO_IO_STATE_PAUSED) + THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_STATE, + "Can't resume if not in Paused state"); - if (isForceIgnore() == false && mpAudioSessionHandler->isSkipSessionEvent() == false) { + if (mpPulseAudioClient->isInThread() == true) + THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_OPERATION, "Can't resume in thread"); - /* Updates ASM to PLAYING */ - mpAudioSessionHandler->updatePlaying(); - } - - internalUnlock(); - - CAudioIO::resume(); - - CAudioIO::onStateChanged(CAudioInfo::AUDIO_IO_STATE_RUNNING); - } catch (CAudioError e) { - internalUnlock(); - throw e; - } + CAudioIO::resume(); + CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_RUNNING); } -void CAudioInput::drain() throw (CAudioError) { - if (IsInit() == false || IsReady() == false) { - THROW_ERROR_MSG(CAudioError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput"); - } - - try{ - CAudioIO::drain(); - } catch (CAudioError e) { - internalUnlock(); - throw e; - } +void CAudioInput::drain() { + THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_SUPPORTED, "Did not support drain of CAudioInput"); } -void CAudioInput::flush() throw (CAudioError) { - if (IsInit() == false || IsReady() == false) { - THROW_ERROR_MSG(CAudioError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput"); - } +void CAudioInput::flush() { + if (__IsInit() == false || __IsReady() == false) + THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, + "Did not initialize or prepare CAudioInput"); - try { - CAudioIO::flush(); - } catch (CAudioError e) { - internalUnlock(); - throw e; - } + CAudioIO::flush(); } -int CAudioInput::getBufferSize() throw (CAudioError) { - if (IsInit() == false) { - THROW_ERROR_MSG(CAudioError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput"); - } - - if (IsReady() == false) { - AUDIO_IO_LOGD("Warning: Did not prepare CAudioInput, then return zero"); - return 0; - } - - int size = 0; +int CAudioInput::getBufferSize() { + if (__IsInit() == false) + THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput"); - try { - internalLock(); - size = mpPulseAudioClient->getBufferSize(); - internalUnlock(); - } catch (CAudioError err) { - internalUnlock(); - throw err; - } - - return size; + /* FIXME : return calculated size here to satisfy backward compatibility */ + return (mAudioInfo.getSampleRate() * DEFAULT_PERIOD_SIZE) / 1000 * mAudioInfo.getSampleSize(); } -void CAudioInput::setStreamCallback(SStreamCallback callback) throw (CAudioError) { - if (IsInit() == false) { - THROW_ERROR_MSG(CAudioError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput"); - } +void CAudioInput::setStreamCallback(SStreamCallback callback) { + if (__IsInit() == false) + THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput"); - internalLock(); - if (callback.onStream == NULL) { - AUDIO_IO_LOGD("mIsUsedSyncRead = true"); - mIsUsedSyncRead = true; - } else { - AUDIO_IO_LOGD("mIsUsedSyncRead = false"); - mIsUsedSyncRead = false; - } - internalUnlock(); + if (callback.onStream == NULL) + __mIsUsedSyncRead = true; + else + __mIsUsedSyncRead = false; + AUDIO_IO_LOGD("__mIsUsedSyncRead = %d", __mIsUsedSyncRead); CAudioIO::setStreamCallback(callback); } -size_t CAudioInput::read(void* buffer, size_t length) throw (CAudioError) { - if (IsInit() == false || IsReady() == false) { - THROW_ERROR_MSG(CAudioError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput"); - } +size_t CAudioInput::read(void* buffer, size_t length) { + if (__IsInit() == false || __IsReady() == false) + THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, + "Did not initialize or prepare CAudioInput"); - if (buffer == NULL) { - THROW_ERROR_MSG_FORMAT(CAudioError::ERROR_INVALID_ARGUMENT, "Parameters are invalid - buffer:%p, length:%d", buffer, length); - } + if (buffer == NULL) + THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_ARGUMENT, + "Parameters are NULL buffer:%p", buffer); - /* Checks synchronous flag */ - if (mIsUsedSyncRead == false) { - THROW_ERROR_MSG(CAudioError::ERROR_NOT_SUPPORTED, "Does not support read() if receive stream callback"); - } + if (CAudioIO::getState() != CAudioInfo::EAudioIOState::AUDIO_IO_STATE_RUNNING) + THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_OPERATION, + "Can't read if not in Running state"); - internalLock(); + /* Checks synchronous flag */ + if (__mIsUsedSyncRead == false) + THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_OPERATION, + "Invalid operation of read() if receive stream callback"); - size_t lengthIter = length; int ret = 0; try { - while (lengthIter > 0) { - size_t l; - - while (mpSyncReadDataPtr == NULL) { - ret = mpPulseAudioClient->peek(&mpSyncReadDataPtr, &mSyncReadLength); - if (ret != 0) { - THROW_ERROR_MSG_FORMAT(CAudioError::ERROR_INTERNAL_OPERATION, "Failed CPulseAudioClient::peek() ret:[%d]", ret); - } - - if (mSyncReadLength <= 0) { -#ifdef _AUDIO_IO_DEBUG_TIMING_ - AUDIO_IO_LOGD("readLength(%d byte) is not valid.. wait..", mSyncReadLength); -#endif - internalWait(); - } else if (mpSyncReadDataPtr == NULL) { - /* There's a hole in the stream, skip it. We could generate - * silence, but that wouldn't work for compressed streams. - */ - ret = mpPulseAudioClient->drop(); - if (ret != 0) { - THROW_ERROR_MSG_FORMAT(CAudioError::ERROR_INTERNAL_OPERATION, "Failed CPulseAudioClient::drop() ret:[%d]", ret); - } - } else { - mSyncReadIndex = 0; - } - }//end of while (pReadData == NULL) - - if (mSyncReadLength < lengthIter) { - l = mSyncReadLength; - } else { - l = lengthIter; - } - - // Copy partial pcm data on out parameter -#ifdef _AUDIO_IO_DEBUG_TIMING_ - AUDIO_IO_LOGD("memcpy() that a peeked buffer(%p), index(%d), length(%d), on out buffer", (const uint8_t*)(mpSyncReadDataPtr) + mSyncReadIndex, mSyncReadIndex, l); -#endif - memcpy(buffer, (const uint8_t*)mpSyncReadDataPtr + mSyncReadIndex, l); + internalLock(); - // Move next position - buffer = (uint8_t*)buffer + l; - lengthIter -= l; + // If another thread did call unprepare, do not read + if (mpPulseAudioClient == NULL) + THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, + "Did not initialize CPulseAudioClient"); - // Adjusts the rest length - mSyncReadIndex += l; - mSyncReadLength -= l; + // Block until read done + ret = mpPulseAudioClient->read(buffer, length); + internalUnlock(); - if (mSyncReadLength == 0) { -#ifdef _AUDIO_IO_DEBUG_TIMING_ - AUDIO_IO_LOGD("mSyncReadLength is zero - Do drop()"); -#endif - ret = mpPulseAudioClient->drop(); - if (ret != 0) { - THROW_ERROR_MSG_FORMAT(CAudioError::ERROR_INTERNAL_OPERATION, "Failed CPulseAudioClient::drop() ret:[%d]", ret); - } - - // Reset the internal pointer - mpSyncReadDataPtr = NULL; - mSyncReadLength = 0; - mSyncReadIndex = 0; - } - }//end of while (length > 0) - } catch (CAudioError e) { + sched_yield(); + } catch (CAudioError& e) { internalUnlock(); - throw e; + throw; } - internalUnlock(); - - return length; + return ret; } -int CAudioInput::peek(const void** buffer, size_t* length) throw (CAudioError) { - if (IsInit() == false || IsReady() == false) { - THROW_ERROR_MSG(CAudioError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput"); - } +int CAudioInput::peek(const void** buffer, size_t* length) { + if (__IsInit() == false || __IsReady() == false) + THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, + "Did not initialize or prepare CAudioInput"); - if (buffer == NULL || length == NULL) { - THROW_ERROR_MSG_FORMAT(CAudioError::ERROR_INVALID_ARGUMENT, "Parameters are NULL buffer:%p, length:%p", buffer, length); - } + if (buffer == NULL || length == NULL) + THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_ARGUMENT, + "Parameters are NULL buffer:%p, length:%p", buffer, length); /* Checks synchronous flag */ - internalLock(); - if (mIsUsedSyncRead == true) { - THROW_ERROR_MSG(CAudioError::ERROR_NOT_SUPPORTED, "Does not support peek() if does not receive a stream callback"); - } - internalUnlock(); + if (__mIsUsedSyncRead == true) + THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_OPERATION, + "Invalid operation of peek() if does not receive a stream callback"); - int ret = 0; - - try { - internalLock(); - ret = mpPulseAudioClient->peek(buffer, length); - internalUnlock(); - } catch (CAudioError e) { - internalUnlock(); - throw e; - } - - return ret; + return mpPulseAudioClient->peek(buffer, length); } -int CAudioInput::drop() throw (CAudioError) { - if (IsInit() == false || IsReady() == false) { - THROW_ERROR_MSG(CAudioError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput"); - } +int CAudioInput::drop() { + if (__IsInit() == false || __IsReady() == false) + THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, + "Did not initialize or prepare CAudioInput"); /* Checks synchronous flag */ - internalLock(); - if (mIsUsedSyncRead == true) { - THROW_ERROR_MSG(CAudioError::ERROR_NOT_SUPPORTED, "Does not support drop() if does not receive a stream callback"); - } - internalUnlock(); - - int ret = 0; - - try { - internalLock(); - ret = mpPulseAudioClient->drop(); - internalUnlock(); - } catch (CAudioError e) { - internalUnlock(); - throw e; - } + if (__mIsUsedSyncRead == true) + THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_OPERATION, + "Invalid operation of drop() if does not receive a stream callback"); - return ret; + return mpPulseAudioClient->drop(); }