Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / media / other / linphonemediaengine.h

diff --git a/src/third_party/libjingle/source/talk/media/other/linphonemediaengine.h b/src/third_party/libjingle/source/talk/media/other/linphonemediaengine.h
index db3e69f..e4ba345 100644 (file)
--- a/src/third_party/libjingle/source/talk/media/other/linphonemediaengine.h
+++ b/src/third_party/libjingle/source/talk/media/other/linphonemediaengine.h
@@ -37,12 +37,12 @@ extern "C" {
 #include <mediastreamer2/mediastream.h>
 }
 
-#include "talk/base/scoped_ptr.h"
 #include "talk/media/base/codec.h"
 #include "talk/media/base/mediachannel.h"
 #include "talk/media/base/mediaengine.h"
+#include "webrtc/base/scoped_ptr.h"
 
-namespace talk_base {
+namespace rtc {
 class StreamInterface;
 }
 
@@ -140,8 +140,8 @@ class LinphoneVoiceChannel : public VoiceMediaChannel {
   virtual bool GetStats(VoiceMediaInfo* info) { return true; }
 
   // Implement pure virtual methods of MediaChannel.
-  virtual void OnPacketReceived(talk_base::Buffer* packet);
-  virtual void OnRtcpReceived(talk_base::Buffer* packet) {}
+  virtual void OnPacketReceived(rtc::Buffer* packet);
+  virtual void OnRtcpReceived(rtc::Buffer* packet) {}
   virtual void SetSendSsrc(uint32 id) {}  // TODO: change RTP packet?
   virtual bool SetRtcpCName(const std::string& cname) { return true; }
   virtual bool Mute(bool on) { return mute_; }
@@ -163,8 +163,8 @@ class LinphoneVoiceChannel : public VoiceMediaChannel {
   AudioStream *audio_stream_;
   LinphoneMediaEngine *engine_;
   RingStream* ring_stream_;
-  talk_base::scoped_ptr<talk_base::AsyncSocket> socket_;
-  void OnIncomingData(talk_base::AsyncSocket *s);
+  rtc::scoped_ptr<rtc::AsyncSocket> socket_;
+  void OnIncomingData(rtc::AsyncSocket *s);
 
   DISALLOW_COPY_AND_ASSIGN(LinphoneVoiceChannel);
 };