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

Unified Diff: media/base/pipeline_impl.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: media/base/pipeline_impl.cc
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index ef8ac158a57c0837399ef7f2626e816135cd8e07..0ec81f9e7ca815c345531ba3f35ce1779b93d393 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc
@@ -859,7 +859,7 @@ void PipelineImpl::RendererWrapper::InitializeRenderer(
DCHECK(media_task_runner_->BelongsToCurrentThread());
switch (demuxer_->GetType()) {
- case DemuxerStreamProvider::Type::STREAM:
+ case MediaResource::Type::STREAM:
if (!demuxer_->GetStream(DemuxerStream::AUDIO) &&
!demuxer_->GetStream(DemuxerStream::VIDEO)) {
DVLOG(1) << "Error: demuxer does not have an audio or a video stream.";
@@ -868,7 +868,7 @@ void PipelineImpl::RendererWrapper::InitializeRenderer(
}
break;
- case DemuxerStreamProvider::Type::URL:
+ case MediaResource::Type::URL:
// NOTE: Empty GURL are not valid.
if (!demuxer_->GetMediaUrlParams().media_url.is_valid()) {
DVLOG(1) << "Error: demuxer does not have a valid URL.";
@@ -904,7 +904,7 @@ void PipelineImpl::RendererWrapper::ReportMetadata() {
DemuxerStream* stream;
switch (demuxer_->GetType()) {
- case DemuxerStreamProvider::Type::STREAM:
+ case MediaResource::Type::STREAM:
metadata.timeline_offset = demuxer_->GetTimelineOffset();
stream = demuxer_->GetStream(DemuxerStream::VIDEO);
if (stream) {
@@ -922,7 +922,7 @@ void PipelineImpl::RendererWrapper::ReportMetadata() {
}
break;
- case DemuxerStreamProvider::Type::URL:
+ case MediaResource::Type::URL:
// We don't know if the MediaPlayerRender has Audio/Video until we start
// playing. Conservatively assume that they do.
metadata.has_video = true;

Powered by Google App Engine
This is Rietveld 408576698