[chromecast] Pass media task runner to VideoPlaneController.

chromecast/browser/cast_browser_main_parts.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromecast/browser/cast_browser_main_parts.h"
 
 #include <stddef.h>
 #include <string.h>
 
 #include <string>
@@ skipping 233 matching lines @@
       parameters_(parameters),
       url_request_context_factory_(url_request_context_factory),
       net_log_(new CastNetLog()) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   AddDefaultCommandLineSwitches(command_line);
 }
 
 CastBrowserMainParts::~CastBrowserMainParts() {
 }
 
+scoped_refptr<base::SingleThreadTaskRunner>
+CastBrowserMainParts::GetMediaTaskRunner() const {
+  // TODO(alokp): Obtain task runner from a local thread or mojo media app.
+  return media::MediaMessageLoop::GetTaskRunner();
+}
+
 void CastBrowserMainParts::PreMainMessageLoopStart() {
   // GroupedHistograms needs to be initialized before any threads are created
   // to prevent race conditions between calls to Preregister and those threads
   // attempting to collect metrics.
   // This call must also be before NetworkChangeNotifier, as it generates
   // Net/DNS metrics.
   metrics::PreregisterAllGroupedHistograms();
 
 #if defined(OS_ANDROID)
   net::NetworkChangeNotifier::SetFactory(
@@ skipping 112 matching lines @@
       new RemoteDebuggingServer(cast_browser_process_->browser_client()->
           EnableRemoteDebuggingImmediately())));
 
   media::CastMediaShlib::Initialize(cmd_line->argv());
   ::media::InitializeMediaLibrary();
 
 #if defined(USE_AURA) && !defined(DISABLE_DISPLAY)
   // TODO(halliwell) move audio builds to use ozone_platform_cast, then can
   // simplify this by removing DISABLE_DISPLAY condition.  Should then also
   // assert(ozone_platform_cast) in BUILD.gn where it depends on //ui/ozone.
+  video_plane_controller_.reset(
+      new media::VideoPlaneController(GetMediaTaskRunner()));
+  cast_browser_process_->cast_screen()->SetDisplayResizeCallback(
+      base::Bind(&media::VideoPlaneController::SetGraphicsPlaneResolution,
+                 base::Unretained(video_plane_controller_.get())));
   ui::OverlayManagerCast::SetOverlayCompositedCallback(
       base::Bind(&media::VideoPlaneController::SetGeometry,
-                 base::Unretained(media::VideoPlaneController::GetInstance())));
+                 base::Unretained(video_plane_controller_.get())));
 #endif
 
   cast_browser_process_->SetCastService(
       cast_browser_process_->browser_client()->CreateCastService(
           cast_browser_process_->browser_context(),
           cast_browser_process_->pref_service(),
-          url_request_context_factory_->GetSystemGetter()));
+          url_request_context_factory_->GetSystemGetter(),
+          video_plane_controller_.get()));
   cast_browser_process_->cast_service()->Initialize();
 
   // Initializing metrics service and network delegates must happen after cast
   // service is intialized because CastMetricsServiceClient and
   // CastNetworkDelegate may use components initialized by cast service.
   cast_browser_process_->metrics_service_client()
       ->Initialize(cast_browser_process_->cast_service());
   url_request_context_factory_->InitializeNetworkDelegates();
 
   cast_browser_process_->cast_service()->Start();
@@ skipping 39 matching lines @@
   cast_browser_process_.reset();
 
 #if defined(USE_AURA)
   aura::Env::DeleteInstance();
 #endif
 
   DeregisterKillOnAlarm();
 #endif
 }
 
+void CastBrowserMainParts::PostDestroyThreads() {
+  // Finalize CastMediaShlib on media thread to ensure it's not accessed
+  // after Finalize.
+  GetMediaTaskRunner()->PostTask(FROM_HERE,
+                                 base::Bind(&media::CastMediaShlib::Finalize));

[halliwell, 2016/03/23 13:12:17]

PostDestroyThreads is commented as "after threads have been stopped and
destroyed", so it looks odd to be posting work to a thread at this point.  Does
PostDestroyThreads comment only apply to certain specific threads (like IO) and
not our media thread?  Are you intending once all this refactoring is done to
try setting our media thread task runner to a different thread (e.g. same as
audio)?

[alokp, 2016/03/23 16:19:33]

Yes it only applies to threads managed by BrowserMainLoop. As of this patch we
manage our own media thread so it is OK for now. This media thread will change
with the work I am doing on AudioManager, but we should still let
CastBrowserMainParts to Finalize the media shlib.

+}
+
 }  // namespace shell
 }  // namespace chromecast