Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Side by Side Diff: webrtc/api/android/jni/androidvideotracksource_jni.cc

Issue 2173853002: Fix a bug where SourceState on AndroidVideoTrackSource is set to live even on failure. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 source->OnTextureFrameCaptured( 59 source->OnTextureFrameCaptured(
60 j_width, j_height, j_rotation, j_timestamp, 60 j_width, j_height, j_rotation, j_timestamp,
61 NativeHandleImpl(jni, j_oes_texture_id, j_transform_matrix)); 61 NativeHandleImpl(jni, j_oes_texture_id, j_transform_matrix));
62 } 62 }
63 63
64 JOW_OBSERVER_METHOD(void, nativeCapturerStarted) 64 JOW_OBSERVER_METHOD(void, nativeCapturerStarted)
65 (JNIEnv* jni, jclass, jlong j_source, jboolean j_success) { 65 (JNIEnv* jni, jclass, jlong j_source, jboolean j_success) {
66 LOG(LS_INFO) << "AndroidVideoTrackSourceObserve_nativeCapturerStarted"; 66 LOG(LS_INFO) << "AndroidVideoTrackSourceObserve_nativeCapturerStarted";
67 webrtc::AndroidVideoTrackSource* source = 67 webrtc::AndroidVideoTrackSource* source =
68 AndroidVideoTrackSourceFromJavaProxy(j_source); 68 AndroidVideoTrackSourceFromJavaProxy(j_source);
69 source->SetState(webrtc::AndroidVideoTrackSource::SourceState::kLive); 69 if (j_success) {
70 source->SetState(webrtc::AndroidVideoTrackSource::SourceState::kLive);
magjed_webrtc 2016/07/22 14:47:08 nit: I prefer ternary, so only one call to SetStat
sakal 2016/07/22 14:53:47 Done.
71 } else {
72 source->SetState(webrtc::AndroidVideoTrackSource::SourceState::kEnded);
73 }
70 } 74 }
71 75
72 JOW_OBSERVER_METHOD(void, nativeCapturerStopped) 76 JOW_OBSERVER_METHOD(void, nativeCapturerStopped)
73 (JNIEnv* jni, jclass, jlong j_source) { 77 (JNIEnv* jni, jclass, jlong j_source) {
74 LOG(LS_INFO) << "AndroidVideoTrackSourceObserve_nativeCapturerStopped"; 78 LOG(LS_INFO) << "AndroidVideoTrackSourceObserve_nativeCapturerStopped";
75 webrtc::AndroidVideoTrackSource* source = 79 webrtc::AndroidVideoTrackSource* source =
76 AndroidVideoTrackSourceFromJavaProxy(j_source); 80 AndroidVideoTrackSourceFromJavaProxy(j_source);
77 source->SetState(webrtc::AndroidVideoTrackSource::SourceState::kEnded); 81 source->SetState(webrtc::AndroidVideoTrackSource::SourceState::kEnded);
78 } 82 }
79 83
80 JOW_OBSERVER_METHOD(void, nativeOnOutputFormatRequest) 84 JOW_OBSERVER_METHOD(void, nativeOnOutputFormatRequest)
81 (JNIEnv* jni, jclass, jlong j_source, jint j_width, jint j_height, jint j_fps) { 85 (JNIEnv* jni, jclass, jlong j_source, jint j_width, jint j_height, jint j_fps) {
82 LOG(LS_INFO) << "AndroidVideoTrackSourceObserve_nativeOnOutputFormatRequest"; 86 LOG(LS_INFO) << "AndroidVideoTrackSourceObserve_nativeOnOutputFormatRequest";
83 webrtc::AndroidVideoTrackSource* source = 87 webrtc::AndroidVideoTrackSource* source =
84 AndroidVideoTrackSourceFromJavaProxy(j_source); 88 AndroidVideoTrackSourceFromJavaProxy(j_source);
85 source->OnOutputFormatRequest(j_width, j_height, j_fps); 89 source->OnOutputFormatRequest(j_width, j_height, j_fps);
86 } 90 }
87 91
88 } // namespace webrtc_jni 92 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698