| Revision | 37b609ace5e4985f8fba262f74020c45f896ed09 (tree) |
|---|---|
| Time | 2016-07-12 23:24:35 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Fix incorrect formatted output conversion
The 64-bit compiler will warn and treat them as errors.
hdmi/tinyaudio_hw.c (diff)| @@ -247,7 +247,7 @@ static int start_output_stream(struct stream_out *out) | ||
| 247 | 247 | out->pcm_config.silence_threshold = 0; |
| 248 | 248 | |
| 249 | 249 | if(activePcm){ |
| 250 | - ALOGV("Closing already open tiny alsa stream running state %d",(int)(activePcm)); | |
| 250 | + ALOGV("Closing already open tiny alsa stream running state %p", activePcm); | |
| 251 | 251 | pcm_close(activePcm); |
| 252 | 252 | activePcm = NULL; |
| 253 | 253 | } |
| @@ -269,7 +269,7 @@ static int start_output_stream(struct stream_out *out) | ||
| 269 | 269 | activePcm = out->pcm; |
| 270 | 270 | activeChannel = out->pcm_config.channels; |
| 271 | 271 | |
| 272 | - ALOGV("Initialized PCM device for channels %d handle = %d",out->pcm_config.channels, (int)activePcm); | |
| 272 | + ALOGI("Initialized PCM device for channels %d handle = %p", out->pcm_config.channels, activePcm); | |
| 273 | 273 | ALOGV("%s exit",__func__); |
| 274 | 274 | return 0; |
| 275 | 275 | } |
| @@ -310,7 +310,7 @@ static size_t out_get_buffer_size(const struct audio_stream *stream) | ||
| 310 | 310 | buf_size/=LATENCY_TO_BUFFER_SIZE_RATIO; |
| 311 | 311 | } |
| 312 | 312 | |
| 313 | - ALOGV("%s : %d, period_size : %d, frame_size : %d", | |
| 313 | + ALOGV("%s : %zu, period_size : %u, frame_size : %zu", | |
| 314 | 314 | __func__, |
| 315 | 315 | buf_size, |
| 316 | 316 | out->pcm_config.period_size, |
| @@ -569,7 +569,7 @@ static ssize_t out_write(struct audio_stream_out *stream, const void* buffer, | ||
| 569 | 569 | int32_t* dstbuff = NULL; |
| 570 | 570 | int outbytes = 0; |
| 571 | 571 | |
| 572 | - ALOGV("%s enter for bytes = %d channels = %d",__func__,bytes, out->pcm_config.channels); | |
| 572 | + ALOGV("%s enter for bytes = %zu channels = %u", __func__, bytes, out->pcm_config.channels); | |
| 573 | 573 | |
| 574 | 574 | pthread_mutex_lock(&out->dev->lock); |
| 575 | 575 | pthread_mutex_lock(&out->lock); |
| @@ -615,7 +615,7 @@ static ssize_t out_write(struct audio_stream_out *stream, const void* buffer, | ||
| 615 | 615 | else |
| 616 | 616 | ret = pcm_write(out->pcm, (void *)buffer, bytes); |
| 617 | 617 | |
| 618 | - ALOGV("pcm_write: %s done for %d input bytes, output bytes = %d ", pcm_get_error(out->pcm),bytes,outbytes); | |
| 618 | + ALOGV("pcm_write: %s done for %zu input bytes, output bytes = %d ", pcm_get_error(out->pcm), bytes, outbytes); | |
| 619 | 619 | |
| 620 | 620 | free(dstbuff); |
| 621 | 621 |
| @@ -752,7 +752,7 @@ static int adev_open_output_stream(struct audio_hw_device *dev, | ||
| 752 | 752 | pthread_mutex_lock(&out->lock); |
| 753 | 753 | |
| 754 | 754 | if(activePcm){ |
| 755 | - ALOGV("Closing already open tiny alsa stream %d",(int)out->pcm); | |
| 755 | + ALOGV("Closing already open tiny alsa stream %p", out->pcm); | |
| 756 | 756 | pcm_close(activePcm); |
| 757 | 757 | activePcm = NULL; |
| 758 | 758 | } |
Android-x86
Fork