Fix out_frame argument of PreprocessFrameAndVerify.

webrtc/modules/video_processing/test/video_processing_unittest.cc

 /*
  *  Copyright (c) 2012 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.
  */
 
@@ skipping 16 matching lines @@
 
 // Define command line flag 'gen_files' (default value: false).
 DEFINE_bool(gen_files, false, "Output files for visual inspection.");
 
 }  // namespace
 
 static void PreprocessFrameAndVerify(const VideoFrame& source,
                                      int target_width,
                                      int target_height,
                                      VideoProcessing* vpm,
-                                     const VideoFrame* out_frame);
+                                     const VideoFrame** out_frame);
 static rtc::scoped_refptr<VideoFrameBuffer> CropBuffer(
     rtc::scoped_refptr<VideoFrameBuffer> source_buffer,
     int offset_x,
     int offset_y,
     int cropped_width,
     int cropped_height);
 // The |source_data| is cropped and scaled to |target_width| x |target_height|,
 // and then scaled back to the expected cropped size. |expected_psnr| is used to
 // verify basic quality, and is set to be ~0.1/0.05dB lower than actual PSNR
 // verified under the same conditions.
@@ skipping 43 matching lines @@
 TEST_F(VideoProcessingTest, PreprocessorLogic) {
 #endif
   // Disable temporal sampling (frame dropping).
   vp_->EnableTemporalDecimation(false);
   int resolution = 100;
   EXPECT_EQ(VPM_OK, vp_->SetTargetResolution(resolution, resolution, 15));
   EXPECT_EQ(VPM_OK, vp_->SetTargetResolution(resolution, resolution, 30));
   // Disable spatial sampling.
   vp_->SetInputFrameResampleMode(kNoRescaling);
   EXPECT_EQ(VPM_OK, vp_->SetTargetResolution(resolution, resolution, 30));
-  VideoFrame* out_frame = NULL;
+  const VideoFrame* out_frame = NULL;
   // Set rescaling => output frame != NULL.
   vp_->SetInputFrameResampleMode(kFastRescaling);
 
   rtc::scoped_refptr<webrtc::I420Buffer> buffer =
       I420Buffer::Create(width_, height_, width_, half_width_, half_width_);
 
   // Clear video frame so DrMemory/Valgrind will allow reads of the buffer.
   buffer->InitializeData();
   VideoFrame video_frame(buffer, 0, 0, webrtc::kVideoRotation_0);
 
-  PreprocessFrameAndVerify(video_frame, resolution, resolution, vp_, out_frame);
+  PreprocessFrameAndVerify(video_frame, resolution, resolution, vp_,
+                           &out_frame);
   // No rescaling=> output frame = NULL.
   vp_->SetInputFrameResampleMode(kNoRescaling);
   EXPECT_TRUE(vp_->PreprocessFrame(video_frame) != nullptr);
 }
 
 #if defined(WEBRTC_IOS)
 TEST_F(VideoProcessingTest, DISABLED_Resampler) {
 #else
 TEST_F(VideoProcessingTest, Resampler) {
 #endif
@@ skipping 62 matching lines @@
 
   printf("\nAverage run time = %d us / frame\n",
          static_cast<int>(total_runtime));
   printf("Min run time = %d us / frame\n\n", static_cast<int>(min_runtime));
 }
 
 void PreprocessFrameAndVerify(const VideoFrame& source,
                               int target_width,
                               int target_height,
                               VideoProcessing* vpm,
-                              const VideoFrame* out_frame) {
+                              const VideoFrame** out_frame) {
   ASSERT_EQ(VPM_OK, vpm->SetTargetResolution(target_width, target_height, 30));
-  out_frame = vpm->PreprocessFrame(source);
-  EXPECT_TRUE(out_frame != nullptr);
+  *out_frame = vpm->PreprocessFrame(source);
+  EXPECT_TRUE(*out_frame != nullptr);
 
   // If no resizing is needed, expect the original frame.
   if (target_width == source.width() && target_height == source.height()) {
-    EXPECT_EQ(&source, out_frame);
+    EXPECT_EQ(&source, *out_frame);
     return;
   }
 
   // Verify the resampled frame.
-  EXPECT_TRUE(out_frame != NULL);
-  EXPECT_EQ(source.render_time_ms(), (out_frame)->render_time_ms());
-  EXPECT_EQ(source.timestamp(), (out_frame)->timestamp());
-  EXPECT_EQ(target_width, (out_frame)->width());
-  EXPECT_EQ(target_height, (out_frame)->height());
+  EXPECT_EQ(source.render_time_ms(), (*out_frame)->render_time_ms());
+  EXPECT_EQ(source.timestamp(), (*out_frame)->timestamp());
+  EXPECT_EQ(target_width, (*out_frame)->width());
+  EXPECT_EQ(target_height, (*out_frame)->height());
 }
 
 rtc::scoped_refptr<VideoFrameBuffer> CropBuffer(
     rtc::scoped_refptr<VideoFrameBuffer> source_buffer,
     int offset_x,
     int offset_y,
     int cropped_width,
     int cropped_height) {
   // Force even.
   offset_x &= ~1;
@@ skipping 11 matching lines @@
           source_buffer->StrideV(), rtc::KeepRefUntilDone(source_buffer)));
 }
 
 void TestSize(const VideoFrame& source_frame,
               const VideoFrameBuffer& cropped_source,
               int target_width,
               int target_height,
               double expected_psnr,
               VideoProcessing* vpm) {
   // Resample source_frame to out_frame.
-  VideoFrame* out_frame = NULL;
+  const VideoFrame* out_frame = NULL;
   vpm->SetInputFrameResampleMode(kBox);
   PreprocessFrameAndVerify(source_frame, target_width, target_height, vpm,
-                           out_frame);
+                           &out_frame);
   if (out_frame == NULL)
     return;
   WriteProcessedFrameForVisualInspection(source_frame, *out_frame);
 
   // Scale |resampled_source_frame| back to the source scale.
   VideoFrame resampled_source_frame;
   resampled_source_frame.ShallowCopy(*out_frame);
   // Compute PSNR against the cropped source frame and check expectation.
   PreprocessFrameAndVerify(resampled_source_frame,
                            cropped_source.width(),
-                           cropped_source.height(), vpm, out_frame);
+                           cropped_source.height(), vpm, &out_frame);
   WriteProcessedFrameForVisualInspection(resampled_source_frame, *out_frame);
 
   // Compute PSNR against the cropped source frame and check expectation.
   double psnr =
       I420PSNR(cropped_source, *out_frame->video_frame_buffer());
   EXPECT_GT(psnr, expected_psnr);
   printf(
       "PSNR: %f. PSNR is between source of size %d %d, and a modified "
       "source which is scaled down/up to: %d %d, and back to source size \n",
       psnr, source_frame.width(), source_frame.height(), target_width,
@@ skipping 13 matching lines @@
   std::cout << "Watch " << filename.str() << " and verify that it is okay."
             << std::endl;
   FILE* stand_alone_file = fopen(filename.str().c_str(), "wb");
   if (PrintVideoFrame(processed, stand_alone_file) < 0)
     std::cerr << "Failed to write: " << filename.str() << std::endl;
   if (stand_alone_file)
     fclose(stand_alone_file);
 }
 
 }  // namespace webrtc