Delete ShallowCopy, in favor of copy construction and assignment.

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 176 matching lines @@
          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) {
   ASSERT_EQ(VPM_OK, vpm->SetTargetResolution(target_width, target_height, 30));
   out_frame = vpm->PreprocessFrame(source);

[magjed_webrtc, 2016/10/25 07:32:11]

We are completely ignoring the input value of |out_frame| and just overwriting
the pointer here. This looks broken.

[nisse-webrtc, 2016/10/25 08:01:34]

I agree. It was changed in cl https://codereview.webrtc.org/1482913003, and
unrelated to this cl.

   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);
     return;
   }
 
   // Verify the resampled frame.
   EXPECT_TRUE(out_frame != NULL);
@@ skipping 29 matching lines @@
               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;
   vpm->SetInputFrameResampleMode(kBox);
   PreprocessFrameAndVerify(source_frame, target_width, target_height, vpm,
                            out_frame);
   if (out_frame == NULL)

[magjed_webrtc, 2016/10/25 07:32:11]

Something is wrong. |out_frame| will always be null here, regardless of what
PreprocessFrameAndVerify does.

[nisse-webrtc, 2016/10/25 08:01:34]

Same here, change from the earlier refactoring.

     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);
+  VideoFrame resampled_source_frame(*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);
   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);
@@ skipping 17 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