Revert "refactor: rtc and cricket to webrtc namespace"

This reverts commit 8db9276.

Author: devopvoid

webrtc-jni/pom.xml

@@ -12,7 +12,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<webrtc.branch>branch-heads/7151</webrtc.branch>
+		<webrtc.branch>branch-heads/6998</webrtc.branch>
 		<webrtc.src.dir>${user.home}/webrtc</webrtc.src.dir>
 		<webrtc.install.dir>${user.home}/webrtc/build</webrtc.install.dir>
 		<cmake.build.type>Release</cmake.build.type>

webrtc-jni/src/main/cpp/include/api/AudioOptions.h

@@ -42,7 +42,7 @@ namespace jni
 				jfieldID residualEchoDetector;
 		};
 
-		webrtc::AudioOptions toNative(JNIEnv * env, const JavaRef<jobject> & javaType);
+		cricket::AudioOptions toNative(JNIEnv * env, const JavaRef<jobject> & javaType);
 	}
 }
 

webrtc-jni/src/main/cpp/include/api/PeerConnectionObserver.h

@@ -36,16 +36,16 @@ namespace jni
 			// PeerConnectionObserver implementation.
 			void OnConnectionChange(webrtc::PeerConnectionInterface::PeerConnectionState state) override;
 			void OnSignalingChange(webrtc::PeerConnectionInterface::SignalingState state) override;
-			void OnTrack(webrtc::scoped_refptr<webrtc::RtpTransceiverInterface> transceiver) override;
-			void OnAddTrack(webrtc::scoped_refptr<webrtc::RtpReceiverInterface> receiver, const std::vector<webrtc::scoped_refptr<webrtc::MediaStreamInterface>> & streams) override;
-			void OnRemoveTrack(webrtc::scoped_refptr<webrtc::RtpReceiverInterface> receiver) override;
-			void OnDataChannel(webrtc::scoped_refptr<webrtc::DataChannelInterface> channel) override;
+			void OnTrack(rtc::scoped_refptr<webrtc::RtpTransceiverInterface> transceiver) override;
+			void OnAddTrack(rtc::scoped_refptr<webrtc::RtpReceiverInterface> receiver, const std::vector<rtc::scoped_refptr<webrtc::MediaStreamInterface>> & streams) override;
+			void OnRemoveTrack(rtc::scoped_refptr<webrtc::RtpReceiverInterface> receiver) override;
+			void OnDataChannel(rtc::scoped_refptr<webrtc::DataChannelInterface> channel) override;
 			void OnRenegotiationNeeded() override;
 			void OnIceConnectionChange(webrtc::PeerConnectionInterface::IceConnectionState state) override;
 			void OnIceGatheringChange(webrtc::PeerConnectionInterface::IceGatheringState state) override;
 			void OnIceCandidate(const webrtc::IceCandidateInterface * candidate) override;
 			void OnIceCandidateError(const std::string & address, int port, const std::string & url, int error_code, const std::string & error_text) override;
-			void OnIceCandidatesRemoved(const std::vector<webrtc::Candidate> & candidates) override;
+			void OnIceCandidatesRemoved(const std::vector<cricket::Candidate> & candidates) override;
 			void OnIceConnectionReceivingChange(bool receiving) override;
 
 		private:

webrtc-jni/src/main/cpp/include/api/RTCIceCandidate.h

@@ -43,9 +43,9 @@ namespace jni
 		};
 
 		JavaLocalRef<jobject> toJava(JNIEnv * env, const webrtc::IceCandidateInterface * candidate);
-		JavaLocalRef<jobject> toJavaCricket(JNIEnv * env, const webrtc::Candidate & candidate);
+		JavaLocalRef<jobject> toJavaCricket(JNIEnv * env, const cricket::Candidate & candidate);
 		std::unique_ptr<webrtc::IceCandidateInterface> toNative(JNIEnv * env, const JavaRef<jobject> & javaType);
-		webrtc::Candidate toNativeCricket(JNIEnv * env, const JavaRef<jobject> & javaType);
+		cricket::Candidate toNativeCricket(JNIEnv * env, const JavaRef<jobject> & javaType);
 	};
 }
 

webrtc-jni/src/main/cpp/include/api/RTCStatsCollectorCallback.h

@@ -33,7 +33,7 @@ namespace jni
 			RTCStatsCollectorCallback(JNIEnv * env, const JavaGlobalRef<jobject> & callback);
 			~RTCStatsCollectorCallback() = default;
 
-			void OnStatsDelivered(const webrtc::scoped_refptr<const webrtc::RTCStatsReport> & report) override;
+			void OnStatsDelivered(const rtc::scoped_refptr<const webrtc::RTCStatsReport> & report) override;
 
 		private:
 			class JavaRTCStatsCollectorCallbackClass : public JavaClass

webrtc-jni/src/main/cpp/include/api/RTCStatsReport.h

@@ -37,7 +37,7 @@ namespace jni
 				jmethodID ctor;
 		};
 
-		JavaLocalRef<jobject> toJava(JNIEnv * env, const webrtc::scoped_refptr<const webrtc::RTCStatsReport> & report);
+		JavaLocalRef<jobject> toJava(JNIEnv * env, const rtc::scoped_refptr<const webrtc::RTCStatsReport> & report);
 	}
 }
 

webrtc-jni/src/main/cpp/include/api/VideoFrame.h

@@ -34,7 +34,7 @@ namespace jni
 
 	namespace I420Buffer
 	{
-		JavaLocalRef<jobject> toJava(JNIEnv * env, const webrtc::scoped_refptr<webrtc::I420BufferInterface> & buffer);
+		JavaLocalRef<jobject> toJava(JNIEnv * env, const rtc::scoped_refptr<webrtc::I420BufferInterface> & buffer);
 	}
 
 	class JavaVideoFrameClass : public JavaClass

webrtc-jni/src/main/cpp/include/api/VideoTrackSink.h

@@ -28,7 +28,7 @@
 
 namespace jni
 {
-	class VideoTrackSink : public webrtc::VideoSinkInterface<webrtc::VideoFrame>
+	class VideoTrackSink : public rtc::VideoSinkInterface<webrtc::VideoFrame>
 	{
 		public:
 			VideoTrackSink(JNIEnv * env, const JavaGlobalRef<jobject> & sink);

webrtc-jni/src/main/cpp/include/api/WebRTCUtils.h

@@ -28,7 +28,7 @@
 namespace jni
 {
 	template <class T>
-	JavaLocalRef<jobjectArray> createObjectArray(JNIEnv * env, const std::vector<webrtc::scoped_refptr<T>> & vector)
+	JavaLocalRef<jobjectArray> createObjectArray(JNIEnv * env, const std::vector<rtc::scoped_refptr<T>> & vector)
 	{
 		jsize vectorSize = static_cast<jsize>(vector.size());
 

webrtc-jni/src/main/cpp/include/media/video/VideoCapture.h

@@ -35,17 +35,17 @@ namespace jni
 
 			void setDevice(const avdev::DevicePtr & device);
 			void setVideoCaptureCapability(const webrtc::VideoCaptureCapability & capability);
-			void setVideoSink(std::unique_ptr<webrtc::VideoSinkInterface<webrtc::VideoFrame>> sink);
+			void setVideoSink(std::unique_ptr<rtc::VideoSinkInterface<webrtc::VideoFrame>> sink);
 			void start();
 			void stop();
 			void destroy();
 
 		private:
 			avdev::DevicePtr device;
 			webrtc::VideoCaptureCapability capability;
-			std::unique_ptr<webrtc::VideoSinkInterface<webrtc::VideoFrame>> sink;
+			std::unique_ptr<rtc::VideoSinkInterface<webrtc::VideoFrame>> sink;
 
-			webrtc::scoped_refptr<webrtc::VideoCaptureModule> captureModule;
+			rtc::scoped_refptr<webrtc::VideoCaptureModule> captureModule;
 	};
 }