diff options
| author | 2018-10-16 17:09:12 +0000 | |
|---|---|---|
| committer | 2018-10-16 17:09:12 +0000 | |
| commit | 3cb7afb2c471d680dd6ae5afc61dcb68939eb15d (patch) | |
| tree | d244ca981b36716fcb692df3c69ef2ef3ed1a7de | |
| parent | e7feb320756b0d80fedd03fd2802af80e8a2055c (diff) | |
| parent | e7db7ef15e7a4acd821d08429f114c30c06daaf4 (diff) | |
Merge "setVolume() function using single input Test: run CTS"
| -rw-r--r-- | media/java/android/media/MediaPlayer2Impl.java | 4 | ||||
| -rw-r--r-- | media/jni/android_media_MediaPlayer2.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/media/java/android/media/MediaPlayer2Impl.java b/media/java/android/media/MediaPlayer2Impl.java index 5604ffd83deb..084b2049e30b 100644 --- a/media/java/android/media/MediaPlayer2Impl.java +++ b/media/java/android/media/MediaPlayer2Impl.java @@ -461,12 +461,12 @@ public final class MediaPlayer2Impl extends MediaPlayer2 { @Override void process() { mVolume = volume; - _setVolume(volume, volume); + _setVolume(volume); } }); } - private native void _setVolume(float leftVolume, float rightVolume); + private native void _setVolume(float volume); /** * Returns the current volume of this player to this player. diff --git a/media/jni/android_media_MediaPlayer2.cpp b/media/jni/android_media_MediaPlayer2.cpp index b52da362beff..352df811d42f 100644 --- a/media/jni/android_media_MediaPlayer2.cpp +++ b/media/jni/android_media_MediaPlayer2.cpp @@ -974,15 +974,15 @@ android_media_MediaPlayer2_isLooping(JNIEnv *env, jobject thiz) } static void -android_media_MediaPlayer2_setVolume(JNIEnv *env, jobject thiz, jfloat leftVolume, jfloat rightVolume) +android_media_MediaPlayer2_setVolume(JNIEnv *env, jobject thiz, jfloat volume) { - ALOGV("setVolume: left %f right %f", (float) leftVolume, (float) rightVolume); + ALOGV("setVolume: volume %f", (float) volume); sp<MediaPlayer2> mp = getMediaPlayer(env, thiz); if (mp == NULL ) { jniThrowException(env, "java/lang/IllegalStateException", NULL); return; } - process_media_player_call( env, thiz, mp->setVolume((float) leftVolume, (float) rightVolume), NULL, NULL ); + process_media_player_call( env, thiz, mp->setVolume((float) volume), NULL, NULL ); } static jbyteArray @@ -1481,7 +1481,7 @@ static const JNINativeMethod gMethods[] = { {"getParameter", "(I)Ljava/lang/Object;", (void *)android_media_MediaPlayer2_getParameter}, {"setLooping", "(Z)V", (void *)android_media_MediaPlayer2_setLooping}, {"isLooping", "()Z", (void *)android_media_MediaPlayer2_isLooping}, - {"_setVolume", "(FF)V", (void *)android_media_MediaPlayer2_setVolume}, + {"_setVolume", "(F)V", (void *)android_media_MediaPlayer2_setVolume}, {"_invoke", "([B)[B", (void *)android_media_MediaPlayer2_invoke}, {"native_init", "()V", (void *)android_media_MediaPlayer2_native_init}, {"native_setup", "(Ljava/lang/Object;)V", (void *)android_media_MediaPlayer2_native_setup}, |