Add optional visualization file writers to VideoProcessor tests.

webrtc/test/testsupport/y4m_frame_writer.cc

Index: webrtc/test/testsupport/y4m_frame_writer.cc
diff --git a/webrtc/test/testsupport/frame_writer.cc b/webrtc/test/testsupport/y4m_frame_writer.cc
similarity index 33%
copy from webrtc/test/testsupport/frame_writer.cc
copy to webrtc/test/testsupport/y4m_frame_writer.cc
index 1b9e8a82efda2f1dd41e78a7ed0a8059e5847a3d..de4af8a77a48ca6a74003787b54229888fc859b9 100644
--- a/webrtc/test/testsupport/frame_writer.cc
+++ b/webrtc/test/testsupport/y4m_frame_writer.cc
@@ -8,62 +8,47 @@
  *  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)
-    : output_filename_(output_filename),
-      frame_length_in_bytes_(frame_length_in_bytes),
-      output_file_(NULL) {
-}
+Y4mFrameWriterImpl::Y4mFrameWriterImpl(std::string output_filename,
+                                       int width,
+                                       int height,
+                                       int frame_rate)
+    : YuvFrameWriterImpl(output_filename, width, height),
+      frame_rate_(frame_rate) {}
 
-FrameWriterImpl::~FrameWriterImpl() {
-  Close();
-}
+Y4mFrameWriterImpl::~Y4mFrameWriterImpl() = default;
 
-bool FrameWriterImpl::Init() {
-  if (frame_length_in_bytes_ <= 0) {
-    fprintf(stderr, "Frame length must be >0, was %zu\n",
-            frame_length_in_bytes_);
+bool Y4mFrameWriterImpl::Init() {
+  if (!YuvFrameWriterImpl::Init()) {
     return false;
   }
-  output_file_ = fopen(output_filename_.c_str(), "wb");
-  if (output_file_ == NULL) {
-    fprintf(stderr, "Couldn't open output file for writing: %s\n",
+  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;
 }
 
-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) {
-    fprintf(stderr, "FrameWriter is not initialized (output file is NULL)\n");
+bool Y4mFrameWriterImpl::WriteFrame(uint8_t* frame_buffer) {
+  if (output_file_ == nullptr) {
+    fprintf(stderr,
+            "Y4mFrameWriterImpl is not initialized (output file is NULL)\n");
     return false;
   }
-  size_t bytes_written = fwrite(frame_buffer, 1, frame_length_in_bytes_,
-                                output_file_);
-  if (bytes_written != frame_length_in_bytes_) {
-    fprintf(stderr, "Failed to write %zu bytes to file %s\n",
-            frame_length_in_bytes_, output_filename_.c_str());
-    return false;
+  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());

[kjellander_webrtc, 2017/02/20 21:41:47]

return false?

[brandtr, 2017/02/21 07:59:31]

Yes! Not sure why that was left out..

   }
-  return true;
+  return YuvFrameWriterImpl::WriteFrame(frame_buffer);
 }
 
 }  // namespace test