| commit | 49a862ec4cba4060f9897ceb24b215d316bc0544 | [log] [tgz] |
|---|---|---|
| author | Per <perkj@chromium.org> | Tue Apr 07 14:16:09 2015 +0200 |
| committer | Per <perkj@chromium.org> | Tue Apr 07 12:16:14 2015 +0000 |
| tree | 77d3fe36ff0f2bba32ffcd2e62b168d4a3dea923 | |
| parent | 26679d6d90aeb7114b6bcc86b26921768256e203 [diff] |
Return pending buffers to Java VideoCapturerAndroid if camera is stopping BUG=4510 R=magjed@webrtc.org Review URL: https://webrtc-codereview.appspot.com/45009005 Cr-Commit-Position: refs/heads/master@{#8935}
diff --git a/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc b/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc index 4fa23f3..88cc31b 100644 --- a/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc +++ b/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc
@@ -176,6 +176,8 @@ DCHECK(thread_checker_.CalledOnValidThread()); if (capturer_) capturer_->OnIncomingFrame(video_frame, length, rotation, time_stamp); + else + ReturnBuffer_w(time_stamp); } JNIEnv* AndroidVideoCapturerJni::jni() { return AttachCurrentThreadIfNeeded(); }