From 295c4c276be06c840f18fd3c44d98c803dff2144 Mon Sep 17 00:00:00 2001 From: glaznev Date: Tue, 8 Mar 2016 10:33:33 -0800 Subject: [PATCH] Reduce camera freeze timeout to 4 sec. BUG=b/27496394 Review URL: https://codereview.webrtc.org/1776463002 Cr-Commit-Position: refs/heads/master@{#11914} --- webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java index be6b3e26fe..75a0c3e9d1 100644 --- a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java +++ b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java @@ -49,7 +49,7 @@ public class VideoCapturerAndroid implements SurfaceTextureHelper.OnTextureFrameAvailableListener { private final static String TAG = "VideoCapturerAndroid"; private final static int CAMERA_OBSERVER_PERIOD_MS = 2000; - private final static int CAMERA_FREEZE_REPORT_TIMOUT_MS = 6000; + private final static int CAMERA_FREEZE_REPORT_TIMOUT_MS = 4000; private android.hardware.Camera camera; // Only non-null while capturing. private Thread cameraThread; @@ -118,7 +118,7 @@ public class VideoCapturerAndroid implements Logging.d(TAG, "Camera fps: " + cameraFps +"."); if (cameraFramesCount == 0) { ++freezePeriodCount; - if (CAMERA_OBSERVER_PERIOD_MS * freezePeriodCount > CAMERA_FREEZE_REPORT_TIMOUT_MS + if (CAMERA_OBSERVER_PERIOD_MS * freezePeriodCount >= CAMERA_FREEZE_REPORT_TIMOUT_MS && eventsHandler != null) { Logging.e(TAG, "Camera freezed."); if (surfaceHelper.isTextureInUse()) {