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

Side by Side Diff: chromecast/browser/cast_content_browser_client.cc

Issue 1845783002: [chromecast] Pass media task runner to MediaPipelineBackendManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Resolved comments. Created 4 years, 8 months 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
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 "chromecast/browser/cast_content_browser_client.h" 5 #include "chromecast/browser/cast_content_browser_client.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 namespace chromecast { 65 namespace chromecast {
66 namespace shell { 66 namespace shell {
67 67
68 namespace { 68 namespace {
69 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 69 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
70 static scoped_ptr<mojo::ShellClient> CreateCastMojoMediaApplication( 70 static scoped_ptr<mojo::ShellClient> CreateCastMojoMediaApplication(
71 CastContentBrowserClient* browser_client) { 71 CastContentBrowserClient* browser_client) {
72 scoped_ptr<::media::MojoMediaClient> mojo_media_client( 72 scoped_ptr<::media::MojoMediaClient> mojo_media_client(
73 new media::CastMojoMediaClient( 73 new media::CastMojoMediaClient(
74 base::Bind(&CastContentBrowserClient::CreateMediaPipelineBackend, 74 browser_client->GetCmaMediaPipelineClient()));
alokp 2016/04/01 03:05:16 This change is not needed and will break mojo buil
tianyuwang1 2016/04/01 17:23:19 Reverted this change.
75 base::Unretained(browser_client))));
76 return scoped_ptr<mojo::ShellClient>( 75 return scoped_ptr<mojo::ShellClient>(
77 new ::media::MojoMediaApplication(std::move(mojo_media_client))); 76 new ::media::MojoMediaApplication(std::move(mojo_media_client)));
78 } 77 }
79 #endif // ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS 78 #endif // ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS
80 } // namespace 79 } // namespace
81 80
82 CastContentBrowserClient::CastContentBrowserClient() 81 CastContentBrowserClient::CastContentBrowserClient()
83 : cast_browser_main_parts_(nullptr), 82 : cast_browser_main_parts_(nullptr),
84 url_request_context_factory_(new URLRequestContextFactory()) {} 83 url_request_context_factory_(new URLRequestContextFactory()) {}
85 84
(...skipping 16 matching lines...) Expand all
102 PrefService* pref_service, 101 PrefService* pref_service,
103 net::URLRequestContextGetter* request_context_getter, 102 net::URLRequestContextGetter* request_context_getter,
104 media::VideoPlaneController* video_plane_controller) { 103 media::VideoPlaneController* video_plane_controller) {
105 return make_scoped_ptr(new CastServiceSimple(browser_context, pref_service)); 104 return make_scoped_ptr(new CastServiceSimple(browser_context, pref_service));
106 } 105 }
107 106
108 #if !defined(OS_ANDROID) 107 #if !defined(OS_ANDROID)
109 scoped_ptr<media::MediaPipelineBackend> 108 scoped_ptr<media::MediaPipelineBackend>
110 CastContentBrowserClient::CreateMediaPipelineBackend( 109 CastContentBrowserClient::CreateMediaPipelineBackend(
111 const media::MediaPipelineDeviceParams& params) { 110 const media::MediaPipelineDeviceParams& params) {
112 return make_scoped_ptr( 111 DCHECK(cast_browser_main_parts_);
113 media::MediaPipelineBackendManager::CreateMediaPipelineBackend(params)); 112 return cast_browser_main_parts_->media_pipeline_backend_manager()
113 ->CreateMediaPipelineBackend(params);
114 } 114 }
115 115
116 media::MediaResourceTracker* 116 media::MediaResourceTracker*
117 CastContentBrowserClient::media_resource_tracker() { 117 CastContentBrowserClient::media_resource_tracker() {
118 return cast_browser_main_parts_->media_resource_tracker(); 118 return cast_browser_main_parts_->media_resource_tracker();
119 } 119 }
120 #endif // OS_ANDROID 120
121 media::MediaPipelineBackendManager*
122 CastContentBrowserClient::media_pipeline_backend_manager() {
123 return cast_browser_main_parts_->media_pipeline_backend_manager();
124 }
125 #endif // !defined(OS_ANDROID)
121 126
122 void CastContentBrowserClient::SetMetricsClientId( 127 void CastContentBrowserClient::SetMetricsClientId(
123 const std::string& client_id) { 128 const std::string& client_id) {
124 } 129 }
125 130
126 void CastContentBrowserClient::RegisterMetricsProviders( 131 void CastContentBrowserClient::RegisterMetricsProviders(
127 ::metrics::MetricsService* metrics_service) { 132 ::metrics::MetricsService* metrics_service) {
128 } 133 }
129 134
130 bool CastContentBrowserClient::EnableRemoteDebuggingImmediately() { 135 bool CastContentBrowserClient::EnableRemoteDebuggingImmediately() {
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 process_type, dumps_path, false /* upload */); 496 process_type, dumps_path, false /* upload */);
492 // StartUploaderThread() even though upload is diferred. 497 // StartUploaderThread() even though upload is diferred.
493 // Breakpad-related memory is freed in the uploader thread. 498 // Breakpad-related memory is freed in the uploader thread.
494 crash_handler->StartUploaderThread(); 499 crash_handler->StartUploaderThread();
495 return crash_handler; 500 return crash_handler;
496 } 501 }
497 #endif // !defined(OS_ANDROID) 502 #endif // !defined(OS_ANDROID)
498 503
499 } // namespace shell 504 } // namespace shell
500 } // namespace chromecast 505 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698