AndroidVideoCapturerJni: Fix threading issues

talk/app/webrtc/androidvideocapturer.h

Index: talk/app/webrtc/androidvideocapturer.h
diff --git a/talk/app/webrtc/androidvideocapturer.h b/talk/app/webrtc/androidvideocapturer.h
index 84b1c06d65a499393b3dc0ba39b06e3d12c34c7f..78594f8c2373b279ba5bf8779a6cf534cf320e02 100644
--- a/talk/app/webrtc/androidvideocapturer.h
+++ b/talk/app/webrtc/androidvideocapturer.h
@@ -32,6 +32,7 @@
 
 #include "talk/media/base/videocapturer.h"
 #include "webrtc/base/thread_checker.h"
+#include "webrtc/common_video/interface/video_frame_buffer.h"
 
 namespace webrtc {
 
@@ -49,10 +50,6 @@ class AndroidVideoCapturerDelegate : public rtc::RefCountInterface {
   // The delegate may not call into AndroidVideoCapturer after this call.
   virtual void Stop() = 0;
 
-  // Notify that a frame received in OnIncomingFrame with |time_stamp| has been
-  // processed and can be returned. May be called on an arbitrary thread.
-  virtual void ReturnBuffer(int64 time_stamp) = 0;
-
   // Must returns a JSON string "{{width=xxx, height=xxx, framerate = xxx}}"
   virtual std::string GetSupportedFormats() = 0;
 };
@@ -69,10 +66,8 @@ class AndroidVideoCapturer : public cricket::VideoCapturer {
   void OnCapturerStarted(bool success);
 
   // Called from JNI when a new frame has been captured.
-  void OnIncomingFrame(void* video_frame,
-                       int length,
-                       int width,
-                       int height,
+  // Argument |buffer| is intentionally by value, for use with rtc::Bind.
+  void OnIncomingFrame(rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer,
                        int rotation,
                        int64 time_stamp);