Index: webrtc/test/testsupport/frame_writer.cc |
diff --git a/webrtc/test/testsupport/frame_writer.cc b/webrtc/test/testsupport/frame_writer.cc |
index 1b9e8a82efda2f1dd41e78a7ed0a8059e5847a3d..be0496fdb1ff654ca91086935ae045d82316179c 100644 |
--- a/webrtc/test/testsupport/frame_writer.cc |
+++ b/webrtc/test/testsupport/frame_writer.cc |
@@ -8,32 +8,36 @@ |
* be found in the AUTHORS file in the root of the source tree. |
*/ |
+#include "webrtc/base/checks.h" |
#include "webrtc/test/testsupport/frame_writer.h" |
-#include <assert.h> |
- |
namespace webrtc { |
namespace test { |
-FrameWriterImpl::FrameWriterImpl(std::string output_filename, |
- size_t frame_length_in_bytes) |
+YuvFrameWriterImpl::YuvFrameWriterImpl(std::string output_filename, |
+ int width, |
+ int height) |
: output_filename_(output_filename), |
- frame_length_in_bytes_(frame_length_in_bytes), |
- output_file_(NULL) { |
-} |
+ frame_length_in_bytes_(0), |
+ width_(width), |
+ height_(height), |
+ output_file_(nullptr) {} |
-FrameWriterImpl::~FrameWriterImpl() { |
+YuvFrameWriterImpl::~YuvFrameWriterImpl() { |
Close(); |
} |
-bool FrameWriterImpl::Init() { |
- if (frame_length_in_bytes_ <= 0) { |
- fprintf(stderr, "Frame length must be >0, was %zu\n", |
- frame_length_in_bytes_); |
+bool YuvFrameWriterImpl::Init() { |
+ if (width_ <= 0 || height_ <= 0) { |
+ fprintf(stderr, "Frame width and height must be >0, was %d x %d\n", width_, |
+ height_); |
return false; |
} |
+ frame_length_in_bytes_ = |
+ width_ * height_ + 2 * ((width_ + 1) / 2) * ((height_ + 1) / 2); |
+ |
output_file_ = fopen(output_filename_.c_str(), "wb"); |
- if (output_file_ == NULL) { |
+ if (output_file_ == nullptr) { |
fprintf(stderr, "Couldn't open output file for writing: %s\n", |
output_filename_.c_str()); |
return false; |
@@ -41,18 +45,9 @@ bool FrameWriterImpl::Init() { |
return true; |
} |
-void FrameWriterImpl::Close() { |
- if (output_file_ != NULL) { |
- fclose(output_file_); |
- output_file_ = NULL; |
- } |
-} |
- |
-size_t FrameWriterImpl::FrameLength() { return frame_length_in_bytes_; } |
- |
-bool FrameWriterImpl::WriteFrame(uint8_t* frame_buffer) { |
- assert(frame_buffer); |
- if (output_file_ == NULL) { |
+bool YuvFrameWriterImpl::WriteFrame(uint8_t* frame_buffer) { |
+ RTC_DCHECK(frame_buffer); |
+ if (output_file_ == nullptr) { |
fprintf(stderr, "FrameWriter is not initialized (output file is NULL)\n"); |
return false; |
} |
@@ -66,5 +61,48 @@ bool FrameWriterImpl::WriteFrame(uint8_t* frame_buffer) { |
return true; |
} |
+void YuvFrameWriterImpl::Close() { |
+ if (output_file_ != nullptr) { |
+ fclose(output_file_); |
+ output_file_ = nullptr; |
+ } |
+} |
+ |
+size_t YuvFrameWriterImpl::FrameLength() { |
+ return frame_length_in_bytes_; |
+} |
+ |
+Y4mFrameWriterImpl::Y4mFrameWriterImpl(std::string output_filename, |
+ int width, |
+ int height, |
+ int frame_rate) |
+ : YuvFrameWriterImpl(output_filename, width, height), |
+ frame_rate_(frame_rate) {} |
+ |
+Y4mFrameWriterImpl::~Y4mFrameWriterImpl() = default; |
+ |
+bool Y4mFrameWriterImpl::Init() { |
+ if (!YuvFrameWriterImpl::Init()) { |
+ return false; |
+ } |
+ int bytes_written = fprintf(output_file_, "YUV4MPEG2 W%d H%d F%d:1 C420\n", |
+ width_, height_, frame_rate_); |
+ if (bytes_written < 0) { |
+ fprintf(stderr, "Failed to write Y4M file header to file %s\n", |
+ output_filename_.c_str()); |
+ return false; |
+ } |
+ return true; |
+} |
+ |
+bool Y4mFrameWriterImpl::WriteFrame(uint8_t* frame_buffer) { |
+ int bytes_written = fprintf(output_file_, "FRAME\n"); |
+ if (bytes_written < 0) { |
+ fprintf(stderr, "Failed to write Y4M frame header to file %s\n", |
+ output_filename_.c_str()); |
åsapersson
2017/02/17 15:47:35
return false?
|
+ } |
+ return YuvFrameWriterImpl::WriteFrame(frame_buffer); |
+} |
+ |
} // namespace test |
} // namespace webrtc |