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

Side by Side Diff: webrtc/sdk/android/src/jni/peerconnection_jni.cc

Issue 2666873002: Adding Java wrapper for DtmfSender. (Closed)
Patch Set: Merge with master Created 3 years, 10 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 | « webrtc/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java ('k') | 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 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 using rtc::Thread; 83 using rtc::Thread;
84 using rtc::ThreadManager; 84 using rtc::ThreadManager;
85 using webrtc::AudioSourceInterface; 85 using webrtc::AudioSourceInterface;
86 using webrtc::AudioTrackInterface; 86 using webrtc::AudioTrackInterface;
87 using webrtc::AudioTrackVector; 87 using webrtc::AudioTrackVector;
88 using webrtc::CreateSessionDescriptionObserver; 88 using webrtc::CreateSessionDescriptionObserver;
89 using webrtc::DataBuffer; 89 using webrtc::DataBuffer;
90 using webrtc::DataChannelInit; 90 using webrtc::DataChannelInit;
91 using webrtc::DataChannelInterface; 91 using webrtc::DataChannelInterface;
92 using webrtc::DataChannelObserver; 92 using webrtc::DataChannelObserver;
93 using webrtc::DtmfSenderInterface;
93 using webrtc::IceCandidateInterface; 94 using webrtc::IceCandidateInterface;
94 using webrtc::LogcatTraceContext; 95 using webrtc::LogcatTraceContext;
95 using webrtc::MediaConstraintsInterface; 96 using webrtc::MediaConstraintsInterface;
96 using webrtc::MediaSourceInterface; 97 using webrtc::MediaSourceInterface;
97 using webrtc::MediaStreamInterface; 98 using webrtc::MediaStreamInterface;
98 using webrtc::MediaStreamTrackInterface; 99 using webrtc::MediaStreamTrackInterface;
99 using webrtc::PeerConnectionFactoryInterface; 100 using webrtc::PeerConnectionFactoryInterface;
100 using webrtc::PeerConnectionInterface; 101 using webrtc::PeerConnectionInterface;
101 using webrtc::PeerConnectionObserver; 102 using webrtc::PeerConnectionObserver;
102 using webrtc::RtpReceiverInterface; 103 using webrtc::RtpReceiverInterface;
(...skipping 2247 matching lines...) Expand 10 before | Expand all | Expand 10 after
2350 } 2351 }
2351 2352
2352 JOW(jboolean, RtpSender_nativeSetTrack)(JNIEnv* jni, 2353 JOW(jboolean, RtpSender_nativeSetTrack)(JNIEnv* jni,
2353 jclass, 2354 jclass,
2354 jlong j_rtp_sender_pointer, 2355 jlong j_rtp_sender_pointer,
2355 jlong j_track_pointer) { 2356 jlong j_track_pointer) {
2356 return reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer) 2357 return reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer)
2357 ->SetTrack(reinterpret_cast<MediaStreamTrackInterface*>(j_track_pointer)); 2358 ->SetTrack(reinterpret_cast<MediaStreamTrackInterface*>(j_track_pointer));
2358 } 2359 }
2359 2360
2360 JOW(jlong, RtpSender_nativeGetTrack)(JNIEnv* jni, 2361 JOW(jlong, RtpSender_nativeGetTrack)
2361 jclass, 2362 (JNIEnv* jni, jclass, jlong j_rtp_sender_pointer) {
2362 jlong j_rtp_sender_pointer,
2363 jlong j_track_pointer) {
2364 return jlongFromPointer( 2363 return jlongFromPointer(
2365 reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer) 2364 reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer)
2366 ->track() 2365 ->track()
2367 .release()); 2366 .release());
2368 } 2367 }
2369 2368
2369 JOW(jlong, RtpSender_nativeGetDtmfSender)
2370 (JNIEnv* jni, jclass, jlong j_rtp_sender_pointer) {
2371 return jlongFromPointer(
2372 reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer)
2373 ->GetDtmfSender()
2374 .release());
2375 }
2376
2370 static void JavaRtpParametersToJsepRtpParameters( 2377 static void JavaRtpParametersToJsepRtpParameters(
2371 JNIEnv* jni, 2378 JNIEnv* jni,
2372 jobject j_parameters, 2379 jobject j_parameters,
2373 webrtc::RtpParameters* parameters) { 2380 webrtc::RtpParameters* parameters) {
2374 RTC_CHECK(parameters != nullptr); 2381 RTC_CHECK(parameters != nullptr);
2375 jclass parameters_class = jni->FindClass("org/webrtc/RtpParameters"); 2382 jclass parameters_class = jni->FindClass("org/webrtc/RtpParameters");
2376 jfieldID encodings_id = 2383 jfieldID encodings_id =
2377 GetFieldID(jni, parameters_class, "encodings", "Ljava/util/LinkedList;"); 2384 GetFieldID(jni, parameters_class, "encodings", "Ljava/util/LinkedList;");
2378 jfieldID codecs_id = 2385 jfieldID codecs_id =
2379 GetFieldID(jni, parameters_class, "codecs", "Ljava/util/LinkedList;"); 2386 GetFieldID(jni, parameters_class, "codecs", "Ljava/util/LinkedList;");
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
2608 (JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer, jlong j_observer_pointer) { 2615 (JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer, jlong j_observer_pointer) {
2609 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer) 2616 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)
2610 ->SetObserver(nullptr); 2617 ->SetObserver(nullptr);
2611 RtpReceiverObserver* observer = 2618 RtpReceiverObserver* observer =
2612 reinterpret_cast<RtpReceiverObserver*>(j_observer_pointer); 2619 reinterpret_cast<RtpReceiverObserver*>(j_observer_pointer);
2613 if (observer) { 2620 if (observer) {
2614 delete observer; 2621 delete observer;
2615 } 2622 }
2616 } 2623 }
2617 2624
2625 JOW(jboolean, DtmfSender_nativeCanInsertDtmf)
2626 (JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
2627 return reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)
2628 ->CanInsertDtmf();
2629 }
2630
2631 JOW(jboolean, DtmfSender_nativeInsertDtmf)
2632 (JNIEnv* jni,
2633 jclass,
2634 jlong j_dtmf_sender_pointer,
2635 jstring tones,
2636 jint duration,
2637 jint inter_tone_gap) {
2638 return reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)
2639 ->InsertDtmf(JavaToStdString(jni, tones), duration, inter_tone_gap);
2640 }
2641
2642 JOW(jstring, DtmfSender_nativeTones)
2643 (JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
2644 return JavaStringFromStdString(
2645 jni,
2646 reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)->tones());
2647 }
2648
2649 JOW(jint, DtmfSender_nativeDuration)
2650 (JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
2651 return reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)
2652 ->duration();
2653 }
2654
2655 JOW(jint, DtmfSender_nativeInterToneGap)
2656 (JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
2657 return reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)
2658 ->inter_tone_gap();
2659 }
2660
2661 JOW(void, DtmfSender_free)
2662 (JNIEnv* jni, jclass, jlong j_dtmf_sender_pointer) {
2663 reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)->Release();
2664 }
2665
2618 } // namespace webrtc_jni 2666 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « webrtc/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698