Index: webrtc/sdk/android/src/jni/pc/mediastream_jni.cc |
diff --git a/webrtc/sdk/android/src/jni/pc/mediastream_jni.cc b/webrtc/sdk/android/src/jni/pc/mediastream_jni.cc |
index 7204de26ce160bbf679f3cfe7cd6d9ea0846ef9e..74dc2c5f417edf072d52959f5c2c5fd450361cc7 100644 |
--- a/webrtc/sdk/android/src/jni/pc/mediastream_jni.cc |
+++ b/webrtc/sdk/android/src/jni/pc/mediastream_jni.cc |
@@ -11,7 +11,8 @@ |
#include "webrtc/api/mediastreaminterface.h" |
#include "webrtc/sdk/android/src/jni/jni_helpers.h" |
-namespace webrtc_jni { |
+namespace webrtc { |
+namespace jni { |
JNI_FUNCTION_DECLARATION(jboolean, |
MediaStream_nativeAddAudioTrack, |
@@ -19,8 +20,8 @@ JNI_FUNCTION_DECLARATION(jboolean, |
jclass, |
jlong pointer, |
jlong j_audio_track_pointer) { |
- return reinterpret_cast<webrtc::MediaStreamInterface*>(pointer)->AddTrack( |
- reinterpret_cast<webrtc::AudioTrackInterface*>(j_audio_track_pointer)); |
+ return reinterpret_cast<MediaStreamInterface*>(pointer)->AddTrack( |
+ reinterpret_cast<AudioTrackInterface*>(j_audio_track_pointer)); |
} |
JNI_FUNCTION_DECLARATION(jboolean, |
@@ -29,8 +30,8 @@ JNI_FUNCTION_DECLARATION(jboolean, |
jclass, |
jlong pointer, |
jlong j_video_track_pointer) { |
- return reinterpret_cast<webrtc::MediaStreamInterface*>(pointer)->AddTrack( |
- reinterpret_cast<webrtc::VideoTrackInterface*>(j_video_track_pointer)); |
+ return reinterpret_cast<MediaStreamInterface*>(pointer)->AddTrack( |
+ reinterpret_cast<VideoTrackInterface*>(j_video_track_pointer)); |
} |
JNI_FUNCTION_DECLARATION(jboolean, |
@@ -39,8 +40,8 @@ JNI_FUNCTION_DECLARATION(jboolean, |
jclass, |
jlong pointer, |
jlong j_audio_track_pointer) { |
- return reinterpret_cast<webrtc::MediaStreamInterface*>(pointer)->RemoveTrack( |
- reinterpret_cast<webrtc::AudioTrackInterface*>(j_audio_track_pointer)); |
+ return reinterpret_cast<MediaStreamInterface*>(pointer)->RemoveTrack( |
+ reinterpret_cast<AudioTrackInterface*>(j_audio_track_pointer)); |
} |
JNI_FUNCTION_DECLARATION(jboolean, |
@@ -49,8 +50,8 @@ JNI_FUNCTION_DECLARATION(jboolean, |
jclass, |
jlong pointer, |
jlong j_video_track_pointer) { |
- return reinterpret_cast<webrtc::MediaStreamInterface*>(pointer)->RemoveTrack( |
- reinterpret_cast<webrtc::VideoTrackInterface*>(j_video_track_pointer)); |
+ return reinterpret_cast<MediaStreamInterface*>(pointer)->RemoveTrack( |
+ reinterpret_cast<VideoTrackInterface*>(j_video_track_pointer)); |
} |
JNI_FUNCTION_DECLARATION(jstring, |
@@ -59,11 +60,12 @@ JNI_FUNCTION_DECLARATION(jstring, |
jclass, |
jlong j_p) { |
return JavaStringFromStdString( |
- jni, reinterpret_cast<webrtc::MediaStreamInterface*>(j_p)->label()); |
+ jni, reinterpret_cast<MediaStreamInterface*>(j_p)->label()); |
} |
JNI_FUNCTION_DECLARATION(void, MediaStream_free, JNIEnv*, jclass, jlong j_p) { |
- CHECK_RELEASE(reinterpret_cast<webrtc::MediaStreamInterface*>(j_p)); |
+ CHECK_RELEASE(reinterpret_cast<MediaStreamInterface*>(j_p)); |
} |
-} // namespace webrtc_jni |
+} // namespace jni |
+} // namespace webrtc |