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

Revert r7886:7887.

Browse Source 
Broke build steps in other code that uses securetunnelsessionclient.cc
and others.

TBR=tommi@webrtc.org,pthatcher@webrtc.org
BUG=

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7890 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2014-12-15 07:03:04 +00:00
parent 40e4767f2b
commit 18a3896bd2
65 changed files with 200 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
all.gyp
View File

@ -21,7 +21,6 @@
'webrtc/webrtc.gyp:*',
'<(libjingle_root)/talk/libjingle.gyp:*',
'<(libjingle_root)/talk/libjingle_examples.gyp:*',
'webrtc/libjingle/libjingle.gyp:*',
'<@(webrtc_root_additional_dependencies)',
],
'conditions': [

2
talk/app/webrtc/webrtcsdp.cc
View File

@ -43,7 +43,7 @@
#include "webrtc/p2p/base/constants.h"
#include "webrtc/p2p/base/port.h"
#include "talk/session/media/mediasession.h"
#include "webrtc/libjingle/media/mediasessionclient.h"
#include "talk/session/media/mediasessionclient.h"
#include "webrtc/base/common.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/messagedigest.h"

0
webrtc/libjingle/examples/call/Info.plist → talk/examples/call/Info.plist
View File

2
webrtc/libjingle/examples/call/call_main.cc → talk/examples/call/call_main.cc
View File

@ -42,7 +42,7 @@
#include "talk/examples/call/console.h"
#include "talk/examples/call/mediaenginefactory.h"
#include "webrtc/p2p/base/constants.h"
#include "webrtc/libjingle/media/mediasessionclient.h"
#include "talk/session/media/mediasessionclient.h"
#include "talk/session/media/srtpfilter.h"
#include "webrtc/libjingle/xmpp/xmppauth.h"
#include "webrtc/libjingle/xmpp/xmppclientsettings.h"

0
webrtc/libjingle/examples/call/call_unittest.cc → talk/examples/call/call_unittest.cc
View File

6
webrtc/libjingle/examples/call/callclient.cc → talk/examples/call/callclient.cc
View File

@ -53,11 +53,11 @@
#include "talk/media/base/videorenderer.h"
#include "talk/media/devices/devicemanager.h"
#include "talk/media/devices/videorendererfactory.h"
#include "webrtc/libjingle/session/sessionmanager.h"
#include "webrtc/p2p/base/sessionmanager.h"
#include "webrtc/p2p/client/basicportallocator.h"
#include "webrtc/p2p/client/sessionmanagertask.h"
#include "webrtc/libjingle/media/mediamessages.h"
#include "webrtc/libjingle/media/mediasessionclient.h"
#include "talk/session/media/mediamessages.h"
#include "talk/session/media/mediasessionclient.h"
#include "webrtc/libjingle/xmpp/constants.h"
#include "webrtc/libjingle/xmpp/hangoutpubsubclient.h"
#include "webrtc/libjingle/xmpp/mucroomconfigtask.h"

4
webrtc/libjingle/examples/call/callclient.h → talk/examples/call/callclient.h
View File

@ -35,8 +35,8 @@
#include "talk/examples/call/console.h"
#include "talk/media/base/mediachannel.h"
#include "webrtc/p2p/base/session.h"
#include "webrtc/libjingle/media/mediamessages.h"
#include "webrtc/libjingle/media/mediasessionclient.h"
#include "talk/session/media/mediamessages.h"
#include "talk/session/media/mediasessionclient.h"
#include "webrtc/libjingle/xmpp/hangoutpubsubclient.h"
#include "webrtc/libjingle/xmpp/presencestatus.h"
#include "webrtc/libjingle/xmpp/xmppclient.h"

0
webrtc/libjingle/examples/call/callclient_unittest.cc → talk/examples/call/callclient_unittest.cc
View File

0
webrtc/libjingle/examples/call/console.cc → talk/examples/call/console.cc
View File

0
webrtc/libjingle/examples/call/console.h → talk/examples/call/console.h
View File

0
webrtc/libjingle/examples/call/friendinvitesendtask.cc → talk/examples/call/friendinvitesendtask.cc
View File

0
webrtc/libjingle/examples/call/friendinvitesendtask.h → talk/examples/call/friendinvitesendtask.h
View File

0
webrtc/libjingle/examples/call/mediaenginefactory.cc → talk/examples/call/mediaenginefactory.cc
View File

0
webrtc/libjingle/examples/call/mediaenginefactory.h → talk/examples/call/mediaenginefactory.h
View File

0
webrtc/libjingle/examples/call/muc.h → talk/examples/call/muc.h
View File

0
webrtc/libjingle/examples/call/mucinviterecvtask.cc → talk/examples/call/mucinviterecvtask.cc
View File

0
webrtc/libjingle/examples/call/mucinviterecvtask.h → talk/examples/call/mucinviterecvtask.h
View File

0
webrtc/libjingle/examples/call/mucinvitesendtask.cc → talk/examples/call/mucinvitesendtask.cc
View File

0
webrtc/libjingle/examples/call/mucinvitesendtask.h → talk/examples/call/mucinvitesendtask.h
View File

0
webrtc/libjingle/examples/call/presencepushtask.cc → talk/examples/call/presencepushtask.cc
View File

0
webrtc/libjingle/examples/call/presencepushtask.h → talk/examples/call/presencepushtask.h
View File

0
webrtc/libjingle/examples/login/login_main.cc → talk/examples/login/login_main.cc
View File

12
talk/libjingle.gyp
View File

@ -585,22 +585,34 @@
],
},
'sources': [
'session/tunnel/pseudotcpchannel.cc',
'session/tunnel/pseudotcpchannel.h',
'session/tunnel/tunnelsessionclient.cc',
'session/tunnel/tunnelsessionclient.h',
'session/tunnel/securetunnelsessionclient.cc',
'session/tunnel/securetunnelsessionclient.h',
'session/media/audiomonitor.cc',
'session/media/audiomonitor.h',
'session/media/bundlefilter.cc',
'session/media/bundlefilter.h',
'session/media/call.cc',
'session/media/call.h',
'session/media/channel.cc',
'session/media/channel.h',
'session/media/channelmanager.cc',
'session/media/channelmanager.h',
'session/media/currentspeakermonitor.cc',
'session/media/currentspeakermonitor.h',
'session/media/mediamessages.cc',
'session/media/mediamessages.h',
'session/media/mediamonitor.cc',
'session/media/mediamonitor.h',
'session/media/mediarecorder.cc',
'session/media/mediarecorder.h',
'session/media/mediasession.cc',
'session/media/mediasession.h',
'session/media/mediasessionclient.cc',
'session/media/mediasessionclient.h',
'session/media/mediasink.h',
'session/media/rtcpmuxfilter.cc',
'session/media/rtcpmuxfilter.h',

73
talk/libjingle_examples.gyp
View File

@ -30,6 +30,19 @@
'build/common.gypi',
],
'targets': [
{
'target_name': 'libjingle_xmpphelp',
'type': 'static_library',
'dependencies': [
'<(DEPTH)/third_party/expat/expat.gyp:expat',
'libjingle.gyp:libjingle',
'libjingle.gyp:libjingle_p2p',
],
'sources': [
'<(webrtc_root)/libjingle/xmpp/jingleinfotask.cc',
'<(webrtc_root)/libjingle/xmpp/jingleinfotask.h',
],
}, # target libjingle_xmpphelp
{
'target_name': 'relayserver',
'type': 'executable',
@ -63,6 +76,16 @@
'examples/turnserver/turnserver_main.cc',
],
}, # target turnserver
{
'target_name': 'login',
'type': 'executable',
'dependencies': [
'libjingle_xmpphelp',
],
'sources': [
'examples/login/login_main.cc',
],
}, # target login
{
'target_name': 'peerconnection_server',
'type': 'executable',
@ -83,6 +106,56 @@
}, # target peerconnection_server
],
'conditions': [
# TODO(ronghuawu): Reenable building call.
# ['OS!="android"', {
# 'targets': [
# {
# 'target_name': 'call',
# 'type': 'executable',
# 'dependencies': [
# 'libjingle.gyp:libjingle_p2p',
# 'libjingle_xmpphelp',
# ],
# 'sources': [
# 'examples/call/call_main.cc',
# 'examples/call/callclient.cc',
# 'examples/call/callclient.h',
# 'examples/call/console.cc',
# 'examples/call/console.h',
# 'examples/call/friendinvitesendtask.cc',
# 'examples/call/friendinvitesendtask.h',
# 'examples/call/mediaenginefactory.cc',
# 'examples/call/mediaenginefactory.h',
# 'examples/call/muc.h',
# 'examples/call/mucinviterecvtask.cc',
# 'examples/call/mucinviterecvtask.h',
# 'examples/call/mucinvitesendtask.cc',
# 'examples/call/mucinvitesendtask.h',
# 'examples/call/presencepushtask.cc',
# 'examples/call/presencepushtask.h',
# ],
# 'conditions': [
# ['OS=="linux"', {
# 'link_settings': {
# 'libraries': [
# '<!@(pkg-config --libs-only-l gobject-2.0 gthread-2.0'
# ' gtk+-2.0)',
# ],
# },
# }],
# ['OS=="win"', {
# 'msvs_settings': {
# 'VCLinkerTool': {
# 'AdditionalDependencies': [
# 'strmiids.lib',
# ],
# },
# },
# }],
# ], # conditions
# }, # target call
# ], # targets
# }], # OS!="android"
['OS=="linux" or OS=="win"', {
'targets': [
{

2
talk/libjingle_tests.gyp
View File

@ -167,7 +167,9 @@
'session/media/channelmanager_unittest.cc',
'session/media/currentspeakermonitor_unittest.cc',
'session/media/mediarecorder_unittest.cc',
'session/media/mediamessages_unittest.cc',
'session/media/mediasession_unittest.cc',
'session/media/mediasessionclient_unittest.cc',
'session/media/rtcpmuxfilter_unittest.cc',
'session/media/srtpfilter_unittest.cc',
],

6
webrtc/libjingle/media/call.cc → talk/session/media/call.cc
View File

@ -28,10 +28,10 @@
#include <string>
#include "talk/media/base/constants.h"
#include "talk/media/base/screencastid.h"
#include "webrtc/libjingle/session/parsing.h"
#include "webrtc/libjingle/media/call.h"
#include "webrtc/p2p/base/parsing.h"
#include "talk/session/media/call.h"
#include "talk/session/media/currentspeakermonitor.h"
#include "webrtc/libjingle/media/mediasessionclient.h"
#include "talk/session/media/mediasessionclient.h"
#include "webrtc/base/helpers.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/thread.h"

2
webrtc/libjingle/media/call.h → talk/session/media/call.h
View File

@ -41,7 +41,7 @@
#include "webrtc/p2p/client/socketmonitor.h"
#include "talk/session/media/audiomonitor.h"
#include "talk/session/media/currentspeakermonitor.h"
#include "webrtc/libjingle/media/mediamessages.h"
#include "talk/session/media/mediamessages.h"
#include "talk/session/media/mediasession.h"
#include "webrtc/libjingle/xmpp/jid.h"
#include "webrtc/base/messagequeue.h"

2
talk/session/media/channel.cc
View File

@ -31,7 +31,7 @@
#include "talk/media/base/rtputils.h"
#include "webrtc/p2p/base/transportchannel.h"
#include "talk/session/media/channelmanager.h"
#include "webrtc/libjingle/media/mediamessages.h"
#include "talk/session/media/mediamessages.h"
#include "talk/session/media/typingmonitor.h"
#include "webrtc/base/bind.h"
#include "webrtc/base/buffer.h"

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

@ -33,9 +33,9 @@
#include "talk/media/base/testutils.h"
#include "webrtc/p2p/base/fakesession.h"
#include "talk/session/media/channel.h"
#include "webrtc/libjingle/media/mediamessages.h"
#include "talk/session/media/mediamessages.h"
#include "talk/session/media/mediarecorder.h"
#include "webrtc/libjingle/media/mediasessionclient.h"
#include "talk/session/media/mediasessionclient.h"
#include "talk/session/media/typingmonitor.h"
#include "webrtc/base/fileutils.h"
#include "webrtc/base/gunit.h"

2
talk/session/media/currentspeakermonitor.cc
View File

@ -29,7 +29,7 @@
#include "talk/media/base/streamparams.h"
#include "talk/session/media/audiomonitor.h"
#include "webrtc/libjingle/media/mediamessages.h"
#include "talk/session/media/mediamessages.h"
#include "webrtc/base/logging.h"
namespace cricket {

51
talk/session/media/currentspeakermonitor_unittest.cc
View File

@ -25,7 +25,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "talk/session/media/audiomonitor.h"
#include "talk/session/media/call.h"
#include "talk/session/media/currentspeakermonitor.h"
#include "webrtc/base/gunit.h"
#include "webrtc/base/thread.h"
@ -42,11 +42,21 @@ static const uint32 kMinTimeBetweenSwitches = 10;
// I am assuming system clocks do not have a coarser resolution than 90 ms.
static const uint32 kSleepTimeBetweenSwitches = 100;
class MockCall : public Call {
public:
MockCall() : Call(NULL) {}
void EmitAudioMonitor(const AudioInfo& info) {
GetAudioSourceProxy()->SignalAudioMonitor(GetAudioSourceProxy(), info);
}
};
class CurrentSpeakerMonitorTest : public testing::Test,
public sigslot::has_slots<> {
public:
CurrentSpeakerMonitorTest() {
monitor_ = new CurrentSpeakerMonitor(&source_, NULL);
call_ = new MockCall();
monitor_ = new CurrentSpeakerMonitor(call_->GetAudioSourceProxy(), NULL);
// Shrink the minimum time betweeen switches to 10 ms so we don't have to
// slow down our tests.
monitor_->set_min_time_between_switches(kMinTimeBetweenSwitches);
@ -58,14 +68,11 @@ class CurrentSpeakerMonitorTest : public testing::Test,
~CurrentSpeakerMonitorTest() {
delete monitor_;
}
void SignalAudioMonitor(const AudioInfo& info) {
source_.SignalAudioMonitor(&source_, info);
delete call_;
}
protected:
AudioSourceContext source_;
MockCall* call_;
CurrentSpeakerMonitor* monitor_;
int num_changes_;
uint32 current_speaker_;
@ -84,7 +91,7 @@ static void InitAudioInfo(AudioInfo* info, int input_level, int output_level) {
TEST_F(CurrentSpeakerMonitorTest, NoActiveStreams) {
AudioInfo info;
InitAudioInfo(&info, 0, 0);
SignalAudioMonitor(info);
call_->EmitAudioMonitor(info);
EXPECT_EQ(current_speaker_, 0U);
EXPECT_EQ(num_changes_, 0);
@ -96,7 +103,7 @@ TEST_F(CurrentSpeakerMonitorTest, MultipleActiveStreams) {
info.active_streams.push_back(std::make_pair(kSsrc1, 3));
info.active_streams.push_back(std::make_pair(kSsrc2, 7));
SignalAudioMonitor(info);
call_->EmitAudioMonitor(info);
// No speaker recognized because the initial sample is treated as possibly
// just noise and disregarded.
@ -105,7 +112,7 @@ TEST_F(CurrentSpeakerMonitorTest, MultipleActiveStreams) {
info.active_streams.push_back(std::make_pair(kSsrc1, 3));
info.active_streams.push_back(std::make_pair(kSsrc2, 7));
SignalAudioMonitor(info);
call_->EmitAudioMonitor(info);
EXPECT_EQ(current_speaker_, kSsrc2);
EXPECT_EQ(num_changes_, 1);
@ -118,21 +125,21 @@ TEST_F(CurrentSpeakerMonitorTest, DISABLED_RapidSpeakerChange) {
info.active_streams.push_back(std::make_pair(kSsrc1, 3));
info.active_streams.push_back(std::make_pair(kSsrc2, 7));
SignalAudioMonitor(info);
call_->EmitAudioMonitor(info);
EXPECT_EQ(current_speaker_, 0U);
EXPECT_EQ(num_changes_, 0);
info.active_streams.push_back(std::make_pair(kSsrc1, 3));
info.active_streams.push_back(std::make_pair(kSsrc2, 7));
SignalAudioMonitor(info);
call_->EmitAudioMonitor(info);
EXPECT_EQ(current_speaker_, kSsrc2);
EXPECT_EQ(num_changes_, 1);
info.active_streams.push_back(std::make_pair(kSsrc1, 9));
info.active_streams.push_back(std::make_pair(kSsrc2, 1));
SignalAudioMonitor(info);
call_->EmitAudioMonitor(info);
// We expect no speaker change because of the rapid change.
EXPECT_EQ(current_speaker_, kSsrc2);
@ -145,14 +152,14 @@ TEST_F(CurrentSpeakerMonitorTest, SpeakerChange) {
info.active_streams.push_back(std::make_pair(kSsrc1, 3));
info.active_streams.push_back(std::make_pair(kSsrc2, 7));
SignalAudioMonitor(info);
call_->EmitAudioMonitor(info);
EXPECT_EQ(current_speaker_, 0U);
EXPECT_EQ(num_changes_, 0);
info.active_streams.push_back(std::make_pair(kSsrc1, 3));
info.active_streams.push_back(std::make_pair(kSsrc2, 7));
SignalAudioMonitor(info);
call_->EmitAudioMonitor(info);
EXPECT_EQ(current_speaker_, kSsrc2);
EXPECT_EQ(num_changes_, 1);
@ -162,7 +169,7 @@ TEST_F(CurrentSpeakerMonitorTest, SpeakerChange) {
info.active_streams.push_back(std::make_pair(kSsrc1, 9));
info.active_streams.push_back(std::make_pair(kSsrc2, 1));
SignalAudioMonitor(info);
call_->EmitAudioMonitor(info);
EXPECT_EQ(current_speaker_, kSsrc1);
EXPECT_EQ(num_changes_, 2);
@ -174,21 +181,21 @@ TEST_F(CurrentSpeakerMonitorTest, InterwordSilence) {
info.active_streams.push_back(std::make_pair(kSsrc1, 3));
info.active_streams.push_back(std::make_pair(kSsrc2, 7));
SignalAudioMonitor(info);
call_->EmitAudioMonitor(info);
EXPECT_EQ(current_speaker_, 0U);
EXPECT_EQ(num_changes_, 0);
info.active_streams.push_back(std::make_pair(kSsrc1, 3));
info.active_streams.push_back(std::make_pair(kSsrc2, 7));
SignalAudioMonitor(info);
call_->EmitAudioMonitor(info);
EXPECT_EQ(current_speaker_, kSsrc2);
EXPECT_EQ(num_changes_, 1);
info.active_streams.push_back(std::make_pair(kSsrc1, 3));
info.active_streams.push_back(std::make_pair(kSsrc2, 7));
SignalAudioMonitor(info);
call_->EmitAudioMonitor(info);
EXPECT_EQ(current_speaker_, kSsrc2);
EXPECT_EQ(num_changes_, 1);
@ -198,7 +205,7 @@ TEST_F(CurrentSpeakerMonitorTest, InterwordSilence) {
info.active_streams.push_back(std::make_pair(kSsrc1, 3));
info.active_streams.push_back(std::make_pair(kSsrc2, 0));
SignalAudioMonitor(info);
call_->EmitAudioMonitor(info);
// Current speaker shouldn't have changed because we treat this as an inter-
// word silence.
@ -207,7 +214,7 @@ TEST_F(CurrentSpeakerMonitorTest, InterwordSilence) {
info.active_streams.push_back(std::make_pair(kSsrc1, 3));
info.active_streams.push_back(std::make_pair(kSsrc2, 0));
SignalAudioMonitor(info);
call_->EmitAudioMonitor(info);
// Current speaker shouldn't have changed because we treat this as an inter-
// word silence.
@ -216,7 +223,7 @@ TEST_F(CurrentSpeakerMonitorTest, InterwordSilence) {
info.active_streams.push_back(std::make_pair(kSsrc1, 3));
info.active_streams.push_back(std::make_pair(kSsrc2, 0));
SignalAudioMonitor(info);
call_->EmitAudioMonitor(info);
// At this point, we should have concluded that SSRC2 stopped speaking.
EXPECT_EQ(current_speaker_, kSsrc1);

6
webrtc/libjingle/media/mediamessages.cc → talk/session/media/mediamessages.cc
View File

@ -29,11 +29,11 @@
* Documentation is in mediamessages.h.
*/
#include "webrtc/libjingle/media/mediamessages.h"
#include "talk/session/media/mediamessages.h"
#include "webrtc/p2p/base/constants.h"
#include "webrtc/libjingle/session/parsing.h"
#include "webrtc/libjingle/media/mediasessionclient.h"
#include "webrtc/p2p/base/parsing.h"
#include "talk/session/media/mediasessionclient.h"
#include "webrtc/libjingle/xmllite/xmlelement.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/stringencode.h"

2
webrtc/libjingle/media/mediamessages.h → talk/session/media/mediamessages.h
View File

@ -41,7 +41,7 @@
#include "talk/media/base/mediachannel.h" // For RtpHeaderExtension
#include "talk/media/base/streamparams.h"
#include "webrtc/libjingle/session/parsing.h"
#include "webrtc/p2p/base/parsing.h"
#include "webrtc/p2p/base/sessiondescription.h"
#include "webrtc/base/basictypes.h"

4
webrtc/libjingle/media/mediamessages_unittest.cc → talk/session/media/mediamessages_unittest.cc
View File

@ -25,13 +25,13 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "webrtc/libjingle/media/mediamessages.h"
#include "talk/session/media/mediamessages.h"
#include <string>
#include <vector>
#include "webrtc/p2p/base/constants.h"
#include "webrtc/libjingle/media/mediasessionclient.h"
#include "talk/session/media/mediasessionclient.h"
#include "webrtc/libjingle/xmllite/xmlelement.h"
#include "webrtc/base/gunit.h"
#include "webrtc/base/scoped_ptr.h"

6
webrtc/libjingle/media/mediasessionclient.cc → talk/session/media/mediasessionclient.cc
View File

@ -27,14 +27,14 @@
#include <string>
#include "webrtc/libjingle/media/mediasessionclient.h"
#include "talk/session/media/mediasessionclient.h"
#include "talk/media/base/capturemanager.h"
#include "talk/media/base/cryptoparams.h"
#include "talk/media/sctp/sctpdataengine.h"
#include "webrtc/p2p/base/constants.h"
#include "webrtc/libjingle/session/parsing.h"
#include "webrtc/libjingle/media/mediamessages.h"
#include "webrtc/p2p/base/parsing.h"
#include "talk/session/media/mediamessages.h"
#include "talk/session/media/srtpfilter.h"
#include "webrtc/libjingle/xmllite/qname.h"
#include "webrtc/libjingle/xmllite/xmlconstants.h"

6
webrtc/libjingle/media/mediasessionclient.h → talk/session/media/mediasessionclient.h
View File

@ -34,10 +34,10 @@
#include <vector>
#include "talk/media/base/cryptoparams.h"
#include "webrtc/p2p/base/session.h"
#include "webrtc/libjingle/session/sessionclient.h"
#include "webrtc/p2p/base/sessionclient.h"
#include "webrtc/p2p/base/sessiondescription.h"
#include "webrtc/libjingle/session/sessionmanager.h"
#include "webrtc/libjingle/media/call.h"
#include "webrtc/p2p/base/sessionmanager.h"
#include "talk/session/media/call.h"
#include "talk/session/media/channelmanager.h"
#include "talk/session/media/mediasession.h"
#include "webrtc/base/messagequeue.h"

2
webrtc/libjingle/media/mediasessionclient_unittest.cc → talk/session/media/mediasessionclient_unittest.cc
View File

@ -33,7 +33,7 @@
#include "talk/media/devices/fakedevicemanager.h"
#include "webrtc/p2p/base/constants.h"
#include "webrtc/p2p/client/basicportallocator.h"
#include "webrtc/libjingle/media/mediasessionclient.h"
#include "talk/session/media/mediasessionclient.h"
#include "webrtc/libjingle/xmllite/xmlbuilder.h"
#include "webrtc/libjingle/xmllite/xmlelement.h"
#include "webrtc/libjingle/xmllite/xmlprinter.h"

0
webrtc/libjingle/tunnel/pseudotcpchannel.cc → talk/session/tunnel/pseudotcpchannel.cc
View File

0
webrtc/libjingle/tunnel/pseudotcpchannel.h → talk/session/tunnel/pseudotcpchannel.h
View File

4
webrtc/libjingle/tunnel/securetunnelsessionclient.cc → talk/session/tunnel/securetunnelsessionclient.cc
View File

@ -28,8 +28,8 @@
// SecureTunnelSessionClient and SecureTunnelSession implementation.
#include "webrtc/p2p/base/transportchannel.h"
#include "webrtc/libjingle/tunnel/pseudotcpchannel.h"
#include "webrtc/libjingle/tunnel/securetunnelsessionclient.h"
#include "talk/session/tunnel/pseudotcpchannel.h"
#include "talk/session/tunnel/securetunnelsessionclient.h"
#include "webrtc/libjingle/xmllite/xmlelement.h"
#include "webrtc/base/basicdefs.h"
#include "webrtc/base/basictypes.h"

2
webrtc/libjingle/tunnel/securetunnelsessionclient.h → talk/session/tunnel/securetunnelsessionclient.h
View File

@ -36,7 +36,7 @@
#include <string>
#include "webrtc/libjingle/tunnel/tunnelsessionclient.h"
#include "talk/session/tunnel/tunnelsessionclient.h"
#include "webrtc/base/sslidentity.h"
#include "webrtc/base/sslstreamadapter.h"

0
webrtc/libjingle/tunnel/tunnelsessionclient.cc → talk/session/tunnel/tunnelsessionclient.cc
View File

4
webrtc/libjingle/tunnel/tunnelsessionclient.h → talk/session/tunnel/tunnelsessionclient.h
View File

@ -33,9 +33,9 @@
#include "webrtc/p2p/base/constants.h"
#include "webrtc/p2p/base/pseudotcp.h"
#include "webrtc/p2p/base/session.h"
#include "webrtc/libjingle/session/sessionclient.h"
#include "webrtc/p2p/base/sessionclient.h"
#include "webrtc/p2p/base/sessiondescription.h"
#include "webrtc/libjingle/session/sessionmanager.h"
#include "webrtc/p2p/base/sessionmanager.h"
#include "webrtc/libjingle/xmllite/qname.h"
#include "webrtc/libjingle/xmpp/constants.h"
#include "webrtc/base/criticalsection.h"

4
webrtc/libjingle/tunnel/tunnelsessionclient_unittest.cc → talk/session/tunnel/tunnelsessionclient_unittest.cc
View File

@ -26,10 +26,10 @@
*/
#include <string>
#include "webrtc/libjingle/session/sessionmanager.h"
#include "webrtc/p2p/base/sessionmanager.h"
#include "webrtc/p2p/base/transport.h"
#include "webrtc/p2p/client/fakeportallocator.h"
#include "webrtc/libjingle/tunnel/tunnelsessionclient.h"
#include "talk/session/tunnel/tunnelsessionclient.h"
#include "webrtc/base/gunit.h"
#include "webrtc/base/messagehandler.h"
#include "webrtc/base/scoped_ptr.h"

171
webrtc/libjingle/libjingle.gyp
View File

@ -1,171 +0,0 @@
# Copyright (c) 2014 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.
{
'includes': ['../build/common.gypi'],
'variables': {
'talk_root%': '<(webrtc_root)/../talk',
},
'targets': [
{
'target_name': 'jingle_session',
'type': 'static_library',
'dependencies': [
'<(talk_root)/libjingle.gyp:libjingle_media',
'<(webrtc_root)/base/base.gyp:webrtc_base',
'<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
'<(DEPTH)/third_party/expat/expat.gyp:expat',
],
'cflags_cc!': [
'-Wnon-virtual-dtor',
],
'export_dependent_settings': [
'<(DEPTH)/third_party/expat/expat.gyp:expat',
],
'sources': [
'media/call.cc',
'media/call.h',
'media/mediasessionclient.cc',
'media/mediasessionclient.h',
'media/mediamessages.cc',
'media/mediamessages.h',
'session/sessionclient.h',
'session/sessionmanagertask.h',
'session/sessionsendtask.h',
'tunnel/pseudotcpchannel.cc',
'tunnel/pseudotcpchannel.h',
'tunnel/tunnelsessionclient.cc',
'tunnel/tunnelsessionclient.h',
'tunnel/securetunnelsessionclient.cc',
'tunnel/securetunnelsessionclient.h',
],
'direct_dependent_settings': {
'cflags_cc!': [
'-Wnon-virtual-dtor',
],
'defines': [
'FEATURE_ENABLE_VOICEMAIL',
],
},
'conditions': [
['build_with_chromium==0', {
'defines': [
'FEATURE_ENABLE_VOICEMAIL',
'FEATURE_ENABLE_PSTN',
],
}],
],
},
{
'target_name': 'jingle_unittest',
'type': 'executable',
'dependencies': [
'jingle_session',
'<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
'<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'<(talk_root)/libjingle.gyp:libjingle',
'<(talk_root)/libjingle.gyp:libjingle_p2p',
'<(talk_root)/libjingle_tests.gyp:libjingle_unittest_main',
],
'include_dirs': [
'<(DEPTH)/third_party/libsrtp/srtp',
],
'sources': [
'media/mediamessages_unittest.cc',
'media/mediasessionclient_unittest.cc',
],
'conditions': [
['OS=="win"', {
'msvs_settings': {
'VCLinkerTool': {
'AdditionalDependencies': [
'strmiids.lib',
],
},
},
}],
],
}, # target jingle_p2p_unittest
{
'target_name': 'libjingle_xmpphelp',
'type': 'static_library',
'dependencies': [
'<(DEPTH)/third_party/expat/expat.gyp:expat',
'<(talk_root)/libjingle.gyp:libjingle',
'<(talk_root)/libjingle.gyp:libjingle_p2p',
],
'sources': [
'xmpp/jingleinfotask.cc',
'xmpp/jingleinfotask.h',
],
}, # target libjingle_xmpphelp
{
'target_name': 'login',
'type': 'executable',
'dependencies': [
'libjingle_xmpphelp',
'<(talk_root)/libjingle.gyp:libjingle',
],
'sources': [
'examples/login/login_main.cc',
],
}, # target login
],
'conditions': [
# TODO(ronghuawu): Reenable building call.
# ['OS!="android"', {
# 'targets': [
# {
# 'target_name': 'call',
# 'type': 'executable',
# 'dependencies': [
# 'libjingle.gyp:libjingle_p2p',
# 'libjingle_xmpphelp',
# ],
# 'sources': [
# 'examples/call/call_main.cc',
# 'examples/call/callclient.cc',
# 'examples/call/callclient.h',
# 'examples/call/console.cc',
# 'examples/call/console.h',
# 'examples/call/friendinvitesendtask.cc',
# 'examples/call/friendinvitesendtask.h',
# 'examples/call/mediaenginefactory.cc',
# 'examples/call/mediaenginefactory.h',
# 'examples/call/muc.h',
# 'examples/call/mucinviterecvtask.cc',
# 'examples/call/mucinviterecvtask.h',
# 'examples/call/mucinvitesendtask.cc',
# 'examples/call/mucinvitesendtask.h',
# 'examples/call/presencepushtask.cc',
# 'examples/call/presencepushtask.h',
# ],
# 'conditions': [
# ['OS=="linux"', {
# 'link_settings': {
# 'libraries': [
# '<!@(pkg-config --libs-only-l gobject-2.0 gthread-2.0'
# ' gtk+-2.0)',
# ],
# },
# }],
# ['OS=="win"', {
# 'msvs_settings': {
# 'VCLinkerTool': {
# 'AdditionalDependencies': [
# 'strmiids.lib',
# ],
# },
# },
# }],
# ], # conditions
# }, # target call
# ], # targets
# }], # OS!="android"
],
}

0
webrtc/libjingle/OWNERS → webrtc/libjingle/xmllite/OWNERS
View File

13
webrtc/libjingle/xmpp/OWNERS Normal file
View File

@ -0,0 +1,13 @@
henrika@webrtc.org
henrike@webrtc.org
henrikg@webrtc.org
hta@webrtc.org
jiayl@webrtc.org
juberti@webrtc.org
mflodman@webrtc.org
perkj@webrtc.org
pthatcher@webrtc.org
sergeyu@chromium.org
tommi@webrtc.org
per-file BUILD.gn=kjellander@webrtc.org

6
webrtc/p2p/base/p2ptransport.cc
View File

@ -15,9 +15,9 @@
#include "webrtc/p2p/base/constants.h"
#include "webrtc/p2p/base/p2ptransportchannel.h"
#include "webrtc/libjingle/session/parsing.h"
#include "webrtc/libjingle/session/sessionmanager.h"
#include "webrtc/libjingle/session/sessionmessages.h"
#include "webrtc/p2p/base/parsing.h"
#include "webrtc/p2p/base/sessionmanager.h"
#include "webrtc/p2p/base/sessionmessages.h"
#include "webrtc/libjingle/xmllite/qname.h"
#include "webrtc/libjingle/xmllite/xmlelement.h"
#include "webrtc/libjingle/xmpp/constants.h"

2
webrtc/libjingle/session/parsing.cc → webrtc/p2p/base/parsing.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "webrtc/libjingle/session/parsing.h"
#include "webrtc/p2p/base/parsing.h"
#include <stdlib.h>
#include <algorithm>

0
webrtc/libjingle/session/parsing.h → webrtc/p2p/base/parsing.h
View File

4
webrtc/p2p/base/rawtransport.cc
View File

@ -11,10 +11,10 @@
#include <string>
#include <vector>
#include "webrtc/p2p/base/constants.h"
#include "webrtc/libjingle/session/parsing.h"
#include "webrtc/p2p/base/parsing.h"
#include "webrtc/p2p/base/rawtransport.h"
#include "webrtc/p2p/base/rawtransportchannel.h"
#include "webrtc/libjingle/session/sessionmanager.h"
#include "webrtc/p2p/base/sessionmanager.h"
#include "webrtc/libjingle/xmllite/qname.h"
#include "webrtc/libjingle/xmllite/xmlelement.h"
#include "webrtc/libjingle/xmpp/constants.h"

2
webrtc/p2p/base/rawtransportchannel.cc
View File

@ -17,7 +17,7 @@
#include "webrtc/p2p/base/portinterface.h"
#include "webrtc/p2p/base/rawtransport.h"
#include "webrtc/p2p/base/relayport.h"
#include "webrtc/libjingle/session/sessionmanager.h"
#include "webrtc/p2p/base/sessionmanager.h"
#include "webrtc/p2p/base/stunport.h"
#include "webrtc/libjingle/xmllite/qname.h"
#include "webrtc/libjingle/xmllite/xmlelement.h"

2
webrtc/p2p/base/session.cc
View File

@ -12,7 +12,7 @@
#include "webrtc/p2p/base/dtlstransport.h"
#include "webrtc/p2p/base/p2ptransport.h"
#include "webrtc/libjingle/session/sessionclient.h"
#include "webrtc/p2p/base/sessionclient.h"
#include "webrtc/p2p/base/transport.h"
#include "webrtc/p2p/base/transportchannelproxy.h"
#include "webrtc/p2p/base/transportinfo.h"

8
webrtc/p2p/base/session.h
View File

@ -16,11 +16,11 @@
#include <string>
#include <vector>
#include "webrtc/libjingle/session/parsing.h"
#include "webrtc/p2p/base/parsing.h"
#include "webrtc/p2p/base/port.h"
#include "webrtc/libjingle/session/sessionclient.h"
#include "webrtc/libjingle/session/sessionmanager.h"
#include "webrtc/libjingle/session/sessionmessages.h"
#include "webrtc/p2p/base/sessionclient.h"
#include "webrtc/p2p/base/sessionmanager.h"
#include "webrtc/p2p/base/sessionmessages.h"
#include "webrtc/p2p/base/transport.h"
#include "webrtc/libjingle/xmllite/xmlelement.h"
#include "webrtc/libjingle/xmpp/constants.h"

6
webrtc/p2p/base/session_unittest.cc
View File

@ -17,13 +17,13 @@
#include "webrtc/p2p/base/basicpacketsocketfactory.h"
#include "webrtc/p2p/base/constants.h"
#include "webrtc/p2p/base/p2ptransport.h"
#include "webrtc/libjingle/session/parsing.h"
#include "webrtc/p2p/base/parsing.h"
#include "webrtc/p2p/base/portallocator.h"
#include "webrtc/p2p/base/relayport.h"
#include "webrtc/p2p/base/relayserver.h"
#include "webrtc/p2p/base/session.h"
#include "webrtc/libjingle/session/sessionclient.h"
#include "webrtc/libjingle/session/sessionmanager.h"
#include "webrtc/p2p/base/sessionclient.h"
#include "webrtc/p2p/base/sessionmanager.h"
#include "webrtc/p2p/base/stunport.h"
#include "webrtc/p2p/base/stunserver.h"
#include "webrtc/p2p/base/transportchannel.h"

0
webrtc/libjingle/session/sessionclient.h → webrtc/p2p/base/sessionclient.h
View File

4
webrtc/libjingle/session/sessionmanager.cc → webrtc/p2p/base/sessionmanager.cc
View File

@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "webrtc/libjingle/session/sessionmanager.h"
#include "webrtc/p2p/base/sessionmanager.h"
#include "webrtc/p2p/base/constants.h"
#include "webrtc/p2p/base/session.h"
#include "webrtc/libjingle/session/sessionmessages.h"
#include "webrtc/p2p/base/sessionmessages.h"
#include "webrtc/libjingle/xmpp/constants.h"
#include "webrtc/libjingle/xmpp/jid.h"
#include "webrtc/base/common.h"

0
webrtc/libjingle/session/sessionmanager.h → webrtc/p2p/base/sessionmanager.h
View File

6
webrtc/libjingle/session/sessionmessages.cc → webrtc/p2p/base/sessionmessages.cc
View File

@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "webrtc/libjingle/session/sessionmessages.h"
#include "webrtc/p2p/base/sessionmessages.h"
#include <stdio.h>
#include <string>
#include "webrtc/p2p/base/constants.h"
#include "webrtc/p2p/base/p2ptransport.h"
#include "webrtc/libjingle/session/parsing.h"
#include "webrtc/libjingle/session/sessionclient.h"
#include "webrtc/p2p/base/parsing.h"
#include "webrtc/p2p/base/sessionclient.h"
#include "webrtc/p2p/base/sessiondescription.h"
#include "webrtc/p2p/base/transport.h"
#include "webrtc/libjingle/xmllite/xmlconstants.h"

2
webrtc/libjingle/session/sessionmessages.h → webrtc/p2p/base/sessionmessages.h
View File

@ -16,7 +16,7 @@
#include <vector>
#include "webrtc/p2p/base/constants.h"
#include "webrtc/libjingle/session/parsing.h"
#include "webrtc/p2p/base/parsing.h"
#include "webrtc/p2p/base/sessiondescription.h" // Needed to delete contents.
#include "webrtc/p2p/base/transportinfo.h"
#include "webrtc/libjingle/xmllite/xmlelement.h"

4
webrtc/p2p/base/transport.cc
View File

@ -12,9 +12,9 @@
#include "webrtc/p2p/base/candidate.h"
#include "webrtc/p2p/base/constants.h"
#include "webrtc/libjingle/session/parsing.h"
#include "webrtc/p2p/base/parsing.h"
#include "webrtc/p2p/base/port.h"
#include "webrtc/libjingle/session/sessionmanager.h"
#include "webrtc/p2p/base/sessionmanager.h"
#include "webrtc/p2p/base/transportchannelimpl.h"
#include "webrtc/libjingle/xmllite/xmlelement.h"
#include "webrtc/libjingle/xmpp/constants.h"

4
webrtc/p2p/base/transport_unittest.cc
View File

@ -11,9 +11,9 @@
#include "webrtc/p2p/base/constants.h"
#include "webrtc/p2p/base/fakesession.h"
#include "webrtc/p2p/base/p2ptransport.h"
#include "webrtc/libjingle/session/parsing.h"
#include "webrtc/p2p/base/parsing.h"
#include "webrtc/p2p/base/rawtransport.h"
#include "webrtc/libjingle/session/sessionmessages.h"
#include "webrtc/p2p/base/sessionmessages.h"
#include "webrtc/libjingle/xmllite/xmlelement.h"
#include "webrtc/libjingle/xmpp/constants.h"
#include "webrtc/base/fakesslidentity.h"

2
webrtc/libjingle/session/sessionmanagertask.h → webrtc/p2p/client/sessionmanagertask.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_P2P_CLIENT_SESSIONMANAGERTASK_H_
#define WEBRTC_P2P_CLIENT_SESSIONMANAGERTASK_H_
#include "webrtc/libjingle/session/sessionmanager.h"
#include "webrtc/p2p/base/sessionmanager.h"
#include "webrtc/p2p/client/sessionsendtask.h"
#include "webrtc/libjingle/xmpp/xmppengine.h"
#include "webrtc/libjingle/xmpp/xmpptask.h"

2
webrtc/libjingle/session/sessionsendtask.h → webrtc/p2p/client/sessionsendtask.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_P2P_CLIENT_SESSIONSENDTASK_H_
#define WEBRTC_P2P_CLIENT_SESSIONSENDTASK_H_
#include "webrtc/libjingle/session/sessionmanager.h"
#include "webrtc/p2p/base/sessionmanager.h"
#include "webrtc/libjingle/xmpp/constants.h"
#include "webrtc/libjingle/xmpp/xmppclient.h"
#include "webrtc/libjingle/xmpp/xmppengine.h"

15
webrtc/p2p/p2p.gyp
View File

@ -39,6 +39,8 @@
'base/p2ptransportchannel.cc',
'base/p2ptransportchannel.h',
'base/packetsocketfactory.h',
'base/parsing.cc',
'base/parsing.h',
'base/port.cc',
'base/port.h',
'base/portallocator.cc',
@ -60,9 +62,14 @@
'base/relayserver.h',
'base/session.cc',
'base/session.h',
'base/sessionclient.h',
'base/sessiondescription.cc',
'base/sessiondescription.h',
'base/sessionid.h',
'base/sessionmanager.cc',
'base/sessionmanager.h',
'base/sessionmessages.cc',
'base/sessionmessages.h',
'base/stun.cc',
'base/stun.h',
'base/stunport.cc',
@ -97,14 +104,10 @@
'client/connectivitychecker.h',
'client/httpportallocator.cc',
'client/httpportallocator.h',
'client/sessionmanagertask.h',
'client/sessionsendtask.h',
'client/socketmonitor.cc',
'client/socketmonitor.h',
'<(webrtc_root)/libjingle/session/parsing.h',
'<(webrtc_root)/libjingle/session/parsing.cc',
'<(webrtc_root)/libjingle/session/sessionmanager.h',
'<(webrtc_root)/libjingle/session/sessionmanager.cc',
'<(webrtc_root)/libjingle/session/sessionmessages.h',
'<(webrtc_root)/libjingle/session/sessionmessages.cc',
],
'direct_dependent_settings': {
'cflags_cc!': [