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

Unified Diff: media/base/pipeline_impl.h

Issue 8661002: Fire CanPlayThrough immediately for local and streaming media files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add test for streaming case to DownloadRateMonitor Created 9 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 side-by-side diff with in-line comments
Download patch
Index: media/base/pipeline_impl.h
diff --git a/media/base/pipeline_impl.h b/media/base/pipeline_impl.h
index 57f8aebda2d75c85118f2cadd3b97ffe70bc3475..31f37b1bd2cf245387ba282c55a3f005c51fcf78 100644
--- a/media/base/pipeline_impl.h
+++ b/media/base/pipeline_impl.h
@@ -125,8 +125,9 @@ class MEDIA_EXPORT PipelineImpl : public Pipeline, public FilterHost {
virtual int64 GetBufferedBytes() const OVERRIDE;
virtual int64 GetTotalBytes() const OVERRIDE;
virtual void GetNaturalVideoSize(gfx::Size* out_size) const OVERRIDE;
+ virtual void SetLocalSource(bool local_source) OVERRIDE;
virtual bool IsStreaming() const OVERRIDE;
- virtual bool IsLoaded() const OVERRIDE;
+ virtual bool IsLocalSource() const OVERRIDE;
virtual PipelineStatistics GetStatistics() const OVERRIDE;
void SetClockForTesting(Clock* clock);
@@ -201,7 +202,7 @@ class MEDIA_EXPORT PipelineImpl : public Pipeline, public FilterHost {
virtual void SetBufferedBytes(int64 buffered_bytes) OVERRIDE;
virtual void SetNaturalVideoSize(const gfx::Size& size) OVERRIDE;
virtual void SetStreaming(bool streamed) OVERRIDE;
- virtual void SetLoaded(bool loaded) OVERRIDE;
+ virtual void SetLocalSourceFromFilter(bool local_source) OVERRIDE;
virtual void SetNetworkActivity(bool is_downloading_data) OVERRIDE;
virtual void NotifyEnded() OVERRIDE;
virtual void DisableAudioRenderer() OVERRIDE;
@@ -385,13 +386,13 @@ class MEDIA_EXPORT PipelineImpl : public Pipeline, public FilterHost {
// Video's natural width and height. Set by filters.
gfx::Size natural_size_;
- // Sets by the filters to indicate whether the data source is a streaming
+ // Set by the filters to indicate whether the data source is a streaming
// source.
bool streaming_;
- // Sets by the filters to indicate whether the data source is a fully
- // loaded source.
- bool loaded_;
+ // Indicates whether the data source is local, such as a local media file
+ // from disk or a local webcam stream.
+ bool local_source_;
// Current volume level (from 0.0f to 1.0f). This value is set immediately
// via SetVolume() and a task is dispatched on the message loop to notify the

Powered by Google App Engine
This is Rietveld 408576698