summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2014-03-20 17:02:31 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2014-03-21 09:24:26 -0700
commit5d21f679c58dbb13c8c931ffec6e06b6b8cd454f (patch)
treef2ea3cdda36f5da80fc31d8551897723eb1fbbdf /core/jni
parent31dc8f701fb14e185bf1c1b35d68bd7d1a42a54a (diff)
downloadframeworks_base-5d21f679c58dbb13c8c931ffec6e06b6b8cd454f.zip
frameworks_base-5d21f679c58dbb13c8c931ffec6e06b6b8cd454f.tar.gz
frameworks_base-5d21f679c58dbb13c8c931ffec6e06b6b8cd454f.tar.bz2
AudioTrack write from ByteBuffer updates position
Remove offset parameter. Update buffer position when data is successfully written. Bug 7919023 Change-Id: I1701532ef0a91e2ccecfc38b24de29bc4f64d035
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/android_media_AudioTrack.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp
index a64d3ba..3a5b566 100644
--- a/core/jni/android_media_AudioTrack.cpp
+++ b/core/jni/android_media_AudioTrack.cpp
@@ -606,7 +606,7 @@ static jint android_media_AudioTrack_write_byte(JNIEnv *env, jobject thiz,
// ----------------------------------------------------------------------------
static jint android_media_AudioTrack_write_native_bytes(JNIEnv *env, jobject thiz,
- jbyteArray javaBytes, jint byteOffset, jint offsetInBytes, jint sizeInBytes,
+ jbyteArray javaBytes, jint byteOffset, jint sizeInBytes,
jint javaAudioFormat, jboolean isWriteBlocking) {
//ALOGV("android_media_AudioTrack_write_native_bytes(offset=%d, sizeInBytes=%d) called",
// offsetInBytes, sizeInBytes);
@@ -623,7 +623,7 @@ static jint android_media_AudioTrack_write_native_bytes(JNIEnv *env, jobject th
return AUDIOTRACK_ERROR_BAD_VALUE;
}
- jint written = writeToTrack(lpTrack, javaAudioFormat, bytes.get() + byteOffset, offsetInBytes,
+ jint written = writeToTrack(lpTrack, javaAudioFormat, bytes.get(), byteOffset,
sizeInBytes, isWriteBlocking == JNI_TRUE /* blocking */);
return written;
@@ -922,7 +922,7 @@ static JNINativeMethod gMethods[] = {
{"native_release", "()V", (void *)android_media_AudioTrack_release},
{"native_write_byte", "([BIIIZ)I",(void *)android_media_AudioTrack_write_byte},
{"native_write_native_bytes",
- "(Ljava/lang/Object;IIIIZ)I",
+ "(Ljava/lang/Object;IIIZ)I",
(void *)android_media_AudioTrack_write_native_bytes},
{"native_write_short", "([SIII)I", (void *)android_media_AudioTrack_write_short},
{"native_setVolume", "(FF)V", (void *)android_media_AudioTrack_set_volume},