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 845 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
856 | 856 |
857 void RendererBlinkPlatformImpl::createHTMLVideoElementCapturer( | 857 void RendererBlinkPlatformImpl::createHTMLVideoElementCapturer( |
858 WebMediaStream* web_media_stream, | 858 WebMediaStream* web_media_stream, |
859 WebMediaPlayer* web_media_player) { | 859 WebMediaPlayer* web_media_player) { |
860 #if BUILDFLAG(ENABLE_WEBRTC) | 860 #if BUILDFLAG(ENABLE_WEBRTC) |
861 DCHECK(web_media_stream); | 861 DCHECK(web_media_stream); |
862 DCHECK(web_media_player); | 862 DCHECK(web_media_player); |
863 AddVideoTrackToMediaStream( | 863 AddVideoTrackToMediaStream( |
864 HtmlVideoElementCapturerSource::CreateFromWebMediaPlayerImpl( | 864 HtmlVideoElementCapturerSource::CreateFromWebMediaPlayerImpl( |
865 web_media_player, content::RenderThread::Get()->GetIOTaskRunner()), | 865 web_media_player, content::RenderThread::Get()->GetIOTaskRunner()), |
| 866 false, // is_remote |
| 867 false, // is_readonly |
866 web_media_stream); | 868 web_media_stream); |
867 #endif | 869 #endif |
868 } | 870 } |
869 | 871 |
870 void RendererBlinkPlatformImpl::createHTMLAudioElementCapturer( | 872 void RendererBlinkPlatformImpl::createHTMLAudioElementCapturer( |
871 WebMediaStream* web_media_stream, | 873 WebMediaStream* web_media_stream, |
872 WebMediaPlayer* web_media_player) { | 874 WebMediaPlayer* web_media_player) { |
873 #if BUILDFLAG(ENABLE_WEBRTC) | 875 #if BUILDFLAG(ENABLE_WEBRTC) |
874 DCHECK(web_media_stream); | 876 DCHECK(web_media_stream); |
875 DCHECK(web_media_player); | 877 DCHECK(web_media_player); |
876 | 878 |
877 blink::WebMediaStreamSource web_media_stream_source; | 879 blink::WebMediaStreamSource web_media_stream_source; |
878 blink::WebMediaStreamTrack web_media_stream_track; | 880 blink::WebMediaStreamTrack web_media_stream_track; |
879 const WebString track_id = WebString::fromUTF8(base::GenerateGUID()); | 881 const WebString track_id = WebString::fromUTF8(base::GenerateGUID()); |
880 | 882 |
881 web_media_stream_source.initialize( | 883 web_media_stream_source.initialize(track_id, |
882 track_id, blink::WebMediaStreamSource::TypeAudio, track_id); | 884 blink::WebMediaStreamSource::TypeAudio, |
| 885 track_id, false /* is_remote */); |
883 web_media_stream_track.initialize(web_media_stream_source); | 886 web_media_stream_track.initialize(web_media_stream_source); |
884 | 887 |
885 MediaStreamAudioSource* const media_stream_source = | 888 MediaStreamAudioSource* const media_stream_source = |
886 HtmlAudioElementCapturerSource::CreateFromWebMediaPlayerImpl( | 889 HtmlAudioElementCapturerSource::CreateFromWebMediaPlayerImpl( |
887 web_media_player); | 890 web_media_player); |
888 | 891 |
889 // Takes ownership of |media_stream_source|. | 892 // Takes ownership of |media_stream_source|. |
890 web_media_stream_source.setExtraData(media_stream_source); | 893 web_media_stream_source.setExtraData(media_stream_source); |
891 | 894 |
892 media_stream_source->ConnectToTrack(web_media_stream_track); | 895 media_stream_source->ConnectToTrack(web_media_stream_track); |
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1269 //------------------------------------------------------------------------------ | 1272 //------------------------------------------------------------------------------ |
1270 void RendererBlinkPlatformImpl::requestPurgeMemory() { | 1273 void RendererBlinkPlatformImpl::requestPurgeMemory() { |
1271 // TODO(tasak|bashi): We should use ChildMemoryCoordinator here, but | 1274 // TODO(tasak|bashi): We should use ChildMemoryCoordinator here, but |
1272 // ChildMemoryCoordinator isn't always available as it's only initialized | 1275 // ChildMemoryCoordinator isn't always available as it's only initialized |
1273 // when kMemoryCoordinatorV0 is enabled. | 1276 // when kMemoryCoordinatorV0 is enabled. |
1274 // Use ChildMemoryCoordinator when memory coordinator is always enabled. | 1277 // Use ChildMemoryCoordinator when memory coordinator is always enabled. |
1275 base::MemoryCoordinatorClientRegistry::GetInstance()->PurgeMemory(); | 1278 base::MemoryCoordinatorClientRegistry::GetInstance()->PurgeMemory(); |
1276 } | 1279 } |
1277 | 1280 |
1278 } // namespace content | 1281 } // namespace content |
OLD | NEW |