Refactor scaling.

webrtc/api/java/jni/androidmediaencoder_jni.cc

 /*
  *  Copyright 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.
  */
 
@@ skipping 656 matching lines @@
     }
     frames_dropped_media_encoder_++;
     OnDroppedFrameOnCodecThread();
     return WEBRTC_VIDEO_CODEC_OK;
   }
   consecutive_full_queue_frame_drops_ = 0;
 
   VideoFrame input_frame = frame;
   if (scale_) {
     // Check framerate before spatial resolution change.
-    quality_scaler_.OnEncodeFrame(frame);
+    quality_scaler_.OnEncodeFrame(frame.width(), frame.height());
     const webrtc::QualityScaler::Resolution scaled_resolution =
         quality_scaler_.GetScaledResolution();
     if (scaled_resolution.width != frame.width() ||
         scaled_resolution.height != frame.height()) {
       if (frame.video_frame_buffer()->native_handle() != nullptr) {
         rtc::scoped_refptr<webrtc::VideoFrameBuffer> scaled_buffer(
             static_cast<AndroidTextureBuffer*>(
                 frame.video_frame_buffer().get())->CropScaleAndRotate(
                     frame.width(), frame.height(), 0, 0,
                     scaled_resolution.width, scaled_resolution.height,
                     webrtc::kVideoRotation_0));
         input_frame.set_video_frame_buffer(scaled_buffer);
       } else {
-        input_frame = quality_scaler_.GetScaledFrame(frame);
+        input_frame.set_video_frame_buffer(
+            quality_scaler_.GetScaledFrame(frame.video_frame_buffer()));

[pbos-webrtc, 2016/05/31 14:14:01]

GetScaledVideoFrameBuffer?

[nisse-webrtc, 2016/06/01 09:15:17]

If you really want, I can rename the quality scaler method. To me, the exact
type used to represent a frame doesn't seem central to what this class and
method does.

[pbos-webrtc, 2016/06/01 15:55:41]

No but I think you should know what you get out of it. GetScaledBuffer would
also work for me, but you don't get a VideoFrame, so GetScaledFrame sounds
weird.

[nisse-webrtc, 2016/06/02 09:00:06]

Done, renamed to GetScaledBuffer.

       }
     }
   }
 
   if (!MaybeReconfigureEncoderOnCodecThread(input_frame)) {
     ALOGE << "Failed to reconfigure encoder.";
     return WEBRTC_VIDEO_CODEC_ERROR;
   }
 
   const int64_t time_before_calling_encode = rtc::TimeMillis();
@@ skipping 573 matching lines @@
   return supported_codecs_;
 }
 
 void MediaCodecVideoEncoderFactory::DestroyVideoEncoder(
     webrtc::VideoEncoder* encoder) {
   ALOGD << "Destroy video encoder.";
   delete encoder;
 }
 
 }  // namespace webrtc_jni