X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcpp%2FCAudioInput.cpp;h=7c4863cb9f90d822eb0354a1e764438b72786b99;hb=ffd34c56a7091e7dd9bc5680ad718a4e1a263740;hp=40521fbf6bef474f56ae33b149f5a5a7a482777b;hpb=745386f6dc72d6bd5c09bee6321e9e4807931392;p=platform%2Fcore%2Fapi%2Faudio-io.git diff --git a/src/cpp/CAudioInput.cpp b/src/cpp/CAudioInput.cpp index 40521fb..7c4863c 100644 --- a/src/cpp/CAudioInput.cpp +++ b/src/cpp/CAudioInput.cpp @@ -17,9 +17,9 @@ #include -#include #include "CAudioIODef.h" #include +#include "cpp_audio_in_privilege.h" #define RECORDER_PRIVILEGE "http://tizen.org/privilege/recorder" #define CLIENT_NAME "AUDIO_IO_PA_CLIENT" @@ -27,11 +27,6 @@ using namespace std; using namespace tizen_media_audio; -struct PrivilegeData { - bool isPrivilegeAllowed; - pa_threaded_mainloop *paMainloop; -}; - /** * class CAudioInput inherited by CAudioIO */ @@ -42,20 +37,6 @@ CAudioInput::CAudioInput(CAudioInfo& info) : mDirection = CAudioInfo::EAudioDirection::AUDIO_DIRECTION_IN; } -CAudioInput::CAudioInput( - unsigned int sampleRate, - CAudioInfo::EChannel channel, - CAudioInfo::ESampleType type, - CAudioInfo::EAudioType audioType) : - __mIsUsedSyncRead(true), - __mIsInit(false) { - mDirection = CAudioInfo::EAudioDirection::AUDIO_DIRECTION_IN; - mAudioInfo = CAudioInfo(sampleRate, channel, type, audioType, -1); -} - -CAudioInput::~CAudioInput() { -} - void CAudioInput::onStream(CPulseAudioClient* pClient, size_t length) { assert(pClient); @@ -63,9 +44,9 @@ 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) { #ifdef _AUDIO_IO_DEBUG_TIMING_ - AUDIO_IO_LOGD("Sync Read Mode! - pClient:[%p], length:[%d]", pClient, length); + AUDIO_IO_LOGD("Sync Read Mode! - pClient:[%p], length:[%zu]", pClient, length); #endif return; } @@ -74,131 +55,33 @@ void CAudioInput::onStream(CPulseAudioClient* pClient, size_t length) { * Accrues callback function */ #ifdef _AUDIO_IO_DEBUG_TIMING_ - AUDIO_IO_LOGD("pClient:[%p], length:[%d]", pClient, length); + AUDIO_IO_LOGD("pClient:[%p], length:[%zu]", pClient, length); #endif CAudioIO::onStream(pClient, length); } -void CAudioInput::__setInit(bool flag) { +void CAudioInput::__setInit(bool flag) noexcept { __mIsInit = flag; } -bool CAudioInput::__IsInit() { - return (CAudioIO::isInit() == true && __mIsInit == true); +bool CAudioInput::__IsInit() noexcept { + return (CAudioIO::isInit() && __mIsInit); } -bool CAudioInput::__IsReady() { +bool CAudioInput::__IsReady() noexcept { return CAudioIO::IsReady(); } -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; - } -} - -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); -} - -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()"); - } - - while (true) { - pa_context_state_t state; - state = pa_context_get_state(c); - - 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); - } - - /* 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; -} - void CAudioInput::initialize() { - if (__IsInit() == true) + if (__IsInit()) return; - if (__IsPrivilegeAllowed() == false) + if (!cpp_audio_in_has_record_privilege()) THROW_ERROR_MSG(CAudioError::EError::ERROR_PERMISSION_DENIED, "No privilege for record"); try { CAudioIO::initialize(); - __setInit(true); + __setInit(true); } catch (CAudioError& e) { finalize(); throw; @@ -208,7 +91,7 @@ void CAudioInput::initialize() { } void CAudioInput::finalize() { - if (__IsInit() == false) { + if (!__IsInit()) { AUDIO_IO_LOGD("Did not initialize"); return; } @@ -219,10 +102,10 @@ void CAudioInput::finalize() { } void CAudioInput::prepare() { - if (__IsInit() == false) + if (!__IsInit()) THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput"); - if (__IsReady() == true) { + if (__IsReady()) { AUDIO_IO_LOGD("Already prepared CAudioInput"); CAudioIO::prepare(); return; @@ -239,6 +122,10 @@ void CAudioInput::prepare() { /* Init StreamSpec */ AUDIO_IO_LOGD("Set Stream Spec : CPulseStreamSpec::STREAM_LATENCY_INPUT_DEFAULT"); CPulseStreamSpec::EStreamLatency streamSpec = CPulseStreamSpec::EStreamLatency::STREAM_LATENCY_INPUT_DEFAULT; + /* Override the default value by audio type */ + if (audioType == CAudioInfo::EAudioType::AUDIO_IN_TYPE_VOIP) + streamSpec = CPulseStreamSpec::EStreamLatency::STREAM_LATENCY_INPUT_VOIP; + CPulseStreamSpec spec(streamSpec, mAudioInfo); internalLock(); @@ -265,11 +152,11 @@ void CAudioInput::prepare() { } void CAudioInput::unprepare() { - if (__IsInit() == false) + if (!__IsInit()) THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput"); - if (__IsReady() == false) { + if (!__IsReady()) { AUDIO_IO_LOGD("Already unprepared"); return; } @@ -292,7 +179,7 @@ void CAudioInput::unprepare() { } void CAudioInput::pause() { - if (__IsInit() == false || __IsReady() == false) + if (!__IsInit() || !__IsReady()) THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput"); @@ -300,7 +187,7 @@ void CAudioInput::pause() { THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_STATE, "Can't pause if not in Running state"); - if (mpPulseAudioClient->isInThread() == true) + if (mpPulseAudioClient->isInThread()) THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_OPERATION, "Can't pause in thread"); CAudioIO::pause(); @@ -308,7 +195,7 @@ void CAudioInput::pause() { } void CAudioInput::resume() { - if (__IsInit() == false || __IsReady() == false) + if (!__IsInit() || !__IsReady()) THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput"); @@ -316,19 +203,15 @@ void CAudioInput::resume() { THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_STATE, "Can't resume if not in Paused state"); - if (mpPulseAudioClient->isInThread() == true) + if (mpPulseAudioClient->isInThread()) THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_OPERATION, "Can't resume in thread"); CAudioIO::resume(); CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_RUNNING); } -void CAudioInput::drain() { - THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_SUPPORTED, "Did not support drain of CAudioInput"); -} - void CAudioInput::flush() { - if (__IsInit() == false || __IsReady() == false) + if (!__IsInit() || !__IsReady()) THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput"); @@ -336,7 +219,7 @@ void CAudioInput::flush() { } int CAudioInput::getBufferSize() { - if (__IsInit() == false) + if (!__IsInit()) THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput"); /* FIXME : return calculated size here to satisfy backward compatibility */ @@ -344,24 +227,22 @@ int CAudioInput::getBufferSize() { } void CAudioInput::setStreamCallback(SStreamCallback callback) { - if (__IsInit() == false) + if (!__IsInit()) THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput"); - if (callback.onStream == NULL) - __mIsUsedSyncRead = true; - else - __mIsUsedSyncRead = false; + __mIsUsedSyncRead = (callback.onStream == nullptr); + AUDIO_IO_LOGD("__mIsUsedSyncRead = %d", __mIsUsedSyncRead); CAudioIO::setStreamCallback(callback); } size_t CAudioInput::read(void* buffer, size_t length) { - if (__IsInit() == false || __IsReady() == false) + if (!__IsInit() || !__IsReady()) THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput"); - if (buffer == NULL) + if (!buffer) THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_ARGUMENT, "Parameters are NULL buffer:%p", buffer); @@ -370,7 +251,7 @@ size_t CAudioInput::read(void* buffer, size_t length) { "Can't read if not in Running state"); /* Checks synchronous flag */ - if (__mIsUsedSyncRead == false) + if (!__mIsUsedSyncRead) THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_OPERATION, "Invalid operation of read() if receive stream callback"); @@ -380,7 +261,7 @@ size_t CAudioInput::read(void* buffer, size_t length) { internalLock(); // If another thread did call unprepare, do not read - if (mpPulseAudioClient == NULL) + if (!mpPulseAudioClient) THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CPulseAudioClient"); @@ -398,16 +279,16 @@ size_t CAudioInput::read(void* buffer, size_t length) { } int CAudioInput::peek(const void** buffer, size_t* length) { - if (__IsInit() == false || __IsReady() == false) + if (!__IsInit() || !__IsReady()) THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput"); - if (buffer == NULL || length == NULL) + if (buffer == nullptr || length == nullptr) THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_ARGUMENT, "Parameters are NULL buffer:%p, length:%p", buffer, length); /* Checks synchronous flag */ - if (__mIsUsedSyncRead == true) + if (__mIsUsedSyncRead) THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_OPERATION, "Invalid operation of peek() if does not receive a stream callback"); @@ -415,12 +296,12 @@ int CAudioInput::peek(const void** buffer, size_t* length) { } int CAudioInput::drop() { - if (__IsInit() == false || __IsReady() == false) + if (!__IsInit() || !__IsReady()) THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize or prepare CAudioInput"); /* Checks synchronous flag */ - if (__mIsUsedSyncRead == true) + if (__mIsUsedSyncRead) THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_OPERATION, "Invalid operation of drop() if does not receive a stream callback");