box and point sampling use scaledownby4 but linear and bilinear do not.

BUG=427
TESTED=out\release\libyuv_unittest --gtest_filter=*.ScaleDownBy4_*
R=tpsiaki@google.com

Review URL: https://webrtc-codereview.appspot.com/51689004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@1373 16f28f9a-4ce2-e073-06de-1de4eb20be90

README.chromium

 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1369
+Version: 1373
 License: BSD
 License File: LICENSE
 

include/libyuv/format_conversion.h

-/*
- *  Copyright 2015 The LibYuv 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.
- */
-
-/* format_conversion.h has been deprecated. */
-/* Functionality for bayer formats (BGGR) removed. */
-
-#ifndef INCLUDE_LIBYUV_FORMAT_CONVERSION_H_  // NOLINT
-#define INCLUDE_LIBYUV_FORMAT_CONVERSION_H_
-#endif  // INCLUDE_LIBYUV_FORMAT_CONVERSION_H_
-

include/libyuv/version.h

@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1369
+#define LIBYUV_VERSION 1373
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT

source/scale.cc

@@ -1455,7 +1455,7 @@ void ScalePlane(const uint8* src, int src_stride,
   }
   if (dst_width == src_width && filtering != kFilterBox) {
     int dy = FixedDiv(src_height, dst_height);
-    // Arbitrary scale vertically, but unscaled vertically.
+    // Arbitrary scale vertically, but unscaled horizontally.
     ScalePlaneVertical(src_height,
                        dst_width, dst_height,
                        src_stride, dst_stride, src, dst,
@@ -1486,7 +1486,7 @@ void ScalePlane(const uint8* src, int src_stride,
       return;
     }
     if (4 * dst_width == src_width && 4 * dst_height == src_height &&
-               filtering != kFilterBilinear) {
+        (filtering == kFilterBox || filtering == kFilterNone)) {
       // optimized, 1/4
       ScalePlaneDown4(src_width, src_height, dst_width, dst_height,
                       src_stride, dst_stride, src, dst, filtering);