From 06a5daa9b842ffd4e4ae0d56915e43f382776ca8 Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Fri, 7 Dec 2018 16:23:05 +0900 Subject: [PATCH] Fix invalid format string [Version] 0.5.15 [Issue Type] Build Change-Id: Ia7106706f2e349d64b859bed53a20d0e85cbec95 --- packaging/capi-media-audio-io.spec | 2 +- src/cpp/CAudioInput.cpp | 4 ++-- src/cpp/CAudioOutput.cpp | 10 +++++----- src/cpp/CPulseAudioClient.cpp | 20 ++++++++++---------- src/cpp/cpp_audio_io.cpp | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packaging/capi-media-audio-io.spec b/packaging/capi-media-audio-io.spec index 7c16553..1d9ecbf 100644 --- a/packaging/capi-media-audio-io.spec +++ b/packaging/capi-media-audio-io.spec @@ -1,6 +1,6 @@ Name: capi-media-audio-io Summary: An Audio Input & Audio Output library in Tizen Native API -Version: 0.5.14 +Version: 0.5.15 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/cpp/CAudioInput.cpp b/src/cpp/CAudioInput.cpp index 64d2e94..498dd9b 100644 --- a/src/cpp/CAudioInput.cpp +++ b/src/cpp/CAudioInput.cpp @@ -60,7 +60,7 @@ void CAudioInput::onStream(CPulseAudioClient* pClient, size_t length) { */ if (__mIsUsedSyncRead == true) { #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; } @@ -69,7 +69,7 @@ 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); } diff --git a/src/cpp/CAudioOutput.cpp b/src/cpp/CAudioOutput.cpp index f330bed..9f3aeaa 100644 --- a/src/cpp/CAudioOutput.cpp +++ b/src/cpp/CAudioOutput.cpp @@ -56,7 +56,7 @@ void CAudioOutput::onStream(CPulseAudioClient* pClient, size_t length) { */ if (__mIsUsedSyncWrite == true) { #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; @@ -66,7 +66,7 @@ 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); } @@ -268,7 +268,7 @@ size_t CAudioOutput::write(const void* buffer, size_t length) { 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; } @@ -292,7 +292,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(); } @@ -301,7 +301,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); diff --git a/src/cpp/CPulseAudioClient.cpp b/src/cpp/CPulseAudioClient.cpp index 7f41a61..db411b4 100644 --- a/src/cpp/CPulseAudioClient.cpp +++ b/src/cpp/CPulseAudioClient.cpp @@ -182,12 +182,12 @@ void CPulseAudioClient::__streamPlaybackCb(pa_stream* s, size_t length, void* us #ifndef DISABLE_MOBILE_BACK_COMP if (pClient->__mIsInit == false) { - AUDIO_IO_LOGD("Occurred this listener when an out stream is on the way to create : Write dummy, length[%d]", length); + AUDIO_IO_LOGD("Occurred this listener when an out stream is on the way to create : Write dummy, length[%zu]", length); __dummy_write(s, length); return; } if (pClient->isCorked()) { - AUDIO_IO_LOGD("Occurred this listener when an out stream is CORKED : Write dummy, length[%d]", length); + AUDIO_IO_LOGD("Occurred this listener when an out stream is CORKED : Write dummy, length[%zu]", length); __dummy_write(s, length); return; } @@ -200,7 +200,7 @@ void CPulseAudioClient::__streamPlaybackCb(pa_stream* s, size_t length, void* us then write dummy data to ensure the start */ if (pClient->__mSpec.getStreamLatency() == CPulseStreamSpec::EStreamLatency::STREAM_LATENCY_OUTPUT_DEFAULT_ASYNC && pClient->__mIsFirstStream) { - AUDIO_IO_LOGW("[async] Write dummy of length[%d] since not written in first callback during prepare", length); + AUDIO_IO_LOGW("[async] Write dummy of length[%zu] since not written in first callback during prepare", length); __dummy_write(s, length); pClient->__mIsFirstStream = false; } @@ -540,7 +540,7 @@ int CPulseAudioClient::read(void* buffer, size_t length) { if (__mSyncReadLength <= 0) { #ifdef _AUDIO_IO_DEBUG_TIMING_ - AUDIO_IO_LOGD("readLength(%d byte) is not valid. wait...", __mSyncReadLength); + AUDIO_IO_LOGD("readLength(%zu byte) is not valid. wait...", __mSyncReadLength); #endif pa_threaded_mainloop_wait(__mpMainloop); } else if (__mpSyncReadDataPtr == NULL) { @@ -562,7 +562,7 @@ int CPulseAudioClient::read(void* buffer, size_t length) { // Copy partial pcm data on out parameter #ifdef _AUDIO_IO_DEBUG_TIMING_ - AUDIO_IO_LOGD("memcpy() that a peeked buffer[0x%x], index[%d], length[%d] on out buffer", (const uint8_t*)(__mpSyncReadDataPtr) + __mSyncReadIndex, __mSyncReadIndex, l); + AUDIO_IO_LOGD("memcpy() that a peeked buffer[%p], index[%zu], length[%zu] on out buffer", (const uint8_t*)(__mpSyncReadDataPtr) + __mSyncReadIndex, __mSyncReadIndex, l); #endif memcpy(buffer, (const uint8_t*)__mpSyncReadDataPtr + __mSyncReadIndex, l); @@ -627,7 +627,7 @@ int CPulseAudioClient::peek(const void** buffer, size_t* length) { } #ifdef _AUDIO_IO_DEBUG_TIMING_ - AUDIO_IO_LOGD("buffer[%p], length[%d]", *buffer, *length); + AUDIO_IO_LOGD("buffer[%p], length[%zu]", *buffer, *length); #endif if (ret < 0) { @@ -681,7 +681,7 @@ int CPulseAudioClient::write(const void* data, size_t length) { int ret = 0; #ifdef _AUDIO_IO_DEBUG_TIMING_ - AUDIO_IO_LOGD("data[%p], length[%d], First[%d]", data, length, __mIsFirstStream); + AUDIO_IO_LOGD("data[%p], length[%zu], First[%d]", data, length, __mIsFirstStream); #endif if (isInThread() == false) { @@ -711,7 +711,7 @@ int CPulseAudioClient::write(const void* data, size_t length) { delete [] dummy; } __mIsFirstStream = false; - AUDIO_IO_LOGW("FIRST STREAM CALLBACK : length[%d], prebuf[%d], dummy[%d]", + AUDIO_IO_LOGW("FIRST STREAM CALLBACK : length[%zu], prebuf[%d], dummy[%zu]", length, prebuf, (length < prebuf) ? prebuf - length : 0); } ret = pa_stream_write(__mpStream, data, length, NULL, 0LL, PA_SEEK_RELATIVE); @@ -932,10 +932,10 @@ size_t CPulseAudioClient::getBufferSize() { if (__mDirection == EStreamDirection::STREAM_DIRECTION_PLAYBACK) { ret = attr->tlength; - AUDIO_IO_LOGD("PLAYBACK buffer size[%d]", ret); + AUDIO_IO_LOGD("PLAYBACK buffer size[%zu]", ret); } else { ret = attr->fragsize; - AUDIO_IO_LOGD("RECORD buffer size[%d]", ret); + AUDIO_IO_LOGD("RECORD buffer size[%zu]", ret); } } catch (CAudioError& e) { if (isInThread() == false) { diff --git a/src/cpp/cpp_audio_io.cpp b/src/cpp/cpp_audio_io.cpp index d1717b8..6160fa2 100644 --- a/src/cpp/cpp_audio_io.cpp +++ b/src/cpp/cpp_audio_io.cpp @@ -569,7 +569,7 @@ int cpp_audio_in_read(audio_in_h input, void *buffer, unsigned int length) { size_t readn = inputHandle->read(buffer, static_cast(length)); ret = static_cast(readn); #ifdef _AUDIO_IO_DEBUG_TIMING_ - AUDIO_IO_LOGD("readn:%d", readn); + AUDIO_IO_LOGD("readn:%zu", readn); #endif } catch (CAudioError& e) { AUDIO_IO_LOGE("%s", e.getErrorMsg()); @@ -1067,7 +1067,7 @@ int cpp_audio_out_write(audio_out_h output, void *buffer, unsigned int length) { size_t written = outputHandle->write(buffer, static_cast(length)); ret = static_cast(written); #ifdef _AUDIO_IO_DEBUG_TIMING_ - AUDIO_IO_LOGD("written:%d", written); + AUDIO_IO_LOGD("written:%zu", written); #endif } catch (CAudioError& e) { AUDIO_IO_LOGE("%s", e.getErrorMsg()); -- 2.34.1