Android: Replace webrtc_jni namespace with nested jni namespace

webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc

 /*
  *  Copyright (c) 2016 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 "webrtc/api/video/video_rotation.h"
 #include "webrtc/api/videosourceproxy.h"
 #include "webrtc/rtc_base/logging.h"
 #include "webrtc/sdk/android/src/jni/androidvideotracksource.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 
-static webrtc::VideoRotation jintToVideoRotation(jint rotation) {
+namespace webrtc {
+
+namespace {
+
+static VideoRotation jintToVideoRotation(jint rotation) {
   RTC_DCHECK(rotation == 0 || rotation == 90 || rotation == 180 ||
              rotation == 270);
-  return static_cast<webrtc::VideoRotation>(rotation);
+  return static_cast<VideoRotation>(rotation);
 }
 
-namespace webrtc_jni {
+}  // namespace
 
-static webrtc::AndroidVideoTrackSource* AndroidVideoTrackSourceFromJavaProxy(
+namespace jni {
+
+static AndroidVideoTrackSource* AndroidVideoTrackSourceFromJavaProxy(
     jlong j_proxy) {
-  auto proxy_source = reinterpret_cast<webrtc::VideoTrackSourceProxy*>(j_proxy);
-  return reinterpret_cast<webrtc::AndroidVideoTrackSource*>(
-      proxy_source->internal());
+  auto proxy_source = reinterpret_cast<VideoTrackSourceProxy*>(j_proxy);
+  return reinterpret_cast<AndroidVideoTrackSource*>(proxy_source->internal());
 }
 
 JNI_FUNCTION_DECLARATION(
     void,
     AndroidVideoTrackSourceObserver_nativeOnByteBufferFrameCaptured,
     JNIEnv* jni,
     jclass,
     jlong j_source,
     jbyteArray j_frame,
     jint length,
     jint width,
     jint height,
     jint rotation,
     jlong timestamp) {
-  webrtc::AndroidVideoTrackSource* source =
+  AndroidVideoTrackSource* source =
       AndroidVideoTrackSourceFromJavaProxy(j_source);
   jbyte* bytes = jni->GetByteArrayElements(j_frame, nullptr);
   source->OnByteBufferFrameCaptured(bytes, length, width, height,
                                     jintToVideoRotation(rotation), timestamp);
   jni->ReleaseByteArrayElements(j_frame, bytes, JNI_ABORT);
 }
 
 JNI_FUNCTION_DECLARATION(
     void,
     AndroidVideoTrackSourceObserver_nativeOnTextureFrameCaptured,
     JNIEnv* jni,
     jclass,
     jlong j_source,
     jint j_width,
     jint j_height,
     jint j_oes_texture_id,
     jfloatArray j_transform_matrix,
     jint j_rotation,
     jlong j_timestamp) {
-  webrtc::AndroidVideoTrackSource* source =
+  AndroidVideoTrackSource* source =
       AndroidVideoTrackSourceFromJavaProxy(j_source);
   source->OnTextureFrameCaptured(
       j_width, j_height, jintToVideoRotation(j_rotation), j_timestamp,
       NativeHandleImpl(jni, j_oes_texture_id, j_transform_matrix));
 }
 
 JNI_FUNCTION_DECLARATION(void,
                          AndroidVideoTrackSourceObserver_nativeOnFrameCaptured,
                          JNIEnv* jni,
                          jclass,
                          jlong j_source,
                          jint j_width,
                          jint j_height,
                          jint j_rotation,
                          jlong j_timestamp_ns,
                          jobject j_video_frame_buffer) {
-  webrtc::AndroidVideoTrackSource* source =
+  AndroidVideoTrackSource* source =
       AndroidVideoTrackSourceFromJavaProxy(j_source);
   source->OnFrameCaptured(jni, j_width, j_height, j_timestamp_ns,
                           jintToVideoRotation(j_rotation),
                           j_video_frame_buffer);
 }
 
 JNI_FUNCTION_DECLARATION(void,
                          AndroidVideoTrackSourceObserver_nativeCapturerStarted,
                          JNIEnv* jni,
                          jclass,
                          jlong j_source,
                          jboolean j_success) {
   LOG(LS_INFO) << "AndroidVideoTrackSourceObserve_nativeCapturerStarted";
-  webrtc::AndroidVideoTrackSource* source =
+  AndroidVideoTrackSource* source =
       AndroidVideoTrackSourceFromJavaProxy(j_source);
-  source->SetState(j_success
-                       ? webrtc::AndroidVideoTrackSource::SourceState::kLive
-                       : webrtc::AndroidVideoTrackSource::SourceState::kEnded);
+  source->SetState(j_success ? AndroidVideoTrackSource::SourceState::kLive
+                             : AndroidVideoTrackSource::SourceState::kEnded);
 }
 
 JNI_FUNCTION_DECLARATION(void,
                          AndroidVideoTrackSourceObserver_nativeCapturerStopped,
                          JNIEnv* jni,
                          jclass,
                          jlong j_source) {
   LOG(LS_INFO) << "AndroidVideoTrackSourceObserve_nativeCapturerStopped";
-  webrtc::AndroidVideoTrackSource* source =
+  AndroidVideoTrackSource* source =
       AndroidVideoTrackSourceFromJavaProxy(j_source);
-  source->SetState(webrtc::AndroidVideoTrackSource::SourceState::kEnded);
+  source->SetState(AndroidVideoTrackSource::SourceState::kEnded);
 }
 
 JNI_FUNCTION_DECLARATION(void,
                          VideoSource_nativeAdaptOutputFormat,
                          JNIEnv* jni,
                          jclass,
                          jlong j_source,
                          jint j_width,
                          jint j_height,
                          jint j_fps) {
   LOG(LS_INFO) << "VideoSource_nativeAdaptOutputFormat";
-  webrtc::AndroidVideoTrackSource* source =
+  AndroidVideoTrackSource* source =
       AndroidVideoTrackSourceFromJavaProxy(j_source);
   source->OnOutputFormatRequest(j_width, j_height, j_fps);
 }
 
-}  // namespace webrtc_jni
+}  // namespace jni
+}  // namespace webrtc