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

Unified Diff: media/filters/file_data_source.cc

Issue 11410052: Refactor FFmpegURLProtocol code from FFmpegDemuxer into BlockingUrlProtocol. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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/filters/file_data_source.cc
diff --git a/media/filters/file_data_source.cc b/media/filters/file_data_source.cc
index ceb7a5a7eb33865a96897d00ba128cc0439ddb9d..00367d50da80a8e8071971b9f2a96eaa301bf9f5 100644
--- a/media/filters/file_data_source.cc
+++ b/media/filters/file_data_source.cc
@@ -15,13 +15,9 @@ namespace media {
FileDataSource::FileDataSource()
DaleCurtis 2012/11/13 03:42:28 Might be worth just replacing most of this a FileU
scherkus (not reviewing) 2012/11/13 18:19:13 I'll do a follow up CL
: file_(NULL),
file_size_(0),
- disable_file_size_(false) {
-}
-
-FileDataSource::FileDataSource(bool disable_file_size)
- : file_(NULL),
- file_size_(0),
- disable_file_size_(disable_file_size) {
+ disable_file_size_(false),
+ force_read_errors_(false),
+ force_streaming_(false) {
}
bool FileDataSource::Initialize(const std::string& url) {
@@ -63,7 +59,8 @@ void FileDataSource::Read(int64 position, int size, uint8* data,
const DataSource::ReadCB& read_cb) {
DCHECK(file_);
base::AutoLock l(lock_);
- if (file_) {
+
+ if (!force_read_errors_ && file_) {
#if defined(OS_WIN)
if (_fseeki64(file_, position, SEEK_SET)) {
read_cb.Run(DataSource::kReadError);
@@ -92,11 +89,11 @@ bool FileDataSource::GetSize(int64* size_out) {
DCHECK(file_);
base::AutoLock l(lock_);
*size_out = file_size_;
- return (NULL != file_ && !disable_file_size_);
+ return (file_ && !disable_file_size_);
}
bool FileDataSource::IsStreaming() {
- return false;
+ return force_streaming_;
}
void FileDataSource::SetBitrate(int bitrate) {}

Powered by Google App Engine
This is Rietveld 408576698