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

Unified Diff: media/base/pipeline.h

Issue 224093011: Move DataSourceHost to BufferedDataSourceHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix windows release build. Created 6 years, 8 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 | « media/base/mock_data_source_host.cc ('k') | media/base/pipeline.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/pipeline.h
diff --git a/media/base/pipeline.h b/media/base/pipeline.h
index d3af4eeaeb9bdb61c7472cff92b6e78d893b1a70..72415876938c2d9a4d054c7400982ad7586ba0d6 100644
--- a/media/base/pipeline.h
+++ b/media/base/pipeline.h
@@ -76,7 +76,7 @@ typedef base::Callback<void(PipelineMetadata)> PipelineMetadataCB;
// If any error ever happens, this object will transition to the "Error" state
// from any state. If Stop() is ever called, this object will transition to
// "Stopped" state.
-class MEDIA_EXPORT Pipeline : public DataSourceHost, public DemuxerHost {
+class MEDIA_EXPORT Pipeline : public DemuxerHost {
public:
// Constructs a media pipeline that will execute on |task_runner|.
Pipeline(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
@@ -169,10 +169,6 @@ class MEDIA_EXPORT Pipeline : public DataSourceHost, public DemuxerHost {
// been determined yet, then returns 0.
base::TimeDelta GetMediaDuration() const;
- // Get the total size of the media file. If the size has not yet been
- // determined or can not be determined, this value is 0.
- int64 GetTotalBytes() const;
-
// Return true if loading progress has been made since the last time this
// method was called.
bool DidLoadingProgress() const;
@@ -215,13 +211,9 @@ class MEDIA_EXPORT Pipeline : public DataSourceHost, public DemuxerHost {
// and |seek_pending_|.
void FinishSeek();
- // DataSourceHost (by way of DemuxerHost) implementation.
- virtual void SetTotalBytes(int64 total_bytes) OVERRIDE;
- virtual void AddBufferedByteRange(int64 start, int64 end) OVERRIDE;
+ // DemuxerHost implementaion.
virtual void AddBufferedTimeRange(base::TimeDelta start,
base::TimeDelta end) OVERRIDE;
-
- // DemuxerHost implementaion.
virtual void SetDuration(base::TimeDelta duration) OVERRIDE;
virtual void OnDemuxerError(PipelineStatus error) OVERRIDE;
virtual void AddTextStream(DemuxerStream* text_stream,
@@ -345,17 +337,13 @@ class MEDIA_EXPORT Pipeline : public DataSourceHost, public DemuxerHost {
// Whether or not the pipeline is running.
bool running_;
- // Amount of available buffered data. Set by filters.
- Ranges<int64> buffered_byte_ranges_;
+ // Amount of available buffered data as reported by |demuxer_|.
Ranges<base::TimeDelta> buffered_time_ranges_;
- // True when AddBufferedByteRange() has been called more recently than
+ // True when AddBufferedTimeRange() has been called more recently than
// DidLoadingProgress().
mutable bool did_loading_progress_;
- // Total size of the media. Set by filters.
- int64 total_bytes_;
-
// Current volume level (from 0.0f to 1.0f). This value is set immediately
// via SetVolume() and a task is dispatched on the task runner to notify the
// filters.
« no previous file with comments | « media/base/mock_data_source_host.cc ('k') | media/base/pipeline.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698