diff options
author | Seungbae Shin <seungbae.shin@samsung.com> | 2018-12-14 15:10:45 +0900 |
---|---|---|
committer | Seungbae Shin <seungbae.shin@samsung.com> | 2018-12-17 12:31:07 +0900 |
commit | 45d19b200968587aac853e9af30f370009e7d6cb (patch) | |
tree | 6248d5167a332653db31c08ff32d825821abd84c | |
parent | 3a0323a6fea77f5f48b44693e58618cd6935ede6 (diff) | |
download | audio-hal-sc7727-45d19b200968587aac853e9af30f370009e7d6cb.tar.gz audio-hal-sc7727-45d19b200968587aac853e9af30f370009e7d6cb.tar.bz2 audio-hal-sc7727-45d19b200968587aac853e9af30f370009e7d6cb.zip |
Fix invalid format stringsubmit/tizen/20181217.051937accepted/tizen/unified/20181218.062934
[Version] 0.1.28
[Issue Type] Build
Change-Id: I08f58b4a889a0c2d8ce01c7e21ae51cc352d92a4
-rw-r--r-- | packaging/audio-hal-sc7727.spec | 2 | ||||
-rw-r--r-- | tizen-audio-impl-pcm.c | 27 | ||||
-rw-r--r-- | tizen-audio-pcm.c | 2 |
3 files changed, 17 insertions, 14 deletions
diff --git a/packaging/audio-hal-sc7727.spec b/packaging/audio-hal-sc7727.spec index 270f2af..8fc978a 100644 --- a/packaging/audio-hal-sc7727.spec +++ b/packaging/audio-hal-sc7727.spec @@ -1,6 +1,6 @@ Name: audio-hal-sc7727 Summary: TIZEN Audio HAL for SC7727 -Version: 0.1.27 +Version: 0.1.28 Release: 0 Group: System/Libraries License: Apache-2.0 diff --git a/tizen-audio-impl-pcm.c b/tizen-audio-impl-pcm.c index e809bab..1385f36 100644 --- a/tizen-audio-impl-pcm.c +++ b/tizen-audio-impl-pcm.c @@ -437,7 +437,7 @@ audio_return_t _pcm_start(void *pcm_handle) } #endif - AUDIO_LOG_INFO("PCM handle 0x%x start", pcm_handle); + AUDIO_LOG_INFO("PCM handle %p start", pcm_handle); return AUDIO_RET_OK; } @@ -457,7 +457,7 @@ audio_return_t _pcm_stop(void *pcm_handle) } #endif - AUDIO_LOG_INFO("PCM handle 0x%x stop", pcm_handle); + AUDIO_LOG_INFO("PCM handle %p stop", pcm_handle); return AUDIO_RET_OK; } @@ -491,7 +491,7 @@ audio_return_t _pcm_avail(void *pcm_handle, uint32_t *avail) err = pcm_get_htimestamp(pcm_handle, &frames_avail, &tspec); if (err < 0) { - AUDIO_LOG_ERROR("Could not get avail and timespec at PCM handle 0x%x : %d", pcm_handle, err); + AUDIO_LOG_ERROR("Could not get avail and timespec at PCM handle %p : %d", pcm_handle, err); return AUDIO_ERR_IOCTL; } @@ -504,7 +504,7 @@ audio_return_t _pcm_avail(void *pcm_handle, uint32_t *avail) snd_pcm_sframes_t frames_avail; if ((frames_avail = snd_pcm_avail(pcm_handle)) < 0) { - AUDIO_LOG_ERROR("Could not get avail at PCM handle 0x%x : %d", pcm_handle, frames_avail); + AUDIO_LOG_ERROR("Could not get avail at PCM handle %p : %ld", pcm_handle, frames_avail); return AUDIO_ERR_IOCTL; } @@ -539,7 +539,7 @@ audio_return_t _pcm_write(void *pcm_handle, const void *buffer, uint32_t frames) frames_written = snd_pcm_writei(pcm_handle, buffer, (snd_pcm_uframes_t) frames); if (frames_written < 0) { - AUDIO_LOG_ERROR("Failed to write pcm : %d", frames_written); + AUDIO_LOG_ERROR("Failed to write pcm : %ld", frames_written); return AUDIO_ERR_IOCTL; } @@ -570,7 +570,7 @@ audio_return_t _pcm_read(void *pcm_handle, void *buffer, uint32_t frames) frames_read = snd_pcm_readi(pcm_handle, buffer, (snd_pcm_uframes_t)frames); if (frames_read < 0) { - AUDIO_LOG_ERROR("Failed to read pcm : %d", frames_read); + AUDIO_LOG_ERROR("Failed to read pcm : %ld", frames_read); return AUDIO_ERR_IOCTL; } @@ -696,7 +696,8 @@ audio_return_t _pcm_get_params(void *pcm_handle, uint32_t direction, void **samp _stop_threshold = config->stop_threshold; _silence_threshold = config->silence_threshold; - AUDIO_LOG_DEBUG("_pcm_get_params (handle 0x%x, format %d, rate %d, channels %d, period_size %d, periods %d, buffer_size %d)", pcm_handle, config->format, config->rate, config->channels, config->period_size, config->period_count, _buffer_size); + AUDIO_LOG_DEBUG("_pcm_get_params (handle %p, format %d, rate %u, channels %u, period_size %u, periods %u, buffer_size %u)", + pcm_handle, config->format, config->rate, config->channels, config->period_size, config->period_count, _buffer_size); #else /* alsa-lib */ int err; audio_pcm_sample_spec_t *ss; @@ -725,7 +726,7 @@ audio_return_t _pcm_get_params(void *pcm_handle, uint32_t direction, void **samp (err = snd_pcm_hw_params_get_format(hwparams, &_format)) < 0 || (err = snd_pcm_hw_params_get_rate(hwparams, &_rate, &dir)) < 0 || (err = snd_pcm_hw_params_get_channels(hwparams, &_channels)) < 0) { - AUDIO_LOG_ERROR("snd_pcm_hw_params_get_{period_size|buffer_size|periods|format|rate|channels}() failed : %s", err); + AUDIO_LOG_ERROR("snd_pcm_hw_params_get_{period_size|buffer_size|periods|format|rate|channels}() failed : %d", err); return AUDIO_ERR_PARAMETER; } @@ -744,10 +745,11 @@ audio_return_t _pcm_get_params(void *pcm_handle, uint32_t direction, void **samp (err = snd_pcm_sw_params_get_stop_threshold(swparams, &_stop_threshold)) < 0 || (err = snd_pcm_sw_params_get_silence_threshold(swparams, &_silence_threshold)) < 0 || (err = snd_pcm_sw_params_get_avail_min(swparams, &_avail_min)) < 0) { - AUDIO_LOG_ERROR("snd_pcm_sw_params_get_{start_threshold|stop_threshold|silence_threshold|avail_min}() failed : %s", err); + AUDIO_LOG_ERROR("snd_pcm_sw_params_get_{start_threshold|stop_threshold|silence_threshold|avail_min}() failed : %d", err); } - AUDIO_LOG_DEBUG("_pcm_get_params (handle 0x%x, format %d, rate %d, channels %d, period_size %d, periods %d, buffer_size %d)", pcm_handle, _format, _rate, _channels, _period_size, _periods, _buffer_size); + AUDIO_LOG_DEBUG("_pcm_get_params (handle %p, format %d, rate %u, channels %u, period_size %lu, periods %u, buffer_size %lu)", + pcm_handle, _format, _rate, _channels, _period_size, _periods, _buffer_size); #endif return AUDIO_RET_OK; @@ -814,7 +816,7 @@ audio_return_t _pcm_set_params(void *pcm_handle, uint32_t direction, void *sampl _buffer_size = period_size * periods; if ((err = snd_pcm_hw_params_set_buffer_size(pcm_handle, hwparams, _buffer_size)) < 0) { - AUDIO_LOG_ERROR("snd_pcm_hw_params_set_buffer_size(%u) failed : %d", _buffer_size, err); + AUDIO_LOG_ERROR("snd_pcm_hw_params_set_buffer_size(%lu) failed : %d", _buffer_size, err); return AUDIO_ERR_PARAMETER; } @@ -860,7 +862,8 @@ audio_return_t _pcm_set_params(void *pcm_handle, uint32_t direction, void *sampl return AUDIO_ERR_IOCTL; } - AUDIO_LOG_DEBUG("_pcm_set_params (handle 0x%x, format %d, rate %d, channels %d, period_size %d, periods %d, buffer_size %d)", pcm_handle, ss.format, ss.rate, ss.channels, period_size, periods, _buffer_size); + AUDIO_LOG_DEBUG("_pcm_set_params (handle %p, format %d, rate %u, channels %u, period_size %u, periods %u, buffer_size %lu)", + pcm_handle, ss.format, ss.rate, ss.channels, period_size, periods, _buffer_size); #endif return AUDIO_RET_OK; diff --git a/tizen-audio-pcm.c b/tizen-audio-pcm.c index e11f8cc..ee836f1 100644 --- a/tizen-audio-pcm.c +++ b/tizen-audio-pcm.c @@ -67,7 +67,7 @@ audio_return_t audio_pcm_open(void *audio_handle, const char *card, const char * ah = (audio_hal_t*)audio_handle; ah->device.pcm_count++; - AUDIO_LOG_INFO("Opening PCM handle 0x%x", (unsigned int)*pcm_handle); + AUDIO_LOG_INFO("Opening PCM handle %p", *pcm_handle); return AUDIO_RET_OK; } |