Android: Replace webrtc_jni namespace with nested jni namespace

webrtc/sdk/android/src/jni/videodecoderwrapper.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
 #define WEBRTC_SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
 
 #include <jni.h>
 #include <deque>
 
 #include "webrtc/api/video_codecs/video_decoder.h"
 #include "webrtc/common_video/h264/h264_bitstream_parser.h"
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 #include "webrtc/sdk/android/src/jni/native_handle_impl.h"
 
-namespace webrtc_jni {
+namespace webrtc {
+namespace jni {
 
 // Wraps a Java decoder and delegates all calls to it. Passes
 // VideoDecoderWrapperCallback to the decoder on InitDecode. Wraps the received
 // frames to AndroidVideoBuffer.
-class VideoDecoderWrapper : public webrtc::VideoDecoder {
+class VideoDecoderWrapper : public VideoDecoder {
  public:
   VideoDecoderWrapper(JNIEnv* jni, jobject decoder);
 
-  int32_t InitDecode(const webrtc::VideoCodec* codec_settings,
+  int32_t InitDecode(const VideoCodec* codec_settings,
                      int32_t number_of_cores) override;
 
-  int32_t Decode(const webrtc::EncodedImage& input_image,
+  int32_t Decode(const EncodedImage& input_image,
                  bool missing_frames,
-                 const webrtc::RTPFragmentationHeader* fragmentation,
-                 const webrtc::CodecSpecificInfo* codec_specific_info,
+                 const RTPFragmentationHeader* fragmentation,
+                 const CodecSpecificInfo* codec_specific_info,
                  int64_t render_time_ms) override;
 
   int32_t RegisterDecodeCompleteCallback(
-      webrtc::DecodedImageCallback* callback) override;
+      DecodedImageCallback* callback) override;
 
   int32_t Release() override;
 
   // Returns true if the decoder prefer to decode frames late.
   // That is, it can not decode infinite number of frames before the decoded
   // frame is consumed.
   bool PrefersLateDecoding() const override;
 
   const char* ImplementationName() const override;
 
@@ skipping 10 matching lines @@
     uint32_t timestamp_rtp;
     rtc::Optional<uint8_t> qp;
   };
 
   int32_t InitDecodeInternal(JNIEnv* jni);
 
   // Takes Java VideoCodecStatus, handles it and returns WEBRTC_VIDEO_CODEC_*
   // status code.
   int32_t HandleReturnCode(JNIEnv* jni, jobject code);
 
-  rtc::Optional<uint8_t> ParseQP(const webrtc::EncodedImage& input_image);
+  rtc::Optional<uint8_t> ParseQP(const EncodedImage& input_image);
 
-  webrtc::VideoCodec codec_settings_;
+  VideoCodec codec_settings_;
   int32_t number_of_cores_;
 
   bool initialized_;
   AndroidVideoBufferFactory android_video_buffer_factory_;
   std::deque<FrameExtraInfo> frame_extra_infos_;
   bool qp_parsing_enabled_;
-  webrtc::H264BitstreamParser h264_bitstream_parser_;
+  H264BitstreamParser h264_bitstream_parser_;
 
-  webrtc::DecodedImageCallback* callback_;
+  DecodedImageCallback* callback_;
 
   const ScopedGlobalRef<jobject> decoder_;
   const ScopedGlobalRef<jclass> encoded_image_class_;
   const ScopedGlobalRef<jclass> frame_type_class_;
   const ScopedGlobalRef<jclass> settings_class_;
   const ScopedGlobalRef<jclass> video_frame_class_;
   const ScopedGlobalRef<jclass> video_codec_status_class_;
   const ScopedGlobalRef<jclass> integer_class_;
 
   jmethodID encoded_image_constructor_;
   jmethodID settings_constructor_;
 
   jfieldID empty_frame_field_;
   jfieldID video_frame_key_field_;
   jfieldID video_frame_delta_field_;
 
   jmethodID video_frame_get_timestamp_ns_method_;
 
   jmethodID init_decode_method_;
   jmethodID release_method_;
   jmethodID decode_method_;
   jmethodID get_prefers_late_decoding_method_;
   jmethodID get_implementation_name_method_;
 
   jmethodID get_number_method_;
 
   jmethodID integer_constructor_;
   jmethodID int_value_method_;
 
-  jobject ConvertEncodedImageToJavaEncodedImage(
-      JNIEnv* jni,
-      const webrtc::EncodedImage& image);
+  jobject ConvertEncodedImageToJavaEncodedImage(JNIEnv* jni,
+                                                const EncodedImage& image);
 };
 
-}  // namespace webrtc_jni
+}  // namespace jni
+}  // namespace webrtc
 
 #endif  // WEBRTC_SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_