summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS2
-rw-r--r--content/renderer/media/mock_media_stream_dependency_factory.cc17
-rw-r--r--content/renderer/media/mock_media_stream_dependency_factory.h3
-rw-r--r--content/renderer/media/mock_peer_connection_impl.cc41
-rw-r--r--content/renderer/media/mock_peer_connection_impl.h14
-rw-r--r--content/renderer/media/peer_connection_handler_jsep.cc2
-rw-r--r--content/renderer/p2p/p2p_transport_impl.cc2
-rw-r--r--content/renderer/p2p/port_allocator.cc6
-rw-r--r--content/renderer/p2p/port_allocator.h2
-rw-r--r--jingle/glue/channel_socket_adapter_unittest.cc4
-rw-r--r--remoting/client/plugin/pepper_port_allocator.cc7
-rw-r--r--remoting/client/plugin/pepper_port_allocator.h1
-rw-r--r--remoting/host/host_port_allocator.cc7
-rw-r--r--remoting/host/host_port_allocator.h1
-rw-r--r--remoting/protocol/libjingle_transport_factory.cc2
-rw-r--r--third_party/libjingle/README.chromium4
-rw-r--r--third_party/libjingle/libjingle.gyp2
17 files changed, 103 insertions, 14 deletions
diff --git a/DEPS b/DEPS
index 990a0ed..247e8b9 100644
--- a/DEPS
+++ b/DEPS
@@ -46,7 +46,7 @@ vars = {
"nacl_toolchain_revision": "9093",
"pnacl_toolchain_revision": "9117",
- "libjingle_revision": "157",
+ "libjingle_revision": "159",
"libphonenumber_revision": "456",
"libvpx_revision": "134182",
"lss_revision": "11",
diff --git a/content/renderer/media/mock_media_stream_dependency_factory.cc b/content/renderer/media/mock_media_stream_dependency_factory.cc
index 47af829..b43e6ea 100644
--- a/content/renderer/media/mock_media_stream_dependency_factory.cc
+++ b/content/renderer/media/mock_media_stream_dependency_factory.cc
@@ -90,6 +90,19 @@ VideoRendererWrapperInterface* MockLocalVideoTrack::GetRenderer() {
return renderer_;
}
+void MockLocalVideoTrack::AddRenderer(VideoRendererInterface* renderer) {
+ NOTIMPLEMENTED();
+}
+
+void MockLocalVideoTrack::RemoveRenderer(VideoRendererInterface* renderer) {
+ NOTIMPLEMENTED();
+}
+
+cricket::VideoRenderer* MockLocalVideoTrack::FrameInput() {
+ NOTIMPLEMENTED();
+ return NULL;
+}
+
std::string MockLocalVideoTrack::kind() const {
NOTIMPLEMENTED();
return "";
@@ -177,6 +190,10 @@ class MockSessionDescription : public SessionDescriptionInterface {
NOTIMPLEMENTED();
return "";
}
+ virtual SdpType type() const OVERRIDE {
+ NOTIMPLEMENTED();
+ return kOffer;
+ }
virtual bool AddCandidate(const IceCandidateInterface* candidate) OVERRIDE {
NOTIMPLEMENTED();
return false;
diff --git a/content/renderer/media/mock_media_stream_dependency_factory.h b/content/renderer/media/mock_media_stream_dependency_factory.h
index 4c04b97..0258627 100644
--- a/content/renderer/media/mock_media_stream_dependency_factory.h
+++ b/content/renderer/media/mock_media_stream_dependency_factory.h
@@ -23,6 +23,9 @@ class MockLocalVideoTrack : public LocalVideoTrackInterface {
virtual cricket::VideoCapturer* GetVideoCapture() OVERRIDE;
virtual void SetRenderer(VideoRendererWrapperInterface* renderer) OVERRIDE;
virtual VideoRendererWrapperInterface* GetRenderer() OVERRIDE;
+ virtual void AddRenderer(VideoRendererInterface* renderer) OVERRIDE;
+ virtual void RemoveRenderer(VideoRendererInterface* renderer) OVERRIDE;
+ virtual cricket::VideoRenderer* FrameInput() OVERRIDE;
virtual std::string kind() const OVERRIDE;
virtual std::string label() const OVERRIDE;
virtual bool enabled() const OVERRIDE;
diff --git a/content/renderer/media/mock_peer_connection_impl.cc b/content/renderer/media/mock_peer_connection_impl.cc
index f0eb845..79cbac4 100644
--- a/content/renderer/media/mock_peer_connection_impl.cc
+++ b/content/renderer/media/mock_peer_connection_impl.cc
@@ -167,4 +167,45 @@ void MockPeerConnectionImpl::AddRemoteStream(MediaStreamInterface* stream) {
remote_streams_->AddStream(stream);
}
+void MockPeerConnectionImpl::CreateOffer(
+ CreateSessionDescriptionObserver* observer,
+ const SessionDescriptionOptions& options) {
+ NOTIMPLEMENTED();
+}
+
+void MockPeerConnectionImpl::CreateAnswer(
+ CreateSessionDescriptionObserver* observer,
+ const SessionDescriptionOptions& options) {
+ NOTIMPLEMENTED();
+}
+
+void MockPeerConnectionImpl::SetLocalDescription(
+ SetSessionDescriptionObserver* observer,
+ SessionDescriptionInterface* desc) {
+ NOTIMPLEMENTED();
+}
+
+void MockPeerConnectionImpl::SetRemoteDescription(
+ SetSessionDescriptionObserver* observer,
+ SessionDescriptionInterface* desc) {
+ NOTIMPLEMENTED();
+}
+
+bool MockPeerConnectionImpl::UpdateIce(const IceServers& configuration,
+ IceOptions options) {
+ NOTIMPLEMENTED();
+ return false;
+}
+
+bool MockPeerConnectionImpl::AddIceCandidate(
+ const IceCandidateInterface* candidate) {
+ NOTIMPLEMENTED();
+ return false;
+}
+
+PeerConnectionInterface::IceState MockPeerConnectionImpl::ice_state() {
+ NOTIMPLEMENTED();
+ return kIceNew;
+}
+
} // namespace webrtc
diff --git a/content/renderer/media/mock_peer_connection_impl.h b/content/renderer/media/mock_peer_connection_impl.h
index 9b61747..122303d 100644
--- a/content/renderer/media/mock_peer_connection_impl.h
+++ b/content/renderer/media/mock_peer_connection_impl.h
@@ -56,6 +56,20 @@ class MockPeerConnectionImpl : public PeerConnectionInterface {
virtual const webrtc::SessionDescriptionInterface* remote_description()
const OVERRIDE;
+ // JSEP01 APIs
+ virtual void CreateOffer(CreateSessionDescriptionObserver* observer,
+ const SessionDescriptionOptions& options) OVERRIDE;
+ virtual void CreateAnswer(CreateSessionDescriptionObserver* observer,
+ const SessionDescriptionOptions& options) OVERRIDE;
+ virtual void SetLocalDescription(SetSessionDescriptionObserver* observer,
+ SessionDescriptionInterface* desc) OVERRIDE;
+ virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer,
+ SessionDescriptionInterface* desc) OVERRIDE;
+ virtual bool UpdateIce(const IceServers& configuration,
+ IceOptions options) OVERRIDE;
+ virtual bool AddIceCandidate(const IceCandidateInterface* candidate) OVERRIDE;
+ virtual IceState ice_state() OVERRIDE;
+
void AddRemoteStream(MediaStreamInterface* stream);
void ClearStreamChangesCommitted() { stream_changes_committed_ = false; }
void SetReadyState(ReadyState state) { ready_state_ = state; }
diff --git a/content/renderer/media/peer_connection_handler_jsep.cc b/content/renderer/media/peer_connection_handler_jsep.cc
index 21c4eac..ffce8c2 100644
--- a/content/renderer/media/peer_connection_handler_jsep.cc
+++ b/content/renderer/media/peer_connection_handler_jsep.cc
@@ -209,7 +209,7 @@ void PeerConnectionHandlerJsep::OnStateChange(StateType state_changed) {
case webrtc::PeerConnectionInterface::kNew:
ready_state = WebKit::WebPeerConnection00HandlerClient::ReadyStateNew;
break;
- case webrtc::PeerConnectionInterface::kNegotiating:
+ case webrtc::PeerConnectionInterface::kOpening:
ready_state =
WebKit::WebPeerConnection00HandlerClient::ReadyStateNegotiating;
break;
diff --git a/content/renderer/p2p/p2p_transport_impl.cc b/content/renderer/p2p/p2p_transport_impl.cc
index 7a13997..1556ef3 100644
--- a/content/renderer/p2p/p2p_transport_impl.cc
+++ b/content/renderer/p2p/p2p_transport_impl.cc
@@ -77,7 +77,7 @@ bool P2PTransportImpl::Init(WebKit::WebFrame* web_frame,
DCHECK(!channel_.get());
channel_.reset(new cricket::P2PTransportChannel(
- 0, NULL, allocator_.get()));
+ "", 0, NULL, allocator_.get()));
channel_->SetIceUfrag(
talk_base::CreateRandomString(cricket::ICE_UFRAG_LENGTH));
channel_->SetIcePwd(talk_base::CreateRandomString(cricket::ICE_PWD_LENGTH));
diff --git a/content/renderer/p2p/port_allocator.cc b/content/renderer/p2p/port_allocator.cc
index 4a0615e..f2c0c48 100644
--- a/content/renderer/p2p/port_allocator.cc
+++ b/content/renderer/p2p/port_allocator.cc
@@ -70,20 +70,22 @@ P2PPortAllocator::~P2PPortAllocator() {
}
cricket::PortAllocatorSession* P2PPortAllocator::CreateSessionInternal(
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password) {
return new P2PPortAllocatorSession(
- this, component, ice_username_fragment, ice_password);
+ this, content_name, component, ice_username_fragment, ice_password);
}
P2PPortAllocatorSession::P2PPortAllocatorSession(
P2PPortAllocator* allocator,
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password)
: cricket::BasicPortAllocatorSession(
- allocator, component,
+ allocator, content_name, component,
ice_username_fragment, ice_password),
allocator_(allocator),
relay_session_attempts_(0),
diff --git a/content/renderer/p2p/port_allocator.h b/content/renderer/p2p/port_allocator.h
index 5aa34db..547efd5 100644
--- a/content/renderer/p2p/port_allocator.h
+++ b/content/renderer/p2p/port_allocator.h
@@ -35,6 +35,7 @@ class P2PPortAllocator : public cricket::BasicPortAllocator {
virtual ~P2PPortAllocator();
virtual cricket::PortAllocatorSession* CreateSessionInternal(
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password) OVERRIDE;
@@ -54,6 +55,7 @@ class P2PPortAllocatorSession : public cricket::BasicPortAllocatorSession,
public:
P2PPortAllocatorSession(
P2PPortAllocator* allocator,
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password);
diff --git a/jingle/glue/channel_socket_adapter_unittest.cc b/jingle/glue/channel_socket_adapter_unittest.cc
index 867aeea..6a51640 100644
--- a/jingle/glue/channel_socket_adapter_unittest.cc
+++ b/jingle/glue/channel_socket_adapter_unittest.cc
@@ -1,4 +1,4 @@
-// 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
// found in the LICENSE file.
@@ -30,7 +30,7 @@ const int kTestError = -32123;
class MockTransportChannel : public cricket::TransportChannel {
public:
MockTransportChannel()
- : cricket::TransportChannel(0) {
+ : cricket::TransportChannel("", 0) {
set_writable(true);
set_readable(true);
}
diff --git a/remoting/client/plugin/pepper_port_allocator.cc b/remoting/client/plugin/pepper_port_allocator.cc
index bf8ac98..e22e84c 100644
--- a/remoting/client/plugin/pepper_port_allocator.cc
+++ b/remoting/client/plugin/pepper_port_allocator.cc
@@ -32,6 +32,7 @@ class PepperPortAllocatorSession
public:
PepperPortAllocatorSession(
cricket::HttpPortAllocatorBase* allocator,
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password,
@@ -74,6 +75,7 @@ class PepperPortAllocatorSession
PepperPortAllocatorSession::PepperPortAllocatorSession(
cricket::HttpPortAllocatorBase* allocator,
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password,
@@ -82,7 +84,7 @@ PepperPortAllocatorSession::PepperPortAllocatorSession(
const std::string& relay_token,
const pp::InstanceHandle& instance)
: HttpPortAllocatorSessionBase(
- allocator, component, ice_username_fragment, ice_password,
+ allocator, content_name, component, ice_username_fragment, ice_password,
stun_hosts, relay_hosts, relay_token, ""),
instance_(instance),
stun_address_resolver_(instance_),
@@ -336,11 +338,12 @@ PepperPortAllocator::~PepperPortAllocator() {
}
cricket::PortAllocatorSession* PepperPortAllocator::CreateSessionInternal(
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password) {
return new PepperPortAllocatorSession(
- this, component, ice_username_fragment, ice_password,
+ this, content_name, component, ice_username_fragment, ice_password,
stun_hosts(), relay_hosts(), relay_token(), instance_);
}
diff --git a/remoting/client/plugin/pepper_port_allocator.h b/remoting/client/plugin/pepper_port_allocator.h
index 914adde..92222a1 100644
--- a/remoting/client/plugin/pepper_port_allocator.h
+++ b/remoting/client/plugin/pepper_port_allocator.h
@@ -29,6 +29,7 @@ class PepperPortAllocator : public cricket::HttpPortAllocatorBase {
// cricket::HttpPortAllocatorBase overrides.
virtual cricket::PortAllocatorSession* CreateSessionInternal(
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password) OVERRIDE;
diff --git a/remoting/host/host_port_allocator.cc b/remoting/host/host_port_allocator.cc
index d9323d1..a3ca33a 100644
--- a/remoting/host/host_port_allocator.cc
+++ b/remoting/host/host_port_allocator.cc
@@ -25,6 +25,7 @@ class HostPortAllocatorSession
public:
HostPortAllocatorSession(
cricket::HttpPortAllocatorBase* allocator,
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password,
@@ -50,6 +51,7 @@ class HostPortAllocatorSession
HostPortAllocatorSession::HostPortAllocatorSession(
cricket::HttpPortAllocatorBase* allocator,
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password,
@@ -58,7 +60,7 @@ HostPortAllocatorSession::HostPortAllocatorSession(
const std::string& relay,
const scoped_refptr<net::URLRequestContextGetter>& url_context)
: HttpPortAllocatorSessionBase(
- allocator, component, ice_username_fragment, ice_password,
+ allocator, content_name, component, ice_username_fragment, ice_password,
stun_hosts, relay_hosts, relay, ""),
url_context_(url_context) {
}
@@ -165,11 +167,12 @@ HostPortAllocator::~HostPortAllocator() {
}
cricket::PortAllocatorSession* HostPortAllocator::CreateSessionInternal(
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password) {
return new HostPortAllocatorSession(
- this, component, ice_username_fragment, ice_password,
+ this, content_name, component, ice_username_fragment, ice_password,
stun_hosts(), relay_hosts(), relay_token(), url_context_);
}
diff --git a/remoting/host/host_port_allocator.h b/remoting/host/host_port_allocator.h
index 042c1e4..47d0893 100644
--- a/remoting/host/host_port_allocator.h
+++ b/remoting/host/host_port_allocator.h
@@ -34,6 +34,7 @@ class HostPortAllocator : public cricket::HttpPortAllocatorBase {
// cricket::HttpPortAllocatorBase overrides.
virtual cricket::PortAllocatorSession* CreateSessionInternal(
+ const std::string& content_name,
int component,
const std::string& ice_username_fragment,
const std::string& ice_password) OVERRIDE;
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index b36d8cb..60be636 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -137,7 +137,7 @@ void LibjingleStreamTransport::Connect(
// Create P2PTransportChannel, attach signal handlers and connect it.
// TODO(sergeyu): Specify correct component ID for the channel.
channel_.reset(new cricket::P2PTransportChannel(
- 0, NULL, port_allocator_));
+ "", 0, NULL, port_allocator_));
channel_->SetIceUfrag(ice_username_fragment_);
channel_->SetIcePwd(ice_password_);
channel_->SignalRequestSignaling.connect(
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index 02c5da0..5559ce9 100644
--- a/third_party/libjingle/README.chromium
+++ b/third_party/libjingle/README.chromium
@@ -1,8 +1,8 @@
Name: Libjingle library. Used for p2p voice and video communication.
Short Name: libjingle
URL: http://code.google.com/p/libjingle/
-Version: 0.6.19
-Revision: 153
+Version: unknown
+Revision: 159
License: BSD
License File: source/COPYING
Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index d164627..98705ca 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -534,6 +534,8 @@
'source/talk/app/webrtc/roapsignaling.cc',
'source/talk/app/webrtc/roapsignaling.h',
'source/talk/app/webrtc/streamcollection.h',
+ 'source/talk/app/webrtc/videotrackrenderers.cc',
+ 'source/talk/app/webrtc/videotrackrenderers.h',
'source/talk/app/webrtc/videorendererimpl.cc',
'source/talk/app/webrtc/videotrack.cc',
'source/talk/app/webrtc/videotrack.h',
generated by cgit v1.1 at 2025-02-14 20:59:40 +0000