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

Side by Side Diff: content/renderer/renderer_blink_platform_impl.cc

Issue 2007433002: Revert of MediaCaptureFromElement: add support for audio captureStream(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « content/renderer/renderer_blink_platform_impl.h ('k') | content/test/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/renderer_blink_platform_impl.h" 5 #include "content/renderer/renderer_blink_platform_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/guid.h"
12 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
13 #include "base/location.h" 12 #include "base/location.h"
14 #include "base/logging.h" 13 #include "base/logging.h"
15 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
16 #include "base/memory/shared_memory.h" 15 #include "base/memory/shared_memory.h"
17 #include "base/metrics/histogram.h" 16 #include "base/metrics/histogram.h"
18 #include "base/numerics/safe_conversions.h" 17 #include "base/numerics/safe_conversions.h"
19 #include "base/single_thread_task_runner.h" 18 #include "base/single_thread_task_runner.h"
20 #include "base/strings/string_number_conversions.h" 19 #include "base/strings/string_number_conversions.h"
21 #include "base/strings/utf_string_conversions.h" 20 #include "base/strings/utf_string_conversions.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "content/renderer/device_sensors/device_light_event_pump.h" 54 #include "content/renderer/device_sensors/device_light_event_pump.h"
56 #include "content/renderer/device_sensors/device_motion_event_pump.h" 55 #include "content/renderer/device_sensors/device_motion_event_pump.h"
57 #include "content/renderer/device_sensors/device_orientation_absolute_event_pump .h" 56 #include "content/renderer/device_sensors/device_orientation_absolute_event_pump .h"
58 #include "content/renderer/device_sensors/device_orientation_event_pump.h" 57 #include "content/renderer/device_sensors/device_orientation_event_pump.h"
59 #include "content/renderer/dom_storage/local_storage_cached_areas.h" 58 #include "content/renderer/dom_storage/local_storage_cached_areas.h"
60 #include "content/renderer/dom_storage/local_storage_namespace.h" 59 #include "content/renderer/dom_storage/local_storage_namespace.h"
61 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" 60 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
62 #include "content/renderer/gamepad_shared_memory_reader.h" 61 #include "content/renderer/gamepad_shared_memory_reader.h"
63 #include "content/renderer/media/audio_decoder.h" 62 #include "content/renderer/media/audio_decoder.h"
64 #include "content/renderer/media/canvas_capture_handler.h" 63 #include "content/renderer/media/canvas_capture_handler.h"
65 #include "content/renderer/media/html_audio_element_capturer_source.h"
66 #include "content/renderer/media/html_video_element_capturer_source.h" 64 #include "content/renderer/media/html_video_element_capturer_source.h"
67 #include "content/renderer/media/image_capture_frame_grabber.h" 65 #include "content/renderer/media/image_capture_frame_grabber.h"
68 #include "content/renderer/media/media_recorder_handler.h" 66 #include "content/renderer/media/media_recorder_handler.h"
69 #include "content/renderer/media/renderer_webaudiodevice_impl.h" 67 #include "content/renderer/media/renderer_webaudiodevice_impl.h"
70 #include "content/renderer/media/renderer_webmidiaccessor_impl.h" 68 #include "content/renderer/media/renderer_webmidiaccessor_impl.h"
71 #include "content/renderer/media/rtc_certificate_generator.h" 69 #include "content/renderer/media/rtc_certificate_generator.h"
72 #include "content/renderer/mojo/blink_service_registry_impl.h" 70 #include "content/renderer/mojo/blink_service_registry_impl.h"
73 #include "content/renderer/render_thread_impl.h" 71 #include "content/renderer/render_thread_impl.h"
74 #include "content/renderer/renderer_clipboard_delegate.h" 72 #include "content/renderer/renderer_clipboard_delegate.h"
75 #include "content/renderer/screen_orientation/screen_orientation_observer.h" 73 #include "content/renderer/screen_orientation/screen_orientation_observer.h"
(...skipping 894 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 AddVideoTrackToMediaStream( 968 AddVideoTrackToMediaStream(
971 HtmlVideoElementCapturerSource::CreateFromWebMediaPlayerImpl( 969 HtmlVideoElementCapturerSource::CreateFromWebMediaPlayerImpl(
972 web_media_player, 970 web_media_player,
973 content::RenderThread::Get()->GetIOMessageLoopProxy()), 971 content::RenderThread::Get()->GetIOMessageLoopProxy()),
974 false, // is_remote 972 false, // is_remote
975 false, // is_readonly 973 false, // is_readonly
976 web_media_stream); 974 web_media_stream);
977 #endif 975 #endif
978 } 976 }
979 977
980 void RendererBlinkPlatformImpl::createHTMLAudioElementCapturer(
981 WebMediaStream* web_media_stream,
982 WebMediaPlayer* web_media_player) {
983 DCHECK(web_media_stream);
984 DCHECK(web_media_player);
985
986 blink::WebMediaStreamSource web_media_stream_source;
987 blink::WebMediaStreamTrack web_media_stream_track;
988 const WebString track_id = WebString::fromUTF8(base::GenerateGUID());
989
990 web_media_stream_source.initialize(track_id,
991 blink::WebMediaStreamSource::TypeAudio,
992 track_id,
993 false /* is_remote */);
994 web_media_stream_track.initialize(web_media_stream_source);
995
996 MediaStreamAudioSource* const media_stream_source =
997 HtmlAudioElementCapturerSource::CreateFromWebMediaPlayerImpl(
998 web_media_player);
999
1000 // Takes ownership of |media_stream_source|.
1001 web_media_stream_source.setExtraData(media_stream_source);
1002
1003 media_stream_source->ConnectToTrack(web_media_stream_track);
1004 web_media_stream->addTrack(web_media_stream_track);
1005 }
1006
1007 //------------------------------------------------------------------------------ 978 //------------------------------------------------------------------------------
1008 979
1009 WebImageCaptureFrameGrabber* 980 WebImageCaptureFrameGrabber*
1010 RendererBlinkPlatformImpl::createImageCaptureFrameGrabber() { 981 RendererBlinkPlatformImpl::createImageCaptureFrameGrabber() {
1011 #if defined(ENABLE_WEBRTC) 982 #if defined(ENABLE_WEBRTC)
1012 return new ImageCaptureFrameGrabber(); 983 return new ImageCaptureFrameGrabber();
1013 #else 984 #else
1014 return nullptr; 985 return nullptr;
1015 #endif // defined(ENABLE_WEBRTC) 986 #endif // defined(ENABLE_WEBRTC)
1016 } 987 }
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
1338 return &trial_token_validator_; 1309 return &trial_token_validator_;
1339 } 1310 }
1340 1311
1341 void RendererBlinkPlatformImpl::workerContextCreated( 1312 void RendererBlinkPlatformImpl::workerContextCreated(
1342 const v8::Local<v8::Context>& worker) { 1313 const v8::Local<v8::Context>& worker) {
1343 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( 1314 GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
1344 worker); 1315 worker);
1345 } 1316 }
1346 1317
1347 } // namespace content 1318 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/renderer_blink_platform_impl.h ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698