From ff0a96d50222274fa7bc262720a21744590e5499 Mon Sep 17 00:00:00 2001 From: Sami Kalliomaki Date: Sat, 23 Jul 2016 14:45:07 +0200 Subject: [PATCH] Fix a bug where SourceState on AndroidVideoTrackSource is set to live even on failure. This affects only Android applications using the new createVideoSource API. R=magjed@webrtc.org Review URL: https://codereview.webrtc.org/2173853002 . Cr-Commit-Position: refs/heads/master@{#13511} --- webrtc/api/android/jni/androidvideotracksource_jni.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/webrtc/api/android/jni/androidvideotracksource_jni.cc b/webrtc/api/android/jni/androidvideotracksource_jni.cc index 5ec281ab98..2d1529938a 100644 --- a/webrtc/api/android/jni/androidvideotracksource_jni.cc +++ b/webrtc/api/android/jni/androidvideotracksource_jni.cc @@ -66,7 +66,9 @@ JOW_OBSERVER_METHOD(void, nativeCapturerStarted) LOG(LS_INFO) << "AndroidVideoTrackSourceObserve_nativeCapturerStarted"; webrtc::AndroidVideoTrackSource* source = AndroidVideoTrackSourceFromJavaProxy(j_source); - source->SetState(webrtc::AndroidVideoTrackSource::SourceState::kLive); + source->SetState(j_success + ? webrtc::AndroidVideoTrackSource::SourceState::kLive + : webrtc::AndroidVideoTrackSource::SourceState::kEnded); } JOW_OBSERVER_METHOD(void, nativeCapturerStopped)