Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Pass subtitle track properties to SubtitleController" into klp-dev

Browse Source
This commit is contained in:
Chong Zhang
2013-09-11 23:51:44 +00:00
committed by Android (Google) Code Review
parent af2d8bbdbd f8ca13b7a0
commit bcb97996eb
2 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
media/java/android/media/MediaFormat.java
View File

@@ -197,6 +197,28 @@ public final class MediaFormat {
*/
public static final String KEY_FLAC_COMPRESSION_LEVEL = "flac-compression-level";
/**
* A key for boolean AUTOSELECT field. Tracks with AUTOSELECT=true are
* considered when automatically selecting a track without specific user
* choice (as defined by HLS).
* @hide
*/
public static final String KEY_AUTOSELECT = "autoselect";
/**
* A key for boolean DEFAULT field. The track with DEFAULT=true is selected
* in the absence of a specific user choice (as defined by HLS).
* @hide
*/
public static final String KEY_DEFAULT = "default";
/**
* A key for boolean FORCED field for subtitle tracks. True if it is a
* forced subtitle track.
* @hide
*/
public static final String KEY_FORCED = "forced";
/* package private */ MediaFormat(Map<String, Object> map) {
mMap = map;
}

26
media/java/android/media/MediaPlayer.java
View File

@@ -1578,7 +1578,8 @@ public class MediaPlayer implements SubtitleController.Listener
* unknown or could not be determined, null is returned.
*/
public MediaFormat getFormat() {
if (mTrackType == MEDIA_TRACK_TYPE_TIMEDTEXT) {
if (mTrackType == MEDIA_TRACK_TYPE_TIMEDTEXT
|| mTrackType == MEDIA_TRACK_TYPE_SUBTITLE) {
return mFormat;
}
return null;
@@ -1602,6 +1603,12 @@ public class MediaPlayer implements SubtitleController.Listener
if (mTrackType == MEDIA_TRACK_TYPE_TIMEDTEXT) {
mFormat = MediaFormat.createSubtitleFormat(
MEDIA_MIMETYPE_TEXT_SUBRIP, language);
} else if (mTrackType == MEDIA_TRACK_TYPE_SUBTITLE) {
mFormat = MediaFormat.createSubtitleFormat(
MEDIA_MIMETYPE_TEXT_VTT, language);
mFormat.setInteger(MediaFormat.KEY_AUTOSELECT, in.readInt());
mFormat.setInteger(MediaFormat.KEY_DEFAULT, in.readInt());
mFormat.setInteger(MediaFormat.KEY_FORCED, in.readInt());
} else {
mFormat = new MediaFormat();
mFormat.setString(MediaFormat.KEY_LANGUAGE, language);
@@ -1629,6 +1636,12 @@ public class MediaPlayer implements SubtitleController.Listener
public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(mTrackType);
dest.writeString(getLanguage());
if (mTrackType == MEDIA_TRACK_TYPE_SUBTITLE) {
dest.writeInt(mFormat.getInteger(MediaFormat.KEY_AUTOSELECT));
dest.writeInt(mFormat.getInteger(MediaFormat.KEY_DEFAULT));
dest.writeInt(mFormat.getInteger(MediaFormat.KEY_FORCED));
}
}
/**
@@ -1693,6 +1706,12 @@ public class MediaPlayer implements SubtitleController.Listener
*/
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";
/*
* A helper function to check if the mime type is supported by media framework.
*/
@@ -1829,9 +1848,8 @@ public class MediaPlayer implements SubtitleController.Listener
if (i < mInbandSubtitleTracks.length) {
inbandTracks[i] = mInbandSubtitleTracks[i];
} else {
MediaFormat format = MediaFormat.createSubtitleFormat(
"text/vtt", tracks[i].getLanguage());
SubtitleTrack track = mSubtitleController.addTrack(format);
SubtitleTrack track = mSubtitleController.addTrack(
tracks[i].getFormat());
inbandTracks[i] = track;
}
}