diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | content/renderer/media/mock_media_stream_dependency_factory.cc | 9 | ||||
| -rw-r--r-- | content/renderer/media/mock_peer_connection_impl.cc | 35 | ||||
| -rw-r--r-- | content/renderer/media/mock_peer_connection_impl.h | 9 | ||||
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 2 |
6 files changed, 41 insertions, 18 deletions
@@ -18,7 +18,7 @@ vars = { "nacl_tools_revision": "10001", # native_client/DEPS: tools_rev "gtm_revision": "578", - "libjingle_revision": "266", + "libjingle_revision": "270", "libphonenumber_revision": "456", "libvpx_revision": "178115", "lss_revision": "17", diff --git a/content/renderer/media/mock_media_stream_dependency_factory.cc b/content/renderer/media/mock_media_stream_dependency_factory.cc index 3babbe9..c997c42 100644 --- a/content/renderer/media/mock_media_stream_dependency_factory.cc +++ b/content/renderer/media/mock_media_stream_dependency_factory.cc @@ -34,6 +34,15 @@ class MockMediaStreamTrackList return tracks_[index]; } + virtual TrackType* Find(const std::string& id) OVERRIDE { + for (size_t i = 0; i < tracks_.size(); ++i) { + if (tracks_.at(i)->id() == id) { + return tracks_.at(i); + } + } + return NULL; + } + void AddTrack(TrackType* track) { tracks_.push_back(track); } diff --git a/content/renderer/media/mock_peer_connection_impl.cc b/content/renderer/media/mock_peer_connection_impl.cc index 9e341cd..cba6640 100644 --- a/content/renderer/media/mock_peer_connection_impl.cc +++ b/content/renderer/media/mock_peer_connection_impl.cc @@ -35,6 +35,26 @@ class MockStreamCollection : public webrtc::StreamCollectionInterface { } return NULL; } + virtual webrtc::MediaStreamTrackInterface* FindAudioTrack( + const std::string& id) OVERRIDE { + for (size_t i = 0; i < streams_.size(); ++i) { + webrtc::MediaStreamTrackInterface* track = + streams_.at(i)->audio_tracks()->Find(id); + if (track) + return track; + } + return NULL; + } + virtual webrtc::MediaStreamTrackInterface* FindVideoTrack( + const std::string& id) OVERRIDE{ + for (size_t i = 0; i < streams_.size(); ++i) { + webrtc::MediaStreamTrackInterface* track = + streams_.at(i)->video_tracks()->Find(id); + if (track) + return track; + } + return NULL; + } void AddStream(MediaStreamInterface* stream) { streams_.push_back(stream); } @@ -151,18 +171,11 @@ void MockPeerConnectionImpl::RemoveStream( } -bool MockPeerConnectionImpl::CanSendDtmf( - const webrtc::AudioTrackInterface* track) { - NOTIMPLEMENTED(); - return false; -} - -bool MockPeerConnectionImpl::SendDtmf( - const webrtc::AudioTrackInterface* send_track, - const std::string& tones, int duration, - const webrtc::AudioTrackInterface* play_track) { +webrtc::DtmfSender* MockPeerConnectionImpl::CreateDtmfSender( + webrtc::AudioTrackInterface* track, + webrtc::DtmfSenderObserverInterface* observer) { NOTIMPLEMENTED(); - return false; + return NULL; } talk_base::scoped_refptr<webrtc::DataChannelInterface> diff --git a/content/renderer/media/mock_peer_connection_impl.h b/content/renderer/media/mock_peer_connection_impl.h index 869a720..ddb7b39 100644 --- a/content/renderer/media/mock_peer_connection_impl.h +++ b/content/renderer/media/mock_peer_connection_impl.h @@ -31,11 +31,10 @@ class MockPeerConnectionImpl : public webrtc::PeerConnectionInterface { const webrtc::MediaConstraintsInterface* constraints) OVERRIDE; virtual void RemoveStream( webrtc::MediaStreamInterface* local_stream) OVERRIDE; - virtual bool CanSendDtmf(const webrtc::AudioTrackInterface* track) OVERRIDE; - virtual bool SendDtmf(const webrtc::AudioTrackInterface* send_track, - const std::string& tones, int duration, - const webrtc::AudioTrackInterface* play_track) OVERRIDE; - virtual talk_base::scoped_refptr<webrtc::DataChannelInterface> + virtual webrtc::DtmfSender* CreateDtmfSender( + webrtc::AudioTrackInterface* track, + webrtc::DtmfSenderObserverInterface* observer) OVERRIDE; + virtual talk_base::scoped_refptr<webrtc::DataChannelInterface> CreateDataChannel(const std::string& label, const webrtc::DataChannelInit* config) OVERRIDE; diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 45b80d3..ab8bb021 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -1,7 +1,7 @@ Name: libjingle URL: http://code.google.com/p/libjingle/ Version: unknown -Revision: 266 +Revision: 270 License: BSD License File: source/COPYING Security Critical: yes diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 5f78e14..092508d 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -622,6 +622,8 @@ '<(libjingle_source)/talk/app/webrtc/mediastreamtrackproxy.cc', '<(libjingle_source)/talk/app/webrtc/mediastreamtrackproxy.h', '<(libjingle_source)/talk/app/webrtc/notifier.h', + '<(libjingle_source)/talk/app/webrtc/dtmfsender.cc', + '<(libjingle_source)/talk/app/webrtc/dtmfsender.h', '<(libjingle_source)/talk/app/webrtc/peerconnection.cc', '<(libjingle_source)/talk/app/webrtc/peerconnection.h', '<(libjingle_source)/talk/app/webrtc/peerconnectionfactory.cc', |