generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Split up (Jingle)Session from BaseSession. This is part of an ongoing effort to move Jingle-specific code out of WebRTC and into its own repository.

Browse Source 
R=juberti@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/35529004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7922 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pthatcher@webrtc.org
2014-12-16 21:37:37 +00:00
parent e2b7585bc2
commit 4afb59903c
14 changed files with 1194 additions and 1179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
talk/session/media/call.h
View File

@@ -37,12 +37,12 @@
#include "talk/media/base/screencastid.h"
#include "talk/media/base/streamparams.h"
#include "talk/media/base/videocommon.h"
#include "webrtc/p2p/base/session.h"
#include "webrtc/p2p/client/socketmonitor.h"
#include "talk/session/media/audiomonitor.h"
#include "talk/session/media/currentspeakermonitor.h"
#include "talk/session/media/mediamessages.h"
#include "talk/session/media/mediasession.h"
#include "webrtc/libjingle/session/session.h"
#include "webrtc/libjingle/xmpp/jid.h"
#include "webrtc/base/messagequeue.h"
@@ -160,9 +160,9 @@ class Call : public rtc::MessageHandler, public sigslot::has_slots<> {
sigslot::signal0<> SignalSetupToCallVoicemail;
sigslot::signal2<Call*, Session*> SignalAddSession;
sigslot::signal2<Call*, Session*> SignalRemoveSession;
sigslot::signal3<Call*, Session*, Session::State>
sigslot::signal3<Call*, Session*, BaseSession::State>
SignalSessionState;
sigslot::signal3<Call*, Session*, Session::Error>
sigslot::signal3<Call*, Session*, BaseSession::Error>
SignalSessionError;
sigslot::signal3<Call*, Session*, const std::string &>
SignalReceivedTerminateReason;
@@ -192,7 +192,7 @@ class Call : public rtc::MessageHandler, public sigslot::has_slots<> {
private:
void OnMessage(rtc::Message* message);
void OnSessionState(BaseSession* base_session, BaseSession::State state);
void OnSessionError(BaseSession* base_session, Session::Error error);
void OnSessionError(BaseSession* base_session, BaseSession::Error error);
void OnSessionInfoMessage(
Session* session, const buzz::XmlElement* action_elem);
void OnViewRequest(

28
talk/session/media/channel_unittest.cc
View File

@@ -1555,21 +1555,21 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
// Test failures in SetLocalContent.
media_channel1_->set_fail_set_recv_codecs(true);
session1_.SetError(cricket::BaseSession::ERROR_NONE, "");
session1_.SetState(cricket::Session::STATE_SENTINITIATE);
session1_.SetState(cricket::BaseSession::STATE_SENTINITIATE);
EXPECT_EQ(cricket::BaseSession::ERROR_CONTENT, session1_.error());
media_channel1_->set_fail_set_recv_codecs(true);
session1_.SetError(cricket::BaseSession::ERROR_NONE, "");
session1_.SetState(cricket::Session::STATE_SENTACCEPT);
session1_.SetState(cricket::BaseSession::STATE_SENTACCEPT);
EXPECT_EQ(cricket::BaseSession::ERROR_CONTENT, session1_.error());
// Test failures in SetRemoteContent.
media_channel1_->set_fail_set_send_codecs(true);
session1_.SetError(cricket::BaseSession::ERROR_NONE, "");
session1_.SetState(cricket::Session::STATE_RECEIVEDINITIATE);
session1_.SetState(cricket::BaseSession::STATE_RECEIVEDINITIATE);
EXPECT_EQ(cricket::BaseSession::ERROR_CONTENT, session1_.error());
media_channel1_->set_fail_set_send_codecs(true);
session1_.SetError(cricket::BaseSession::ERROR_NONE, "");
session1_.SetState(cricket::Session::STATE_RECEIVEDACCEPT);
session1_.SetState(cricket::BaseSession::STATE_RECEIVEDACCEPT);
EXPECT_EQ(cricket::BaseSession::ERROR_CONTENT, session1_.error());
}
@@ -1581,7 +1581,7 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
session1_.set_local_description(sdesc);
session1_.SetError(cricket::BaseSession::ERROR_NONE, "");
session1_.SetState(cricket::Session::STATE_SENTINITIATE);
session1_.SetState(cricket::BaseSession::STATE_SENTINITIATE);
EXPECT_EQ(cricket::BaseSession::ERROR_NONE, session1_.error());
EXPECT_TRUE(media_channel1_->HasSendStream(1));
@@ -1589,7 +1589,7 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
sdesc = CreateSessionDescriptionWithStream(2);
session1_.set_local_description(sdesc);
session1_.SetState(cricket::Session::STATE_SENTINITIATE);
session1_.SetState(cricket::BaseSession::STATE_SENTINITIATE);
EXPECT_EQ(cricket::BaseSession::ERROR_NONE, session1_.error());
EXPECT_FALSE(media_channel1_->HasSendStream(1));
EXPECT_TRUE(media_channel1_->HasSendStream(2));
@@ -1603,13 +1603,13 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
session1_.set_remote_description(sdesc);
session1_.SetError(cricket::BaseSession::ERROR_NONE, "");
session1_.SetState(cricket::Session::STATE_RECEIVEDINITIATE);
session1_.SetState(cricket::BaseSession::STATE_RECEIVEDINITIATE);
EXPECT_EQ(cricket::BaseSession::ERROR_NONE, session1_.error());
EXPECT_TRUE(media_channel1_->HasRecvStream(1));
sdesc = CreateSessionDescriptionWithStream(2);
session1_.set_remote_description(sdesc);
session1_.SetState(cricket::Session::STATE_RECEIVEDINITIATE);
session1_.SetState(cricket::BaseSession::STATE_RECEIVEDINITIATE);
EXPECT_EQ(cricket::BaseSession::ERROR_NONE, session1_.error());
EXPECT_FALSE(media_channel1_->HasRecvStream(1));
EXPECT_TRUE(media_channel1_->HasRecvStream(2));
@@ -1623,7 +1623,7 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
session1_.set_remote_description(sdesc);
session1_.SetError(cricket::BaseSession::ERROR_NONE, "");
session1_.SetState(cricket::Session::STATE_RECEIVEDINITIATE);
session1_.SetState(cricket::BaseSession::STATE_RECEIVEDINITIATE);
EXPECT_EQ(cricket::BaseSession::ERROR_NONE, session1_.error());
EXPECT_TRUE(media_channel1_->HasRecvStream(1));
@@ -1631,7 +1631,7 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
sdesc = CreateSessionDescriptionWithStream(2);
session1_.set_local_description(sdesc);
session1_.SetState(cricket::Session::STATE_SENTPRACCEPT);
session1_.SetState(cricket::BaseSession::STATE_SENTPRACCEPT);
EXPECT_EQ(cricket::BaseSession::ERROR_NONE, session1_.error());
EXPECT_TRUE(media_channel1_->HasRecvStream(1));
EXPECT_TRUE(media_channel1_->HasSendStream(2));
@@ -1640,7 +1640,7 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
sdesc = CreateSessionDescriptionWithStream(3);
session1_.set_local_description(sdesc);
session1_.SetState(cricket::Session::STATE_SENTACCEPT);
session1_.SetState(cricket::BaseSession::STATE_SENTACCEPT);
EXPECT_EQ(cricket::BaseSession::ERROR_NONE, session1_.error());
EXPECT_TRUE(media_channel1_->HasRecvStream(1));
EXPECT_FALSE(media_channel1_->HasSendStream(2));
@@ -1655,7 +1655,7 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
session1_.set_local_description(sdesc);
session1_.SetError(cricket::BaseSession::ERROR_NONE, "");
session1_.SetState(cricket::Session::STATE_SENTINITIATE);
session1_.SetState(cricket::BaseSession::STATE_SENTINITIATE);
EXPECT_EQ(cricket::BaseSession::ERROR_NONE, session1_.error());
EXPECT_TRUE(media_channel1_->HasSendStream(1));
@@ -1663,7 +1663,7 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
sdesc = CreateSessionDescriptionWithStream(2);
session1_.set_remote_description(sdesc);
session1_.SetState(cricket::Session::STATE_RECEIVEDPRACCEPT);
session1_.SetState(cricket::BaseSession::STATE_RECEIVEDPRACCEPT);
EXPECT_EQ(cricket::BaseSession::ERROR_NONE, session1_.error());
EXPECT_TRUE(media_channel1_->HasSendStream(1));
EXPECT_TRUE(media_channel1_->HasRecvStream(2));
@@ -1672,7 +1672,7 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
sdesc = CreateSessionDescriptionWithStream(3);
session1_.set_remote_description(sdesc);
session1_.SetState(cricket::Session::STATE_RECEIVEDACCEPT);
session1_.SetState(cricket::BaseSession::STATE_RECEIVEDACCEPT);
EXPECT_EQ(cricket::BaseSession::ERROR_NONE, session1_.error());
EXPECT_TRUE(media_channel1_->HasSendStream(1));
EXPECT_FALSE(media_channel1_->HasRecvStream(2));

1
talk/session/media/currentspeakermonitor.h
View File

@@ -39,7 +39,6 @@
namespace cricket {
class BaseSession;
class Session;
struct AudioInfo;
struct MediaStreams;

2
talk/session/tunnel/pseudotcpchannel.h
View File

@@ -29,10 +29,10 @@
#define TALK_SESSION_TUNNEL_PSEUDOTCPCHANNEL_H_
#include "webrtc/p2p/base/pseudotcp.h"
#include "webrtc/p2p/base/session.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/messagequeue.h"
#include "webrtc/base/stream.h"
#include "webrtc/libjingle/session/session.h"
namespace rtc {
class Thread;