Merge "Replace hard-coded sample rate values by constants" (1e821372) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioTrack.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -69,6 +69,11 @@ public class AudioTrack
		/** Maximum value for a channel volume */
		private static final float VOLUME_MAX = 1.0f;

		/** Minimum value for sample rate */
		private static final int SAMPLE_RATE_HZ_MIN = 4000;
		/** Maximum value for sample rate */
		private static final int SAMPLE_RATE_HZ_MAX = 48000;

		/** indicates AudioTrack state is stopped */
		public static final int PLAYSTATE_STOPPED = 1; // matches SL_PLAYSTATE_STOPPED
		/** indicates AudioTrack state is paused */
		@@ -685,7 +690,7 @@ public class AudioTrack
		}

		// sample rate, note these values are subject to change
		if ( (sampleRateInHz < 4000) \|\| (sampleRateInHz > 48000) ) {
		if ( (sampleRateInHz < SAMPLE_RATE_HZ_MIN) \|\| (sampleRateInHz > SAMPLE_RATE_HZ_MAX) ) {
		loge("getMinBufferSize(): " + sampleRateInHz + " Hz is not a supported sample rate.");
		return AudioTrack.ERROR_BAD_VALUE;
		}