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

Commit 043b26ba authored by Robert Shih's avatar Robert Shih Committed by Android Git Automerger
Browse files

am 4816ebe8: am e8a8440d: am f1207122: Merge "MediaPlayer: provide mime type... 

am 4816ebe8: am e8a8440d: am f1207122: Merge "MediaPlayer: provide mime type for all track types" into mnc-dev

* commit '4816ebe8':
  MediaPlayer: provide mime type for all track types
parents af460613 4816ebe8

media/java/android/media/MediaPlayer.java

+5 −10
Original line number Diff line number Diff line
@@ -1953,21 +1953,16 @@ public class MediaPlayer implements SubtitleController.Listener 


        TrackInfo(Parcel in) {

            mTrackType = in.readInt();

            // TODO: parcel in the full MediaFormat

            String language = in.readString();



            if (mTrackType == MEDIA_TRACK_TYPE_TIMEDTEXT) {

                mFormat = MediaFormat.createSubtitleFormat(

                    MEDIA_MIMETYPE_TEXT_SUBRIP, language);

            } else if (mTrackType == MEDIA_TRACK_TYPE_SUBTITLE) {

            // TODO: parcel in the full MediaFormat; currently we are using createSubtitleFormat

            // even for audio/video tracks, meaning we only set the mime and language.

            String mime = in.readString();

            String language = in.readString();

            mFormat = MediaFormat.createSubtitleFormat(mime, language);



            if (mTrackType == MEDIA_TRACK_TYPE_SUBTITLE) {

                mFormat.setInteger(MediaFormat.KEY_IS_AUTOSELECT, in.readInt());

                mFormat.setInteger(MediaFormat.KEY_IS_DEFAULT, in.readInt());

                mFormat.setInteger(MediaFormat.KEY_IS_FORCED_SUBTITLE, in.readInt());

            } else {

                mFormat = new MediaFormat();

                mFormat.setString(MediaFormat.KEY_LANGUAGE, language);

            }

        }