Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a9edc98 authored by Dongwon Kang's avatar Dongwon Kang
Browse files

MediaPlayer2: remove hidden oob subtitle/timed text APIs 

Also, other hidden subtitle API (SubtitleController, TimeProvider)
usages are removed since it will be handled within the VideoView2
side by using MediaClock notification.

Test: MediaPlayer2Test
Bug: 112767549
Change-Id: Ie1bba984b5e159cbd3915ea57b7624d31d84f011
parent c7be180e

media/java/android/media/MediaPlayer2.java

+1 −116
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ import android.view.SurfaceHolder; 


import dalvik.system.CloseGuard;



import java.io.FileDescriptor;

import java.io.IOException;

import java.io.InputStream;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;
@@ -456,8 +453,7 @@ import java.util.concurrent.Executor; 
 * thread by default has a Looper running).

 *

 */

public abstract class MediaPlayer2 implements SubtitleController.Listener

                                            , AutoCloseable

public abstract class MediaPlayer2 implements AutoCloseable

                                            , AudioRouting {

    private final CloseGuard mGuard = CloseGuard.get();
@@ -1305,16 +1301,6 @@ public abstract class MediaPlayer2 implements SubtitleController.Listener 
    // This is a synchronous call.

    public abstract void reset();



    /**

     * Set up a timer for {@link #TimeProvider}. {@link #TimeProvider} will be

     * notified when the presentation time reaches (becomes greater than or equal to)

     * the value specified.

     *

     * @param mediaTimeUs presentation time to get timed event callback at

     * @hide

     */

    public void notifyAt(long mediaTimeUs) { }



    /**

     * Checks whether the MediaPlayer2 is looping or non-looping.

     *
@@ -1462,95 +1448,6 @@ public abstract class MediaPlayer2 implements SubtitleController.Listener 
     */

    public static final String MEDIA_MIMETYPE_TEXT_CEA_708 = "text/cea-708";



    /** @hide */

    public void setSubtitleAnchor(

            SubtitleController controller,

            SubtitleController.Anchor anchor) { }



    /** @hide */

    @Override

    public void onSubtitleTrackSelected(SubtitleTrack track) { }



    /** @hide */

    public void addSubtitleSource(InputStream is, MediaFormat format) { }



    /* TODO: Limit the total number of external timed text source to a reasonable number.

     */

    /**

     * Adds an external timed text source file.

     *

     * Currently supported format is SubRip with the file extension .srt, case insensitive.

     * Note that a single external timed text source may contain multiple tracks in it.

     * One can find the total number of available tracks using {@link #getTrackInfo()} to see what

     * additional tracks become available after this method call.

     *

     * @param path The file path of external timed text source file.

     * @param mimeType The mime type of the file. Must be one of the mime types listed above.

     * @throws IOException if the file cannot be accessed or is corrupted.

     * @throws IllegalArgumentException if the mimeType is not supported.

     * @throws IllegalStateException if called in an invalid state.

     * @hide

     */

    public void addTimedTextSource(String path, String mimeType) throws IOException { }



    /**

     * Adds an external timed text source file (Uri).

     *

     * Currently supported format is SubRip with the file extension .srt, case insensitive.

     * Note that a single external timed text source may contain multiple tracks in it.

     * One can find the total number of available tracks using {@link #getTrackInfo()} to see what

     * additional tracks become available after this method call.

     *

     * @param context the Context to use when resolving the Uri

     * @param uri the Content URI of the data you want to play

     * @param mimeType The mime type of the file. Must be one of the mime types listed above.

     * @throws IOException if the file cannot be accessed or is corrupted.

     * @throws IllegalArgumentException if the mimeType is not supported.

     * @throws IllegalStateException if called in an invalid state.

     * @hide

     */

    public void addTimedTextSource(Context context, Uri uri, String mimeType) throws IOException { }



    /**

     * Adds an external timed text source file (FileDescriptor).

     *

     * It is the caller's responsibility to close the file descriptor.

     * It is safe to do so as soon as this call returns.

     *

     * Currently supported format is SubRip. Note that a single external timed text source may

     * contain multiple tracks in it. One can find the total number of available tracks

     * using {@link #getTrackInfo()} to see what additional tracks become available

     * after this method call.

     *

     * @param fd the FileDescriptor for the file you want to play

     * @param mimeType The mime type of the file. Must be one of the mime types listed above.

     * @throws IllegalArgumentException if the mimeType is not supported.

     * @throws IllegalStateException if called in an invalid state.

     * @hide

     */

    public void addTimedTextSource(FileDescriptor fd, String mimeType) { }



    /**

     * Adds an external timed text file (FileDescriptor).

     *

     * It is the caller's responsibility to close the file descriptor.

     * It is safe to do so as soon as this call returns.

     *

     * Currently supported format is SubRip. Note that a single external timed text source may

     * contain multiple tracks in it. One can find the total number of available tracks

     * using {@link #getTrackInfo()} to see what additional tracks become available

     * after this method call.

     *

     * @param fd the FileDescriptor for the file you want to play

     * @param offset the offset into the file where the data to be played starts, in bytes

     * @param length the length in bytes of the data to be played

     * @param mime The mime type of the file. Must be one of the mime types listed above.

     * @throws IllegalArgumentException if the mimeType is not supported.

     * @throws IllegalStateException if called in an invalid state.

     * @hide

     */

    public abstract void addTimedTextSource(FileDescriptor fd, long offset, long length, String mime);



    /**

     * 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
@@ -1618,11 +1515,6 @@ public abstract class MediaPlayer2 implements SubtitleController.Listener 
    // This is an asynchronous call.

    public abstract void deselectTrack(int index);



    /** @hide */

    public MediaTimeProvider getMediaTimeProvider() {

        return null;

    }



    /**

     * Interface definition for callbacks to be invoked when the player has the corresponding

     * events.
@@ -1904,12 +1796,6 @@ public abstract class MediaPlayer2 implements SubtitleController.Listener 
     */

    public static final int MEDIA_INFO_METADATA_UPDATE = 802;



    /** A new set of external-only metadata is available.  Used by

     *  JAVA framework to avoid triggering track scanning.

     * @hide

     */

    public static final int MEDIA_INFO_EXTERNAL_METADATA_UPDATE = 803;



    /** Informs that audio is not playing. Note that playback of the video

     * is not interrupted.

     * @see EventCallback#onInfo
@@ -1958,7 +1844,6 @@ public abstract class MediaPlayer2 implements SubtitleController.Listener 
            MEDIA_INFO_BAD_INTERLEAVING,

            MEDIA_INFO_NOT_SEEKABLE,

            MEDIA_INFO_METADATA_UPDATE,

            MEDIA_INFO_EXTERNAL_METADATA_UPDATE,

            MEDIA_INFO_AUDIO_NOT_PLAYING,

            MEDIA_INFO_VIDEO_NOT_PLAYING,

            MEDIA_INFO_TIMED_TEXT_ERROR,

media/java/android/media/MediaPlayer2Impl.java

+6 −1040

File changed.

Preview size limit exceeded, changes collapsed.

media/jni/android_media_MediaPlayer2.cpp

+0 −13
Original line number Diff line number Diff line
@@ -769,18 +769,6 @@ android_media_MediaPlayer2_seekTo(JNIEnv *env, jobject thiz, jlong msec, jint mo 
                              NULL, NULL);

}



static void

android_media_MediaPlayer2_notifyAt(JNIEnv *env, jobject thiz, jlong mediaTimeUs)

{

    sp<MediaPlayer2> mp = getMediaPlayer(env, thiz);

    if (mp == NULL) {

        jniThrowException(env, "java/lang/IllegalStateException", NULL);

        return;

    }

    ALOGV("notifyAt: %lld", (long long)mediaTimeUs);

    process_media_player_call( env, thiz, mp->notifyAt((int64_t)mediaTimeUs), NULL, NULL );

}



static jint

android_media_MediaPlayer2_getState(JNIEnv *env, jobject thiz)

{
@@ -1482,7 +1470,6 @@ static const JNINativeMethod gMethods[] = { 
    {"_setSyncParams",     "(Landroid/media/SyncParams;)V",  (void *)android_media_MediaPlayer2_setSyncParams},

    {"getSyncParams",     "()Landroid/media/SyncParams;",   (void *)android_media_MediaPlayer2_getSyncParams},

    {"_seekTo",             "(JI)V",                            (void *)android_media_MediaPlayer2_seekTo},

    {"_notifyAt",           "(J)V",                             (void *)android_media_MediaPlayer2_notifyAt},

    {"_pause",              "()V",                              (void *)android_media_MediaPlayer2_pause},

    {"isPlaying",           "()Z",                              (void *)android_media_MediaPlayer2_isPlaying},

    {"getCurrentPosition",  "()J",                              (void *)android_media_MediaPlayer2_getCurrentPosition},