Merge "Hide stretch mode from PlaybackSettings" (09f9a7ad) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -16447,18 +16447,14 @@ package android.media {
		ctor public PlaybackSettings();
		method public android.media.PlaybackSettings allowDefaults();
		method public int getAudioFallbackMode();
		method public int getAudioStretchMode();
		method public float getPitch();
		method public float getSpeed();
		method public android.media.PlaybackSettings setAudioFallbackMode(int);
		method public android.media.PlaybackSettings setAudioStretchMode(int);
		method public android.media.PlaybackSettings setPitch(float);
		method public android.media.PlaybackSettings setSpeed(float);
		field public static final int AUDIO_FALLBACK_MODE_DEFAULT = 0; // 0x0
		field public static final int AUDIO_FALLBACK_MODE_FAIL = 2; // 0x2
		field public static final int AUDIO_FALLBACK_MODE_MUTE = 1; // 0x1
		field public static final int AUDIO_STRETCH_MODE_DEFAULT = 0; // 0x0
		field public static final int AUDIO_STRETCH_MODE_VOICE = 1; // 0x1
		}

		public final class Rating implements android.os.Parcelable {

+0 −4

Original line number	Diff line number	Diff line
		@@ -17663,18 +17663,14 @@ package android.media {
		ctor public PlaybackSettings();
		method public android.media.PlaybackSettings allowDefaults();
		method public int getAudioFallbackMode();
		method public int getAudioStretchMode();
		method public float getPitch();
		method public float getSpeed();
		method public android.media.PlaybackSettings setAudioFallbackMode(int);
		method public android.media.PlaybackSettings setAudioStretchMode(int);
		method public android.media.PlaybackSettings setPitch(float);
		method public android.media.PlaybackSettings setSpeed(float);
		field public static final int AUDIO_FALLBACK_MODE_DEFAULT = 0; // 0x0
		field public static final int AUDIO_FALLBACK_MODE_FAIL = 2; // 0x2
		field public static final int AUDIO_FALLBACK_MODE_MUTE = 1; // 0x1
		field public static final int AUDIO_STRETCH_MODE_DEFAULT = 0; // 0x0
		field public static final int AUDIO_STRETCH_MODE_VOICE = 1; // 0x1
		}

		public final class Rating implements android.os.Parcelable {

+2 −3

Original line number	Diff line number	Diff line
		@@ -926,8 +926,7 @@ public class AudioTrack
		return new PlaybackSettings()
		.setSpeed(floatArray[0])
		.setPitch(floatArray[1])
		.setAudioFallbackMode(intArray[0])
		.setAudioStretchMode(intArray[1]);
		.setAudioFallbackMode(intArray[0]);
		}

		/**
		@@ -1350,7 +1349,7 @@ public class AudioTrack
		};
		intArray = new int[] {
		settings.getAudioFallbackMode(),
		settings.getAudioStretchMode(),
		PlaybackSettings.AUDIO_STRETCH_MODE_DEFAULT,
		};
		} catch (IllegalStateException e) {
		throw new IllegalArgumentException(e);

+4 −8

Original line number	Diff line number	Diff line
		@@ -38,14 +38,6 @@ import android.annotation.IntDef;
		* Return {@link java.lang.IllegalArgumentException} from
		* <code>AudioTrack.setPlaybackSettings(PlaybackSettings)</code>.</li>
		* </ul>
		* <p> <strong>audio stretch mode:</strong> select
		* timestretch handling.
		* <ul>
		* <li> {@link PlaybackSettings#AUDIO_STRETCH_MODE_DEFAULT}:
		* System will determine best selection. </li>
		* <li> {@link PlaybackSettings#AUDIO_STRETCH_MODE_VOICE}:
		* Content is primarily voice.</li>
		* </ul>
		* <p> <strong>pitch:</strong> increases or decreases the tonal frequency of the audio content.
		* It is expressed as a multiplicative factor, where normal pitch is 1.0f.
		* <p> <strong>speed:</strong> increases or decreases the time to
		@@ -84,7 +76,9 @@ public final class PlaybackSettings {
		)
		@Retention(RetentionPolicy.SOURCE)
		public @interface AudioStretchMode {}
		/** @hide */
		public static final int AUDIO_STRETCH_MODE_DEFAULT = 0;
		/** @hide */
		public static final int AUDIO_STRETCH_MODE_VOICE = 1;

		// flags to indicate which settings are actually set
		@@ -136,6 +130,7 @@ public final class PlaybackSettings {
		}

		/**
		* @hide
		* Sets the audio stretch mode.
		* @param audioStretchMode
		* @return this <code>PlaybackSettings</code> instance.
		@@ -147,6 +142,7 @@ public final class PlaybackSettings {
		}

		/**
		* @hide
		* Retrieves the audio stretch mode.
		* @return audio stretch mode
		* @throws IllegalStateException if the audio stretch mode is not set.