Merge "Remove default channel mask for AudioTrack" (a218f53d) · Commits · e / os / android_frameworks_av

media/libmedia/AudioTrack.cpp

+5 −7

Original line number	Diff line number	Diff line
		@@ -250,9 +250,6 @@ status_t AudioTrack::set(
		if (format == AUDIO_FORMAT_DEFAULT) {
		format = AUDIO_FORMAT_PCM_16_BIT;
		}
		if (channelMask == 0) {
		channelMask = AUDIO_CHANNEL_OUT_STEREO;
		}

		// validate parameters
		if (!audio_is_valid_format(format)) {
		@@ -260,6 +257,11 @@ status_t AudioTrack::set(
		return BAD_VALUE;
		}

		if (!audio_is_output_channel(channelMask)) {
		ALOGE("Invalid channel mask %#x", channelMask);
		return BAD_VALUE;
		}

		// AudioFlinger does not currently support 8-bit data in shared memory
		if (format == AUDIO_FORMAT_PCM_8_BIT && sharedBuffer != 0) {
		ALOGE("8-bit data in shared memory is not supported");
		@@ -282,10 +284,6 @@ status_t AudioTrack::set(
		flags = (audio_output_flags_t)(flags &~AUDIO_OUTPUT_FLAG_DEEP_BUFFER);
		}

		if (!audio_is_output_channel(channelMask)) {
		ALOGE("Invalid channel mask %#x", channelMask);
		return BAD_VALUE;
		}
		mChannelMask = channelMask;
		uint32_t channelCount = popcount(channelMask);
		mChannelCount = channelCount;