diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-02-10 16:07:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-10 16:07:15 +0000 |
| commit | ec95f0e82a680931e9c7c9011dbbd68d5ab484c8 (patch) | |
| tree | f3d3a5d02b466a58454a53a034375a02e0ffe1c3 /media | |
| parent | 8497416c40bae877bc67b0ef30bb41a73af54711 (diff) | |
| parent | cac3daa6332bf6d1f7d26adc4a9915f3d7992dd9 (diff) | |
| download | frameworks_av-ec95f0e82a680931e9c7c9011dbbd68d5ab484c8.zip frameworks_av-ec95f0e82a680931e9c7c9011dbbd68d5ab484c8.tar.gz frameworks_av-ec95f0e82a680931e9c7c9011dbbd68d5ab484c8.tar.bz2 | |
Merge "Use printf format %#x for audio_format_t in logs"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioRecord.cpp | 6 | ||||
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 6 | ||||
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index a9ba154..541cb51 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -52,7 +52,7 @@ status_t AudioRecord::getMinFrameCount( } if (size == 0) { - ALOGE("Unsupported configuration: sampleRate %u, format %d, channelMask %#x", + ALOGE("Unsupported configuration: sampleRate %u, format %#x, channelMask %#x", sampleRate, format, channelMask); return BAD_VALUE; } @@ -191,12 +191,12 @@ status_t AudioRecord::set( // validate parameters if (!audio_is_valid_format(format)) { - ALOGE("Invalid format %d", format); + ALOGE("Invalid format %#x", format); return BAD_VALUE; } // Temporary restriction: AudioFlinger currently supports 16-bit PCM only if (format != AUDIO_FORMAT_PCM_16_BIT) { - ALOGE("Format %d is not supported", format); + ALOGE("Format %#x is not supported", format); return BAD_VALUE; } mFormat = format; diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index e224d20..72a60ea 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -374,7 +374,7 @@ status_t AudioSystem::getInputBufferSize(uint32_t sampleRate, audio_format_t for } inBuffSize = af->getInputBufferSize(sampleRate, format, channelMask); if (inBuffSize == 0) { - ALOGE("AudioSystem::getInputBufferSize failed sampleRate %d format %x channelMask %x", + ALOGE("AudioSystem::getInputBufferSize failed sampleRate %d format %#x channelMask %x", sampleRate, format, channelMask); return BAD_VALUE; } @@ -490,7 +490,7 @@ void AudioSystem::AudioFlingerClient::ioConfigChanged(int event, audio_io_handle OutputDescriptor *outputDesc = new OutputDescriptor(*desc); gOutputs.add(ioHandle, outputDesc); - ALOGV("ioConfigChanged() new output samplingRate %u, format %d channel mask %#x frameCount %u " + ALOGV("ioConfigChanged() new output samplingRate %u, format %#x channel mask %#x frameCount %u " "latency %d", outputDesc->samplingRate, outputDesc->format, outputDesc->channelMask, outputDesc->frameCount, outputDesc->latency); @@ -514,7 +514,7 @@ void AudioSystem::AudioFlingerClient::ioConfigChanged(int event, audio_io_handle if (param2 == NULL) break; desc = (const OutputDescriptor *)param2; - ALOGV("ioConfigChanged() new config for output %d samplingRate %u, format %d channel mask %#x " + ALOGV("ioConfigChanged() new config for output %d samplingRate %u, format %#x channel mask %#x " "frameCount %d latency %d", ioHandle, desc->samplingRate, desc->format, desc->channelMask, desc->frameCount, desc->latency); diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index cfd79bc..41b4845 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -273,7 +273,7 @@ status_t AudioTrack::set( // validate parameters if (!audio_is_valid_format(format)) { - ALOGE("Invalid format %d", format); + ALOGE("Invalid format %#x", format); return BAD_VALUE; } mFormat = format; |