Refactor scaling.

webrtc/api/java/jni/androidmediaencoder_jni.cc

Index: webrtc/api/java/jni/androidmediaencoder_jni.cc
diff --git a/webrtc/api/java/jni/androidmediaencoder_jni.cc b/webrtc/api/java/jni/androidmediaencoder_jni.cc
index 0e36aa1b7463dba4b60b3b7a488d452d85c3982a..9f244c3b55bdc834f8a3569ec9c9e6869de4cd3c 100644
--- a/webrtc/api/java/jni/androidmediaencoder_jni.cc
+++ b/webrtc/api/java/jni/androidmediaencoder_jni.cc
@@ -674,7 +674,7 @@ int32_t MediaCodecVideoEncoder::EncodeOnCodecThread(
   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() ||
@@ -688,7 +688,8 @@ int32_t MediaCodecVideoEncoder::EncodeOnCodecThread(
                     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_.GetScaledBuffer(frame.video_frame_buffer()));
       }
     }
   }