From d20d24716697f9ecdee02c279a51018ee95baab2 Mon Sep 17 00:00:00 2001 From: perkj Date: Wed, 2 Dec 2015 04:25:27 -0800 Subject: [PATCH] Fix VideoCaptureAndroid, drop frame when switching camera using textures. Dropping the first frame intended to fix a problem when switching cameras on N6 when we are capturing to textures but due to a silly bug fixed in this cl the frame was not dropped... BUG=webrtc:5262 TBR=magjed@webrtc.org Review URL: https://codereview.webrtc.org/1489363002 Cr-Commit-Position: refs/heads/master@{#10867} --- .../webrtc/java/android/org/webrtc/VideoCapturerAndroid.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java b/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java index 72ef309de3..7fa32f8050 100644 --- a/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java +++ b/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java @@ -745,9 +745,9 @@ public class VideoCapturerAndroid extends VideoCapturer implements surfaceHelper.returnTextureFrame(); return; } - if (!dropNextFrame) { + if (dropNextFrame) { surfaceHelper.returnTextureFrame(); - dropNextFrame = true; + dropNextFrame = false; return; }