Skip to content

Commit e20ae66

Browse files
committed
Address comments
1 parent 61662e1 commit e20ae66

File tree

5 files changed

+13
-24
lines changed

5 files changed

+13
-24
lines changed

cobalt/browser/mojom/cobalt_settings.mojom

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ union SettingValue {
2020
};
2121

2222
interface CobaltSettings {
23-
// Synchronous call is used here because this is called during renderer
24-
// initialization (RenderThreadStarted) where we need the settings before
25-
// proceeding. Though it blocks the render thread, it is acceptable, since it
23+
// Synchronous call is used here because this is called before player
24+
// creation. Though it blocks the render thread, it is acceptable, since it
2625
// happens only at the construction stage.
2726
[Sync]
2827
GetSetting(string key) => (SettingValue? value);

cobalt/renderer/cobalt_content_renderer_client.cc

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,19 +96,6 @@ CobaltContentRendererClient::CobaltContentRendererClient() {
9696

9797
CobaltContentRendererClient::~CobaltContentRendererClient() = default;
9898

99-
void CobaltContentRendererClient::RenderThreadStarted() {
100-
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
101-
mojo::Remote<cobalt::mojom::CobaltSettings> cobalt_settings;
102-
content::RenderThread::Get()->BindHostReceiver(
103-
cobalt_settings.BindNewPipeAndPassReceiver());
104-
105-
cobalt::mojom::SettingValuePtr value;
106-
if (cobalt_settings->GetSetting("Media.DisableExternalAllocator", &value) &&
107-
value && value->is_int_value()) {
108-
use_external_allocator_ = value->get_int_value() != 1;
109-
}
110-
}
111-
11299
void CobaltContentRendererClient::RenderFrameCreated(
113100
content::RenderFrame* render_frame) {
114101
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
@@ -203,7 +190,17 @@ void CobaltContentRendererClient::GetStarboardRendererFactoryTraits(
203190
renderer_factory_traits->audio_write_duration_remote =
204191
base::Microseconds(kSbPlayerWriteDurationRemote);
205192

206-
renderer_factory_traits->use_external_allocator = use_external_allocator_;
193+
mojo::Remote<cobalt::mojom::CobaltSettings> cobalt_settings;
194+
content::RenderThread::Get()->BindHostReceiver(
195+
cobalt_settings.BindNewPipeAndPassReceiver());
196+
197+
bool use_external_allocator = true;
198+
cobalt::mojom::SettingValuePtr value;
199+
if (cobalt_settings->GetSetting("Media.DisableExternalAllocator", &value) &&
200+
value && value->is_int_value()) {
201+
use_external_allocator = value->get_int_value() != 1;
202+
}
203+
renderer_factory_traits->use_external_allocator = use_external_allocator;
207204

208205
// TODO(b/405424096) - Cobalt: Move VideoGeometrySetterService to Gpu thread.
209206
renderer_factory_traits->bind_host_receiver_callback =

cobalt/renderer/cobalt_content_renderer_client.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ class CobaltContentRendererClient : public content::ContentRendererClient {
4141
~CobaltContentRendererClient() override;
4242

4343
// ContentRendererClient implementation.
44-
void RenderThreadStarted() override;
4544
void RenderFrameCreated(content::RenderFrame* render_frame) override;
4645
void GetSupportedKeySystems(::media::GetSupportedKeySystemsCB cb) override;
4746
bool IsSupportedAudioType(const ::media::AudioType& type) override;
@@ -65,8 +64,6 @@ class CobaltContentRendererClient : public content::ContentRendererClient {
6564

6665
base::ScopedClosureRunner unregister_thread_closure;
6766

68-
bool use_external_allocator_ = true;
69-
7067
THREAD_CHECKER(thread_checker_);
7168
};
7269

media/mojo/services/gpu_mojo_media_client.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,6 @@ struct StarboardRendererTraits {
170170
~StarboardRendererTraits();
171171
};
172172

173-
174-
175173
// Creates a platform-specific media::StarboardRenderer.
176174
// This is used on Cobalt (android/linux).
177175
std::unique_ptr<Renderer> CreatePlatformStarboardRenderer(

media/starboard/sbplayer_bridge.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -758,8 +758,6 @@ void SbPlayerBridge::CreatePlayer() {
758758

759759
player_creation_time_ = Time::Now();
760760

761-
// TODO(kjyoun): Connect use_external_allocator_ to player.
762-
763761
SbPlayerCreationParam creation_param = {};
764762
creation_param.drm_system = drm_system_;
765763
creation_param.audio_stream_info = audio_stream_info_;

0 commit comments

Comments
 (0)