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

Side by Side Diff: content/browser/media/android/media_player_renderer.cc

Issue 2463533002: Add support for MediaUrlInterceptor (Closed)
Patch Set: Removed registration, added TODO Created 4 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/browser/media/android/media_player_renderer.h" 5 #include "content/browser/media/android/media_player_renderer.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "content/browser/android/scoped_surface_request_manager.h" 9 #include "content/browser/android/scoped_surface_request_manager.h"
10 #include "content/browser/media/android/media_resource_getter_impl.h" 10 #include "content/browser/media/android/media_resource_getter_impl.h"
11 #include "content/public/browser/browser_context.h" 11 #include "content/public/browser/browser_context.h"
12 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
13 #include "content/public/browser/render_process_host.h" 13 #include "content/public/browser/render_process_host.h"
14 #include "content/public/browser/storage_partition.h" 14 #include "content/public/browser/storage_partition.h"
15 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
16 #include "content/public/common/content_client.h" 16 #include "content/public/common/content_client.h"
17 17
18 // TODO(tguilbert): Remove this ID once MediaPlayerManager has been deleted 18 // TODO(tguilbert): Remove this ID once MediaPlayerManager has been deleted
19 // and MediaPlayerBridge updated. See comment in header file. 19 // and MediaPlayerBridge updated. See comment in header file.
20 constexpr int kUnusedAndIrrelevantPlayerId = 0; 20 constexpr int kUnusedAndIrrelevantPlayerId = 0;
21 21
22 namespace content { 22 namespace content {
23 23
24 namespace {
25
26 media::MediaUrlInterceptor* g_media_url_interceptor = nullptr;
27
28 } // namespace
29
24 MediaPlayerRenderer::MediaPlayerRenderer(RenderFrameHost* render_frame_host) 30 MediaPlayerRenderer::MediaPlayerRenderer(RenderFrameHost* render_frame_host)
25 : render_frame_host_(render_frame_host), 31 : render_frame_host_(render_frame_host),
26 has_error_(false), 32 has_error_(false),
27 weak_factory_(this) {} 33 weak_factory_(this) {}
28 34
29 MediaPlayerRenderer::~MediaPlayerRenderer() { 35 MediaPlayerRenderer::~MediaPlayerRenderer() {
30 CancelScopedSurfaceRequest(); 36 CancelScopedSurfaceRequest();
31 } 37 }
32 38
33 void MediaPlayerRenderer::Initialize( 39 void MediaPlayerRenderer::Initialize(
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 storage::FileSystemContext* file_system_context = 162 storage::FileSystemContext* file_system_context =
157 partition ? partition->GetFileSystemContext() : nullptr; 163 partition ? partition->GetFileSystemContext() : nullptr;
158 media_resource_getter_.reset( 164 media_resource_getter_.reset(
159 new MediaResourceGetterImpl(context, file_system_context, host->GetID(), 165 new MediaResourceGetterImpl(context, file_system_context, host->GetID(),
160 render_frame_host_->GetRoutingID())); 166 render_frame_host_->GetRoutingID()));
161 } 167 }
162 return media_resource_getter_.get(); 168 return media_resource_getter_.get();
163 } 169 }
164 170
165 media::MediaUrlInterceptor* MediaPlayerRenderer::GetMediaUrlInterceptor() { 171 media::MediaUrlInterceptor* MediaPlayerRenderer::GetMediaUrlInterceptor() {
166 // TODO(tguilbert): Offer a RegisterMediaUrlInterceptor equivalent for use in 172 return g_media_url_interceptor;
167 // webview. See crbug.com/636588.
168 return nullptr;
169 } 173 }
170 174
171 void MediaPlayerRenderer::OnTimeUpdate(int player_id, 175 void MediaPlayerRenderer::OnTimeUpdate(int player_id,
172 base::TimeDelta current_timestamp, 176 base::TimeDelta current_timestamp,
173 base::TimeTicks current_time_ticks) {} 177 base::TimeTicks current_time_ticks) {}
174 178
175 void MediaPlayerRenderer::OnMediaMetadataChanged(int player_id, 179 void MediaPlayerRenderer::OnMediaMetadataChanged(int player_id,
176 base::TimeDelta duration, 180 base::TimeDelta duration,
177 int width, 181 int width,
178 int height, 182 int height,
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 } 239 }
236 240
237 void MediaPlayerRenderer::OnDecoderResourcesReleased(int player_id) { 241 void MediaPlayerRenderer::OnDecoderResourcesReleased(int player_id) {
238 // Since we are not using a pool of MediaPlayerAndroid instances, this 242 // Since we are not using a pool of MediaPlayerAndroid instances, this
239 // function is not relevant. 243 // function is not relevant.
240 244
241 // TODO(tguilbert): Throttle requests, via exponential backoff. 245 // TODO(tguilbert): Throttle requests, via exponential backoff.
242 // See crbug.com/636615. 246 // See crbug.com/636615.
243 } 247 }
244 248
249 // static
250 void MediaPlayerRenderer::RegisterMediaUrlInterceptor(
251 media::MediaUrlInterceptor* media_url_interceptor) {
252 g_media_url_interceptor = media_url_interceptor;
253 }
254
245 void MediaPlayerRenderer::CancelScopedSurfaceRequest() { 255 void MediaPlayerRenderer::CancelScopedSurfaceRequest() {
246 if (!surface_request_token_) 256 if (!surface_request_token_)
247 return; 257 return;
248 258
249 ScopedSurfaceRequestManager::GetInstance()->UnregisterScopedSurfaceRequest( 259 ScopedSurfaceRequestManager::GetInstance()->UnregisterScopedSurfaceRequest(
250 surface_request_token_); 260 surface_request_token_);
251 surface_request_token_ = base::UnguessableToken(); 261 surface_request_token_ = base::UnguessableToken();
252 } 262 }
253 263
254 } // namespace content 264 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698