Index: webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h |
diff --git a/webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h b/webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h |
index 2d9d749a6b2014f43820549c06da9d85d400d107..d543b35e157bb82b1df3922ceb1534e2c8209805 100644 |
--- a/webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h |
+++ b/webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h |
@@ -19,48 +19,43 @@ |
#include "webrtc/sdk/android/src/jni/jni_helpers.h" |
#include "webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.h" |
-namespace webrtc_jni { |
+namespace webrtc { |
+namespace jni { |
// Adapter between the C++ PeerConnectionObserver interface and the Java |
// PeerConnection.Observer interface. Wraps an instance of the Java interface |
// and dispatches C++ callbacks to Java. |
-class PeerConnectionObserverJni : public webrtc::PeerConnectionObserver { |
+class PeerConnectionObserverJni : public PeerConnectionObserver { |
public: |
PeerConnectionObserverJni(JNIEnv* jni, jobject j_observer); |
virtual ~PeerConnectionObserverJni(); |
// Implementation of PeerConnectionObserver interface, which propagates |
// the callbacks to the Java observer. |
- void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override; |
+ void OnIceCandidate(const IceCandidateInterface* candidate) override; |
void OnIceCandidatesRemoved( |
const std::vector<cricket::Candidate>& candidates) override; |
void OnSignalingChange( |
- webrtc::PeerConnectionInterface::SignalingState new_state) override; |
+ PeerConnectionInterface::SignalingState new_state) override; |
void OnIceConnectionChange( |
- webrtc::PeerConnectionInterface::IceConnectionState new_state) override; |
+ PeerConnectionInterface::IceConnectionState new_state) override; |
void OnIceConnectionReceivingChange(bool receiving) override; |
void OnIceGatheringChange( |
- webrtc::PeerConnectionInterface::IceGatheringState new_state) override; |
- void OnAddStream( |
- rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) override; |
- void OnRemoveStream( |
- rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) override; |
- void OnDataChannel( |
- rtc::scoped_refptr<webrtc::DataChannelInterface> channel) override; |
+ PeerConnectionInterface::IceGatheringState new_state) override; |
+ void OnAddStream(rtc::scoped_refptr<MediaStreamInterface> stream) override; |
+ void OnRemoveStream(rtc::scoped_refptr<MediaStreamInterface> stream) override; |
+ void OnDataChannel(rtc::scoped_refptr<DataChannelInterface> channel) override; |
void OnRenegotiationNeeded() override; |
- void OnAddTrack( |
- rtc::scoped_refptr<webrtc::RtpReceiverInterface> receiver, |
- const std::vector<rtc::scoped_refptr<webrtc::MediaStreamInterface>>& |
- streams) override; |
+ void OnAddTrack(rtc::scoped_refptr<RtpReceiverInterface> receiver, |
+ const std::vector<rtc::scoped_refptr<MediaStreamInterface>>& |
+ streams) override; |
void SetConstraints(MediaConstraintsJni* constraints); |
const MediaConstraintsJni* constraints() { return constraints_.get(); } |
private: |
- typedef std::map<webrtc::MediaStreamInterface*, jobject> |
- NativeToJavaStreamsMap; |
- typedef std::map<webrtc::RtpReceiverInterface*, jobject> |
- NativeToJavaRtpReceiverMap; |
+ typedef std::map<MediaStreamInterface*, jobject> NativeToJavaStreamsMap; |
+ typedef std::map<RtpReceiverInterface*, jobject> NativeToJavaRtpReceiverMap; |
void DisposeRemoteStream(const NativeToJavaStreamsMap::iterator& it); |
void DisposeRtpReceiver(const NativeToJavaRtpReceiverMap::iterator& it); |
@@ -68,13 +63,12 @@ class PeerConnectionObserverJni : public webrtc::PeerConnectionObserver { |
// If the NativeToJavaStreamsMap contains the stream, return it. |
// Otherwise, create a new Java MediaStream. |
jobject GetOrCreateJavaStream( |
- const rtc::scoped_refptr<webrtc::MediaStreamInterface>& stream); |
+ const rtc::scoped_refptr<MediaStreamInterface>& stream); |
// Converts array of streams, creating or re-using Java streams as necessary. |
jobjectArray NativeToJavaMediaStreamArray( |
JNIEnv* jni, |
- const std::vector<rtc::scoped_refptr<webrtc::MediaStreamInterface>>& |
- streams); |
+ const std::vector<rtc::scoped_refptr<MediaStreamInterface>>& streams); |
const ScopedGlobalRef<jobject> j_observer_global_; |
const ScopedGlobalRef<jclass> j_observer_class_; |
@@ -95,6 +89,7 @@ class PeerConnectionObserverJni : public webrtc::PeerConnectionObserver { |
std::unique_ptr<MediaConstraintsJni> constraints_; |
}; |
-} // namespace webrtc_jni |
+} // namespace jni |
+} // namespace webrtc |
#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_ |