Revise cpp codes

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

diff --git a/src/cpp/CAudioOutput.cpp b/src/cpp/CAudioOutput.cpp
index 996cdc5..f122752 100644 (file)
--- a/src/cpp/CAudioOutput.cpp
+++ b/src/cpp/CAudioOutput.cpp
@@ -26,6 +26,7 @@ using namespace tizen_media_audio;
 /**
  * class CAudioOutput
  */
+
 CAudioOutput::CAudioOutput(CAudioInfo& info) :
     CAudioIO(info),
     __mIsUsedSyncWrite(false),
@@ -33,22 +34,6 @@ CAudioOutput::CAudioOutput(CAudioInfo& info) :
     mDirection = CAudioInfo::EAudioDirection::AUDIO_DIRECTION_OUT;
 }
 
-//LCOV_EXCL_START
-CAudioOutput::CAudioOutput(
-        unsigned int            sampleRate,
-        CAudioInfo::EChannel    channel,
-        CAudioInfo::ESampleType sampleType,
-        CAudioInfo::EAudioType  audioType) :
-    __mIsUsedSyncWrite(false),
-    __mIsInit(false) {
-    mDirection = CAudioInfo::EAudioDirection::AUDIO_DIRECTION_OUT;
-    mAudioInfo = CAudioInfo(sampleRate, channel, sampleType, audioType, -1);
-}
-//LCOV_EXCL_STOP
-
-CAudioOutput::~CAudioOutput() {
-}
-
 void CAudioOutput::onStream(CPulseAudioClient* pClient, size_t length) {
     assert(pClient);
 
@@ -56,9 +41,9 @@ void CAudioOutput::onStream(CPulseAudioClient* pClient, size_t length) {
      * Does not call CAudioIO::onStream() for synchronization
      * if a user is using write()
      */
-    if (__mIsUsedSyncWrite == true) {
+    if (__mIsUsedSyncWrite) {
 #ifdef _AUDIO_IO_DEBUG_TIMING_
-        AUDIO_IO_LOGD("Sync Write Mode! - signal! - pClient:[%p], length:[%d]", pClient, length);
+        AUDIO_IO_LOGD("Sync Write Mode! - signal! - pClient:[%p], length:[%zu]", pClient, length);
 #endif
         internalSignal();
         return;
@@ -68,25 +53,25 @@ void CAudioOutput::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 CAudioOutput::__setInit(bool flag) {
+void CAudioOutput::__setInit(bool flag) noexcept {
     __mIsInit = flag;
 }
 
-bool CAudioOutput::__IsInit() {
-    return (CAudioIO::isInit() == true && __mIsInit == true);
+bool CAudioOutput::__IsInit() noexcept {
+    return (CAudioIO::isInit() && __mIsInit);
 }
 
-bool CAudioOutput::__IsReady() {
+bool CAudioOutput::__IsReady() noexcept {
     return CAudioIO::IsReady();
 }
 
 void CAudioOutput::initialize() {
-    if (__IsInit() == true)
+    if (__IsInit())
         return;
 
     try {
@@ -101,7 +86,7 @@ void CAudioOutput::initialize() {
 }
 
 void CAudioOutput::finalize() {
-    if (__IsInit() == false) {
+    if (!__IsInit()) {
         AUDIO_IO_LOGD("Did not initialize");
         return;
     }
@@ -112,10 +97,10 @@ void CAudioOutput::finalize() {
 }
 
 void CAudioOutput::prepare() {
-    if (__IsInit() == false)
+    if (!__IsInit())
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED, "Did not initialize CAudioOutput");
 
-    if (__IsReady() == true) {
+    if (__IsReady()) {
         AUDIO_IO_LOGD("Already prepared CAudioOutput");
         CAudioIO::prepare();
         return;
@@ -140,6 +125,12 @@ void CAudioOutput::prepare() {
             streamSpec = CPulseStreamSpec::EStreamLatency::STREAM_LATENCY_OUTPUT_DEFAULT_ASYNC;
         }
 #endif
+        /* Override the default value by audio type */
+        if (audioType == CAudioInfo::EAudioType::AUDIO_OUT_TYPE_VOIP)
+            streamSpec = CPulseStreamSpec::EStreamLatency::STREAM_LATENCY_OUTPUT_VOIP;
+        else if (audioType == CAudioInfo::EAudioType::AUDIO_OUT_TYPE_MEDIA_NETWORK_SOURCE)
+            streamSpec = CPulseStreamSpec::EStreamLatency::STREAM_LATENCY_OUTPUT_HIGH;
+
         CPulseStreamSpec spec(streamSpec, mAudioInfo);
 
         internalLock();
@@ -166,11 +157,11 @@ void CAudioOutput::prepare() {
 }
 
 void CAudioOutput::unprepare() {
-    if (__IsInit() == false)
+    if (!__IsInit())
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED,
                         "Did not initialize CAudioOutput");
 
-    if (__IsReady() == false) {
+    if (!__IsReady()) {
         AUDIO_IO_LOGD("Already unprepared");
         return;
     }
@@ -193,7 +184,7 @@ void CAudioOutput::unprepare() {
 }
 
 void CAudioOutput::pause() {
-    if (__IsInit() == false || __IsReady() == false)
+    if (!__IsInit() || !__IsReady())
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED,
                         "Did not initialize or prepare CAudioOutput");
 
@@ -201,7 +192,7 @@ void CAudioOutput::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();
@@ -209,7 +200,7 @@ void CAudioOutput::pause() {
 }
 
 void CAudioOutput::resume() {
-    if (__IsInit() == false || __IsReady() == false)
+    if (!__IsInit() || !__IsReady())
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED,
                         "Did not initialize or prepare CAudioOutput");
 
@@ -217,7 +208,7 @@ void CAudioOutput::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();
@@ -225,7 +216,7 @@ void CAudioOutput::resume() {
 }
 
 void CAudioOutput::drain() {
-    if (__IsInit() == false || __IsReady() == false)
+    if (!__IsInit() || !__IsReady())
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED,
                         "Did not initialize or prepare CAudioOutput");
 
@@ -236,7 +227,7 @@ void CAudioOutput::drain() {
 }
 
 void CAudioOutput::flush() {
-    if (__IsInit() == false || __IsReady() == false)
+    if (!__IsInit() || !__IsReady())
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED,
                         "Did not initialize or prepare CAudioOutput");
 
@@ -244,7 +235,7 @@ void CAudioOutput::flush() {
 }
 
 int CAudioOutput::getBufferSize() {
-    if (__IsInit() == false)
+    if (!__IsInit())
         THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED,
                         "Did not initialize or prepare CAudioOutput");
 
@@ -253,11 +244,11 @@ int CAudioOutput::getBufferSize() {
 }
 
 size_t CAudioOutput::write(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 CAudioOutput");
 
-    if (buffer == NULL)
+    if (!buffer)
         THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_ARGUMENT,
                                "Parameters are invalid - buffer:%p, length:%zu", buffer, length);
 
@@ -266,13 +257,13 @@ size_t CAudioOutput::write(const void* buffer, size_t length) {
                         "Can't write if not in Running state");
 
     /* When write() is called in PulseAudio callback, bypass a pcm data to CPulseAudioClient (For Asynchronous) */
-    if (mpPulseAudioClient && mpPulseAudioClient->isInThread() == true) {
+    if (mpPulseAudioClient && mpPulseAudioClient->isInThread()) {
         int ret = mpPulseAudioClient->write(buffer, length);
         if (ret < 0)
             THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INTERNAL_OPERATION,
                                    "The written result is invalid ret:%d", ret);
 #ifdef _AUDIO_IO_DEBUG_TIMING_
-        AUDIO_IO_LOGD("CPulseAudioClient->write(buffer:%p, length:%d)", buffer, length);
+        AUDIO_IO_LOGD("CPulseAudioClient->write(buffer:%p, length:%zu)", buffer, length);
 #endif
         return length;
     }
@@ -282,7 +273,7 @@ size_t CAudioOutput::write(const void* buffer, size_t length) {
         internalLock();
 
         // If another thread did call unprepare, do not write
-        if (mpPulseAudioClient == NULL)
+        if (!mpPulseAudioClient)
             THROW_ERROR_MSG(CAudioError::EError::ERROR_NOT_INITIALIZED,
                             "Did not initialize CPulseAudioClient");
 
@@ -296,7 +287,7 @@ size_t CAudioOutput::write(const void* buffer, size_t length) {
 
             while ((l = mpPulseAudioClient->getWritableSize()) == 0) {
 #ifdef _AUDIO_IO_DEBUG_TIMING_
-                AUDIO_IO_LOGD("writableSize is [%d].. wait", l);
+                AUDIO_IO_LOGD("writableSize is [%zu].. wait", l);
 #endif
                 internalWait();
             }
@@ -305,7 +296,7 @@ size_t CAudioOutput::write(const void* buffer, size_t length) {
                 l = lengthIter;
 
 #ifdef _AUDIO_IO_DEBUG_TIMING_
-            AUDIO_IO_LOGD("CPulseAudioClient->write(buffer:%p, length:%d)", buffer, l);
+            AUDIO_IO_LOGD("CPulseAudioClient->write(buffer:%p, length:%zu)", buffer, l);
 #endif
 
             int ret = mpPulseAudioClient->write(buffer, l);