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

Unified Diff: content/renderer/media/webmediaplayer_impl.h

Issue 206103004: Remove HasAudio(), HasVideo(), GetInitialNaturalSize() from media::Pipeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase /again/. Created 6 years, 9 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
« no previous file with comments | « no previous file | content/renderer/media/webmediaplayer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webmediaplayer_impl.h
diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h
index b3516c54687dc9778cde276f7a0fb19f4f2efc5a..cdbeae9880988063d90457cbc0da459a3a4882c3 100644
--- a/content/renderer/media/webmediaplayer_impl.h
+++ b/content/renderer/media/webmediaplayer_impl.h
@@ -166,8 +166,8 @@ class WebMediaPlayerImpl
void OnPipelineSeek(media::PipelineStatus status);
void OnPipelineEnded();
void OnPipelineError(media::PipelineStatus error);
- void OnPipelineBufferingState(
- media::Pipeline::BufferingState buffering_state);
+ void OnPipelineMetadata(media::PipelineMetadata metadata);
+ void OnPipelinePrerollCompleted();
void OnDemuxerOpened();
void OnKeyAdded(const std::string& session_id);
void OnKeyError(const std::string& session_id,
@@ -261,6 +261,9 @@ class WebMediaPlayerImpl
// The LoadType passed in the |load_type| parameter of the load() call.
LoadType load_type_;
+ // Cache of metadata for answering hasAudio(), hasVideo(), and naturalSize().
+ media::PipelineMetadata pipeline_metadata_;
+
// Playback state.
//
// TODO(scherkus): we have these because Pipeline favours the simplicity of a
@@ -323,7 +326,6 @@ class WebMediaPlayerImpl
// Video rendering members.
VideoFrameCompositor compositor_;
media::SkCanvasVideoRenderer skcanvas_video_renderer_;
- gfx::Size natural_size_;
// The compositor layer for displaying the video content when using composited
// playback.
« no previous file with comments | « no previous file | content/renderer/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698