summaryrefslogtreecommitdiffstats
path: root/chromium/media/filters/file_data_source.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/filters/file_data_source.cc')
-rw-r--r--chromium/media/filters/file_data_source.cc34
1 files changed, 6 insertions, 28 deletions
diff --git a/chromium/media/filters/file_data_source.cc b/chromium/media/filters/file_data_source.cc
index 341347e78a1..e8b3292898f 100644
--- a/chromium/media/filters/file_data_source.cc
+++ b/chromium/media/filters/file_data_source.cc
@@ -15,30 +15,15 @@ FileDataSource::FileDataSource()
force_streaming_(false) {
}
-bool FileDataSource::Initialize(const base::FilePath& file_path) {
- DCHECK(!file_.IsValid());
-
- if (!file_.Initialize(file_path))
- return false;
-
- UpdateHostBytes();
- return true;
+FileDataSource::FileDataSource(base::File file)
+ : force_read_errors_(false),
+ force_streaming_(false) {
+ file_.Initialize(file.Pass());
}
-bool FileDataSource::InitializeFromPlatformFile(
- const base::PlatformFile& file) {
+bool FileDataSource::Initialize(const base::FilePath& file_path) {
DCHECK(!file_.IsValid());
-
- if (!file_.Initialize(file))
- 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) {
@@ -79,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