diff options
| author | Robert Shih <robertshih@google.com> | 2014-07-25 11:08:50 -0700 |
|---|---|---|
| committer | Robert Shih <robertshih@google.com> | 2014-07-29 11:55:46 -0700 |
| commit | c42a96dba4beaf87875e71b8d8b77ce7154c5cdb (patch) | |
| tree | 939a958f65d694a534ea1532486c4d527646d290 /media | |
| parent | e647099e14114475e9a2827a10dab2d2e36308c4 (diff) | |
| download | frameworks_base-c42a96dba4beaf87875e71b8d8b77ce7154c5cdb.zip frameworks_base-c42a96dba4beaf87875e71b8d8b77ce7154c5cdb.tar.gz frameworks_base-c42a96dba4beaf87875e71b8d8b77ce7154c5cdb.tar.bz2 | |
MediaPlayer: scanInternalSubtitleTracks in synchronous prepare
Bug: 16385674
Change-Id: I56d205ad2fe33bd64ea2251440c88fd4ecfa13ad
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MediaPlayer.java | 7 | ||||
| -rw-r--r-- | media/jni/android_media_MediaPlayer.cpp | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index d9217a0..907615d 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -1108,7 +1108,12 @@ public class MediaPlayer implements SubtitleController.Listener * * @throws IllegalStateException if it is called in an invalid state */ - public native void prepare() throws IOException, IllegalStateException; + public void prepare() throws IOException, IllegalStateException { + _prepare(); + scanInternalSubtitleTracks(); + } + + private native void _prepare() throws IOException, IllegalStateException; /** * Prepares the player for playback, asynchronously. diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index 4587cf5..73a924d 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -861,7 +861,7 @@ static JNINativeMethod gMethods[] = { {"_setDataSource", "(Ljava/io/FileDescriptor;JJ)V", (void *)android_media_MediaPlayer_setDataSourceFD}, {"_setVideoSurface", "(Landroid/view/Surface;)V", (void *)android_media_MediaPlayer_setVideoSurface}, - {"prepare", "()V", (void *)android_media_MediaPlayer_prepare}, + {"_prepare", "()V", (void *)android_media_MediaPlayer_prepare}, {"prepareAsync", "()V", (void *)android_media_MediaPlayer_prepareAsync}, {"_start", "()V", (void *)android_media_MediaPlayer_start}, {"_stop", "()V", (void *)android_media_MediaPlayer_stop}, |