Merge "MediaPlayer2: clean up code" (7a12c506) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaPlayer2.java

+9 −35

Original line number	Diff line number	Diff line
		@@ -856,11 +856,9 @@ public abstract class MediaPlayer2 implements AutoCloseable
		* Checks whether the MediaPlayer2 is looping or non-looping.
		*
		* @return true if the MediaPlayer2 is currently looping, false otherwise
		* @hide
		*/
		public boolean isLooping() {
		return false;
		}
		// This is a synchronous call.
		public abstract boolean isLooping();

		/**
		* Sets the audio session ID.
		@@ -875,7 +873,8 @@ public abstract class MediaPlayer2 implements AutoCloseable
		* When created, a MediaPlayer2 instance automatically generates its own audio session ID.
		* However, it is possible to force this player to be part of an already existing audio session
		* by calling this method.
		* This method must be called before one of the overloaded <code> setDataSource </code> methods.
		* This method must be called when player is in {@link #PLAYER_STATE_IDLE} or
		* {@link #PLAYER_STATE_PREPARED} state in order to have sessionId take effect.
		* @return a token which can be used to cancel the operation later with {@link #cancelCommand}.
		*/
		// This is an asynchronous call.
		@@ -885,8 +884,10 @@ public abstract class MediaPlayer2 implements AutoCloseable
		* Returns the audio session ID.
		*
		* @return the audio session ID. {@see #setAudioSessionId(int)}
		* Note that the audio session ID is 0 only if a problem occured when the MediaPlayer2 was contructed.
		* Note that the audio session ID is 0 only if a problem occured when the MediaPlayer2 was
		* contructed.
		*/
		// This is a synchronous call.
		public abstract int getAudioSessionId();

		/**
		@@ -907,7 +908,6 @@ public abstract class MediaPlayer2 implements AutoCloseable
		// This is an asynchronous call.
		public abstract Object attachAuxEffect(int effectId);


		/**
		* Sets the send level of the player to the attached auxiliary effect.
		* See {@link #attachAuxEffect(int)}. The level value range is 0 to 1.0.
		@@ -972,36 +972,10 @@ public abstract class MediaPlayer2 implements AutoCloseable
		* @return List of track info. The total number of tracks is the array length.
		* Must be called again if an external timed text source has been added after
		* addTimedTextSource method is called.
		* @throws IllegalStateException if it is called in an invalid state.
		*/
		public abstract List<TrackInfo> getTrackInfo();

		/* Do not change these values without updating their counterparts
		* in include/media/stagefright/MediaDefs.h and media/libstagefright/MediaDefs.cpp!
		*/
		/**
		* MIME type for SubRip (SRT) container. Used in addTimedTextSource APIs.
		* @hide
		*/
		public static final String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip";

		/**
		* MIME type for WebVTT subtitle data.
		* @hide
		*/
		public static final String MEDIA_MIMETYPE_TEXT_VTT = "text/vtt";

		/**
		* MIME type for CEA-608 closed caption data.
		* @hide
		*/
		public static final String MEDIA_MIMETYPE_TEXT_CEA_608 = "text/cea-608";

		/**
		* MIME type for CEA-708 closed caption data.
		* @hide
		*/
		public static final String MEDIA_MIMETYPE_TEXT_CEA_708 = "text/cea-708";

		/**
		* Returns the index of the audio, video, or subtitle track currently selected for playback,
		* The return value is an index into the array returned by {@link #getTrackInfo()}, and can
		@@ -1202,7 +1176,7 @@ public abstract class MediaPlayer2 implements AutoCloseable
		public abstract void unregisterEventCallback(EventCallback eventCallback);

		/* Do not change these values without updating their counterparts
		* in include/media/mediaplayer2.h!
		* in include/media/MediaPlayer2Types.h!
		*/
		/** Unspecified media player error.
		* @see EventCallback#onError

media/java/android/media/MediaPlayer2Impl.java

+2 −177

Original line number	Diff line number	Diff line
		@@ -56,7 +56,6 @@ import java.net.URL;
		import java.nio.ByteOrder;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;
		import java.util.HashMap;
		import java.util.Iterator;
		import java.util.LinkedList;
		@@ -64,7 +63,6 @@ import java.util.List;
		import java.util.Map;
		import java.util.Queue;
		import java.util.UUID;
		import java.util.WeakHashMap;
		import java.util.concurrent.ConcurrentLinkedQueue;
		import java.util.concurrent.Executor;
		import java.util.concurrent.RejectedExecutionException;
		@@ -1015,24 +1013,6 @@ public final class MediaPlayer2Impl extends MediaPlayer2 {

		private native final void _seekTo(long msec, int mode);

		/**
		* Get current playback position as a {@link MediaTimestamp}.
		* <p>
		* The MediaTimestamp represents how the media time correlates to the system time in
		* a linear fashion using an anchor and a clock rate. During regular playback, the media
		* time moves fairly constantly (though the anchor frame may be rebased to a current
		* system time, the linear correlation stays steady). Therefore, this method does not
		* need to be called often.
		* <p>
		* To help users get current playback position, this method always anchors the timestamp
		* to the current {@link System#nanoTime system time}, so
		* {@link MediaTimestamp#getAnchorMediaTimeUs} can be used as current playback position.
		*
		* @return a MediaTimestamp object if a timestamp is available, or {@code null} if no timestamp
		* is available, e.g. because the media player has not been initialized.
		*
		* @see MediaTimestamp
		*/
		@Override
		@Nullable
		public MediaTimestamp getTimestamp()
		@@ -1048,11 +1028,6 @@ public final class MediaPlayer2Impl extends MediaPlayer2 {
		}
		}

		/**
		* Resets the MediaPlayer2 to its uninitialized state. After calling
		* this method, you will have to initialize it again by setting the
		* data source and calling prepare().
		*/
		@Override
		public void reset() {
		synchronized (mEventCbLock) {
		@@ -1085,41 +1060,14 @@ public final class MediaPlayer2Impl extends MediaPlayer2 {

		// Keep KEY_PARAMETER_* in sync with include/media/mediaplayer2.h
		private final static int KEY_PARAMETER_AUDIO_ATTRIBUTES = 1400;
		/**
		* Sets the audio attributes.
		* @param value value of the parameter to be set.
		* @return true if the parameter is set successfully, false otherwise
		*/

		// return true if the parameter is set successfully, false otherwise
		private native boolean native_setAudioAttributes(AudioAttributes audioAttributes);
		private native AudioAttributes native_getAudioAttributes();


		/**
		* Checks whether the MediaPlayer2 is looping or non-looping.
		*
		* @return true if the MediaPlayer2 is currently looping, false otherwise
		* @hide
		*/
		@Override
		public native boolean isLooping();

		/**
		* Sets the audio session ID.
		*
		* @param sessionId the audio session ID.
		* The audio session ID is a system wide unique identifier for the audio stream played by
		* this MediaPlayer2 instance.
		* The primary use of the audio session ID is to associate audio effects to a particular
		* instance of MediaPlayer2: if an audio session ID is provided when creating an audio effect,
		* this effect will be applied only to the audio content of media players within the same
		* audio session and not to the output mix.
		* When created, a MediaPlayer2 instance automatically generates its own audio session ID.
		* However, it is possible to force this player to be part of an already existing audio session
		* by calling this method.
		* This method must be called before one of the overloaded <code> setDataSource </code> methods.
		* @throws IllegalStateException if it is called in an invalid state
		* @throws IllegalArgumentException if the sessionId is invalid.
		*/
		@Override
		public Object setAudioSessionId(int sessionId) {
		return addTask(new Task(CALL_COMPLETED_SET_AUDIO_SESSION_ID, false) {
		@@ -1132,29 +1080,9 @@ public final class MediaPlayer2Impl extends MediaPlayer2 {

		private native void _setAudioSessionId(int sessionId);

		/**
		* Returns the audio session ID.
		*
		* @return the audio session ID. {@see #setAudioSessionId(int)}
		* Note that the audio session ID is 0 only if a problem occured when the MediaPlayer2 was contructed.
		*/
		@Override
		public native int getAudioSessionId();

		/**
		* Attaches an auxiliary effect to the player. A typical auxiliary effect is a reverberation
		* effect which can be applied on any sound source that directs a certain amount of its
		* energy to this effect. This amount is defined by setAuxEffectSendLevel().
		* See {@link #setAuxEffectSendLevel(float)}.
		* <p>After creating an auxiliary effect (e.g.
		* {@link android.media.audiofx.EnvironmentalReverb}), retrieve its ID with
		* {@link android.media.audiofx.AudioEffect#getId()} and use it when calling this method
		* to attach the player to the effect.
		* <p>To detach the effect from the player, call this method with a null effect id.
		* <p>This method must be called after one of the overloaded <code> setDataSource </code>
		* methods.
		* @param effectId system wide unique id of the effect to attach
		*/
		@Override
		public Object attachAuxEffect(int effectId) {
		return addTask(new Task(CALL_COMPLETED_ATTACH_AUX_EFFECT, false) {
		@@ -1167,18 +1095,6 @@ public final class MediaPlayer2Impl extends MediaPlayer2 {

		private native void _attachAuxEffect(int effectId);

		/**
		* Sets the send level of the player to the attached auxiliary effect.
		* See {@link #attachAuxEffect(int)}. The level value range is 0 to 1.0.
		* <p>By default the send level is 0, so even if an effect is attached to the player
		* this method must be called for the effect to be applied.
		* <p>Note that the passed level value is a raw scalar. UI controls should be scaled
		* logarithmically: the gain applied by audio framework ranges from -72dB to 0dB,
		* so an appropriate conversion from linear UI input x to level is:
		* x == 0 -> level = 0
		* 0 < x <= R -> level = 10^(72*(x-R)/20/R)
		* @param level send level scalar
		*/
		@Override
		public Object setAuxEffectSendLevel(float level) {
		return addTask(new Task(CALL_COMPLETED_SET_AUX_EFFECT_SEND_LEVEL, false) {
		@@ -1208,31 +1124,17 @@ public final class MediaPlayer2Impl extends MediaPlayer2 {
		* @see android.media.MediaPlayer2#getTrackInfo
		*/
		public static final class TrackInfoImpl extends TrackInfo {
		/**
		* Gets the track type.
		* @return TrackType which indicates if the track is video, audio, timed text.
		*/
		@Override
		public int getTrackType() {
		return mTrackType;
		}

		/**
		* Gets the language code of the track.
		* @return a language code in either way of ISO-639-1 or ISO-639-2.
		* When the language is unknown or could not be determined,
		* ISO-639-2 language code, "und", is returned.
		*/
		@Override
		public String getLanguage() {
		String language = mFormat.getString(MediaFormat.KEY_LANGUAGE);
		return language == null ? "und" : language;
		}

		/**
		* Gets the {@link MediaFormat} of the track. If the format is
		* unknown or could not be determined, null is returned.
		*/
		@Override
		public MediaFormat getFormat() {
		if (mTrackType == MEDIA_TRACK_TYPE_TIMEDTEXT
		@@ -1294,14 +1196,6 @@ public final class MediaPlayer2Impl extends MediaPlayer2 {
		}
		};

		/**
		* Returns a List of track information.
		*
		* @return List of track info. The total number of tracks is the array length.
		* Must be called again if an external timed text source has been added after
		* addTimedTextSource method is called.
		* @throws IllegalStateException if it is called in an invalid state.
		*/
		@Override
		public List<TrackInfo> getTrackInfo() {
		TrackInfoImpl trackInfo[] = getInbandTrackInfoImpl();
		@@ -1328,33 +1222,6 @@ public final class MediaPlayer2Impl extends MediaPlayer2 {
		return trackInfo;
		}

		/*
		* A helper function to check if the mime type is supported by media framework.
		*/
		private static boolean availableMimeTypeForExternalSource(String mimeType) {
		if (MEDIA_MIMETYPE_TEXT_SUBRIP.equals(mimeType)) {
		return true;
		}
		return false;
		}

		/**
		* Returns the index of the audio, video, or subtitle track currently selected for playback,
		* The return value is an index into the array returned by {@link #getTrackInfo()}, and can
		* be used in calls to {@link #selectTrack(int)} or {@link #deselectTrack(int)}.
		*
		* @param trackType should be one of {@link TrackInfo#MEDIA_TRACK_TYPE_VIDEO},
		* {@link TrackInfo#MEDIA_TRACK_TYPE_AUDIO}, or
		* {@link TrackInfo#MEDIA_TRACK_TYPE_SUBTITLE}
		* @return index of the audio, video, or subtitle track currently selected for playback;
		* a negative integer is returned when there is no selected track for {@code trackType} or
		* when {@code trackType} is not one of audio, video, or subtitle.
		* @throws IllegalStateException if called after {@link #close()}
		*
		* @see #getTrackInfo()
		* @see #selectTrack(int)
		* @see #deselectTrack(int)
		*/
		@Override
		public int getSelectedTrack(int trackType) {
		PlayerMessage request = PlayerMessage.newBuilder()
		@@ -1368,34 +1235,6 @@ public final class MediaPlayer2Impl extends MediaPlayer2 {
		return response.getValues(0).getInt32Value();
		}

		/**
		* Selects a track.
		* <p>
		* If a MediaPlayer2 is in invalid state, it throws an IllegalStateException exception.
		* If a MediaPlayer2 is in <em>Started</em> state, the selected track is presented immediately.
		* If a MediaPlayer2 is not in Started state, it just marks the track to be played.
		* </p>
		* <p>
		* In any valid state, if it is called multiple times on the same type of track (ie. Video,
		* Audio, Timed Text), the most recent one will be chosen.
		* </p>
		* <p>
		* The first audio and video tracks are selected by default if available, even though
		* this method is not called. However, no timed text track will be selected until
		* this function is called.
		* </p>
		* <p>
		* Currently, only timed text tracks or audio tracks can be selected via this method.
		* In addition, the support for selecting an audio track at runtime is pretty limited
		* in that an audio track can only be selected in the <em>Prepared</em> state.
		* </p>
		* @param index the index of the track to be selected. The valid range of the index
		* is 0..total number of track - 1. The total number of tracks as well as the type of
		* each individual track can be found by calling {@link #getTrackInfo()} method.
		* @throws IllegalStateException if called in an invalid state.
		*
		* @see android.media.MediaPlayer2#getTrackInfo
		*/
		@Override
		public Object selectTrack(int index) {
		return addTask(new Task(CALL_COMPLETED_SELECT_TRACK, false) {
		@@ -1406,20 +1245,6 @@ public final class MediaPlayer2Impl extends MediaPlayer2 {
		});
		}

		/**
		* Deselect a track.
		* <p>
		* Currently, the track must be a timed text track and no audio or video tracks can be
		* deselected. If the timed text track identified by index has not been
		* selected before, it throws an exception.
		* </p>
		* @param index the index of the track to be deselected. The valid range of the index
		* is 0..total number of tracks - 1. The total number of tracks as well as the type of
		* each individual track can be found by calling {@link #getTrackInfo()} method.
		* @throws IllegalStateException if called in an invalid state.
		*
		* @see android.media.MediaPlayer2#getTrackInfo
		*/
		@Override
		public Object deselectTrack(int index) {
		return addTask(new Task(CALL_COMPLETED_DESELECT_TRACK, false) {

media/jni/android_media_MediaPlayer2.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -1050,9 +1050,9 @@ android_media_MediaPlayer2_native_finalize(JNIEnv *env, jobject thiz)
		android_media_MediaPlayer2_release(env, thiz);
		}

		static void android_media_MediaPlayer2_set_audio_session_id(JNIEnv *env, jobject thiz,
		static void android_media_MediaPlayer2_setAudioSessionId(JNIEnv *env, jobject thiz,
		jint sessionId) {
		ALOGV("set_session_id(): %d", sessionId);
		ALOGV("setAudioSessionId(): %d", sessionId);
		sp<MediaPlayer2> mp = getMediaPlayer(env, thiz);
		if (mp == NULL ) {
		jniThrowException(env, "java/lang/IllegalStateException", NULL);
		@@ -1062,8 +1062,8 @@ static void android_media_MediaPlayer2_set_audio_session_id(JNIEnv *env, jobjec
		NULL);
		}

		static jint android_media_MediaPlayer2_get_audio_session_id(JNIEnv *env, jobject thiz) {
		ALOGV("get_session_id()");
		static jint android_media_MediaPlayer2_getAudioSessionId(JNIEnv *env, jobject thiz) {
		ALOGV("getAudioSessionId()");
		sp<MediaPlayer2> mp = getMediaPlayer(env, thiz);
		if (mp == NULL ) {
		jniThrowException(env, "java/lang/IllegalStateException", NULL);
		@@ -1419,8 +1419,8 @@ static const JNINativeMethod gMethods[] = {
		{"native_init", "()V", (void *)android_media_MediaPlayer2_native_init},
		{"native_setup", "(Ljava/lang/Object;)V", (void *)android_media_MediaPlayer2_native_setup},
		{"native_finalize", "()V", (void *)android_media_MediaPlayer2_native_finalize},
		{"getAudioSessionId", "()I", (void *)android_media_MediaPlayer2_get_audio_session_id},
		{"_setAudioSessionId", "(I)V", (void *)android_media_MediaPlayer2_set_audio_session_id},
		{"getAudioSessionId", "()I", (void *)android_media_MediaPlayer2_getAudioSessionId},
		{"_setAudioSessionId", "(I)V", (void *)android_media_MediaPlayer2_setAudioSessionId},
		{"_setAuxEffectSendLevel", "(F)V", (void *)android_media_MediaPlayer2_setAuxEffectSendLevel},
		{"_attachAuxEffect", "(I)V", (void *)android_media_MediaPlayer2_attachAuxEffect},
		// Modular DRM