Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Side by Side Diff: content/renderer/media/webrtc/webrtc_media_stream_track_adapter_unittest.cc

Issue 2972553002: Remove MediaStreamVideoSource::GetCurrentSupportedFormats() (Closed)
Patch Set: remove extra use in media_stream_video_capturer_source_unittest.cc Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2017 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2017 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 "content/renderer/media/webrtc/webrtc_media_stream_track_adapter.h" 5 #include "content/renderer/media/webrtc/webrtc_media_stream_track_adapter.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 audio_source->ConnectToTrack(web_track); 58 audio_source->ConnectToTrack(web_track);
59 return web_track; 59 return web_track;
60 } 60 }
61 61
62 blink::WebMediaStreamTrack CreateLocalVideoTrack() { 62 blink::WebMediaStreamTrack CreateLocalVideoTrack() {
63 blink::WebMediaStreamSource web_source; 63 blink::WebMediaStreamSource web_source;
64 web_source.Initialize(blink::WebString::FromUTF8("local_video_id"), 64 web_source.Initialize(blink::WebString::FromUTF8("local_video_id"),
65 blink::WebMediaStreamSource::kTypeVideo, 65 blink::WebMediaStreamSource::kTypeVideo,
66 blink::WebString::FromUTF8("local_video_track"), 66 blink::WebString::FromUTF8("local_video_track"),
67 false); 67 false);
68 MockMediaStreamVideoSource* video_source = 68 MockMediaStreamVideoSource* video_source = new MockMediaStreamVideoSource();
69 new MockMediaStreamVideoSource(true);
70 // Takes ownership of |video_source|. 69 // Takes ownership of |video_source|.
71 web_source.SetExtraData(video_source); 70 web_source.SetExtraData(video_source);
72 71
73 return MediaStreamVideoTrack::CreateVideoTrack( 72 return MediaStreamVideoTrack::CreateVideoTrack(
74 video_source, MediaStreamVideoSource::ConstraintsCallback(), true); 73 video_source, MediaStreamVideoSource::ConstraintsCallback(), true);
75 } 74 }
76 75
77 void CreateRemoteTrackAdapter( 76 void CreateRemoteTrackAdapter(
78 webrtc::MediaStreamTrackInterface* webrtc_track) { 77 webrtc::MediaStreamTrackInterface* webrtc_track) {
79 track_adapter_ = WebRtcMediaStreamTrackAdapter::CreateRemoteTrackAdapter( 78 track_adapter_ = WebRtcMediaStreamTrackAdapter::CreateRemoteTrackAdapter(
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 EXPECT_EQ(track_adapter_->webrtc_track()->kind(), 188 EXPECT_EQ(track_adapter_->webrtc_track()->kind(),
190 webrtc::MediaStreamTrackInterface::kVideoKind); 189 webrtc::MediaStreamTrackInterface::kVideoKind);
191 EXPECT_EQ(track_adapter_->webrtc_track()->id().c_str(), 190 EXPECT_EQ(track_adapter_->webrtc_track()->id().c_str(),
192 track_adapter_->web_track().Id()); 191 track_adapter_->web_track().Id());
193 EXPECT_TRUE(track_adapter_->GetRemoteVideoTrackAdapterForTesting()); 192 EXPECT_TRUE(track_adapter_->GetRemoteVideoTrackAdapterForTesting());
194 EXPECT_TRUE( 193 EXPECT_TRUE(
195 track_adapter_->GetRemoteVideoTrackAdapterForTesting()->initialized()); 194 track_adapter_->GetRemoteVideoTrackAdapterForTesting()->initialized());
196 } 195 }
197 196
198 } // namespace content 197 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698