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/peerconnection_jni.cc

Issue 2505173002: Added a callback function OnAddTrack to PeerConnectionObserver (Closed)
Patch Set: Simple change on java and obj-c. Created 4 years, 1 month 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
OLDNEW
1 /* 1 /*
2 * Copyright 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2013 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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 } 367 }
368 368
369 void OnRenegotiationNeeded() override { 369 void OnRenegotiationNeeded() override {
370 ScopedLocalRefFrame local_ref_frame(jni()); 370 ScopedLocalRefFrame local_ref_frame(jni());
371 jmethodID m = 371 jmethodID m =
372 GetMethodID(jni(), *j_observer_class_, "onRenegotiationNeeded", "()V"); 372 GetMethodID(jni(), *j_observer_class_, "onRenegotiationNeeded", "()V");
373 jni()->CallVoidMethod(*j_observer_global_, m); 373 jni()->CallVoidMethod(*j_observer_global_, m);
374 CHECK_EXCEPTION(jni()) << "error during CallVoidMethod"; 374 CHECK_EXCEPTION(jni()) << "error during CallVoidMethod";
375 } 375 }
376 376
377 void OnAddTrack(
378 rtc::scoped_refptr<RtpReceiverInterface> receiver,
379 std::vector<rtc::scoped_refptr<MediaStreamInterface>> streams) override {}
380
377 void SetConstraints(ConstraintsWrapper* constraints) { 381 void SetConstraints(ConstraintsWrapper* constraints) {
378 RTC_CHECK(!constraints_.get()) << "constraints already set!"; 382 RTC_CHECK(!constraints_.get()) << "constraints already set!";
379 constraints_.reset(constraints); 383 constraints_.reset(constraints);
380 } 384 }
381 385
382 const ConstraintsWrapper* constraints() { return constraints_.get(); } 386 const ConstraintsWrapper* constraints() { return constraints_.get(); }
383 387
384 private: 388 private:
385 typedef std::map<MediaStreamInterface*, jobject> NativeToJavaStreamsMap; 389 typedef std::map<MediaStreamInterface*, jobject> NativeToJavaStreamsMap;
386 390
(...skipping 2018 matching lines...) Expand 10 before | Expand all | Expand 10 after
2405 return JavaStringFromStdString( 2409 return JavaStringFromStdString(
2406 jni, 2410 jni,
2407 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); 2411 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id());
2408 } 2412 }
2409 2413
2410 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { 2414 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) {
2411 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); 2415 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release();
2412 } 2416 }
2413 2417
2414 } // namespace webrtc_jni 2418 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/peerconnection.cc » ('j') | webrtc/api/peerconnectionfactory_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698