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

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

Issue 3009613002: Android: Replace webrtc_jni namespace with nested jni namespace (Closed)
Patch Set: Rebase Created 3 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2017 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
11 #include "webrtc/api/rtpreceiverinterface.h" 11 #include "webrtc/api/rtpreceiverinterface.h"
12 #include "webrtc/sdk/android/src/jni/jni_helpers.h" 12 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
13 #include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h" 13 #include "webrtc/sdk/android/src/jni/pc/java_native_conversion.h"
14 #include "webrtc/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h" 14 #include "webrtc/sdk/android/src/jni/pc/rtpreceiverobserver_jni.h"
15 15
16 namespace webrtc_jni { 16 namespace webrtc {
17 namespace jni {
17 18
18 JNI_FUNCTION_DECLARATION(jlong, 19 JNI_FUNCTION_DECLARATION(jlong,
19 RtpReceiver_nativeGetTrack, 20 RtpReceiver_nativeGetTrack,
20 JNIEnv* jni, 21 JNIEnv* jni,
21 jclass, 22 jclass,
22 jlong j_rtp_receiver_pointer, 23 jlong j_rtp_receiver_pointer,
23 jlong j_track_pointer) { 24 jlong j_track_pointer) {
24 return jlongFromPointer( 25 return jlongFromPointer(
25 reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer) 26 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)
26 ->track() 27 ->track()
27 .release()); 28 .release());
28 } 29 }
29 30
30 JNI_FUNCTION_DECLARATION(jboolean, 31 JNI_FUNCTION_DECLARATION(jboolean,
31 RtpReceiver_nativeSetParameters, 32 RtpReceiver_nativeSetParameters,
32 JNIEnv* jni, 33 JNIEnv* jni,
33 jclass, 34 jclass,
34 jlong j_rtp_receiver_pointer, 35 jlong j_rtp_receiver_pointer,
35 jobject j_parameters) { 36 jobject j_parameters) {
36 if (IsNull(jni, j_parameters)) { 37 if (IsNull(jni, j_parameters)) {
37 return false; 38 return false;
38 } 39 }
39 webrtc::RtpParameters parameters; 40 RtpParameters parameters;
40 JavaToNativeRtpParameters(jni, j_parameters, &parameters); 41 JavaToNativeRtpParameters(jni, j_parameters, &parameters);
41 return reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer) 42 return reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)
42 ->SetParameters(parameters); 43 ->SetParameters(parameters);
43 } 44 }
44 45
45 JNI_FUNCTION_DECLARATION(jobject, 46 JNI_FUNCTION_DECLARATION(jobject,
46 RtpReceiver_nativeGetParameters, 47 RtpReceiver_nativeGetParameters,
47 JNIEnv* jni, 48 JNIEnv* jni,
48 jclass, 49 jclass,
49 jlong j_rtp_receiver_pointer) { 50 jlong j_rtp_receiver_pointer) {
50 webrtc::RtpParameters parameters = 51 RtpParameters parameters =
51 reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer) 52 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)
52 ->GetParameters(); 53 ->GetParameters();
53 return NativeToJavaRtpParameters(jni, parameters); 54 return NativeToJavaRtpParameters(jni, parameters);
54 } 55 }
55 56
56 JNI_FUNCTION_DECLARATION(jstring, 57 JNI_FUNCTION_DECLARATION(jstring,
57 RtpReceiver_nativeId, 58 RtpReceiver_nativeId,
58 JNIEnv* jni, 59 JNIEnv* jni,
59 jclass, 60 jclass,
60 jlong j_rtp_receiver_pointer) { 61 jlong j_rtp_receiver_pointer) {
61 return JavaStringFromStdString( 62 return JavaStringFromStdString(
62 jni, 63 jni,
63 reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer) 64 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id());
64 ->id());
65 } 65 }
66 66
67 JNI_FUNCTION_DECLARATION(jlong, 67 JNI_FUNCTION_DECLARATION(jlong,
68 RtpReceiver_nativeSetObserver, 68 RtpReceiver_nativeSetObserver,
69 JNIEnv* jni, 69 JNIEnv* jni,
70 jclass, 70 jclass,
71 jlong j_rtp_receiver_pointer, 71 jlong j_rtp_receiver_pointer,
72 jobject j_observer) { 72 jobject j_observer) {
73 RtpReceiverObserverJni* rtpReceiverObserver = 73 RtpReceiverObserverJni* rtpReceiverObserver =
74 new RtpReceiverObserverJni(jni, j_observer); 74 new RtpReceiverObserverJni(jni, j_observer);
75 reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer) 75 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)
76 ->SetObserver(rtpReceiverObserver); 76 ->SetObserver(rtpReceiverObserver);
77 return jlongFromPointer(rtpReceiverObserver); 77 return jlongFromPointer(rtpReceiverObserver);
78 } 78 }
79 79
80 JNI_FUNCTION_DECLARATION(void, 80 JNI_FUNCTION_DECLARATION(void,
81 RtpReceiver_nativeUnsetObserver, 81 RtpReceiver_nativeUnsetObserver,
82 JNIEnv* jni, 82 JNIEnv* jni,
83 jclass, 83 jclass,
84 jlong j_rtp_receiver_pointer, 84 jlong j_rtp_receiver_pointer,
85 jlong j_observer_pointer) { 85 jlong j_observer_pointer) {
86 reinterpret_cast<webrtc::RtpReceiverInterface*>(j_rtp_receiver_pointer) 86 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)
87 ->SetObserver(nullptr); 87 ->SetObserver(nullptr);
88 RtpReceiverObserverJni* observer = 88 RtpReceiverObserverJni* observer =
89 reinterpret_cast<RtpReceiverObserverJni*>(j_observer_pointer); 89 reinterpret_cast<RtpReceiverObserverJni*>(j_observer_pointer);
90 if (observer) { 90 if (observer) {
91 delete observer; 91 delete observer;
92 } 92 }
93 } 93 }
94 94
95 } // namespace webrtc_jni 95 } // namespace jni
96 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698