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

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

Issue 272043003: Renamed MediaStreamDependencyFactory to PeerConnectionDependencyFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_adapter.h" 5 #include "content/renderer/media/webrtc/webrtc_media_stream_adapter.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/renderer/media/media_stream_audio_source.h" 8 #include "content/renderer/media/media_stream_audio_source.h"
9 #include "content/renderer/media/media_stream_dependency_factory.h"
10 #include "content/renderer/media/media_stream_track.h" 9 #include "content/renderer/media/media_stream_track.h"
10 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
11 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 11 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
12 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 12 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
13 #include "third_party/WebKit/public/platform/WebString.h" 13 #include "third_party/WebKit/public/platform/WebString.h"
14 14
15 namespace content { 15 namespace content {
16 16
17 WebRtcMediaStreamAdapter::WebRtcMediaStreamAdapter( 17 WebRtcMediaStreamAdapter::WebRtcMediaStreamAdapter(
18 const blink::WebMediaStream& web_stream, 18 const blink::WebMediaStream& web_stream,
19 MediaStreamDependencyFactory* factory) 19 PeerConnectionDependencyFactory* factory)
20 : web_stream_(web_stream), 20 : web_stream_(web_stream),
21 factory_(factory) { 21 factory_(factory) {
22 webrtc_media_stream_ = 22 webrtc_media_stream_ =
23 factory_->CreateLocalMediaStream(web_stream.id().utf8()); 23 factory_->CreateLocalMediaStream(web_stream.id().utf8());
24 24
25 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks; 25 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks;
26 web_stream_.audioTracks(audio_tracks); 26 web_stream_.audioTracks(audio_tracks);
27 for (size_t i = 0; i < audio_tracks.size(); ++i) 27 for (size_t i = 0; i < audio_tracks.size(); ++i)
28 CreateAudioTrack(audio_tracks[i]); 28 CreateAudioTrack(audio_tracks[i]);
29 29
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 void WebRtcMediaStreamAdapter::CreateVideoTrack( 102 void WebRtcMediaStreamAdapter::CreateVideoTrack(
103 const blink::WebMediaStreamTrack& track) { 103 const blink::WebMediaStreamTrack& track) {
104 DCHECK_EQ(track.source().type(), blink::WebMediaStreamSource::TypeVideo); 104 DCHECK_EQ(track.source().type(), blink::WebMediaStreamSource::TypeVideo);
105 WebRtcVideoTrackAdapter* adapter = 105 WebRtcVideoTrackAdapter* adapter =
106 new WebRtcVideoTrackAdapter(track, factory_); 106 new WebRtcVideoTrackAdapter(track, factory_);
107 video_adapters_.push_back(adapter); 107 video_adapters_.push_back(adapter);
108 webrtc_media_stream_->AddTrack(adapter->webrtc_video_track()); 108 webrtc_media_stream_->AddTrack(adapter->webrtc_video_track());
109 } 109 }
110 110
111 } // namespace content 111 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698