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

Unified Diff: webrtc/modules/video_coding/utility/ivf_file_writer.cc

Issue 2054373002: FileWrapper[Impl] modifications and actually remove the "Impl" class. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix use of ASSERT instead of ASSERT_TRUE in test Created 4 years, 6 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
Index: webrtc/modules/video_coding/utility/ivf_file_writer.cc
diff --git a/webrtc/modules/video_coding/utility/ivf_file_writer.cc b/webrtc/modules/video_coding/utility/ivf_file_writer.cc
index 97f1da30e40a1b7fe7b8ad07fd4bd1c684c835b6..a80cf9bf6bc5c11f66f01072795735cce94f7150 100644
--- a/webrtc/modules/video_coding/utility/ivf_file_writer.cc
+++ b/webrtc/modules/video_coding/utility/ivf_file_writer.cc
@@ -38,7 +38,7 @@ std::unique_ptr<IvfFileWriter> IvfFileWriter::Open(const std::string& file_name,
VideoCodecType codec_type) {
std::unique_ptr<IvfFileWriter> file_writer;
std::unique_ptr<FileWrapper> file(FileWrapper::Create());
- if (file->OpenFile(file_name.c_str(), false) != 0)
+ if (!file->OpenFile(file_name.c_str(), false))
return file_writer;
file_writer.reset(new IvfFileWriter(
@@ -139,7 +139,7 @@ bool IvfFileWriter::InitFromFirstFrame(const EncodedImage& encoded_image) {
}
bool IvfFileWriter::WriteFrame(const EncodedImage& encoded_image) {
- RTC_DCHECK(file_->Open());
+ RTC_DCHECK(file_->is_open());
if (num_frames_ == 0 && !InitFromFirstFrame(encoded_image))
return false;
@@ -178,7 +178,7 @@ bool IvfFileWriter::WriteFrame(const EncodedImage& encoded_image) {
}
bool IvfFileWriter::Close() {
- if (!file_->Open())
+ if (!file_->is_open())
return false;
if (num_frames_ == 0) {
@@ -190,7 +190,9 @@ bool IvfFileWriter::Close() {
return true;
}
- return WriteHeader() && (file_->CloseFile() == 0);
+ bool ret = WriteHeader();
+ file_->CloseFile();
+ return ret;
}
} // namespace webrtc
« no previous file with comments | « webrtc/modules/media_file/media_file_utility.cc ('k') | webrtc/modules/video_coding/utility/ivf_file_writer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698