AndroidVideoCapturerJni: Fix threading issues

talk/app/webrtc/androidvideocapturer.h

 /*
  * libjingle
  * Copyright 2015 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 14 matching lines @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef TALK_APP_WEBRTC_ANDROIDVIDEOCAPTURER_H_
 #define TALK_APP_WEBRTC_ANDROIDVIDEOCAPTURER_H_
 
 #include <string>
 #include <vector>
 
 #include "talk/media/base/videocapturer.h"
 #include "webrtc/base/thread_checker.h"
+#include "webrtc/common_video/interface/video_frame_buffer.h"
 
 namespace webrtc {
 
 class AndroidVideoCapturer;
 
 class AndroidVideoCapturerDelegate : public rtc::RefCountInterface {
  public:
   virtual ~AndroidVideoCapturerDelegate() {}
   // Start capturing. The implementation of the delegate must call
   // AndroidVideoCapturer::OnCapturerStarted with the result of this request.
   virtual void Start(int width, int height, int framerate,
                      AndroidVideoCapturer* capturer) = 0;
 
   // Stops capturing.
   // 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;
 };
 
 // Android implementation of cricket::VideoCapturer for use with WebRtc
 // PeerConnection.
 class AndroidVideoCapturer : public cricket::VideoCapturer {
  public:
   explicit AndroidVideoCapturer(
       const rtc::scoped_refptr<AndroidVideoCapturerDelegate>& delegate);
   virtual ~AndroidVideoCapturer();
 
   // Called from JNI when the capturer has been started.
   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);
 
   // Called from JNI to request a new video format.
   void OnOutputFormatRequest(int width, int height, int fps);
 
   AndroidVideoCapturerDelegate* delegate() { return delegate_.get(); }
 
  private:
   // cricket::VideoCapturer implementation.
@@ skipping 13 matching lines @@
 
   class FrameFactory;
   FrameFactory* frame_factory_;  // Owned by cricket::VideoCapturer.
 
   cricket::CaptureState current_state_;
 };
 
 }  // namespace webrtc
 
 #endif  // TALK_APP_WEBRTC_ANDROIDVIDEOCAPTURER_H_