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

Unified Diff: content/browser/media/android/media_player_renderer.cc

Issue 2668393002: Rename DemuxerStreamProvider into MediaResource (Closed)
Patch Set: rebase Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/media/android/media_player_renderer.cc
diff --git a/content/browser/media/android/media_player_renderer.cc b/content/browser/media/android/media_player_renderer.cc
index 2f8e9e602c4774bacddda3b1ce687a224606387e..7e5874aedd27084a1d4de342ef7bbcd5fd48c712 100644
--- a/content/browser/media/android/media_player_renderer.cc
+++ b/content/browser/media/android/media_player_renderer.cc
@@ -40,19 +40,17 @@ MediaPlayerRenderer::~MediaPlayerRenderer() {
CancelScopedSurfaceRequest();
}
-void MediaPlayerRenderer::Initialize(
- media::DemuxerStreamProvider* demuxer_stream_provider,
- media::RendererClient* client,
- const media::PipelineStatusCB& init_cb) {
+void MediaPlayerRenderer::Initialize(media::MediaResource* media_resource,
+ media::RendererClient* client,
+ const media::PipelineStatusCB& init_cb) {
DVLOG(1) << __func__;
DCHECK_CURRENTLY_ON(BrowserThread::UI);
renderer_client_ = client;
- if (demuxer_stream_provider->GetType() !=
- media::DemuxerStreamProvider::Type::URL) {
- DLOG(ERROR) << "DemuxerStreamProvider is not of Type URL";
+ if (media_resource->GetType() != media::MediaResource::Type::URL) {
+ DLOG(ERROR) << "MediaResource is not of Type URL";
init_cb.Run(media::PIPELINE_ERROR_INITIALIZATION_FAILED);
return;
}
@@ -61,7 +59,7 @@ void MediaPlayerRenderer::Initialize(
media::MediaServiceThrottler::GetInstance()->GetDelayForClientCreation();
if (creation_delay.is_zero()) {
- CreateMediaPlayer(demuxer_stream_provider->GetMediaUrlParams(), init_cb);
+ CreateMediaPlayer(media_resource->GetMediaUrlParams(), init_cb);
return;
}
@@ -69,7 +67,7 @@ void MediaPlayerRenderer::Initialize(
BrowserThread::UI, FROM_HERE,
base::Bind(&MediaPlayerRenderer::CreateMediaPlayer,
weak_factory_.GetWeakPtr(),
- demuxer_stream_provider->GetMediaUrlParams(), init_cb),
+ media_resource->GetMediaUrlParams(), init_cb),
creation_delay);
}

Powered by Google App Engine
This is Rietveld 408576698