Refactor scaling.

webrtc/api/java/jni/androidvideocapturer_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.
  */
 
 #include "webrtc/api/java/jni/androidvideocapturer_jni.h"
 #include "webrtc/api/java/jni/classreferenceholder.h"
 #include "webrtc/api/java/jni/native_handle_impl.h"
 #include "webrtc/api/java/jni/surfacetexturehelper_jni.h"
 #include "third_party/libyuv/include/libyuv/convert.h"
-#include "third_party/libyuv/include/libyuv/scale.h"
 #include "webrtc/base/bind.h"
 
 namespace webrtc_jni {
 
 jobject AndroidVideoCapturerJni::application_context_ = nullptr;
 
 // static
 int AndroidVideoCapturerJni::SetAndroidObjects(JNIEnv* jni,
                                                jobject appliction_context) {
   if (application_context_) {
@@ skipping 183 matching lines @@
       y_plane + width * crop_y + crop_x, width,
       uv_plane + uv_width * crop_y + crop_x, width,
       buffer->MutableData(webrtc::kYPlane), buffer->stride(webrtc::kYPlane),
       // Swap U and V, since we have NV21, not NV12.
       buffer->MutableData(webrtc::kVPlane), buffer->stride(webrtc::kVPlane),
       buffer->MutableData(webrtc::kUPlane), buffer->stride(webrtc::kUPlane),
       crop_width, crop_height, static_cast<libyuv::RotationMode>(
           capturer_->apply_rotation() ? rotation : 0));
 
   if (adapted_width != rotated_width || adapted_height != rotated_height) {
-    rtc::scoped_refptr<webrtc::VideoFrameBuffer> scaled =
-      post_scale_pool_.CreateBuffer(adapted_width, adapted_height);
-    // TODO(nisse): This should be done by some Scale method in
-    // I420Buffer, but we can't do that right now, since
-    // I420BufferPool uses a wrapper object.
-    if (libyuv::I420Scale(buffer->DataY(), buffer->StrideY(),
-                          buffer->DataU(), buffer->StrideU(),
-                          buffer->DataV(), buffer->StrideV(),
-                          rotated_width, rotated_height,
-                          scaled->MutableDataY(), scaled->StrideY(),
-                          scaled->MutableDataU(), scaled->StrideU(),
-                          scaled->MutableDataV(), scaled->StrideV(),
-                          adapted_width, adapted_height,
-                          libyuv::kFilterBox) < 0) {
-      LOG(LS_WARNING) << "I420Scale failed";
-      return;
-    }
+    rtc::scoped_refptr<webrtc::I420Buffer> scaled =
+        post_scale_pool_.CreateBuffer(adapted_width, adapted_height);
+    scaled->CropAndScale(buffer, 0, 0, rotated_width, rotated_height);

[magjed_webrtc, 2016/05/30 11:58:26]

You should use crop_x/crop_y instead of 0?

[nisse-webrtc, 2016/05/30 12:58:22]

I don't think so. Cropping was done in the above call to NV12ToI420Rotate, so
here we should scale the full image.

     buffer = scaled;
   }
   // TODO(nisse): Use microsecond time instead.
   capturer_->OnFrame(cricket::WebRtcVideoFrame(
                          buffer, timestamp_ns,
                          capturer_->apply_rotation()
                              ? webrtc::kVideoRotation_0
                              : static_cast<webrtc::VideoRotation>(rotation)),
                      width, height);
 }
@@ skipping 87 matching lines @@
 
 JOW(void, VideoCapturer_00024NativeObserver_nativeOnOutputFormatRequest)
     (JNIEnv* jni, jclass, jlong j_capturer, jint j_width, jint j_height,
         jint j_fps) {
   LOG(LS_INFO) << "NativeObserver_nativeOnOutputFormatRequest";
   reinterpret_cast<AndroidVideoCapturerJni*>(j_capturer)->OnOutputFormatRequest(
       j_width, j_height, j_fps);
 }
 
 }  // namespace webrtc_jni