| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 | 287 |
| 288 // Creates a remote MediaStream and adds it to the mocked native | 288 // Creates a remote MediaStream and adds it to the mocked native |
| 289 // peer connection. | 289 // peer connection. |
| 290 scoped_refptr<webrtc::MediaStreamInterface> | 290 scoped_refptr<webrtc::MediaStreamInterface> |
| 291 AddRemoteMockMediaStream(const std::string& stream_label, | 291 AddRemoteMockMediaStream(const std::string& stream_label, |
| 292 const std::string& video_track_label, | 292 const std::string& video_track_label, |
| 293 const std::string& audio_track_label) { | 293 const std::string& audio_track_label) { |
| 294 scoped_refptr<webrtc::MediaStreamInterface> stream( | 294 scoped_refptr<webrtc::MediaStreamInterface> stream( |
| 295 mock_dependency_factory_->CreateLocalMediaStream(stream_label)); | 295 mock_dependency_factory_->CreateLocalMediaStream(stream_label)); |
| 296 if (!video_track_label.empty()) { | 296 if (!video_track_label.empty()) { |
| 297 webrtc::VideoTrackSourceInterface* source = NULL; | 297 stream->AddTrack(MockWebRtcVideoTrack::Create(video_track_label).get()); |
| 298 scoped_refptr<webrtc::VideoTrackInterface> video_track( | |
| 299 mock_dependency_factory_->CreateLocalVideoTrack( | |
| 300 video_track_label, source)); | |
| 301 stream->AddTrack(video_track.get()); | |
| 302 } | 298 } |
| 303 if (!audio_track_label.empty()) { | 299 if (!audio_track_label.empty()) { |
| 304 scoped_refptr<webrtc::AudioTrackInterface> audio_track( | 300 stream->AddTrack(MockWebRtcAudioTrack::Create(audio_track_label).get()); |
| 305 WebRtcLocalAudioTrackAdapter::Create(audio_track_label, NULL)); | |
| 306 stream->AddTrack(audio_track.get()); | |
| 307 } | 301 } |
| 308 mock_peer_connection_->AddRemoteStream(stream.get()); | 302 mock_peer_connection_->AddRemoteStream(stream.get()); |
| 309 return stream; | 303 return stream; |
| 310 } | 304 } |
| 311 | 305 |
| 312 base::MessageLoop message_loop_; | 306 base::MessageLoop message_loop_; |
| 313 scoped_ptr<ChildProcess> child_process_; | 307 scoped_ptr<ChildProcess> child_process_; |
| 314 scoped_ptr<MockWebRTCPeerConnectionHandlerClient> mock_client_; | 308 scoped_ptr<MockWebRTCPeerConnectionHandlerClient> mock_client_; |
| 315 scoped_ptr<MockPeerConnectionDependencyFactory> mock_dependency_factory_; | 309 scoped_ptr<MockPeerConnectionDependencyFactory> mock_dependency_factory_; |
| 316 scoped_ptr<NiceMock<MockPeerConnectionTracker> > mock_tracker_; | 310 scoped_ptr<NiceMock<MockPeerConnectionTracker> > mock_tracker_; |
| (...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 793 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks; | 787 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks; |
| 794 webkit_stream.audioTracks(audio_tracks); | 788 webkit_stream.audioTracks(audio_tracks); |
| 795 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, | 789 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, |
| 796 audio_tracks[0].source().getReadyState()); | 790 audio_tracks[0].source().getReadyState()); |
| 797 | 791 |
| 798 blink::WebVector<blink::WebMediaStreamTrack> video_tracks; | 792 blink::WebVector<blink::WebMediaStreamTrack> video_tracks; |
| 799 webkit_stream.videoTracks(video_tracks); | 793 webkit_stream.videoTracks(video_tracks); |
| 800 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, | 794 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, |
| 801 video_tracks[0].source().getReadyState()); | 795 video_tracks[0].source().getReadyState()); |
| 802 | 796 |
| 803 remote_stream->GetAudioTracks()[0]->set_state( | 797 static_cast<MockWebRtcAudioTrack*>(remote_stream->GetAudioTracks()[0].get()) |
| 804 webrtc::MediaStreamTrackInterface::kEnded); | 798 ->SetEnded(); |
| 805 base::RunLoop().RunUntilIdle(); | 799 base::RunLoop().RunUntilIdle(); |
| 806 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, | 800 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, |
| 807 audio_tracks[0].source().getReadyState()); | 801 audio_tracks[0].source().getReadyState()); |
| 808 | 802 |
| 809 remote_stream->GetVideoTracks()[0]->set_state( | 803 static_cast<MockWebRtcVideoTrack*>(remote_stream->GetVideoTracks()[0].get()) |
| 810 webrtc::MediaStreamTrackInterface::kEnded); | 804 ->SetEnded(); |
| 811 base::RunLoop().RunUntilIdle(); | 805 base::RunLoop().RunUntilIdle(); |
| 812 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, | 806 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, |
| 813 video_tracks[0].source().getReadyState()); | 807 video_tracks[0].source().getReadyState()); |
| 814 } | 808 } |
| 815 | 809 |
| 816 TEST_F(RTCPeerConnectionHandlerTest, RemoveAndAddAudioTrackFromRemoteStream) { | 810 TEST_F(RTCPeerConnectionHandlerTest, RemoveAndAddAudioTrackFromRemoteStream) { |
| 817 std::string remote_stream_label("remote_stream"); | 811 std::string remote_stream_label("remote_stream"); |
| 818 base::RunLoop run_loop; | 812 base::RunLoop run_loop; |
| 819 | 813 |
| 820 // Grab the added media stream when it's been successfully added to the PC. | 814 // Grab the added media stream when it's been successfully added to the PC. |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1026 EXPECT_CALL(*mock_tracker_.get(), | 1020 EXPECT_CALL(*mock_tracker_.get(), |
| 1027 TrackCreateDTMFSender(pc_handler_.get(), | 1021 TrackCreateDTMFSender(pc_handler_.get(), |
| 1028 testing::Ref(tracks[0]))); | 1022 testing::Ref(tracks[0]))); |
| 1029 | 1023 |
| 1030 scoped_ptr<blink::WebRTCDTMFSenderHandler> sender( | 1024 scoped_ptr<blink::WebRTCDTMFSenderHandler> sender( |
| 1031 pc_handler_->createDTMFSender(tracks[0])); | 1025 pc_handler_->createDTMFSender(tracks[0])); |
| 1032 EXPECT_TRUE(sender.get()); | 1026 EXPECT_TRUE(sender.get()); |
| 1033 } | 1027 } |
| 1034 | 1028 |
| 1035 } // namespace content | 1029 } // namespace content |
| OLD | NEW |