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

Commit 1789cc7f authored by Wei Jia's avatar Wei Jia
Browse files

MediaPlayer2: clean up APIs 

Make MediaPlayer2 derived from MediaPlayerBase
Test: MediaPlayer2 plays
Bug: 63934228
Change-Id: Ib31e3196ad65c694f778a8a79277e53017a7026f
parent 7d29aa7d

api/current.txt

+59 −48
Original line number Diff line number Diff line
@@ -22517,8 +22517,8 @@ package android.media { 
    method public java.io.FileDescriptor getFileDescriptor();

    method public long getFileDescriptorLength();

    method public long getFileDescriptorOffset();

    method public long getId();

    method public android.media.Media2DataSource getMedia2DataSource();

    method public java.lang.String getMediaId();

    method public long getStartPosition();

    method public int getType();

    method public android.net.Uri getUri();
@@ -22542,7 +22542,7 @@ package android.media { 
    method public android.media.DataSourceDesc.Builder setDataSource(android.content.Context, android.net.Uri);

    method public android.media.DataSourceDesc.Builder setDataSource(android.content.Context, android.net.Uri, java.util.Map<java.lang.String, java.lang.String>, java.util.List<java.net.HttpCookie>);

    method public android.media.DataSourceDesc.Builder setEndPosition(long);

    method public android.media.DataSourceDesc.Builder setId(long);

    method public android.media.DataSourceDesc.Builder setMediaId(java.lang.String);

    method public android.media.DataSourceDesc.Builder setStartPosition(long);

  }










@@ -24297,68 +24297,79 @@ package android.media {













    field public static final int MEDIA_TRACK_TYPE_VIDEO = 1; // 0x1















  }



























  public abstract class MediaPlayer2 implements android.media.AudioRouting java.lang.AutoCloseable {













    method public abstract void addPlaylistItem(int, android.media.DataSourceDesc);













  public abstract class MediaPlayer2 extends android.media.MediaPlayerBase implements android.media.AudioRouting {















    method public abstract void attachAuxEffect(int);













    method public abstract void clearDrmEventCallback();













    method public abstract void clearMediaPlayer2EventCallback();















    method public abstract void clearPendingCommands();















    method public abstract void close();















    method public static final android.media.MediaPlayer2 create();















    method public abstract void deselectTrack(int);













    method public abstract android.media.DataSourceDesc editPlaylistItem(int, android.media.DataSourceDesc);













    method public abstract android.media.AudioAttributes getAudioAttributes();















    method public abstract int getAudioSessionId();













    method public abstract android.media.DataSourceDesc getCurrentDataSource();













    method public abstract int getCurrentPlaylistItemIndex();













    method public abstract long getBufferedPosition();















    method public abstract long getCurrentPosition();















    method public abstract android.media.MediaPlayer2.DrmInfo getDrmInfo();













    method public abstract android.media.MediaDrm.KeyRequest getDrmKeyRequest(byte[], byte[], java.lang.String, int, java.util.Map<java.lang.String, java.lang.String>) throws android.media.MediaPlayer2.NoDrmSchemeException;















    method public abstract java.lang.String getDrmPropertyString(java.lang.String) throws android.media.MediaPlayer2.NoDrmSchemeException;















    method public abstract long getDuration();













    method public abstract android.media.MediaDrm.KeyRequest getKeyRequest(byte[], byte[], java.lang.String, int, java.util.Map<java.lang.String, java.lang.String>) throws android.media.MediaPlayer2.NoDrmSchemeException;













    method public abstract int getLoopingMode();













    method public abstract int getMediaPlayer2State();















    method public abstract android.os.PersistableBundle getMetrics();















    method public abstract android.media.PlaybackParams getPlaybackParams();













    method public abstract java.util.List<android.media.DataSourceDesc> getPlaylist();















    method public abstract int getSelectedTrack(int);















    method public abstract android.media.SyncParams getSyncParams();















    method public abstract android.media.MediaTimestamp getTimestamp();















    method public abstract java.util.List<android.media.MediaPlayer2.TrackInfo> getTrackInfo();















    method public abstract int getVideoHeight();















    method public abstract int getVideoWidth();













    method public abstract boolean isPlaying();













    method public abstract void movePlaylistItem(int, int);













    method public abstract void pause();













    method public abstract void play();













    method public abstract void prepareAsync();













    method public void notifyWhenCommandLabelReached(java.lang.Object);















    method public abstract void prepareDrm(java.util.UUID) throws android.media.MediaPlayer2.ProvisioningNetworkErrorException, android.media.MediaPlayer2.ProvisioningServerErrorException, android.media.ResourceBusyException, android.media.UnsupportedSchemeException;













    method public abstract byte[] provideKeyResponse(byte[], byte[]) throws android.media.DeniedByServerException, android.media.MediaPlayer2.NoDrmSchemeException;













    method public abstract void registerDrmEventCallback(java.util.concurrent.Executor, android.media.MediaPlayer2.DrmEventCallback);













    method public abstract void registerEventCallback(java.util.concurrent.Executor, android.media.MediaPlayer2.EventCallback);













    method public abstract byte[] provideDrmKeyResponse(byte[], byte[]) throws android.media.DeniedByServerException, android.media.MediaPlayer2.NoDrmSchemeException;















    method public abstract void releaseDrm() throws android.media.MediaPlayer2.NoDrmSchemeException;













    method public abstract android.media.DataSourceDesc removePlaylistItem(int);















    method public abstract void reset();













    method public abstract void restoreKeys(byte[]) throws android.media.MediaPlayer2.NoDrmSchemeException;













    method public abstract void restoreDrmKeys(byte[]) throws android.media.MediaPlayer2.NoDrmSchemeException;













    method public void seekTo(long);















    method public abstract void seekTo(long, int);















    method public abstract void selectTrack(int);













    method public abstract void setAudioAttributes(android.media.AudioAttributes);















    method public abstract void setAudioSessionId(int);















    method public abstract void setAuxEffectSendLevel(float);













    method public abstract void setCurrentPlaylistItem(int);













    method public abstract void setDataSource(android.media.DataSourceDesc) throws java.io.IOException;













    method public abstract void setDrmEventCallback(java.util.concurrent.Executor, android.media.MediaPlayer2.DrmEventCallback);















    method public abstract void setDrmPropertyString(java.lang.String, java.lang.String) throws android.media.MediaPlayer2.NoDrmSchemeException;













    method public abstract void setLoopingMode(int);













    method public abstract void setNextPlaylistItem(int);













    method public abstract void setMediaPlayer2EventCallback(java.util.concurrent.Executor, android.media.MediaPlayer2.MediaPlayer2EventCallback);















    method public abstract void setOnDrmConfigHelper(android.media.MediaPlayer2.OnDrmConfigHelper);















    method public abstract void setPlaybackParams(android.media.PlaybackParams);













    method public abstract void setPlaylist(java.util.List<android.media.DataSourceDesc>, int) throws java.io.IOException;















    method public abstract void setSurface(android.view.Surface);















    method public abstract void setSyncParams(android.media.SyncParams);













    method public abstract void setVolume(float, float);













    method public abstract void unregisterDrmEventCallback(android.media.MediaPlayer2.DrmEventCallback);













    method public abstract void unregisterEventCallback(android.media.MediaPlayer2.EventCallback);













    field public static final int LOOPING_MODE_FULL = 1; // 0x1













    field public static final int LOOPING_MODE_NONE = 0; // 0x0













    field public static final int LOOPING_MODE_SHUFFLE = 3; // 0x3













    field public static final int LOOPING_MODE_SINGLE = 2; // 0x2













    field public static final int MEDIAPLAYER2_STATE_ERROR = 5; // 0x5













    field public static final int MEDIAPLAYER2_STATE_IDLE = 1; // 0x1













    field public static final int MEDIAPLAYER2_STATE_PAUSED = 3; // 0x3













    field public static final int MEDIAPLAYER2_STATE_PLAYING = 4; // 0x4













    field public static final int MEDIAPLAYER2_STATE_PREPARED = 2; // 0x2













    field public static final int MEDIA_CALL_ATTACH_AUX_EFFECT = 1; // 0x1













    field public static final int MEDIA_CALL_DESELECT_TRACK = 2; // 0x2













    field public static final int MEDIA_CALL_LOOP_CURRENT = 3; // 0x3













    field public static final int MEDIA_CALL_PAUSE = 4; // 0x4













    field public static final int MEDIA_CALL_PLAY = 5; // 0x5













    field public static final int MEDIA_CALL_PREPARE = 6; // 0x6













    field public static final int MEDIA_CALL_PREPARE_DRM = 7; // 0x7













    field public static final int MEDIA_CALL_PROVIDE_DRM_KEY_RESPONSE = 8; // 0x8













    field public static final int MEDIA_CALL_RELEASE_DRM = 12; // 0xc













    field public static final int MEDIA_CALL_RESTORE_DRM_KEYS = 13; // 0xd













    field public static final int MEDIA_CALL_SEEK_TO = 14; // 0xe













    field public static final int MEDIA_CALL_SELECT_TRACK = 15; // 0xf













    field public static final int MEDIA_CALL_SET_AUDIO_ATTRIBUTES = 16; // 0x10













    field public static final int MEDIA_CALL_SET_AUDIO_SESSION_ID = 17; // 0x11













    field public static final int MEDIA_CALL_SET_AUX_EFFECT_SEND_LEVEL = 18; // 0x12













    field public static final int MEDIA_CALL_SET_DATA_SOURCE = 19; // 0x13













    field public static final int MEDIA_CALL_SET_DRM_CONFIG_HELPER = 20; // 0x14













    field public static final int MEDIA_CALL_SET_DRM_PROPERTY_STRING = 21; // 0x15













    field public static final int MEDIA_CALL_SET_NEXT_DATA_SOURCE = 22; // 0x16













    field public static final int MEDIA_CALL_SET_NEXT_DATA_SOURCES = 23; // 0x17













    field public static final int MEDIA_CALL_SET_PLAYBACK_PARAMS = 24; // 0x18













    field public static final int MEDIA_CALL_SET_PLAYBACK_SPEED = 25; // 0x19













    field public static final int MEDIA_CALL_SET_PLAYER_VOLUME = 26; // 0x1a













    field public static final int MEDIA_CALL_SET_SURFACE = 27; // 0x1b













    field public static final int MEDIA_CALL_SET_SYNC_PARAMS = 28; // 0x1c













    field public static final int MEDIA_CALL_SKIP_TO_NEXT = 29; // 0x1d















    field public static final int MEDIA_ERROR_IO = -1004; // 0xfffffc14















    field public static final int MEDIA_ERROR_MALFORMED = -1007; // 0xfffffc11















    field public static final int MEDIA_ERROR_NOT_VALID_FOR_PROGRESSIVE_PLAYBACK = 200; // 0xc8









@@ -24370,9 +24381,7 @@ package android.media {













    field public static final int MEDIA_INFO_BAD_INTERLEAVING = 800; // 0x320















    field public static final int MEDIA_INFO_BUFFERING_END = 702; // 0x2be















    field public static final int MEDIA_INFO_BUFFERING_START = 701; // 0x2bd













    field public static final int MEDIA_INFO_COMPLETE_CALL_PAUSE = 102; // 0x66













    field public static final int MEDIA_INFO_COMPLETE_CALL_PLAY = 101; // 0x65













    field public static final int MEDIA_INFO_COMPLETE_CALL_SEEK = 103; // 0x67













    field public static final int MEDIA_INFO_BUFFERING_UPDATE = 704; // 0x2c0















    field public static final int MEDIA_INFO_METADATA_UPDATE = 802; // 0x322















    field public static final int MEDIA_INFO_NOT_SEEKABLE = 801; // 0x321















    field public static final int MEDIA_INFO_PLAYBACK_COMPLETE = 5; // 0x5









@@ -24398,8 +24407,8 @@ package android.media {



























  public static abstract class MediaPlayer2.DrmEventCallback {















    ctor public MediaPlayer2.DrmEventCallback();













    method public void onDrmInfo(android.media.MediaPlayer2, long, android.media.MediaPlayer2.DrmInfo);













    method public void onDrmPrepared(android.media.MediaPlayer2, long, int);













    method public void onDrmInfo(android.media.MediaPlayer2, android.media.DataSourceDesc, android.media.MediaPlayer2.DrmInfo);













    method public void onDrmPrepared(android.media.MediaPlayer2, android.media.DataSourceDesc, int);















  }





























  public static abstract class MediaPlayer2.DrmInfo {









@@ -24408,13 +24417,15 @@ package android.media {













    method public abstract java.util.List<java.util.UUID> getSupportedSchemes();















  }



























  public static abstract class MediaPlayer2.EventCallback {













    ctor public MediaPlayer2.EventCallback();













    method public void onBufferingUpdate(android.media.MediaPlayer2, long, int);













    method public void onError(android.media.MediaPlayer2, long, int, int);













    method public void onInfo(android.media.MediaPlayer2, long, int, int);













    method public void onTimedMetaDataAvailable(android.media.MediaPlayer2, long, android.media.TimedMetaData);













    method public void onVideoSizeChanged(android.media.MediaPlayer2, long, int, int);













  public static abstract class MediaPlayer2.MediaPlayer2EventCallback {













    ctor public MediaPlayer2.MediaPlayer2EventCallback();













    method public void onCallComplete(android.media.MediaPlayer2, android.media.DataSourceDesc, int, int);













    method public void onCommandLabelReached(android.media.MediaPlayer2, java.lang.Object);













    method public void onError(android.media.MediaPlayer2, android.media.DataSourceDesc, int, int);













    method public void onInfo(android.media.MediaPlayer2, android.media.DataSourceDesc, int, int);













    method public void onMediaTimeChanged(android.media.MediaPlayer2, android.media.DataSourceDesc, android.media.MediaTimestamp);













    method public void onTimedMetaDataAvailable(android.media.MediaPlayer2, android.media.DataSourceDesc, android.media.TimedMetaData);













    method public void onVideoSizeChanged(android.media.MediaPlayer2, android.media.DataSourceDesc, int, int);















  }





























  public static final class MediaPlayer2.MetricsConstants {









@@ -24437,7 +24448,7 @@ package android.media {













  }





























  public static abstract interface MediaPlayer2.OnDrmConfigHelper {













    method public abstract void onDrmConfig(android.media.MediaPlayer2, long);













    method public abstract void onDrmConfig(android.media.MediaPlayer2, android.media.DataSourceDesc);















  }





























  public static abstract class MediaPlayer2.ProvisioningNetworkErrorException extends android.media.MediaDrmException {










@@ -24485,7 +24496,7 @@ package android.media {













    method public abstract void setNextDataSource(android.media.DataSourceDesc);















    method public abstract void setNextDataSources(java.util.List<android.media.DataSourceDesc>);















    method public abstract void setPlaybackSpeed(float);













    method public abstract void setVolume(float);













    method public abstract void setPlayerVolume(float);















    method public abstract void skipToNext();















    method public abstract void unregisterPlayerEventCallback(android.media.MediaPlayerBase.PlayerEventCallback);















    field public static final int BUFFERING_STATE_BUFFERING_AND_PLAYABLE = 1; // 0x1

























media/java/android/media/DataSourceDesc.java



+12
−12




























Original line number
Diff line number
Diff line








@@ -74,7 +74,7 @@ public final class DataSourceDesc {













    private List<HttpCookie> mUriCookies;















    private Context mUriContext;





























    private long mId = 0;













    private String mMediaId;















    private long mStartPositionMs = 0;















    private long mEndPositionMs = LONG_MAX;

























@@ -82,11 +82,11 @@ public final class DataSourceDesc {













    }































    /**













     * Return the Id of data source.













     * @return the Id of data source













     * Return the media Id of data source.













     * @return the media Id of data source















     */













    public long getId() {













        return mId;













    public String getMediaId() {













        return mMediaId;















    }































    /**










@@ -222,7 +222,7 @@ public final class DataSourceDesc {













        private List<HttpCookie> mUriCookies;















        private Context mUriContext;





























        private long mId = 0;













        private String mMediaId;















        private long mStartPositionMs = 0;















        private long mEndPositionMs = LONG_MAX;

























@@ -248,7 +248,7 @@ public final class DataSourceDesc {













            mUriCookies = dsd.mUriCookies;















            mUriContext = dsd.mUriContext;





























            mId = dsd.mId;













            mMediaId = dsd.mMediaId;















            mStartPositionMs = dsd.mStartPositionMs;















            mEndPositionMs = dsd.mEndPositionMs;















        }










@@ -282,7 +282,7 @@ public final class DataSourceDesc {













            dsd.mUriCookies = mUriCookies;















            dsd.mUriContext = mUriContext;





























            dsd.mId = mId;













            dsd.mMediaId = mMediaId;















            dsd.mStartPositionMs = mStartPositionMs;















            dsd.mEndPositionMs = mEndPositionMs;

























@@ -290,13 +290,13 @@ public final class DataSourceDesc {













        }































        /**













         * Sets the Id of this data source.













         * Sets the media Id of this data source.















         *













         * @param id the Id of this data source













         * @param mediaId the media Id of this data source















         * @return the same Builder instance.















         */













        public Builder setId(long id) {













            mId = id;













        public Builder setMediaId(String mediaId) {













            mMediaId = mediaId;















            return this;















        }

















































media/java/android/media/MediaPlayer2.java



+680
−504


























File changed.
Preview size limit exceeded, changes collapsed.
























media/java/android/media/MediaPlayer2Impl.java



+512
−1053


























File changed.
Preview size limit exceeded, changes collapsed.
























media/java/android/media/MediaPlayerBase.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -240,7 +240,7 @@ public abstract class MediaPlayerBase implements AutoCloseable {













     * gain. See {@link #getMaxPlayerVolume()} for the volume range supported by this player.















     * @param volume a value between 0.0f and {@link #getMaxPlayerVolume()}.















     */













    public abstract void setVolume(float volume);













    public abstract void setPlayerVolume(float volume);































    /**















     * Returns the current volume of this player to this player.









@@ -250,7 +250,7 @@ public abstract class MediaPlayerBase implements AutoCloseable {













    public abstract float getPlayerVolume();































    /**













     * @return the maximum volume that can be used in {@link #setVolume(float)}.













     * @return the maximum volume that can be used in {@link #setPlayerVolume(float)}.















     */















    public float getMaxPlayerVolume() { return 1.0f; }