Refactor scaling.

webrtc/modules/video_coding/codecs/test/videoprocessor.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 48 matching lines @@
       source_buffer_(NULL),
       first_key_frame_has_been_excluded_(false),
       last_frame_missing_(false),
       initialized_(false),
       encoded_frame_size_(0),
       encoded_frame_type_(kVideoFrameKey),
       prev_time_stamp_(0),
       num_dropped_frames_(0),
       num_spatial_resizes_(0),
       last_encoder_frame_width_(0),
-      last_encoder_frame_height_(0),
-      scaler_() {
+      last_encoder_frame_height_(0) {
   assert(encoder);
   assert(decoder);
   assert(frame_reader);
   assert(frame_writer);
   assert(packet_manipulator);
   assert(stats);
 }
 
 bool VideoProcessorImpl::Init() {
   // Calculate a factor used for bit rate calculations:
@@ skipping 247 matching lines @@
   if (static_cast<int>(image.width()) != last_encoder_frame_width_ ||
       static_cast<int>(image.height()) != last_encoder_frame_height_) {
     ++num_spatial_resizes_;
     last_encoder_frame_width_ = image.width();
     last_encoder_frame_height_ = image.height();
   }
   // Check if codec size is different from native/original size, and if so,
   // upsample back to original size: needed for PSNR and SSIM computations.
   if (image.width() != config_.codec_settings->width ||
       image.height() != config_.codec_settings->height) {
-    VideoFrame up_image;
-    int ret_val = scaler_.Set(
-        image.width(), image.height(), config_.codec_settings->width,
-        config_.codec_settings->height, kI420, kI420, kScaleBilinear);
-    assert(ret_val >= 0);
-    if (ret_val < 0) {
-      fprintf(stderr, "Failed to set scalar for frame: %d, return code: %d\n",
-              frame_number, ret_val);
-    }
-    ret_val = scaler_.Scale(image, &up_image);
-    assert(ret_val >= 0);
-    if (ret_val < 0) {
-      fprintf(stderr, "Failed to scale frame: %d, return code: %d\n",
-              frame_number, ret_val);
-    }
+    rtc::scoped_refptr<I420Buffer> up_image(
+        new rtc::RefCountedObject<I420Buffer>(config_.codec_settings->width,
+                                              config_.codec_settings->height));
+
+    // Should be the same aspect ratio, no cropping needed.

[pbos-webrtc, 2016/06/03 14:53:23]

I still think the DCHECKs are good here.

[nisse-webrtc, 2016/06/09 08:10:05]

Hmm. I'm afraid the DCHECKs in the earlier patchset were too strict, and will
trigger incorrectly if the original size is odd.

+    up_image->Scale(image.video_frame_buffer());
+
     // TODO(mikhal): Extracting the buffer for now - need to update test.
-    size_t length = CalcBufferSize(kI420, up_image.width(), up_image.height());
+    size_t length =
+        CalcBufferSize(kI420, up_image->width(), up_image->height());
     std::unique_ptr<uint8_t[]> image_buffer(new uint8_t[length]);
     int extracted_length = ExtractBuffer(up_image, length, image_buffer.get());
     assert(extracted_length > 0);
     // Update our copy of the last successful frame:
     memcpy(last_successful_frame_buffer_, image_buffer.get(), extracted_length);
     bool write_success = frame_writer_->WriteFrame(image_buffer.get());
     assert(write_success);
     if (!write_success) {
       fprintf(stderr, "Failed to write frame %d to disk!", frame_number);
     }
@@ skipping 66 matching lines @@
 }
 int32_t VideoProcessorImpl::VideoProcessorDecodeCompleteCallback::Decoded(
     VideoFrame& image) {
   // Forward to parent class.
   video_processor_->FrameDecoded(image);
   return 0;
 }
 
 }  // namespace test
 }  // namespace webrtc