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

Side by Side Diff: content/renderer/media/media_stream_center.cc

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 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) 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 "content/renderer/media/media_stream_center.h" 5 #include "content/renderer/media/media_stream_center.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 DCHECK_EQ(source.getType(), blink::WebMediaStreamSource::TypeAudio); 46 DCHECK_EQ(source.getType(), blink::WebMediaStreamSource::TypeAudio);
47 if (source.remote()) { 47 if (source.remote()) {
48 factory->CreateRemoteAudioTrack(track); 48 factory->CreateRemoteAudioTrack(track);
49 } else { 49 } else {
50 factory->CreateLocalAudioTrack(track); 50 factory->CreateLocalAudioTrack(track);
51 } 51 }
52 } 52 }
53 53
54 void CreateNativeVideoMediaStreamTrack( 54 void CreateNativeVideoMediaStreamTrack(
55 const blink::WebMediaStreamTrack& track) { 55 const blink::WebMediaStreamTrack& track) {
56 DCHECK(track.extraData() == NULL); 56 DCHECK(track.getExtraData() == NULL);
57 blink::WebMediaStreamSource source = track.source(); 57 blink::WebMediaStreamSource source = track.source();
58 DCHECK_EQ(source.getType(), blink::WebMediaStreamSource::TypeVideo); 58 DCHECK_EQ(source.getType(), blink::WebMediaStreamSource::TypeVideo);
59 MediaStreamVideoSource* native_source = 59 MediaStreamVideoSource* native_source =
60 MediaStreamVideoSource::GetVideoSource(source); 60 MediaStreamVideoSource::GetVideoSource(source);
61 DCHECK(native_source); 61 DCHECK(native_source);
62 blink::WebMediaStreamTrack writable_track(track); 62 blink::WebMediaStreamTrack writable_track(track);
63 // TODO(perkj): The constraints to use here should be passed from blink when 63 // TODO(perkj): The constraints to use here should be passed from blink when
64 // a new track is created. For cloning, it should be the constraints of the 64 // a new track is created. For cloning, it should be the constraints of the
65 // cloned track and not the originating source. 65 // cloned track and not the originating source.
66 // Also - source.constraints() returns an uninitialized constraint if the 66 // Also - source.constraints() returns an uninitialized constraint if the
67 // source is coming from a remote video track. See http://crbug/287805. 67 // source is coming from a remote video track. See http://crbug/287805.
68 blink::WebMediaConstraints constraints = source.constraints(); 68 blink::WebMediaConstraints constraints = source.constraints();
69 if (constraints.isNull()) 69 if (constraints.isNull())
70 constraints.initialize(); 70 constraints.initialize();
71 writable_track.setExtraData( 71 writable_track.setExtraData(
72 new MediaStreamVideoTrack(native_source, constraints, 72 new MediaStreamVideoTrack(native_source, constraints,
73 MediaStreamVideoSource::ConstraintsCallback(), 73 MediaStreamVideoSource::ConstraintsCallback(),
74 track.isEnabled())); 74 track.isEnabled()));
75 } 75 }
76 76
77 void CreateNativeMediaStreamTrack(const blink::WebMediaStreamTrack& track, 77 void CreateNativeMediaStreamTrack(const blink::WebMediaStreamTrack& track,
78 PeerConnectionDependencyFactory* factory) { 78 PeerConnectionDependencyFactory* factory) {
79 DCHECK(!track.isNull() && !track.extraData()); 79 DCHECK(!track.isNull() && !track.getExtraData());
80 DCHECK(!track.source().isNull()); 80 DCHECK(!track.source().isNull());
81 81
82 switch (track.source().getType()) { 82 switch (track.source().getType()) {
83 case blink::WebMediaStreamSource::TypeAudio: 83 case blink::WebMediaStreamSource::TypeAudio:
84 CreateNativeAudioMediaStreamTrack(track, factory); 84 CreateNativeAudioMediaStreamTrack(track, factory);
85 break; 85 break;
86 case blink::WebMediaStreamSource::TypeVideo: 86 case blink::WebMediaStreamSource::TypeVideo:
87 CreateNativeVideoMediaStreamTrack(track); 87 CreateNativeVideoMediaStreamTrack(track);
88 break; 88 break;
89 } 89 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 MediaStreamTrack* native_track = MediaStreamTrack::GetTrack(track); 125 MediaStreamTrack* native_track = MediaStreamTrack::GetTrack(track);
126 native_track->Stop(); 126 native_track->Stop();
127 return true; 127 return true;
128 } 128 }
129 129
130 blink::WebAudioSourceProvider* 130 blink::WebAudioSourceProvider*
131 MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack( 131 MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack(
132 const blink::WebMediaStreamTrack& track) { 132 const blink::WebMediaStreamTrack& track) {
133 DVLOG(1) << "MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack"; 133 DVLOG(1) << "MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack";
134 MediaStreamTrack* media_stream_track = 134 MediaStreamTrack* media_stream_track =
135 static_cast<MediaStreamTrack*>(track.extraData()); 135 static_cast<MediaStreamTrack*>(track.getExtraData());
136 if (!media_stream_track) { 136 if (!media_stream_track) {
137 DLOG(ERROR) << "Native track missing for webaudio source."; 137 DLOG(ERROR) << "Native track missing for webaudio source.";
138 return nullptr; 138 return nullptr;
139 } 139 }
140 140
141 blink::WebMediaStreamSource source = track.source(); 141 blink::WebMediaStreamSource source = track.source();
142 DCHECK_EQ(source.getType(), blink::WebMediaStreamSource::TypeAudio); 142 DCHECK_EQ(source.getType(), blink::WebMediaStreamSource::TypeAudio);
143 143
144 // TODO(tommi): Rename WebRtcLocalAudioSourceProvider to 144 // TODO(tommi): Rename WebRtcLocalAudioSourceProvider to
145 // WebRtcAudioSourceProvider since it's not specific to local. 145 // WebRtcAudioSourceProvider since it's not specific to local.
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 185
186 bool MediaStreamCenter::didRemoveMediaStreamTrack( 186 bool MediaStreamCenter::didRemoveMediaStreamTrack(
187 const blink::WebMediaStream& stream, 187 const blink::WebMediaStream& stream,
188 const blink::WebMediaStreamTrack& track) { 188 const blink::WebMediaStreamTrack& track) {
189 DVLOG(1) << "MediaStreamCenter::didRemoveMediaStreamTrack"; 189 DVLOG(1) << "MediaStreamCenter::didRemoveMediaStreamTrack";
190 MediaStream* native_stream = MediaStream::GetMediaStream(stream); 190 MediaStream* native_stream = MediaStream::GetMediaStream(stream);
191 return native_stream->RemoveTrack(track); 191 return native_stream->RemoveTrack(track);
192 } 192 }
193 193
194 } // namespace content 194 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_audio_track.cc ('k') | content/renderer/media/media_stream_track.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698