Android: Replace webrtc_jni namespace with nested jni namespace

webrtc/sdk/android/src/jni/nv21buffer_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 <vector>
 
 #include "third_party/libyuv/include/libyuv/convert.h"
 #include "third_party/libyuv/include/libyuv/scale.h"
 
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/rtc_base/checks.h"
 
-namespace webrtc_jni {
+namespace webrtc {
+namespace jni {
 
 extern "C" JNIEXPORT void JNICALL
 Java_org_webrtc_NV21Buffer_nativeCropAndScale(JNIEnv* jni,
                                               jclass,
                                               jint crop_x,
                                               jint crop_y,
                                               jint crop_width,
                                               jint crop_height,
                                               jint scale_width,
                                               jint scale_height,
@@ skipping 23 matching lines @@
   uint8_t const* src_uv = src_y + src_height * src_stride_y;
 
   uint8_t* dst_y = static_cast<uint8_t*>(jni->GetDirectBufferAddress(j_dst_y));
   uint8_t* dst_u = static_cast<uint8_t*>(jni->GetDirectBufferAddress(j_dst_u));
   uint8_t* dst_v = static_cast<uint8_t*>(jni->GetDirectBufferAddress(j_dst_v));
 
   // Crop using pointer arithmetic.
   src_y += crop_x + crop_y * src_stride_y;
   src_uv += crop_chroma_x + crop_chroma_y * src_stride_uv;
 
-  webrtc::NV12ToI420Scaler scaler;
+  NV12ToI420Scaler scaler;
   // U- and V-planes are swapped because this is NV21 not NV12.
   scaler.NV12ToI420Scale(src_y, src_stride_y, src_uv, src_stride_uv, crop_width,
                          crop_height, dst_y, dst_stride_y, dst_v, dst_stride_v,
                          dst_u, dst_stride_u, scale_width, scale_height);
 
   jni->ReleaseByteArrayElements(j_src, src_bytes, JNI_ABORT);
 }
 
-}  // namespace webrtc_jni
+}  // namespace jni
+}  // namespace webrtc