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

Side by Side Diff: content/public/renderer/media_stream_utils.cc

Issue 2788593002: Remove |remote| and |readonly| members of MediaStreamTrack. (Closed)
Patch Set: Fixed webkit-tests Created 3 years, 8 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/public/renderer/media_stream_utils.h" 5 #include "content/public/renderer/media_stream_utils.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/guid.h" 11 #include "base/guid.h"
12 #include "base/rand_util.h" 12 #include "base/rand_util.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "content/renderer/media/external_media_stream_audio_source.h" 14 #include "content/renderer/media/external_media_stream_audio_source.h"
15 #include "content/renderer/media/media_stream_video_capturer_source.h" 15 #include "content/renderer/media/media_stream_video_capturer_source.h"
16 #include "content/renderer/media/media_stream_video_source.h" 16 #include "content/renderer/media/media_stream_video_source.h"
17 #include "content/renderer/media/media_stream_video_track.h" 17 #include "content/renderer/media/media_stream_video_track.h"
18 #include "media/base/audio_capturer_source.h" 18 #include "media/base/audio_capturer_source.h"
19 #include "media/capture/video_capturer_source.h" 19 #include "media/capture/video_capturer_source.h"
20 #include "third_party/WebKit/public/platform/WebMediaStream.h" 20 #include "third_party/WebKit/public/platform/WebMediaStream.h"
21 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 21 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
22 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" 22 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
23 23
24 namespace content { 24 namespace content {
25 25
26 bool AddVideoTrackToMediaStream( 26 bool AddVideoTrackToMediaStream(
27 std::unique_ptr<media::VideoCapturerSource> video_source, 27 std::unique_ptr<media::VideoCapturerSource> video_source,
28 bool is_remote, 28 bool is_remote,
29 bool is_readonly,
30 blink::WebMediaStream* web_media_stream) { 29 blink::WebMediaStream* web_media_stream) {
31 DCHECK(video_source.get()); 30 DCHECK(video_source.get());
32 if (!web_media_stream || web_media_stream->isNull()) { 31 if (!web_media_stream || web_media_stream->isNull()) {
33 DLOG(ERROR) << "WebMediaStream is null"; 32 DLOG(ERROR) << "WebMediaStream is null";
34 return false; 33 return false;
35 } 34 }
36 35
37 blink::WebMediaStreamSource web_media_stream_source; 36 blink::WebMediaStreamSource web_media_stream_source;
38 MediaStreamVideoSource* const media_stream_source = 37 MediaStreamVideoSource* const media_stream_source =
39 new MediaStreamVideoCapturerSource( 38 new MediaStreamVideoCapturerSource(
(...skipping 12 matching lines...) Expand all
52 MediaStreamVideoSource::ConstraintsCallback(), true)); 51 MediaStreamVideoSource::ConstraintsCallback(), true));
53 return true; 52 return true;
54 } 53 }
55 54
56 bool AddAudioTrackToMediaStream( 55 bool AddAudioTrackToMediaStream(
57 scoped_refptr<media::AudioCapturerSource> audio_source, 56 scoped_refptr<media::AudioCapturerSource> audio_source,
58 int sample_rate, 57 int sample_rate,
59 media::ChannelLayout channel_layout, 58 media::ChannelLayout channel_layout,
60 int frames_per_buffer, 59 int frames_per_buffer,
61 bool is_remote, 60 bool is_remote,
62 bool is_readonly,
63 blink::WebMediaStream* web_media_stream) { 61 blink::WebMediaStream* web_media_stream) {
64 DCHECK(audio_source.get()); 62 DCHECK(audio_source.get());
65 if (!web_media_stream || web_media_stream->isNull()) { 63 if (!web_media_stream || web_media_stream->isNull()) {
66 DLOG(ERROR) << "WebMediaStream is null"; 64 DLOG(ERROR) << "WebMediaStream is null";
67 return false; 65 return false;
68 } 66 }
69 67
70 const media::AudioParameters params( 68 const media::AudioParameters params(
71 media::AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, 69 media::AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
72 sample_rate, sizeof(int16_t) * 8, frames_per_buffer); 70 sample_rate, sizeof(int16_t) * 8, frames_per_buffer);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 const blink::WebMediaStreamTrack& video_track) { 110 const blink::WebMediaStreamTrack& video_track) {
113 if (video_track.isNull()) 111 if (video_track.isNull())
114 return; 112 return;
115 MediaStreamVideoSource* const source = 113 MediaStreamVideoSource* const source =
116 MediaStreamVideoSource::GetVideoSource(video_track.source()); 114 MediaStreamVideoSource::GetVideoSource(video_track.source());
117 if (source) 115 if (source)
118 source->RequestRefreshFrame(); 116 source->RequestRefreshFrame();
119 } 117 }
120 118
121 } // namespace content 119 } // namespace content
OLDNEW
« no previous file with comments | « content/public/renderer/media_stream_utils.h ('k') | content/renderer/renderer_blink_platform_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698