move __IsReady function into the critical section

[platform/core/api/audio-io.git] / src / cpp / CAudioInput.cpp

diff --git a/src/cpp/CAudioInput.cpp b/src/cpp/CAudioInput.cpp
index 8b6633f..e95918d 100644 (file)
--- a/src/cpp/CAudioInput.cpp
+++ b/src/cpp/CAudioInput.cpp
@@ -33,7 +33,8 @@ using namespace tizen_media_audio;
 CAudioInput::CAudioInput(CAudioInfo& info) :
     CAudioIO(info),
     __mIsUsedSyncRead(true),
-    __mIsInit(false) {
+    __mIsInit(false),
+    __mVolume(CAudioInfo::DEFAULT_RECORD_VOLUME) {
     mDirection = CAudioInfo::EAudioDirection::AUDIO_DIRECTION_IN;
 }
 
@@ -89,6 +90,7 @@ void CAudioInput::initialize() {
 //LCOV_EXCL_STOP
     }
 
+    CAudioIO::setState(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_IDLE);
     CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_IDLE);
 }
 
@@ -101,11 +103,13 @@ void CAudioInput::finalize() {
     }
 
     CAudioIO::finalize();
-
     __setInit(false);
+    __mVolume = CAudioInfo::DEFAULT_RECORD_VOLUME;
 }
 
 void CAudioInput::prepare() {
+    std::lock_guard<std::mutex> mutex(mMutex);
+
     if (!__IsInit())
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput"); //LCOV_EXCL_LINE
 
@@ -132,32 +136,28 @@ void CAudioInput::prepare() {
 
         CPulseStreamSpec spec(streamSpec, mAudioInfo);
 
-        internalLock();
         mpPulseAudioClient = new CPulseAudioClient(CPulseAudioClient::EStreamDirection::STREAM_DIRECTION_RECORD, spec, this);
         mpPulseAudioClient->initialize();
+        mpPulseAudioClient->applyRecordVolume(__mVolume);
 #ifndef DISABLE_MOBILE_BACK_COMP
         /* Uncork stream which is created with CORKED flag */
         mpPulseAudioClient->cork(false);
 #endif
-        internalUnlock();
-
         CAudioIO::prepare();
     } catch (const CAudioError& e) {
 //LCOV_EXCL_START
         SAFE_FINALIZE(mpPulseAudioClient);
         SAFE_DELETE(mpPulseAudioClient);
-        internalUnlock();
         throw;
 //LCOV_EXCL_STOP
     } 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() {
+    std::unique_lock<std::mutex> mutex(mMutex);
+
     if (!__IsInit())
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, //LCOV_EXCL_LINE
                         "Did not initialize CAudioInput");          //LCOV_EXCL_LINE
@@ -169,24 +169,22 @@ void CAudioInput::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);
-        internalUnlock();
-    } catch (const CAudioError& e) {
-//LCOV_EXCL_START
-        internalUnlock();
-        throw;
-//LCOV_EXCL_STOP
-    }
+    if (mpPulseAudioClient && mpPulseAudioClient->isInThread())
+        THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_OPERATION, "Can't unprepare inside pulseaudio thread");
+
+    SAFE_FINALIZE(mpPulseAudioClient);
+    SAFE_DELETE(mpPulseAudioClient);
+
+    CAudioIO::setState(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_IDLE);
+
+    mutex.unlock();
 
     CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_IDLE);
 }
 
 void CAudioInput::pause() {
+    std::unique_lock<std::mutex> mutex(mMutex);
+
     if (!__IsInit() || !__IsReady())
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED,   //LCOV_EXCL_LINE
                         "Did not initialize or prepare CAudioInput"); //LCOV_EXCL_LINE
@@ -199,10 +197,16 @@ void CAudioInput::pause() {
         THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_OPERATION, "Can't pause in thread"); //LCOV_EXCL_LINE
 
     CAudioIO::pause();
+    CAudioIO::setState(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_PAUSED);
+
+    mutex.unlock();
+
     CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_PAUSED);
 }
 
 void CAudioInput::resume() {
+    std::unique_lock<std::mutex> mutex(mMutex);
+
     if (!__IsInit() || !__IsReady())
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED,   //LCOV_EXCL_LINE
                         "Did not initialize or prepare CAudioInput"); //LCOV_EXCL_LINE
@@ -215,10 +219,16 @@ void CAudioInput::resume() {
         THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_OPERATION, "Can't resume in thread"); //LCOV_EXCL_LINE
 
     CAudioIO::resume();
+    CAudioIO::setState(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_RUNNING);
+
+    mutex.unlock();
+
     CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_RUNNING);
 }
 
 void CAudioInput::flush() {
+    std::lock_guard<std::mutex> mutex(mMutex);
+
     if (!__IsInit() || !__IsReady())
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED,   //LCOV_EXCL_LINE
                         "Did not initialize or prepare CAudioInput"); //LCOV_EXCL_LINE
@@ -246,6 +256,8 @@ void CAudioInput::setStreamCallback(SStreamCallback callback) {
 }
 
 size_t CAudioInput::read(void* buffer, size_t length) {
+    std::unique_lock<std::mutex> mutex(mMutex);
+
     if (!__IsInit() || !__IsReady())
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED,   //LCOV_EXCL_LINE
                         "Did not initialize or prepare CAudioInput"); //LCOV_EXCL_LINE
@@ -265,25 +277,16 @@ size_t CAudioInput::read(void* buffer, size_t length) {
 
     int ret = 0;
 
-    try {
-        internalLock();
+    // If another thread did call unprepare, do not read
+    if (!mpPulseAudioClient)
+        THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, //LCOV_EXCL_LINE
+                        "Did not initialize CPulseAudioClient");    //LCOV_EXCL_LINE
 
-        // If another thread did call unprepare, do not read
-        if (!mpPulseAudioClient)
-            THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, //LCOV_EXCL_LINE
-                            "Did not initialize CPulseAudioClient");    //LCOV_EXCL_LINE
+    // Block until read done
+    ret = mpPulseAudioClient->read(buffer, length);
+    mutex.unlock();
 
-        // Block until read done
-        ret = mpPulseAudioClient->read(buffer, length);
-        internalUnlock();
-
-        sched_yield();
-    } catch (const CAudioError& e) {
-//LCOV_EXCL_START
-        internalUnlock();
-        throw;
-//LCOV_EXCL_STOP
-    }
+    sched_yield();
 
     return ret;
 }
@@ -317,3 +320,25 @@ int CAudioInput::drop() {
 
     return mpPulseAudioClient->drop();
 }
+
+void CAudioInput::setVolume(double volume) {
+    if (!__IsInit())
+        THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Not initialized"); //LCOV_EXCL_LINE
+
+    if (__IsReady()) {
+        std::unique_lock<std::mutex> defer_mutex(mMutex, std::defer_lock);
+        if (!mpPulseAudioClient->isInThread())
+            defer_mutex.lock();
+
+        mpPulseAudioClient->applyRecordVolume(volume);
+    }
+
+    __mVolume = volume;
+}
+
+double CAudioInput::getVolume() {
+    if (!__IsInit())
+        THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Not initialized"); //LCOV_EXCL_LINE
+
+    return __mVolume;
+}