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

Unified Diff: media/filters/file_data_source.cc

Issue 212803004: Separate DemuxerHost from DataSourceHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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 | « media/filters/file_data_source.h ('k') | media/filters/file_data_source_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/file_data_source.cc
diff --git a/media/filters/file_data_source.cc b/media/filters/file_data_source.cc
index 8fb310091754f73180bacd029ac9bab8a49ed9b0..e8b3292898f5d9d6c62feb260ed29695f44ed759 100644
--- a/media/filters/file_data_source.cc
+++ b/media/filters/file_data_source.cc
@@ -18,25 +18,12 @@ FileDataSource::FileDataSource()
FileDataSource::FileDataSource(base::File file)
: force_read_errors_(false),
force_streaming_(false) {
- if (!file_.Initialize(file.Pass()))
- return;
-
- UpdateHostBytes();
+ file_.Initialize(file.Pass());
}
bool FileDataSource::Initialize(const base::FilePath& file_path) {
DCHECK(!file_.IsValid());
-
- if (!file_.Initialize(file_path))
- return false;
-
- UpdateHostBytes();
- return true;
-}
-
-void FileDataSource::set_host(DataSourceHost* host) {
- DataSource::set_host(host);
- UpdateHostBytes();
+ return file_.Initialize(file_path);
}
void FileDataSource::Stop(const base::Closure& callback) {
@@ -77,11 +64,4 @@ void FileDataSource::SetBitrate(int bitrate) {}
FileDataSource::~FileDataSource() {}
-void FileDataSource::UpdateHostBytes() {
- if (host() && file_.IsValid()) {
- host()->SetTotalBytes(file_.length());
- host()->AddBufferedByteRange(0, file_.length());
- }
-}
-
} // namespace media
« no previous file with comments | « media/filters/file_data_source.h ('k') | media/filters/file_data_source_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698