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

Side by Side Diff: components/html_viewer/media_factory.cc

Issue 1409123005: Add methods for telling V8 how much memory audio/video is using. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix html viewer. Created 5 years, 1 month 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 | « no previous file | content/renderer/render_frame_impl.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/html_viewer/media_factory.h" 5 #include "components/html_viewer/media_factory.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 10 matching lines...) Expand all
21 #include "media/blink/webmediaplayer_params.h" 21 #include "media/blink/webmediaplayer_params.h"
22 #include "media/cdm/default_cdm_factory.h" 22 #include "media/cdm/default_cdm_factory.h"
23 #include "media/filters/default_media_permission.h" 23 #include "media/filters/default_media_permission.h"
24 #include "media/mojo/interfaces/renderer.mojom.h" 24 #include "media/mojo/interfaces/renderer.mojom.h"
25 #include "media/mojo/services/mojo_cdm_factory.h" 25 #include "media/mojo/services/mojo_cdm_factory.h"
26 #include "media/mojo/services/mojo_renderer_factory.h" 26 #include "media/mojo/services/mojo_renderer_factory.h"
27 #include "media/renderers/default_renderer_factory.h" 27 #include "media/renderers/default_renderer_factory.h"
28 #include "media/renderers/gpu_video_accelerator_factories.h" 28 #include "media/renderers/gpu_video_accelerator_factories.h"
29 #include "mojo/application/public/cpp/connect.h" 29 #include "mojo/application/public/cpp/connect.h"
30 #include "mojo/application/public/interfaces/shell.mojom.h" 30 #include "mojo/application/public/interfaces/shell.mojom.h"
31 #include "third_party/WebKit/public/web/WebKit.h"
32 #include "v8/include/v8.h"
31 33
32 namespace html_viewer { 34 namespace html_viewer {
33 35
34 namespace { 36 namespace {
35 37
36 // Enable mojo media Renderer in media pipeline instead of using the internal 38 // Enable mojo media Renderer in media pipeline instead of using the internal
37 // media::Renderer implementation. 39 // media::Renderer implementation.
38 // TODO(xhwang): Move this to media_switches.h. 40 // TODO(xhwang): Move this to media_switches.h.
39 const char kEnableMojoMediaRenderer[] = "enable-mojo-media-renderer"; 41 const char kEnableMojoMediaRenderer[] = "enable-mojo-media-renderer";
40 42
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 media_renderer_factory.reset( 93 media_renderer_factory.reset(
92 new media::DefaultRendererFactory(media_log, 94 new media::DefaultRendererFactory(media_log,
93 nullptr, // No GPU factory. 95 nullptr, // No GPU factory.
94 GetAudioHardwareConfig())); 96 GetAudioHardwareConfig()));
95 } 97 }
96 98
97 media::WebMediaPlayerParams params( 99 media::WebMediaPlayerParams params(
98 media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(), 100 media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(),
99 media_log, GetMediaThreadTaskRunner(), GetMediaThreadTaskRunner(), 101 media_log, GetMediaThreadTaskRunner(), GetMediaThreadTaskRunner(),
100 compositor_task_runner_, media::WebMediaPlayerParams::Context3DCB(), 102 compositor_task_runner_, media::WebMediaPlayerParams::Context3DCB(),
103 base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory,
104 base::Unretained(blink::mainThreadIsolate())),
101 GetMediaPermission(), initial_cdm); 105 GetMediaPermission(), initial_cdm);
102 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; 106 base::WeakPtr<media::WebMediaPlayerDelegate> delegate;
103 107
104 return new media::WebMediaPlayerImpl(frame, client, encrypted_client, 108 return new media::WebMediaPlayerImpl(frame, client, encrypted_client,
105 delegate, media_renderer_factory.Pass(), 109 delegate, media_renderer_factory.Pass(),
106 GetCdmFactory(), params); 110 GetCdmFactory(), params);
107 #endif // defined(OS_ANDROID) 111 #endif // defined(OS_ANDROID)
108 } 112 }
109 113
110 blink::WebEncryptedMediaClient* MediaFactory::GetEncryptedMediaClient() { 114 blink::WebEncryptedMediaClient* MediaFactory::GetEncryptedMediaClient() {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 scoped_refptr<base::SingleThreadTaskRunner> 170 scoped_refptr<base::SingleThreadTaskRunner>
167 MediaFactory::GetMediaThreadTaskRunner() { 171 MediaFactory::GetMediaThreadTaskRunner() {
168 if (!media_thread_.IsRunning()) 172 if (!media_thread_.IsRunning())
169 media_thread_.Start(); 173 media_thread_.Start();
170 174
171 return media_thread_.task_runner(); 175 return media_thread_.task_runner();
172 } 176 }
173 #endif // !defined(OS_ANDROID) 177 #endif // !defined(OS_ANDROID)
174 178
175 } // namespace html_viewer 179 } // namespace html_viewer
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698