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

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

Issue 1773273007: Cleanup: media_stream_api.* ==> media_stream_utils.* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: +headers in blink_test_runner.cc 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 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_api.h" 5 #include "content/public/renderer/media_stream_utils.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/guid.h" 10 #include "base/guid.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.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/media_stream_audio_source.h" 14 #include "content/renderer/media/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 "content/renderer/render_thread_impl.h" 18 #include "content/renderer/render_thread_impl.h"
19 #include "media/base/audio_capturer_source.h"
20 #include "media/base/video_capturer_source.h"
19 #include "third_party/WebKit/public/platform/WebMediaStream.h" 21 #include "third_party/WebKit/public/platform/WebMediaStream.h"
20 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 22 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
21 #include "third_party/WebKit/public/platform/WebURL.h"
22 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" 23 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
23 #include "url/gurl.h"
24 24
25 namespace content { 25 namespace content {
26 26
27 bool AddVideoTrackToMediaStream( 27 bool AddVideoTrackToMediaStream(
28 scoped_ptr<media::VideoCapturerSource> video_source, 28 scoped_ptr<media::VideoCapturerSource> video_source,
29 bool is_remote, 29 bool is_remote,
30 bool is_readonly, 30 bool is_readonly,
31 blink::WebMediaStream* web_media_stream) { 31 blink::WebMediaStream* web_media_stream) {
32 DCHECK(video_source.get()); 32 DCHECK(video_source.get());
33 if (!web_media_stream || web_media_stream->isNull()) { 33 if (!web_media_stream || web_media_stream->isNull()) {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 120
121 content::MediaStreamVideoSource* source = 121 content::MediaStreamVideoSource* source =
122 content::MediaStreamVideoSource::GetVideoSource(video_track.source()); 122 content::MediaStreamVideoSource::GetVideoSource(video_track.source());
123 if (!source) 123 if (!source)
124 return nullptr; 124 return nullptr;
125 125
126 return source->GetCurrentFormat(); 126 return source->GetCurrentFormat();
127 } 127 }
128 128
129 } // namespace content 129 } // 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