Merge "Use printf format %#x for audio_format_t in logs" (ec95f0e8) · Commits · e / os / android_frameworks_av

media/libmedia/AudioRecord.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;

media/libmedia/AudioSystem.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);

media/libmedia/AudioTrack.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

services/audioflinger/AudioFlinger.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -508,7 +508,7 @@ sp<IAudioTrack> AudioFlinger::createTrack(
		// client is responsible for conversion of 8-bit PCM to 16-bit PCM,
		// and we don't yet support 8.24 or 32-bit PCM
		if (audio_is_linear_pcm(format) && format != AUDIO_FORMAT_PCM_16_BIT) {
		ALOGE("createTrack() invalid format %d", format);
		ALOGE("createTrack() invalid format %#x", format);
		lStatus = BAD_VALUE;
		goto Exit;
		}
		@@ -1299,7 +1299,7 @@ sp<IAudioRecord> AudioFlinger::openRecord(
		}

		if (format != AUDIO_FORMAT_PCM_16_BIT) {
		ALOGE("openRecord() invalid format %d", format);
		ALOGE("openRecord() invalid format %#x", format);
		lStatus = BAD_VALUE;
		goto Exit;
		}
		@@ -1746,7 +1746,7 @@ audio_io_handle_t AudioFlinger::openInput(audio_module_handle_t module,
		audio_stream_in_t *inStream = NULL;
		status_t status = inHwHal->open_input_stream(inHwHal, id, *pDevices, &config,
		&inStream);
		ALOGV("openInput() openInputStream returned input %p, SamplingRate %d, Format %d, Channels %x, "
		ALOGV("openInput() openInputStream returned input %p, SamplingRate %d, Format %#x, Channels %x, "
		"status %d",
		inStream,
		config.sample_rate,

services/audioflinger/Threads.cpp

+9 −9

Original line number	Diff line number	Diff line
		@@ -1276,8 +1276,8 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac
		if (mType == DIRECT) {
		if ((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_PCM) {
		if (sampleRate != mSampleRate \|\| format != mFormat \|\| channelMask != mChannelMask) {
		ALOGE("createTrack_l() Bad parameter: sampleRate %u format %d, channelMask 0x%08x "
		"for output %p with format %d",
		ALOGE("createTrack_l() Bad parameter: sampleRate %u format %#x, channelMask 0x%08x "
		"for output %p with format %#x",
		sampleRate, format, channelMask, mOutput, mFormat);
		lStatus = BAD_VALUE;
		goto Exit;
		@@ -1285,16 +1285,16 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac
		}
		} else if (mType == OFFLOAD) {
		if (sampleRate != mSampleRate \|\| format != mFormat \|\| channelMask != mChannelMask) {
		ALOGE("createTrack_l() Bad parameter: sampleRate %d format %d, channelMask 0x%08x \""
		"for output %p with format %d",
		ALOGE("createTrack_l() Bad parameter: sampleRate %d format %#x, channelMask 0x%08x \""
		"for output %p with format %#x",
		sampleRate, format, channelMask, mOutput, mFormat);
		lStatus = BAD_VALUE;
		goto Exit;
		}
		} else {
		if ((format & AUDIO_FORMAT_MAIN_MASK) != AUDIO_FORMAT_PCM) {
		ALOGE("createTrack_l() Bad parameter: format %d \""
		"for output %p with format %d",
		ALOGE("createTrack_l() Bad parameter: format %#x \""
		"for output %p with format %#x",
		format, mOutput, mFormat);
		lStatus = BAD_VALUE;
		goto Exit;
		@@ -1650,10 +1650,10 @@ void AudioFlinger::PlaybackThread::readOutputParameters()
		mChannelCount = popcount(mChannelMask);
		mFormat = mOutput->stream->common.get_format(&mOutput->stream->common);
		if (!audio_is_valid_format(mFormat)) {
		LOG_FATAL("HAL format %d not valid for output", mFormat);
		LOG_FATAL("HAL format %#x not valid for output", mFormat);
		}
		if ((mType == MIXER \|\| mType == DUPLICATING) && mFormat != AUDIO_FORMAT_PCM_16_BIT) {
		LOG_FATAL("HAL format %d not supported for mixed output; must be AUDIO_FORMAT_PCM_16_BIT",
		LOG_FATAL("HAL format %#x not supported for mixed output; must be AUDIO_FORMAT_PCM_16_BIT",
		mFormat);
		}
		mFrameSize = audio_stream_frame_size(&mOutput->stream->common);
		@@ -5380,7 +5380,7 @@ void AudioFlinger::RecordThread::readInputParameters()
		mChannelCount = popcount(mChannelMask);
		mFormat = mInput->stream->common.get_format(&mInput->stream->common);
		if (mFormat != AUDIO_FORMAT_PCM_16_BIT) {
		ALOGE("HAL format %d not supported; must be AUDIO_FORMAT_PCM_16_BIT", mFormat);
		ALOGE("HAL format %#x not supported; must be AUDIO_FORMAT_PCM_16_BIT", mFormat);
		}
		mFrameSize = audio_stream_frame_size(&mInput->stream->common);
		mBufferSize = mInput->stream->common.get_buffer_size(&mInput->stream->common);