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..e131e8890cbdbb7449b46fd754967e9cbdac865e 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_.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.

       }
     }
   }