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

Unified Diff: services/media/framework/parts/file_reader.cc

Issue 1814583002: Motown: New wrapper classes for ffmpeg format context and io context (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Tweaks based on feedback. Created 4 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 | « no previous file | services/media/framework/parts/reader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/media/framework/parts/file_reader.cc
diff --git a/services/media/framework/parts/file_reader.cc b/services/media/framework/parts/file_reader.cc
index 623e1e41140ec194451dbdc6e553cb86e9526177..4061ecda337357af7792ba4e978a8e2fd6907d8e 100644
--- a/services/media/framework/parts/file_reader.cc
+++ b/services/media/framework/parts/file_reader.cc
@@ -34,14 +34,18 @@ Result FileReader::Init(const GURL& gurl) {
return Result::kUnsupportedOperation;
}
} else {
- size_ = -1;
+ size_ = kFailed;
}
return Result::kOk;
}
size_t FileReader::Read(uint8_t* buffer, size_t bytes_to_read) {
- return fread(buffer, 1, bytes_to_read, file_);
+ size_t bytes_read = fread(buffer, 1, bytes_to_read, file_);
+ if (bytes_read != bytes_to_read && ferror(file_) != 0) {
+ bytes_read = kFailed;
+ }
+ return bytes_read;
}
int64_t FileReader::GetPosition() const {
« no previous file with comments | « no previous file | services/media/framework/parts/reader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698