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

media/base/android/media_codec_bridge.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/android/media_codec_bridge.h"
 
 #include <jni.h>
 #include <string>
 
 #include "base/android/build_info.h"
@@ skipping 363 matching lines @@
            << ", index: " << *index << ", offset: " << *offset
            << ", size: " << *size << ", flags: " << flags;
   return status;
 }
 
 void MediaCodecBridge::ReleaseOutputBuffer(int index, bool render) {
   DVLOG(3) << __PRETTY_FUNCTION__ << ": " << index;
   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);
 }
 
 int MediaCodecBridge::GetInputBuffersCount() {
   JNIEnv* env = AttachCurrentThread();
   return Java_MediaCodecBridge_getInputBuffersCount(env, j_media_codec_.obj());
 }
 
 int MediaCodecBridge::GetOutputBuffersCount() {
   JNIEnv* env = AttachCurrentThread();
@@ skipping 191 matching lines @@
       break;
     }
     default:
       LOG(ERROR) << "Invalid header encountered for codec: "
                  << AudioCodecToAndroidMimeType(codec);
       return false;
   }
   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();
   ScopedJavaLocalRef<jobject> buf =
       Java_MediaCodecBridge_getOutputBuffer(env, media_codec(), index);
   uint8* buffer = static_cast<uint8*>(env->GetDirectBufferAddress(buf.obj()));
 
   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) {
   JNIEnv* env = AttachCurrentThread();
   Java_MediaCodecBridge_setVolume(env, media_codec(), volume);
 }
 
 // static
 AudioCodecBridge* AudioCodecBridge::Create(const AudioCodec& codec) {
   if (!MediaCodecBridge::IsAvailable())
@@ skipping 108 matching lines @@
 void VideoCodecBridge::RequestKeyFrameSoon() {
   JNIEnv* env = AttachCurrentThread();
   Java_MediaCodecBridge_requestKeyFrameSoon(env, media_codec());
 }
 
 bool MediaCodecBridge::RegisterMediaCodecBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace media