Merge "Add support for audio session id in the TTS" (c25427a6) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -26660,6 +26660,7 @@ package android.speech.tts {
		field public static final java.lang.String KEY_FEATURE_EMBEDDED_SYNTHESIS = "embeddedTts";
		field public static final java.lang.String KEY_FEATURE_NETWORK_SYNTHESIS = "networkTts";
		field public static final java.lang.String KEY_PARAM_PAN = "pan";
		field public static final java.lang.String KEY_PARAM_SESSION_ID = "sessionId";
		field public static final java.lang.String KEY_PARAM_STREAM = "streamType";
		field public static final java.lang.String KEY_PARAM_UTTERANCE_ID = "utteranceId";
		field public static final java.lang.String KEY_PARAM_VOLUME = "volume";

core/java/android/speech/tts/AudioPlaybackQueueItem.java

+28 −4

Original line number	Diff line number	Diff line
		@@ -16,9 +16,12 @@
		package android.speech.tts;

		import android.content.Context;
		import android.media.AudioSystem;
		import android.media.AudioTrack;
		import android.media.MediaPlayer;
		import android.net.Uri;
		import android.os.ConditionVariable;
		import android.speech.tts.TextToSpeechService.AudioOutputParams;
		import android.speech.tts.TextToSpeechService.UtteranceProgressDispatcher;
		import android.util.Log;

		@@ -27,7 +30,7 @@ class AudioPlaybackQueueItem extends PlaybackQueueItem {

		private final Context mContext;
		private final Uri mUri;
		private final int mStreamType;
		private final AudioOutputParams mAudioParams;

		private final ConditionVariable mDone;
		private MediaPlayer mPlayer;
		@@ -35,12 +38,12 @@ class AudioPlaybackQueueItem extends PlaybackQueueItem {

		AudioPlaybackQueueItem(UtteranceProgressDispatcher dispatcher,
		Object callerIdentity,
		Context context, Uri uri, int streamType) {
		Context context, Uri uri, AudioOutputParams audioParams) {
		super(dispatcher, callerIdentity);

		mContext = context;
		mUri = uri;
		mStreamType = streamType;
		mAudioParams = audioParams;

		mDone = new ConditionVariable();
		mPlayer = null;
		@@ -73,7 +76,11 @@ class AudioPlaybackQueueItem extends PlaybackQueueItem {
		mDone.open();
		}
		});
		mPlayer.setAudioStreamType(mStreamType);
		mPlayer.setAudioStreamType(mAudioParams.mStreamType);
		setupVolume(mPlayer, mAudioParams.mVolume, mAudioParams.mPan);
		if (mAudioParams.mSessionId != AudioSystem.AUDIO_SESSION_ALLOCATE) {
		mPlayer.setAudioSessionId(mAudioParams.mSessionId);
		}
		mPlayer.start();
		mDone.block();
		finish();
		@@ -89,6 +96,23 @@ class AudioPlaybackQueueItem extends PlaybackQueueItem {
		}
		}

		private static void setupVolume(MediaPlayer player, float volume, float pan) {
		final float vol = clip(volume, 0.0f, 1.0f);
		final float panning = clip(pan, -1.0f, 1.0f);

		float volLeft = vol, volRight = vol;
		if (panning > 0.0f) {
		volLeft *= (1.0f - panning);
		} else if (panning < 0.0f) {
		volRight *= (1.0f + panning);
		}
		player.setVolume(volLeft, volRight);
		}

		private static final float clip(float value, float min, float max) {
		return value < min ? min : (value < max ? value : max);
		}

		private void finish() {
		try {
		mPlayer.stop();

core/java/android/speech/tts/BlockingAudioTrack.java

+15 −23

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ package android.speech.tts;

		import android.media.AudioFormat;
		import android.media.AudioTrack;
		import android.speech.tts.TextToSpeechService.AudioOutputParams;
		import android.util.Log;

		/**
		@@ -44,12 +45,11 @@ class BlockingAudioTrack {
		private static final int MIN_AUDIO_BUFFER_SIZE = 8192;


		private final int mStreamType;
		private final AudioOutputParams mAudioParams;
		private final int mSampleRateInHz;
		private final int mAudioFormat;
		private final int mChannelCount;
		private final float mVolume;
		private final float mPan;


		private final int mBytesPerFrame;
		/**
		@@ -73,15 +73,14 @@ class BlockingAudioTrack {
		private AudioTrack mAudioTrack;
		private volatile boolean mStopped;

		BlockingAudioTrack(int streamType, int sampleRate,
		int audioFormat, int channelCount,
		float volume, float pan) {
		mStreamType = streamType;
		private int mSessionId;

		BlockingAudioTrack(AudioOutputParams audioParams, int sampleRate,
		int audioFormat, int channelCount) {
		mAudioParams = audioParams;
		mSampleRateInHz = sampleRate;
		mAudioFormat = audioFormat;
		mChannelCount = channelCount;
		mVolume = volume;
		mPan = pan;

		mBytesPerFrame = AudioFormat.getBytesPerSample(mAudioFormat) * mChannelCount;
		mIsShortUtterance = false;
		@@ -215,8 +214,9 @@ class BlockingAudioTrack {
		= AudioTrack.getMinBufferSize(mSampleRateInHz, channelConfig, mAudioFormat);
		int bufferSizeInBytes = Math.max(MIN_AUDIO_BUFFER_SIZE, minBufferSizeInBytes);

		AudioTrack audioTrack = new AudioTrack(mStreamType, mSampleRateInHz, channelConfig,
		mAudioFormat, bufferSizeInBytes, AudioTrack.MODE_STREAM);
		AudioTrack audioTrack = new AudioTrack(mAudioParams.mStreamType, mSampleRateInHz,
		channelConfig, mAudioFormat, bufferSizeInBytes, AudioTrack.MODE_STREAM,
		mAudioParams.mSessionId);
		if (audioTrack.getState() != AudioTrack.STATE_INITIALIZED) {
		Log.w(TAG, "Unable to create audio track.");
		audioTrack.release();
		@@ -225,7 +225,7 @@ class BlockingAudioTrack {

		mAudioBufferSize = bufferSizeInBytes;

		setupVolume(audioTrack, mVolume, mPan);
		setupVolume(audioTrack, mAudioParams.mVolume, mAudioParams.mPan);
		return audioTrack;
		}

		@@ -328,19 +328,11 @@ class BlockingAudioTrack {
		}

		private static final long clip(long value, long min, long max) {
		if (value < min) {
		return min;
		}

		if (value > max) {
		return max;
		}

		return value;
		return value < min ? min : (value < max ? value : max);
		}

		private static float clip(float value, float min, float max) {
		return value > max ? max : (value < min ? min : value);
		private static final float clip(float value, float min, float max) {
		return value < min ? min : (value < max ? value : max);
		}

		}

core/java/android/speech/tts/PlaybackSynthesisCallback.java

+7 −24

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*/
		package android.speech.tts;

		import android.speech.tts.TextToSpeechService.AudioOutputParams;
		import android.speech.tts.TextToSpeechService.UtteranceProgressDispatcher;
		import android.util.Log;

		@@ -28,23 +29,7 @@ class PlaybackSynthesisCallback extends AbstractSynthesisCallback {

		private static final int MIN_AUDIO_BUFFER_SIZE = 8192;

		/**
		* Audio stream type. Must be one of the STREAM_ contants defined in
		* {@link android.media.AudioManager}.
		*/
		private final int mStreamType;

		/**
		* Volume, in the range [0.0f, 1.0f]. The default value is
		* {@link TextToSpeech.Engine#DEFAULT_VOLUME} (1.0f).
		*/
		private final float mVolume;

		/**
		* Left/right position of the audio, in the range [-1.0f, 1.0f].
		* The default value is {@link TextToSpeech.Engine#DEFAULT_PAN} (0.0f).
		*/
		private final float mPan;
		private final AudioOutputParams mAudioParams;

		/**
		* Guards {@link #mAudioTrackHandler}, {@link #mItem} and {@link #mStopped}.
		@@ -65,13 +50,11 @@ class PlaybackSynthesisCallback extends AbstractSynthesisCallback {
		private final Object mCallerIdentity;
		private final AbstractEventLogger mLogger;

		PlaybackSynthesisCallback(int streamType, float volume, float pan,
		AudioPlaybackHandler audioTrackHandler, UtteranceProgressDispatcher dispatcher,
		Object callerIdentity, AbstractEventLogger logger, boolean clientIsUsingV2) {
		PlaybackSynthesisCallback(AudioOutputParams audioParams, AudioPlaybackHandler audioTrackHandler,
		UtteranceProgressDispatcher dispatcher, Object callerIdentity,
		AbstractEventLogger logger, boolean clientIsUsingV2) {
		super(clientIsUsingV2);
		mStreamType = streamType;
		mVolume = volume;
		mPan = pan;
		mAudioParams = audioParams;
		mAudioTrackHandler = audioTrackHandler;
		mDispatcher = dispatcher;
		mCallerIdentity = callerIdentity;
		@@ -161,7 +144,7 @@ class PlaybackSynthesisCallback extends AbstractSynthesisCallback {
		return TextToSpeech.ERROR;
		}
		SynthesisPlaybackQueueItem item = new SynthesisPlaybackQueueItem(
		mStreamType, sampleRateInHz, audioFormat, channelCount, mVolume, mPan,
		mAudioParams, sampleRateInHz, audioFormat, channelCount,
		mDispatcher, mCallerIdentity, mLogger);
		mAudioTrackHandler.enqueue(item);
		mItem = item;

core/java/android/speech/tts/SynthesisPlaybackQueueItem.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*/
		package android.speech.tts;

		import android.speech.tts.TextToSpeechService.AudioOutputParams;
		import android.speech.tts.TextToSpeechService.UtteranceProgressDispatcher;
		import android.util.Log;

		@@ -62,9 +63,8 @@ final class SynthesisPlaybackQueueItem extends PlaybackQueueItem {
		private final BlockingAudioTrack mAudioTrack;
		private final AbstractEventLogger mLogger;

		SynthesisPlaybackQueueItem(int streamType, int sampleRate,
		int audioFormat, int channelCount,
		float volume, float pan, UtteranceProgressDispatcher dispatcher,
		SynthesisPlaybackQueueItem(AudioOutputParams audioParams, int sampleRate,
		int audioFormat, int channelCount, UtteranceProgressDispatcher dispatcher,
		Object callerIdentity, AbstractEventLogger logger) {
		super(dispatcher, callerIdentity);

		@@ -74,8 +74,7 @@ final class SynthesisPlaybackQueueItem extends PlaybackQueueItem {
		mDone = false;
		mStatusCode = TextToSpeech.SUCCESS;

		mAudioTrack = new BlockingAudioTrack(streamType, sampleRate, audioFormat,
		channelCount, volume, pan);
		mAudioTrack = new BlockingAudioTrack(audioParams, sampleRate, audioFormat, channelCount);
		mLogger = logger;
		}