Merge 105121 - Numerous fixes to audio/video buffered resource loading.

media/filters/file_data_source.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <limits>
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "media/base/filter_host.h"
 #include "media/base/filters.h"
 #include "media/base/pipeline.h"
 #include "media/filters/file_data_source.h"
 
 namespace media {
 
 FileDataSource::FileDataSource()
     : file_(NULL),
-      file_size_(0) {
+      file_size_(0),
+      disable_file_size_(false) {
+}
+
+FileDataSource::FileDataSource(bool disable_file_size)
+    : file_(NULL),
+      file_size_(0),
+      disable_file_size_(disable_file_size) {
 }
 
 FileDataSource::~FileDataSource() {
   DCHECK(!file_);
 }
 
 PipelineStatus FileDataSource::Initialize(const std::string& url) {
   DCHECK(!file_);
 #if defined(OS_WIN)
   FilePath file_path(UTF8ToWide(url));
 #else
   FilePath file_path(url);
 #endif
   if (file_util::GetFileSize(file_path, &file_size_)) {
     file_ = file_util::OpenFile(file_path, "rb");
   }
   if (!file_) {
     file_size_ = 0;
     return PIPELINE_ERROR_URL_NOT_FOUND;
   }
-  if (host()) {
-    host()->SetTotalBytes(file_size_);
-    host()->SetBufferedBytes(file_size_);
-  }
+  UpdateHostBytes();
 
   return PIPELINE_OK;
 }
 
 void FileDataSource::set_host(FilterHost* filter_host) {
   DataSource::set_host(filter_host);
-  if (file_) {
+  UpdateHostBytes();
+}
+
+void FileDataSource::UpdateHostBytes() {
+  if (host() && file_) {
     host()->SetTotalBytes(file_size_);
     host()->SetBufferedBytes(file_size_);
   }
 }
 
 void FileDataSource::Stop(FilterCallback* callback) {
   base::AutoLock l(lock_);
   if (file_) {
     file_util::CloseFile(file_);
     file_ = NULL;
@@ skipping 35 matching lines @@
   }
 
   callback->RunWithParams(Tuple1<size_t>(static_cast<size_t>(kReadError)));
 }
 
 bool FileDataSource::GetSize(int64* size_out) {
   DCHECK(size_out);
   DCHECK(file_);
   base::AutoLock l(lock_);
   *size_out = file_size_;
-  return (NULL != file_);
+  return (NULL != file_ && !disable_file_size_);
 }
 
 bool FileDataSource::IsStreaming() {
   return false;
 }
 
-void FileDataSource::SetPreload(Preload preload) {}
+void FileDataSource::SetPreload(Preload preload) {
+}
+
+void FileDataSource::SetBitrate(int bitrate) {
+}
 
 }  // namespace media