Android: Replace webrtc_jni namespace with nested jni namespace

webrtc/sdk/android/src/jni/pc/video_jni.cc

 /*
  *  Copyright 2017 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <jni.h>
 
 #include "webrtc/api/videosourceproxy.h"
 #include "webrtc/media/engine/webrtcvideodecoderfactory.h"
 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
 #include "webrtc/rtc_base/logging.h"
 #include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h"
 #include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h"
 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 #include "webrtc/sdk/android/src/jni/pc/ownedfactoryandthreads.h"
 #include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
 #include "webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h"
 
-namespace webrtc_jni {
+namespace webrtc {
+namespace jni {
 
 // TODO(sakal): Remove this once MediaCodecVideoDecoder/Encoder are no longer
 // used and all applications inject their own codecs.
 // This is semi broken if someone wants to create multiple peerconnection
 // factories.
 static bool use_media_codec_decoder_factory;
 
 cricket::WebRtcVideoEncoderFactory* CreateVideoEncoderFactory(
     JNIEnv* jni,
     jobject j_encoder_factory) {
@@ skipping 24 matching lines @@
 JNI_FUNCTION_DECLARATION(jlong,
                          PeerConnectionFactory_nativeCreateVideoSource,
                          JNIEnv* jni,
                          jclass,
                          jlong native_factory,
                          jobject j_surface_texture_helper,
                          jboolean is_screencast) {
   OwnedFactoryAndThreads* factory =
       reinterpret_cast<OwnedFactoryAndThreads*>(native_factory);
 
-  rtc::scoped_refptr<webrtc::AndroidVideoTrackSource> source(
-      new rtc::RefCountedObject<webrtc::AndroidVideoTrackSource>(
+  rtc::scoped_refptr<AndroidVideoTrackSource> source(
+      new rtc::RefCountedObject<AndroidVideoTrackSource>(
           factory->signaling_thread(), jni, j_surface_texture_helper,
           is_screencast));
-  rtc::scoped_refptr<webrtc::VideoTrackSourceProxy> proxy_source =
-      webrtc::VideoTrackSourceProxy::Create(factory->signaling_thread(),
-                                            factory->worker_thread(), source);
+  rtc::scoped_refptr<VideoTrackSourceProxy> proxy_source =
+      VideoTrackSourceProxy::Create(factory->signaling_thread(),
+                                    factory->worker_thread(), source);
 
   return (jlong)proxy_source.release();
 }
 
 JNI_FUNCTION_DECLARATION(jlong,
                          PeerConnectionFactory_nativeCreateVideoTrack,
                          JNIEnv* jni,
                          jclass,
                          jlong native_factory,
                          jstring id,
                          jlong native_source) {
   rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
       factoryFromJava(native_factory));
-  rtc::scoped_refptr<webrtc::VideoTrackInterface> track(
-      factory->CreateVideoTrack(
-          JavaToStdString(jni, id),
-          reinterpret_cast<webrtc::VideoTrackSourceInterface*>(native_source)));
+  rtc::scoped_refptr<VideoTrackInterface> track(factory->CreateVideoTrack(
+      JavaToStdString(jni, id),
+      reinterpret_cast<VideoTrackSourceInterface*>(native_source)));
   return (jlong)track.release();
 }
 
 JNI_FUNCTION_DECLARATION(
     void,
     PeerConnectionFactory_nativeSetVideoHwAccelerationOptions,
     JNIEnv* jni,
     jclass,
     jlong native_factory,
     jobject local_egl_context,
@@ skipping 15 matching lines @@
 
   MediaCodecVideoDecoderFactory* decoder_factory =
       static_cast<MediaCodecVideoDecoderFactory*>(
           owned_factory->decoder_factory());
   if (use_media_codec_decoder_factory && decoder_factory) {
     LOG(LS_INFO) << "Set EGL context for HW decoding.";
     decoder_factory->SetEGLContext(jni, remote_egl_context);
   }
 }
 
-}  // namespace webrtc_jni
+}  // namespace jni
+}  // namespace webrtc