Fix an issue that audio and video may run out of sync

media/base/android/media_codec_bridge.cc

Index: media/base/android/media_codec_bridge.cc
diff --git a/media/base/android/media_codec_bridge.cc b/media/base/android/media_codec_bridge.cc
index 0178844156c504ebc0bb84f172de233ae95d0a78..c034a9008a84489bddfe2a119e2c7062967e6427 100644
--- a/media/base/android/media_codec_bridge.cc
+++ b/media/base/android/media_codec_bridge.cc
@@ -381,7 +381,7 @@ void MediaCodecBridge::ReleaseOutputBuffer(int index, bool render) {
   JNIEnv* env = AttachCurrentThread();
   CHECK(env);
 
-  Java_MediaCodecBridge_releaseOutputBuffer(
+  return Java_MediaCodecBridge_releaseOutputBuffer(

[wolenetz, 2014/04/03 18:14:40]

Perhaps I'm confused here, but ILTM like the .java version of this method
returns void, and so does this method. What retval are we trying to return here?

[qinmin, 2014/04/03 21:59:45]

added by accident. Removed.

On 2014/04/03 18:14:40, wolenetz wrote:

       env, j_media_codec_.obj(), index, render);
 }
 
@@ -593,7 +593,7 @@ bool AudioCodecBridge::ConfigureMediaFormat(jobject j_format,
   return true;
 }
 
-void AudioCodecBridge::PlayOutputBuffer(int index, size_t size) {
+int64 AudioCodecBridge::PlayOutputBuffer(int index, size_t size) {
   DCHECK_LE(0, index);
   int numBytes = base::checked_cast<int>(size);
   JNIEnv* env = AttachCurrentThread();
@@ -603,7 +603,8 @@ void AudioCodecBridge::PlayOutputBuffer(int index, size_t size) {
 
   ScopedJavaLocalRef<jbyteArray> byte_array =
       base::android::ToJavaByteArray(env, buffer, numBytes);
-  Java_MediaCodecBridge_playOutputBuffer(env, media_codec(), byte_array.obj());
+  return Java_MediaCodecBridge_playOutputBuffer(
+      env, media_codec(), byte_array.obj());
 }
 
 void AudioCodecBridge::SetVolume(double volume) {