OLD | NEW |
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 <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 840 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
851 | 851 |
852 void RendererBlinkPlatformImpl::createHTMLVideoElementCapturer( | 852 void RendererBlinkPlatformImpl::createHTMLVideoElementCapturer( |
853 WebMediaStream* web_media_stream, | 853 WebMediaStream* web_media_stream, |
854 WebMediaPlayer* web_media_player) { | 854 WebMediaPlayer* web_media_player) { |
855 #if BUILDFLAG(ENABLE_WEBRTC) | 855 #if BUILDFLAG(ENABLE_WEBRTC) |
856 DCHECK(web_media_stream); | 856 DCHECK(web_media_stream); |
857 DCHECK(web_media_player); | 857 DCHECK(web_media_player); |
858 AddVideoTrackToMediaStream( | 858 AddVideoTrackToMediaStream( |
859 HtmlVideoElementCapturerSource::CreateFromWebMediaPlayerImpl( | 859 HtmlVideoElementCapturerSource::CreateFromWebMediaPlayerImpl( |
860 web_media_player, content::RenderThread::Get()->GetIOTaskRunner()), | 860 web_media_player, content::RenderThread::Get()->GetIOTaskRunner()), |
| 861 false, // is_remote |
| 862 false, // is_readonly |
861 web_media_stream); | 863 web_media_stream); |
862 #endif | 864 #endif |
863 } | 865 } |
864 | 866 |
865 void RendererBlinkPlatformImpl::createHTMLAudioElementCapturer( | 867 void RendererBlinkPlatformImpl::createHTMLAudioElementCapturer( |
866 WebMediaStream* web_media_stream, | 868 WebMediaStream* web_media_stream, |
867 WebMediaPlayer* web_media_player) { | 869 WebMediaPlayer* web_media_player) { |
868 #if BUILDFLAG(ENABLE_WEBRTC) | 870 #if BUILDFLAG(ENABLE_WEBRTC) |
869 DCHECK(web_media_stream); | 871 DCHECK(web_media_stream); |
870 DCHECK(web_media_player); | 872 DCHECK(web_media_player); |
871 | 873 |
872 blink::WebMediaStreamSource web_media_stream_source; | 874 blink::WebMediaStreamSource web_media_stream_source; |
873 blink::WebMediaStreamTrack web_media_stream_track; | 875 blink::WebMediaStreamTrack web_media_stream_track; |
874 const WebString track_id = WebString::fromUTF8(base::GenerateGUID()); | 876 const WebString track_id = WebString::fromUTF8(base::GenerateGUID()); |
875 | 877 |
876 web_media_stream_source.initialize( | 878 web_media_stream_source.initialize(track_id, |
877 track_id, blink::WebMediaStreamSource::TypeAudio, track_id); | 879 blink::WebMediaStreamSource::TypeAudio, |
| 880 track_id, |
| 881 false /* is_remote */); |
878 web_media_stream_track.initialize(web_media_stream_source); | 882 web_media_stream_track.initialize(web_media_stream_source); |
879 | 883 |
880 MediaStreamAudioSource* const media_stream_source = | 884 MediaStreamAudioSource* const media_stream_source = |
881 HtmlAudioElementCapturerSource::CreateFromWebMediaPlayerImpl( | 885 HtmlAudioElementCapturerSource::CreateFromWebMediaPlayerImpl( |
882 web_media_player); | 886 web_media_player); |
883 | 887 |
884 // Takes ownership of |media_stream_source|. | 888 // Takes ownership of |media_stream_source|. |
885 web_media_stream_source.setExtraData(media_stream_source); | 889 web_media_stream_source.setExtraData(media_stream_source); |
886 | 890 |
887 media_stream_source->ConnectToTrack(web_media_stream_track); | 891 media_stream_source->ConnectToTrack(web_media_stream_track); |
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1259 //------------------------------------------------------------------------------ | 1263 //------------------------------------------------------------------------------ |
1260 void RendererBlinkPlatformImpl::requestPurgeMemory() { | 1264 void RendererBlinkPlatformImpl::requestPurgeMemory() { |
1261 // TODO(tasak|bashi): We should use ChildMemoryCoordinator here, but | 1265 // TODO(tasak|bashi): We should use ChildMemoryCoordinator here, but |
1262 // ChildMemoryCoordinator isn't always available as it's only initialized | 1266 // ChildMemoryCoordinator isn't always available as it's only initialized |
1263 // when kMemoryCoordinatorV0 is enabled. | 1267 // when kMemoryCoordinatorV0 is enabled. |
1264 // Use ChildMemoryCoordinator when memory coordinator is always enabled. | 1268 // Use ChildMemoryCoordinator when memory coordinator is always enabled. |
1265 base::MemoryCoordinatorClientRegistry::GetInstance()->PurgeMemory(); | 1269 base::MemoryCoordinatorClientRegistry::GetInstance()->PurgeMemory(); |
1266 } | 1270 } |
1267 | 1271 |
1268 } // namespace content | 1272 } // namespace content |
OLD | NEW |