am bcad4637: am eb046057: am 6e745aec: Merge "Rename mChannels to mChannelMask" into mnc-dev (9f14f527) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioTrack.java

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -242,7 +242,7 @@ public class AudioTrack
	/**		/**
	* The audio channel mask used for calling native AudioTrack		* The audio channel mask used for calling native AudioTrack
	*/		*/
	private int mChannels = AudioFormat.CHANNEL_OUT_MONO;		private int mChannelMask = AudioFormat.CHANNEL_OUT_MONO;

	/**		/**
	* The type of the audio stream to play. See		* The type of the audio stream to play. See
	@@ -485,7 +485,7 @@ public class AudioTrack
	session[0] = sessionId;		session[0] = sessionId;
	// native initialization		// native initialization
	int initResult = native_setup(new WeakReference<AudioTrack>(this), mAttributes,		int initResult = native_setup(new WeakReference<AudioTrack>(this), mAttributes,
	mSampleRate, mChannels, mChannelIndexMask, mAudioFormat,		mSampleRate, mChannelMask, mChannelIndexMask, mAudioFormat,
	mNativeBufferSizeInBytes, mDataLoadMode, session);		mNativeBufferSizeInBytes, mDataLoadMode, session);
	if (initResult != SUCCESS) {		if (initResult != SUCCESS) {
	loge("Error code "+initResult+" when initializing AudioTrack.");		loge("Error code "+initResult+" when initializing AudioTrack.");
	@@ -699,7 +699,7 @@ public class AudioTrack
	// This is where constructor IllegalArgumentException-s are thrown		// This is where constructor IllegalArgumentException-s are thrown
	// postconditions:		// postconditions:
	// mChannelCount is valid		// mChannelCount is valid
	// mChannels is valid		// mChannelMask is valid
	// mAudioFormat is valid		// mAudioFormat is valid
	// mSampleRate is valid		// mSampleRate is valid
	// mDataLoadMode is valid		// mDataLoadMode is valid
	@@ -722,12 +722,12 @@ public class AudioTrack
	case AudioFormat.CHANNEL_OUT_MONO:		case AudioFormat.CHANNEL_OUT_MONO:
	case AudioFormat.CHANNEL_CONFIGURATION_MONO:		case AudioFormat.CHANNEL_CONFIGURATION_MONO:
	mChannelCount = 1;		mChannelCount = 1;
	mChannels = AudioFormat.CHANNEL_OUT_MONO;		mChannelMask = AudioFormat.CHANNEL_OUT_MONO;
	break;		break;
	case AudioFormat.CHANNEL_OUT_STEREO:		case AudioFormat.CHANNEL_OUT_STEREO:
	case AudioFormat.CHANNEL_CONFIGURATION_STEREO:		case AudioFormat.CHANNEL_CONFIGURATION_STEREO:
	mChannelCount = 2;		mChannelCount = 2;
	mChannels = AudioFormat.CHANNEL_OUT_STEREO;		mChannelMask = AudioFormat.CHANNEL_OUT_STEREO;
	break;		break;
	default:		default:
	if (channelConfig == AudioFormat.CHANNEL_INVALID && channelIndexMask != 0) {		if (channelConfig == AudioFormat.CHANNEL_INVALID && channelIndexMask != 0) {
	@@ -738,7 +738,7 @@ public class AudioTrack
	// input channel configuration features unsupported channels		// input channel configuration features unsupported channels
	throw new IllegalArgumentException("Unsupported channel configuration.");		throw new IllegalArgumentException("Unsupported channel configuration.");
	}		}
	mChannels = channelConfig;		mChannelMask = channelConfig;
	mChannelCount = AudioFormat.channelCountFromOutChannelMask(channelConfig);		mChannelCount = AudioFormat.channelCountFromOutChannelMask(channelConfig);
	}		}
	// check the channel index configuration (if present)		// check the channel index configuration (if present)