diff options
| author | Colin Cross <ccross@android.com> | 2014-04-21 15:59:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-21 15:59:26 +0000 |
| commit | 747d0df39c66704e182b5c8485471940bfdf5816 (patch) | |
| tree | 4b7402a21eb550a7beb003e7264ca74433989e9d /modules/audio_remote_submix | |
| parent | 32853ed46b08ae4236e90cc565acb81e9a739a93 (diff) | |
| parent | 6322562d0f1387c08109f706f381a3818114f91f (diff) | |
| download | hardware_libhardware-747d0df39c66704e182b5c8485471940bfdf5816.zip hardware_libhardware-747d0df39c66704e182b5c8485471940bfdf5816.tar.gz hardware_libhardware-747d0df39c66704e182b5c8485471940bfdf5816.tar.bz2 | |
am 6322562d: am c070bad4: Merge changes I672d4ee8,I6a2183b5,If0c0135e
* commit '6322562d0f1387c08109f706f381a3818114f91f':
usbaudio: allow compiling for 64-bit
audio_remote_submix: allow compiling for 64-bit
audio: allow compiling for 64-bit
Diffstat (limited to 'modules/audio_remote_submix')
| -rw-r--r-- | modules/audio_remote_submix/Android.mk | 3 | ||||
| -rw-r--r-- | modules/audio_remote_submix/audio_hw.cpp | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/modules/audio_remote_submix/Android.mk b/modules/audio_remote_submix/Android.mk index d718c76..90da396 100644 --- a/modules/audio_remote_submix/Android.mk +++ b/modules/audio_remote_submix/Android.mk @@ -26,6 +26,7 @@ LOCAL_C_INCLUDES += \ LOCAL_SHARED_LIBRARIES := liblog libcutils libutils libnbaio LOCAL_STATIC_LIBRARIES := libmedia_helper LOCAL_MODULE_TAGS := optional -LOCAL_32_BIT_ONLY := true +LOCAL_CFLAGS := -Wno-unused-parameter + include $(BUILD_SHARED_LIBRARY) diff --git a/modules/audio_remote_submix/audio_hw.cpp b/modules/audio_remote_submix/audio_hw.cpp index 6b14aa5..22e2dbf 100644 --- a/modules/audio_remote_submix/audio_hw.cpp +++ b/modules/audio_remote_submix/audio_hw.cpp @@ -271,7 +271,7 @@ static ssize_t out_write(struct audio_stream_out *stream, const void* buffer, return 0; } else { // write() returned UNDERRUN or WOULD_BLOCK, retry - ALOGE("out_write() write to pipe returned unexpected %d", written_frames); + ALOGE("out_write() write to pipe returned unexpected %zd", written_frames); written_frames = sink->write(buffer, frames); } } @@ -281,10 +281,10 @@ static ssize_t out_write(struct audio_stream_out *stream, const void* buffer, pthread_mutex_unlock(&out->dev->lock); if (written_frames < 0) { - ALOGE("out_write() failed writing to pipe with %d", written_frames); + ALOGE("out_write() failed writing to pipe with %zd", written_frames); return 0; } else { - ALOGV("out_write() wrote %lu bytes)", written_frames * frame_size); + ALOGV("out_write() wrote %zu bytes)", written_frames * frame_size); return written_frames * frame_size; } } @@ -327,7 +327,7 @@ static int in_set_sample_rate(struct audio_stream *stream, uint32_t rate) static size_t in_get_buffer_size(const struct audio_stream *stream) { const struct submix_stream_in *in = reinterpret_cast<const struct submix_stream_in *>(stream); - ALOGV("in_get_buffer_size() returns %u", + ALOGV("in_get_buffer_size() returns %zu", in->dev->config.period_size * audio_stream_frame_size(stream)); return in->dev->config.period_size * audio_stream_frame_size(stream); } @@ -449,7 +449,7 @@ static ssize_t in_read(struct audio_stream_in *stream, void* buffer, } if (remaining_frames > 0) { - ALOGV(" remaining_frames = %d", remaining_frames); + ALOGV(" remaining_frames = %zu", remaining_frames); memset(((char*)buffer)+ bytes - (remaining_frames * frame_size), 0, remaining_frames * frame_size); } @@ -488,7 +488,7 @@ static ssize_t in_read(struct audio_stream_in *stream, void* buffer, } - ALOGV("in_read returns %d", bytes); + ALOGV("in_read returns %zu", bytes); return bytes; } |