| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 | 242 |
| 243 local_stream.audioTracks(audio_tracks); | 243 local_stream.audioTracks(audio_tracks); |
| 244 const std::string audio_track_id = UTF16ToUTF8(audio_tracks[0].id()); | 244 const std::string audio_track_id = UTF16ToUTF8(audio_tracks[0].id()); |
| 245 scoped_refptr<WebRtcAudioCapturer> capturer; | 245 scoped_refptr<WebRtcAudioCapturer> capturer; |
| 246 RTCMediaConstraints audio_constraints(audio_source.constraints()); | 246 RTCMediaConstraints audio_constraints(audio_source.constraints()); |
| 247 scoped_refptr<webrtc::AudioTrackInterface> audio_track( | 247 scoped_refptr<webrtc::AudioTrackInterface> audio_track( |
| 248 mock_dependency_factory_->CreateLocalAudioTrack( | 248 mock_dependency_factory_->CreateLocalAudioTrack( |
| 249 audio_track_id, capturer, NULL, NULL, | 249 audio_track_id, capturer, NULL, NULL, |
| 250 &audio_constraints)); | 250 &audio_constraints)); |
| 251 MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack( | 251 MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack( |
| 252 audio_track.get(), audio_tracks[0]); | 252 audio_track.get(), audio_tracks[0], true); |
| 253 native_stream->AddTrack(audio_track.get()); | 253 native_stream->AddTrack(audio_track.get()); |
| 254 | 254 |
| 255 local_stream.videoTracks(video_tracks); | 255 local_stream.videoTracks(video_tracks); |
| 256 const std::string video_track_id = UTF16ToUTF8(video_tracks[0].id()); | 256 const std::string video_track_id = UTF16ToUTF8(video_tracks[0].id()); |
| 257 webrtc::VideoSourceInterface* source = NULL; | 257 webrtc::VideoSourceInterface* source = NULL; |
| 258 scoped_refptr<webrtc::VideoTrackInterface> video_track( | 258 scoped_refptr<webrtc::VideoTrackInterface> video_track( |
| 259 mock_dependency_factory_->CreateLocalVideoTrack( | 259 mock_dependency_factory_->CreateLocalVideoTrack( |
| 260 video_track_id, source)); | 260 video_track_id, source)); |
| 261 MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack( | 261 MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack( |
| 262 video_track.get(), video_tracks[0]); | 262 video_track.get(), video_tracks[0], true); |
| 263 native_stream->AddTrack(video_track.get()); | 263 native_stream->AddTrack(video_track.get()); |
| 264 | 264 |
| 265 local_stream.setExtraData( | 265 local_stream.setExtraData( |
| 266 new MediaStreamExtraData(native_stream.get(), true)); | 266 new MediaStreamExtraData(native_stream.get(), true)); |
| 267 return local_stream; | 267 return local_stream; |
| 268 } | 268 } |
| 269 | 269 |
| 270 // Creates a remote MediaStream and adds it to the mocked native | 270 // Creates a remote MediaStream and adds it to the mocked native |
| 271 // peer connection. | 271 // peer connection. |
| 272 scoped_refptr<webrtc::MediaStreamInterface> | 272 scoped_refptr<webrtc::MediaStreamInterface> |
| (...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 819 EXPECT_CALL(*mock_tracker_.get(), | 819 EXPECT_CALL(*mock_tracker_.get(), |
| 820 TrackCreateDTMFSender(pc_handler_.get(), | 820 TrackCreateDTMFSender(pc_handler_.get(), |
| 821 testing::Ref(tracks[0]))); | 821 testing::Ref(tracks[0]))); |
| 822 | 822 |
| 823 scoped_ptr<blink::WebRTCDTMFSenderHandler> sender( | 823 scoped_ptr<blink::WebRTCDTMFSenderHandler> sender( |
| 824 pc_handler_->createDTMFSender(tracks[0])); | 824 pc_handler_->createDTMFSender(tracks[0])); |
| 825 EXPECT_TRUE(sender.get()); | 825 EXPECT_TRUE(sender.get()); |
| 826 } | 826 } |
| 827 | 827 |
| 828 } // namespace content | 828 } // namespace content |
| OLD | NEW |