audio-io fixed build issue on 64-bit platform

[Version] 0.3.6
[Profile] Common
[Issue Type] Bug
[Dependency module] NA
[Dependency commit] NA
[Comment]
'size_t' uses 8 bytes in 64-bit platform.

Signed-off-by: KimJeongYeon <jeongyeon.kim@samsung.com>
Change-Id: I6ed599f1165d73579cb5e72bb83191f373e54529

diff --git a/include/CAudioInput.h b/include/CAudioInput.h
index 3ecc898..f8c0284 100644 (file)
--- a/include/CAudioInput.h
+++ b/include/CAudioInput.h
@@ -76,7 +76,7 @@ namespace tizen_media_audio {
         virtual void setStreamCallback(SStreamCallback callback) throw (CAudioError);
 
         /* Methods */
-        int read(void* buffer, size_t length) throw (CAudioError);
+        size_t read(void* buffer, size_t length) throw (CAudioError);
         int peek(const void** buffer, size_t* length) throw (CAudioError);
         int drop() throw (CAudioError);
     };

diff --git a/include/CAudioOutput.h b/include/CAudioOutput.h
index 59de7e3..984bf0d 100644 (file)
--- a/include/CAudioOutput.h
+++ b/include/CAudioOutput.h
@@ -70,7 +70,7 @@ namespace tizen_media_audio {
         virtual int  getBufferSize() throw (CAudioError);
 
         /* Methods */
-        int write(const void* buffer, unsigned int length) throw (CAudioError);
+        size_t write(const void* buffer, size_t length) throw (CAudioError);
     };
 
 } /* namespace tizen_media_audio */

diff --git a/src/cpp/CAudioInput.cpp b/src/cpp/CAudioInput.cpp
index 9440bc2..e2c2b77 100644 (file)
--- a/src/cpp/CAudioInput.cpp
+++ b/src/cpp/CAudioInput.cpp
@@ -349,7 +349,7 @@ void CAudioInput::setStreamCallback(SStreamCallback callback) throw (CAudioError
     CAudioIO::setStreamCallback(callback);
 }
 
-int CAudioInput::read(void* buffer, unsigned int length) throw (CAudioError) {
+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");
     }
@@ -365,7 +365,7 @@ int CAudioInput::read(void* buffer, unsigned int length) throw (CAudioError) {
 
     internalLock();
 
-    unsigned int lengthIter = length;
+    size_t lengthIter = length;
     int ret = 0;
 
     try {
@@ -441,7 +441,7 @@ int CAudioInput::read(void* buffer, unsigned int length) throw (CAudioError) {
     return length;
 }
 
-int CAudioInput::peek(const void** buffer, unsigned int* length) throw (CAudioError) {
+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");
     }

diff --git a/src/cpp/CAudioOutput.cpp b/src/cpp/CAudioOutput.cpp
index f050401..396b4f1 100644 (file)
--- a/src/cpp/CAudioOutput.cpp
+++ b/src/cpp/CAudioOutput.cpp
@@ -319,7 +319,7 @@ int CAudioOutput::getBufferSize() throw (CAudioError) {
     return size;
 }
 
-int CAudioOutput::write(const void* buffer, unsigned int length) throw (CAudioError) {
+size_t CAudioOutput::write(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 CAudioOutput");
     }
@@ -356,10 +356,10 @@ int CAudioOutput::write(const void* buffer, unsigned int length) throw (CAudioEr
     // Sets synchronous flag
     mIsUsedSyncWrite = true;
 
-    unsigned int lengthIter = length;
+    size_t lengthIter = length;
     try {
         while (lengthIter > 0) {
-            int l, r;
+            size_t l;
 
             while ((l = mpPulseAudioClient->getWritableSize()) == 0) {
 #ifdef _AUDIO_IO_DEBUG_TIMING_
@@ -368,11 +368,7 @@ int CAudioOutput::write(const void* buffer, unsigned int length) throw (CAudioEr
                 internalWait();
             }
 
-            if (l == -1) {
-                THROW_ERROR_MSG(CAudioError::ERROR_INTERNAL_OPERATION, "The Writable size is invalid");
-            }
-
-            if (static_cast<unsigned int>(l) > lengthIter) {
+            if (l > lengthIter) {
                 l = lengthIter;
             }
 
@@ -380,7 +376,7 @@ int CAudioOutput::write(const void* buffer, unsigned int length) throw (CAudioEr
             AUDIO_IO_LOGD("PulseAudioClient->write(buffer:%p, length:%d)", buffer, l);
 #endif
 
-            r = mpPulseAudioClient->write(buffer, l);
+            int r = mpPulseAudioClient->write(buffer, l);
             if (r < 0) {
                 THROW_ERROR_MSG_FORMAT(CAudioError::ERROR_INTERNAL_OPERATION, "The written result is invalid ret:%d", r);
             }

diff --git a/src/cpp/cpp_audio_io.cpp b/src/cpp/cpp_audio_io.cpp
index 0c5571e..e7f72e0 100644 (file)
--- a/src/cpp/cpp_audio_io.cpp
+++ b/src/cpp/cpp_audio_io.cpp
@@ -94,7 +94,7 @@ static audio_io_error_e _convert_CAudioError(CAudioError& error) {
     audio_io_error_e    ret = AUDIO_IO_ERROR_NONE;
     CAudioError::EError err = error.getError();
 
-    switch(err)
+    switch (err)
     {
     case CAudioError::ERROR_NONE:
         ret = AUDIO_IO_ERROR_NONE;
@@ -632,9 +632,10 @@ int cpp_audio_in_read(audio_in_h input, void *buffer, unsigned int length) {
         assert(handle->audioIoHandle);
 
         CAudioInput* inputHandle = dynamic_cast<CAudioInput*>(handle->audioIoHandle);
-        ret = inputHandle->read(buffer, length);
+        size_t readn = inputHandle->read(buffer, static_cast<size_t>(length));
+        ret = static_cast<int>(readn);
 #ifdef _AUDIO_IO_DEBUG_TIMING_
-        AUDIO_IO_LOGD("ret:%d", ret);
+        AUDIO_IO_LOGD("readn:%d", readn);
 #endif
     } catch (CAudioError e) {
         AUDIO_IO_LOGE("%s", e.getErrorMsg());
@@ -895,7 +896,7 @@ int cpp_audio_in_peek(audio_in_h input, const void **buffer, unsigned int *lengt
         CAudioInput* inputHandle = dynamic_cast<CAudioInput*>(handle->audioIoHandle);
         assert(inputHandle);
 
-        inputHandle->peek(buffer, length);
+        inputHandle->peek(buffer, static_cast<size_t*>(length));
     } catch (CAudioError e) {
         AUDIO_IO_LOGE("%s", e.getErrorMsg());
         return _convert_CAudioError(e);
@@ -1236,9 +1237,10 @@ int cpp_audio_out_write(audio_out_h output, void *buffer, unsigned int length) {
         assert(handle->audioIoHandle);
 
         CAudioOutput* outputHandle = dynamic_cast<CAudioOutput*>(handle->audioIoHandle);
-        ret = outputHandle->write(buffer, length);
+        size_t writen = outputHandle->write(buffer, static_cast<size_t>(length));
+        ret = static_cast<int>(writen);
 #ifdef _AUDIO_IO_DEBUG_TIMING_
-        AUDIO_IO_LOGD("ret:%d", ret);
+        AUDIO_IO_LOGD("writen:%d", writen);
 #endif
     } catch (CAudioError e) {
         AUDIO_IO_LOGE("%s", e.getErrorMsg());