X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcpp%2FCAudioInput.cpp;h=40521fbf6bef474f56ae33b149f5a5a7a482777b;hb=907fc08da90dfa673c95794b5bf7b7980e8c3d76;hp=3aea844774add48d451cbc30cc7c6087c436d3a1;hpb=9699cfb8be7219bafc69f8a7d3fcb97d25b181b4;p=platform%2Fcore%2Fapi%2Faudio-io.git

diff --git a/src/cpp/CAudioInput.cpp b/src/cpp/CAudioInput.cpp
index 3aea844..40521fb 100644
--- a/src/cpp/CAudioInput.cpp
+++ b/src/cpp/CAudioInput.cpp
@@ -79,20 +79,6 @@ 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:%p], [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::onSignal(CAudioSessionHandler* pHandler, mm_sound_signal_name_t signal, int value) {
-    assert(pHandler);
-    AUDIO_IO_LOGD("[pHandler:%p], [signal:%d], [value:%d]", pHandler, signal, value);
-    CAudioIO::onSignal(pHandler, signal, value);
-}
-
 void CAudioInput::__setInit(bool flag) {
     __mIsInit = flag;
 }
@@ -150,6 +136,7 @@ static bool __IsPrivilegeAllowed() {
     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()");
@@ -203,31 +190,21 @@ static bool __IsPrivilegeAllowed() {
 }
 
 void CAudioInput::initialize() {
-    if (__IsInit() == true) {
+    if (__IsInit() == true)
         return;
-    }
+
+    if (__IsPrivilegeAllowed() == false)
+        THROW_ERROR_MSG(CAudioError::EError::ERROR_PERMISSION_DENIED, "No privilege for record");
 
     try {
         CAudioIO::initialize();
-        if (__IsPrivilegeAllowed() == false) {
-            THROW_ERROR_MSG(CAudioError::EError::ERROR_PERMISSION_DENIED, "No privilege for record");
-        }
-
-        // Create ASM Handler
-        mpAudioSessionHandler = new CAudioSessionHandler(CAudioSessionHandler::EAudioSessionType::AUDIO_SESSION_TYPE_CAPTURE, mAudioInfo, this);
-
-        // Initialize ASM Handler
-        mpAudioSessionHandler->initialize();
-
-        __setInit(true);
-        CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_IDLE);
+       __setInit(true);
     } catch (CAudioError& e) {
         finalize();
         throw;
-    } catch (const std::bad_alloc&) {
-        finalize();
-        THROW_ERROR_MSG(CAudioError::EError::ERROR_OUT_OF_MEMORY, "Failed to allocate CAudioSessionHandler object");
     }
+
+    CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_IDLE);
 }
 
 void CAudioInput::finalize() {
@@ -236,172 +213,114 @@ void CAudioInput::finalize() {
         return;
     }
 
-    SAFE_FINALIZE(mpAudioSessionHandler);
-    SAFE_DELETE(mpAudioSessionHandler);
-
     CAudioIO::finalize();
 
     __setInit(false);
 }
 
 void CAudioInput::prepare() {
-    if (__IsInit() == false) {
+    if (__IsInit() == false)
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput");
-    }
 
     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::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<int>(audioType));
-        }
-
-        if (mpAudioSessionHandler->getId() < 0) {  // Did not registerSound()
-            // Check session to skip registration
-            if (isForceIgnore() == false && mpAudioSessionHandler->isSkipSession() == false) {
-                // Register ASM Listener
-                AUDIO_IO_LOGD("Register ASM Listener");
-                mpAudioSessionHandler->registerSound();
-            }
-        }
-
-        CAudioIO::setInternalStreamInfo();
+    /* 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<int>(audioType));
 
-        // Init StreamSpec
+    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
+        internalLock();
         mpPulseAudioClient = new CPulseAudioClient(CPulseAudioClient::EStreamDirection::STREAM_DIRECTION_RECORD, spec, this);
-
-        // Initialize PulseAudio Handler
         mpPulseAudioClient->initialize();
-
-        if (isForceIgnore() == false && mpAudioSessionHandler->isSkipSession() == false)
-            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) {
+        SAFE_FINALIZE(mpPulseAudioClient);
+        SAFE_DELETE(mpPulseAudioClient);
         internalUnlock();
         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() {
-    if (__IsInit() == false) {
+    if (__IsInit() == false)
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED,
                         "Did not initialize CAudioInput");
-    }
 
     if (__IsReady() == false) {
         AUDIO_IO_LOGD("Already unprepared");
         return;
     }
 
-    try {
-        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);
-
         internalUnlock();
-
-        if (mpAudioSessionHandler->getId() >= 0) {
-            if (isForceIgnore() == false && mpAudioSessionHandler->isSkipSession() == false)
-                mpAudioSessionHandler->updateStop();
-
-            if (mpAudioSessionHandler->isSkipSession() ==  false)
-                mpAudioSessionHandler->unregisterSound();
-        }
-
-        CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_IDLE);
     } catch (CAudioError& e) {
         internalUnlock();
         throw;
     }
+
+    CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_IDLE);
 }
 
 void CAudioInput::pause() {
-    if (__IsInit() == false || __IsReady() == false) {
+    if (__IsInit() == false || __IsReady() == false)
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED,
                         "Did not initialize or prepare CAudioInput");
-    }
 
-    if (CAudioIO::getState() != CAudioInfo::EAudioIOState::AUDIO_IO_STATE_RUNNING) {
+    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");
-    }
 
-    if (mpPulseAudioClient->isInThread() == true) {
+    if (mpPulseAudioClient->isInThread() == true)
         THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_OPERATION, "Can't pause in thread");
-    }
-
-    try {
-        CAudioIO::pause();
-
-        internalLock();
-
-        /* Updates ASM to STOP */
-        if (isForceIgnore() == false && mpAudioSessionHandler->isSkipSession() == false) {
-            mpAudioSessionHandler->updateStop();
-        }
 
-        internalUnlock();
-
-        CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_PAUSED);
-    } catch (CAudioError& e) {
-        internalUnlock();
-        throw;
-    }
+    CAudioIO::pause();
+    CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_PAUSED);
 }
 
 void CAudioInput::resume() {
-    if (__IsInit() == false || __IsReady() == false) {
+    if (__IsInit() == false || __IsReady() == false)
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED,
                         "Did not initialize or prepare CAudioInput");
-    }
 
-    if (CAudioIO::getState() != CAudioInfo::EAudioIOState::AUDIO_IO_STATE_PAUSED) {
+    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 (mpPulseAudioClient->isInThread() == true) {
+    if (mpPulseAudioClient->isInThread() == true)
         THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_OPERATION, "Can't resume in thread");
-    }
-
-    try {
-        internalLock();
 
-        if (isForceIgnore() == false && mpAudioSessionHandler->isSkipSession() == false)
-            mpAudioSessionHandler->updatePlaying();
-
-        internalUnlock();
-
-        CAudioIO::resume();
-
-        CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_RUNNING);
-    } catch (CAudioError& e) {
-        internalUnlock();
-        throw;
-    }
+    CAudioIO::resume();
+    CAudioIO::onStateChanged(CAudioInfo::EAudioIOState::AUDIO_IO_STATE_RUNNING);
 }
 
 void CAudioInput::drain() {
@@ -409,61 +328,51 @@ void CAudioInput::drain() {
 }
 
 void CAudioInput::flush() {
-    if (__IsInit() == false || __IsReady() == false) {
+    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) {
-        throw;
-    }
+    CAudioIO::flush();
 }
 
 int CAudioInput::getBufferSize() {
-    if (__IsInit() == false) {
+    if (__IsInit() == false)
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput");
-    }
 
     /* FIXME : return calculated size here to satisfy backward compatibility */
     return (mAudioInfo.getSampleRate() * DEFAULT_PERIOD_SIZE) / 1000 * mAudioInfo.getSampleSize();
 }
 
 void CAudioInput::setStreamCallback(SStreamCallback callback) {
-    if (__IsInit() == false) {
+    if (__IsInit() == false)
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioInput");
-    }
 
-    if (callback.onStream == NULL) {
-        AUDIO_IO_LOGD("__mIsUsedSyncRead = true");
+    if (callback.onStream == NULL)
         __mIsUsedSyncRead = true;
-    } else {
-        AUDIO_IO_LOGD("__mIsUsedSyncRead = false");
+    else
         __mIsUsedSyncRead = false;
-    }
+    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() == false || __IsReady() == false)
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED,
                         "Did not initialize or prepare CAudioInput");
-    }
-    if (buffer == NULL) {
+
+    if (buffer == NULL)
         THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_ARGUMENT,
                                "Parameters are NULL buffer:%p", buffer);
-    }
-    if (CAudioIO::getState() != CAudioInfo::EAudioIOState::AUDIO_IO_STATE_RUNNING) {
+
+    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");
-    }
+
     /* Checks synchronous flag */
-    if (__mIsUsedSyncRead == false) {
+    if (__mIsUsedSyncRead == false)
         THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_OPERATION,
                         "Invalid operation of read() if receive stream callback");
-    }
 
     int ret = 0;
 
@@ -477,8 +386,8 @@ size_t CAudioInput::read(void* buffer, size_t length) {
 
         // Block until read done
         ret = mpPulseAudioClient->read(buffer, length);
-
         internalUnlock();
+
         sched_yield();
     } catch (CAudioError& e) {
         internalUnlock();
@@ -489,52 +398,31 @@ 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() == false || __IsReady() == false)
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED,
                         "Did not initialize or prepare CAudioInput");
-    }
 
-    if (buffer == NULL || length == NULL) {
+    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 */
-    if (__mIsUsedSyncRead == true) {
+    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 {
-        ret = mpPulseAudioClient->peek(buffer, length);
-    } catch (CAudioError& e) {
-        throw;
-    }
-
-    return ret;
+    return mpPulseAudioClient->peek(buffer, length);
 }
 
 int CAudioInput::drop() {
-    if (__IsInit() == false || __IsReady() == false) {
+    if (__IsInit() == false || __IsReady() == false)
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED,
                         "Did not initialize or prepare CAudioInput");
-    }
 
     /* Checks synchronous flag */
-    if (__mIsUsedSyncRead == true) {
+    if (__mIsUsedSyncRead == true)
         THROW_ERROR_MSG(CAudioError::EError::ERROR_INVALID_OPERATION,
                         "Invalid operation of drop() if does not receive a stream callback");
-    }
-
-    int ret = 0;
 
-    try {
-        ret = mpPulseAudioClient->drop();
-    } catch (CAudioError& e) {
-        throw;
-    }
-
-    return ret;
+    return mpPulseAudioClient->drop();
 }