Roll libjingle to r126.

- Implemented ROAP on top of JSEP.
- Added a new signal after PortAllocatorSesison discoves all candidates for
  the channel.

TEST=try bots and apprtc.appspot.com
Review URL: https://chromiumcodereview.appspot.com/9727011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127702 0039d316-1c4b-4281-b951-d872f2087c98
parent add85b9a
...@@ -39,7 +39,7 @@ vars = { ...@@ -39,7 +39,7 @@ vars = {
"nacl_toolchain_revision": "7898", "nacl_toolchain_revision": "7898",
"pnacl_toolchain_revision": "7898", "pnacl_toolchain_revision": "7898",
"libjingle_revision": "125", "libjingle_revision": "126",
"libphonenumber_revision": "425", "libphonenumber_revision": "425",
"libvpx_revision": "125647", "libvpx_revision": "125647",
"lss_revision": "9", "lss_revision": "9",
......
...@@ -91,8 +91,9 @@ MockPeerConnectionImpl::SdpState MockPeerConnectionImpl::sdp_state() { ...@@ -91,8 +91,9 @@ MockPeerConnectionImpl::SdpState MockPeerConnectionImpl::sdp_state() {
return kSdpNew; return kSdpNew;
} }
void MockPeerConnectionImpl::StartIce(IceOptions options) { bool MockPeerConnectionImpl::StartIce(IceOptions options) {
NOTIMPLEMENTED(); NOTIMPLEMENTED();
return false;
} }
webrtc::SessionDescriptionInterface* MockPeerConnectionImpl::CreateOffer( webrtc::SessionDescriptionInterface* MockPeerConnectionImpl::CreateOffer(
......
...@@ -32,7 +32,7 @@ class MockPeerConnectionImpl : public PeerConnectionInterface { ...@@ -32,7 +32,7 @@ class MockPeerConnectionImpl : public PeerConnectionInterface {
virtual void Close() OVERRIDE; virtual void Close() OVERRIDE;
virtual ReadyState ready_state() OVERRIDE; virtual ReadyState ready_state() OVERRIDE;
virtual SdpState sdp_state() OVERRIDE; virtual SdpState sdp_state() OVERRIDE;
virtual void StartIce(IceOptions options) OVERRIDE; virtual bool StartIce(IceOptions options) OVERRIDE;
virtual webrtc::SessionDescriptionInterface* CreateOffer( virtual webrtc::SessionDescriptionInterface* CreateOffer(
const webrtc::MediaHints& hints) OVERRIDE; const webrtc::MediaHints& hints) OVERRIDE;
......
...@@ -125,7 +125,8 @@ bool P2PTransportImpl::AddRemoteCandidate(const std::string& address) { ...@@ -125,7 +125,8 @@ bool P2PTransportImpl::AddRemoteCandidate(const std::string& address) {
return true; return true;
} }
void P2PTransportImpl::OnRequestSignaling() { void P2PTransportImpl::OnRequestSignaling(
cricket::TransportChannelImpl* channel) {
channel_->OnSignalingReady(); channel_->OnSignalingReady();
} }
......
// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
...@@ -66,7 +66,7 @@ class CONTENT_EXPORT P2PTransportImpl ...@@ -66,7 +66,7 @@ class CONTENT_EXPORT P2PTransportImpl
private: private:
class ChannelAdapter; class ChannelAdapter;
void OnRequestSignaling(); void OnRequestSignaling(cricket::TransportChannelImpl* channel);
void OnCandidateReady(cricket::TransportChannelImpl* channel, void OnCandidateReady(cricket::TransportChannelImpl* channel,
const cricket::Candidate& candidate); const cricket::Candidate& candidate);
void OnReadableState(cricket::TransportChannel* channel); void OnReadableState(cricket::TransportChannel* channel);
......
...@@ -50,7 +50,7 @@ class LibjingleStreamTransport : public StreamTransport, ...@@ -50,7 +50,7 @@ class LibjingleStreamTransport : public StreamTransport,
virtual bool is_connected() const OVERRIDE; virtual bool is_connected() const OVERRIDE;
private: private:
void OnRequestSignaling(); void OnRequestSignaling(cricket::TransportChannelImpl* channel);
void OnCandidateReady(cricket::TransportChannelImpl* channel, void OnCandidateReady(cricket::TransportChannelImpl* channel,
const cricket::Candidate& candidate); const cricket::Candidate& candidate);
void OnRouteChange(cricket::TransportChannel* channel, void OnRouteChange(cricket::TransportChannel* channel,
...@@ -207,7 +207,8 @@ bool LibjingleStreamTransport::is_connected() const { ...@@ -207,7 +207,8 @@ bool LibjingleStreamTransport::is_connected() const {
return callback_.is_null(); return callback_.is_null();
} }
void LibjingleStreamTransport::OnRequestSignaling() { void LibjingleStreamTransport::OnRequestSignaling(
cricket::TransportChannelImpl* channel) {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
channel_->OnSignalingReady(); channel_->OnSignalingReady();
} }
......
Name: Libjingle library. Used for p2p voice and video communication. Name: Libjingle library. Used for p2p voice and video communication.
Short Name: libjingle Short Name: libjingle
URL: http://code.google.com/p/libjingle/ URL: http://code.google.com/p/libjingle/
Version: 0.6.16 Version: 0.6.17
Revision: 125 Revision: 126
License: BSD License: BSD
License File: source/COPYING License File: source/COPYING
Security Critical: yes Security Critical: yes
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment