diff options
| author | Eric Laurent <elaurent@google.com> | 2013-08-22 12:09:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-22 12:09:08 -0700 |
| commit | c49aa8d4f3c8a8647ca567c762fe4af59007307c (patch) | |
| tree | 29fafb57d104dcf7293a6d12ca1b7496ac45da69 /modules/audio_remote_submix/audio_hw.cpp | |
| parent | 0370e9328643bd838a35cdad8632fd6e8993b659 (diff) | |
| parent | 9595f7cff6ddbeb58350fadeaf21da3f14fb76bc (diff) | |
| download | hardware_libhardware-c49aa8d4f3c8a8647ca567c762fe4af59007307c.zip hardware_libhardware-c49aa8d4f3c8a8647ca567c762fe4af59007307c.tar.gz hardware_libhardware-c49aa8d4f3c8a8647ca567c762fe4af59007307c.tar.bz2 | |
am 9595f7cf: remote submix: fix test on sampling valid rates
* commit '9595f7cff6ddbeb58350fadeaf21da3f14fb76bc':
remote submix: fix test on sampling valid rates
Diffstat (limited to 'modules/audio_remote_submix/audio_hw.cpp')
| -rw-r--r-- | modules/audio_remote_submix/audio_hw.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/audio_remote_submix/audio_hw.cpp b/modules/audio_remote_submix/audio_hw.cpp index 5e88ef7..9df17b6 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 %16lx", written_frames); + ALOGE("out_write() write to pipe returned unexpected %d", written_frames); written_frames = sink->write(buffer, frames); } } @@ -281,7 +281,7 @@ 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 %16lx", written_frames); + ALOGE("out_write() failed writing to pipe with %d", written_frames); return 0; } else { ALOGV("out_write() wrote %lu bytes)", written_frames * frame_size); @@ -549,7 +549,7 @@ static int adev_open_output_stream(struct audio_hw_device *dev, config->channel_mask = AUDIO_CHANNEL_OUT_STEREO; rsxadev->config.channel_mask = config->channel_mask; - if ((config->sample_rate != 48000) || (config->sample_rate != 44100)) { + if ((config->sample_rate != 48000) && (config->sample_rate != 44100)) { config->sample_rate = DEFAULT_RATE_HZ; } rsxadev->config.rate = config->sample_rate; @@ -708,7 +708,7 @@ static int adev_open_input_stream(struct audio_hw_device *dev, config->channel_mask = AUDIO_CHANNEL_IN_STEREO; rsxadev->config.channel_mask = config->channel_mask; - if ((config->sample_rate != 48000) || (config->sample_rate != 44100)) { + if ((config->sample_rate != 48000) && (config->sample_rate != 44100)) { config->sample_rate = DEFAULT_RATE_HZ; } rsxadev->config.rate = config->sample_rate; |