diff options
| author | Wei Jia <wjia@google.com> | 2016-11-03 17:44:01 -0700 |
|---|---|---|
| committer | Wei Jia <wjia@google.com> | 2016-12-01 12:32:34 -0800 |
| commit | ebc2b694d1b5dc6b8a2cd2825e11f914e542cc56 (patch) | |
| tree | c2c449605f3f3a2a611015d50704f83e9b676207 /media/jni/android_media_MediaPlayer.cpp | |
| parent | 2c0dc3e09429973f018f771cdecb7d4ecba48833 (diff) | |
MediaPlayer: enable same seek modes as in MediaMetadataRetriever.
Test: manually check result of mediaplayer.seekTo
Bug: 32557491
Change-Id: Ib507fbfb86a24fcf9b42758e89e595a4a58d33b5
Diffstat (limited to 'media/jni/android_media_MediaPlayer.cpp')
| -rw-r--r-- | media/jni/android_media_MediaPlayer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index c82570286bbc..c52ed941af85 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -577,15 +577,15 @@ android_media_MediaPlayer_getSyncParams(JNIEnv *env, jobject thiz) } static void -android_media_MediaPlayer_seekTo(JNIEnv *env, jobject thiz, jint msec) +android_media_MediaPlayer_seekTo(JNIEnv *env, jobject thiz, jint msec, jint mode) { sp<MediaPlayer> mp = getMediaPlayer(env, thiz); if (mp == NULL ) { jniThrowException(env, "java/lang/IllegalStateException", NULL); return; } - ALOGV("seekTo: %d(msec)", msec); - process_media_player_call( env, thiz, mp->seekTo(msec), NULL, NULL ); + ALOGV("seekTo: %d(msec), mode=%d", msec, mode); + process_media_player_call( env, thiz, mp->seekTo(msec, (MediaPlayerSeekMode)mode), NULL, NULL ); } static jint @@ -1056,7 +1056,7 @@ static const JNINativeMethod gMethods[] = { {"getPlaybackParams", "()Landroid/media/PlaybackParams;", (void *)android_media_MediaPlayer_getPlaybackParams}, {"setSyncParams", "(Landroid/media/SyncParams;)V", (void *)android_media_MediaPlayer_setSyncParams}, {"getSyncParams", "()Landroid/media/SyncParams;", (void *)android_media_MediaPlayer_getSyncParams}, - {"seekTo", "(I)V", (void *)android_media_MediaPlayer_seekTo}, + {"_seekTo", "(II)V", (void *)android_media_MediaPlayer_seekTo}, {"_pause", "()V", (void *)android_media_MediaPlayer_pause}, {"isPlaying", "()Z", (void *)android_media_MediaPlayer_isPlaying}, {"getCurrentPosition", "()I", (void *)android_media_MediaPlayer_getCurrentPosition}, |