Refactor stopCapture to be asynchronous in VideoCapturerAndroid.

webrtc/api/android/java/src/org/webrtc/VideoCapturer.java

 /*
  *  Copyright 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 package org.webrtc;
 
 import android.content.Context;
 
 import java.util.List;
 
 // Base interface for all VideoCapturers to implement.
+// All events will be fired on the camera thread.
 public interface VideoCapturer {
   // Interface used for providing callbacks to an observer.
   public interface CapturerObserver {
     // Notify if the camera have been started successfully or not.
-    // Called on a Java thread owned by VideoCapturer.
     void onCapturerStarted(boolean success);
+
     void onCapturerStopped();
 
-    // Delivers a captured frame. Called on a Java thread owned by VideoCapturer.
+    // Delivers a captured frame.
     void onByteBufferFrameCaptured(byte[] data, int width, int height, int rotation,
         long timeStamp);
 
-    // Delivers a captured frame in a texture with id |oesTextureId|. Called on a Java thread
-    // owned by VideoCapturer.
+    // Delivers a captured frame in a texture with id |oesTextureId|.
     void onTextureFrameCaptured(
         int width, int height, int oesTextureId, float[] transformMatrix, int rotation,
         long timestamp);
 
     // Requests an output format from the video capturer. Captured frames
     // by the camera will be scaled/or dropped by the video capturer.
-    // Called on a Java thread owned by VideoCapturer.
     void onOutputFormatRequest(int width, int height, int framerate);
   }
 
   // An implementation of CapturerObserver that forwards all calls from
   // Java to the C layer.
   static class NativeObserver implements CapturerObserver {
     private final long nativeCapturer;
 
     public NativeObserver(long nativeCapturer) {
       this.nativeCapturer = nativeCapturer;
@@ skipping 104 matching lines @@
   void initialize(SurfaceTextureHelper surfaceTextureHelper, Context applicationContext,
       CapturerObserver capturerObserver);
 
   /**
    * Start capturing frames in a format that is as close as possible to |width| x |height| and
    * |framerate|.
    */
   void startCapture(int width, int height, int framerate);
 
   /**
-   * Stop capturing. This function should block until capture is actually stopped.
+   * Stop capturing. No more frames/events will be delivered to the observer when this method
+   * returns.
    */
-  void stopCapture() throws InterruptedException;
+  void stopCapture();
 
   void onOutputFormatRequest(int width, int height, int framerate);
 
   void changeCaptureFormat(int width, int height, int framerate);
 
   /**
    * Perform any final cleanup here. No more capturing will be done after this call.
    */
   void dispose();
 }