Revert of Add Jpeg frame writer for test support.

webrtc/video/video_quality_test.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include "webrtc/video/video_quality_test.h"
@@ skipping 15 matching lines @@
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_format.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h"
 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
 #include "webrtc/rtc_base/checks.h"
 #include "webrtc/rtc_base/cpu_time.h"
 #include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/flags.h"
 #include "webrtc/rtc_base/format_macros.h"
-#include "webrtc/rtc_base/logging.h"
 #include "webrtc/rtc_base/memory_usage.h"
 #include "webrtc/rtc_base/optional.h"
-#include "webrtc/rtc_base/pathutils.h"
 #include "webrtc/rtc_base/platform_file.h"
 #include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/system_wrappers/include/cpu_info.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/layer_filtering_transport.h"
 #include "webrtc/test/run_loop.h"
 #include "webrtc/test/statistics.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/test/testsupport/frame_writer.h"
-#include "webrtc/test/testsupport/test_output.h"
 #include "webrtc/test/vcm_capturer.h"
 #include "webrtc/test/video_renderer.h"
 #include "webrtc/voice_engine/include/voe_base.h"
 
 #include "webrtc/test/rtp_file_writer.h"
 
-DEFINE_bool(save_worst_frame,
-            false,
-            "Enable saving a frame with the lowest PSNR to a jpeg file in the "
-            "test_output_dir");
-
 namespace {
 
 constexpr int kSendStatsPollingIntervalMs = 1000;
 
 constexpr size_t kMaxComparisons = 10;
 constexpr char kSyncGroup[] = "av_sync";
 constexpr int kOpusMinBitrateBps = 6000;
 constexpr int kOpusBitrateFbBps = 32000;
 constexpr int kFramesSentInQuickTest = 1;
 constexpr uint32_t kThumbnailSendSsrcStart = 0xE0000;
@@ skipping 752 matching lines @@
            dropped_frames_);
     printf("RESULT cpu_usage: %s = %lf %%\n", test_label_.c_str(),
            GetCpuUsagePercent());
 
 #if defined(WEBRTC_WIN)
       // On Linux and Mac in Resident Set some unused pages may be counted.
       // Therefore this metric will depend on order in which tests are run and
       // will be flaky.
     PrintResult("memory_usage", memory_usage_, " bytes");
 #endif
+    // TODO(ilnik): enable frame writing for android, once jpeg frame writer
+    // is implemented.
 
-    // LibJpeg is not available on iOS.
-#if !defined(WEBRTC_IOS)
-    // Saving only the worst frame for manual analysis. Intention here is to
-    // only detect video corruptions and not to track picture quality. Thus,
-    // jpeg is used here.
-    if (FLAG_save_worst_frame && worst_frame_) {
-      std::string output_dir;
-      test::GetTestOutputDir(&output_dir);
-      std::string output_path =
-          rtc::Pathname(output_dir, test_label_ + ".jpg").pathname();
-      LOG(LS_INFO) << "Saving worst frame to " << output_path;
-      test::JpegFrameWriter frame_writer(output_path);
-      RTC_CHECK(frame_writer.WriteFrame(worst_frame_->frame,
-                                        100 /*best quality*/));
+#if !defined(WEBRTC_ANDROID)
+    if (worst_frame_) {
+      test::Y4mFrameWriterImpl frame_writer(test_label_ + ".y4m",
+                                            worst_frame_->frame.width(),
+                                            worst_frame_->frame.height(), 1);
+      bool res = frame_writer.Init();
+      RTC_DCHECK(res);
+      size_t length =
+          CalcBufferSize(VideoType::kI420, worst_frame_->frame.width(),
+                         worst_frame_->frame.height());
+      rtc::Buffer extracted_buffer(length);
+      size_t extracted_length =
+          ExtractBuffer(worst_frame_->frame.video_frame_buffer()->ToI420(),
+                        length, extracted_buffer.data());
+      RTC_DCHECK_EQ(extracted_length, frame_writer.FrameLength());
+      res = frame_writer.WriteFrame(extracted_buffer.data());
+      RTC_DCHECK(res);
+      frame_writer.Close();
     }
 #endif
 
     //  Disable quality check for quick test, as quality checks may fail
     //  because too few samples were collected.
     if (!is_quick_test_enabled_) {
       EXPECT_GT(psnr_.Mean(), avg_psnr_threshold_);
       EXPECT_GT(ssim_.Mean(), avg_ssim_threshold_);
     }
   }
@@ skipping 1261 matching lines @@
   if (!params_.logging.encoded_frame_base_path.empty()) {
     std::ostringstream str;
     str << receive_logs_++;
     std::string path =
         params_.logging.encoded_frame_base_path + "." + str.str() + ".recv.ivf";
     stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path),
                                         100000000);
   }
 }
 }  // namespace webrtc