Add separate event for camera freeze.

talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java

 /*
  * 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 10 matching lines @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 package org.webrtc;
 
 import android.content.Context;
-import android.graphics.SurfaceTexture;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.SystemClock;
 import android.view.Surface;
 import android.view.WindowManager;
 
 import org.json.JSONException;
 import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
 import org.webrtc.Logging;
 
@@ skipping 54 matching lines @@
   private boolean firstFrameReported;
   private final boolean isCapturingToTexture;
   private final SurfaceTextureHelper surfaceHelper;
   // The camera API can output one old frame after the camera has been switched or the resolution
   // has been changed. This flag is used for dropping the first frame after camera restart.
   private boolean dropNextFrame = false;
   // |openCameraOnCodecThreadRunner| is used for retrying to open the camera if it is in use by
   // another application when startCaptureOnCameraThread is called.
   private Runnable openCameraOnCodecThreadRunner;
   private final static int MAX_OPEN_CAMERA_ATTEMPTS = 3;
-  private final static int OPEN_CAMERA_DELAY_MS = 300;
+  private final static int OPEN_CAMERA_DELAY_MS = 500;
   private int openCameraAttempts;
 
   // Camera error callback.
   private final android.hardware.Camera.ErrorCallback cameraErrorCallback =
       new android.hardware.Camera.ErrorCallback() {
     @Override
     public void onError(int error, android.hardware.Camera camera) {
       String errorMessage;
       if (error == android.hardware.Camera.CAMERA_ERROR_SERVER_DIED) {
         errorMessage = "Camera server died!";
@@ skipping 17 matching lines @@
           / CAMERA_OBSERVER_PERIOD_MS;
 
       Logging.d(TAG, "Camera fps: " + cameraFps +
           ". Pending buffers: " + cameraStatistics.pendingFramesTimeStamps());
       if (cameraFramesCount == 0) {
         ++freezePeriodCount;
         if (CAMERA_OBSERVER_PERIOD_MS * freezePeriodCount > CAMERA_FREEZE_REPORT_TIMOUT_MS
             && eventsHandler != null) {
           Logging.e(TAG, "Camera freezed.");
           if (cameraStatistics.pendingFramesCount() == cameraStatistics.maxPendingFrames) {
-            eventsHandler.onCameraError("Camera failure. Client must return video buffers.");
+            eventsHandler.onCameraFreezed("Camera failure. Client must return video buffers.");
           } else {
-            eventsHandler.onCameraError("Camera failure.");
+            eventsHandler.onCameraFreezed("Camera failure.");
           }
           return;
         }
       } else {
         freezePeriodCount = 0;
       }
       cameraThreadHandler.postDelayed(this, CAMERA_OBSERVER_PERIOD_MS);
     }
   };
 
@@ skipping 40 matching lines @@
       threadChecker.checkIsOnValidThread();
       List<Long> timeStampsMs = new ArrayList<Long>();
       for (long ts : timeStampsNs) {
         timeStampsMs.add(TimeUnit.NANOSECONDS.toMillis(ts));
       }
       return timeStampsMs.toString();
     }
   }
 
   public static interface CameraEventsHandler {
-    // Camera error handler - invoked when camera stops receiving frames
+    // Camera error handler - invoked when camera can not be opened
     // or any camera exception happens on camera thread.
     void onCameraError(String errorDescription);
 
+    // Invoked when camera stops receiving frames
+    void onCameraFreezed(String errorDescription);
+
     // Callback invoked when camera is opening.
     void onCameraOpening(int cameraId);
 
     // Callback invoked when first camera frame is available after camera is opened.
     void onFirstFrameAvailable();
 
     // Callback invoked when camera closed.
     void onCameraClosed();
   }
 
@@ skipping 717 matching lines @@
     private native void nativeOnByteBufferFrameCaptured(long nativeCapturer,
         byte[] data, int length, int width, int height, int rotation, long timeStamp);
     private native void nativeOnTextureFrameCaptured(long nativeCapturer, int width, int height,
         int oesTextureId, float[] transformMatrix, long timestamp);
     private native void nativeOnOutputFormatRequest(long nativeCapturer,
         int width, int height, int framerate);
   }
 
   private static native long nativeCreateVideoCapturer(VideoCapturerAndroid videoCapturer);
 }