diff options
| author | Lajos Molnar <lajos@google.com> | 2013-09-03 22:51:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-03 22:51:32 +0000 |
| commit | a861245f06e854d47ff44155ebd3ac0e31c0cb2c (patch) | |
| tree | 6c8ab56bbef142c6f7ee54d23cfc5fd0dbaf1df3 /media/java | |
| parent | 02a25a97a24e06768159ddc2b680c253a2ce71c7 (diff) | |
| parent | af309824350d6b2fd38e19ef9104211e5ba132e8 (diff) | |
| download | frameworks_base-a861245f06e854d47ff44155ebd3ac0e31c0cb2c.zip frameworks_base-a861245f06e854d47ff44155ebd3ac0e31c0cb2c.tar.gz frameworks_base-a861245f06e854d47ff44155ebd3ac0e31c0cb2c.tar.bz2 | |
Merge "VideoView: add addSubtitleSource" into klp-dev
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 946dd71..1b9bdaf 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -2382,6 +2382,16 @@ public class MediaPlayer */ public static final int MEDIA_INFO_TIMED_TEXT_ERROR = 900; + /** Subtitle track was not supported by the media framework. + * @see android.media.MediaPlayer.OnInfoListener + */ + public static final int MEDIA_INFO_UNSUPPORTED_SUBTITLE = 901; + + /** Reading the subtitle track takes too long. + * @see android.media.MediaPlayer.OnInfoListener + */ + public static final int MEDIA_INFO_SUBTITLE_TIMED_OUT = 902; + /** * Interface definition of a callback to be invoked to communicate some * info and/or warning about the media or its playback. @@ -2402,6 +2412,8 @@ public class MediaPlayer * <li>{@link #MEDIA_INFO_BAD_INTERLEAVING} * <li>{@link #MEDIA_INFO_NOT_SEEKABLE} * <li>{@link #MEDIA_INFO_METADATA_UPDATE} + * <li>{@link #MEDIA_INFO_UNSUPPORTED_SUBTITLE} + * <li>{@link #MEDIA_INFO_SUBTITLE_TIMED_OUT} * </ul> * @param extra an extra code, specific to the info. Typically * implementation dependent. |