From 812f59ed40060d2197fc176ab8f08072f667066c Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Fri, 17 Apr 2015 18:04:09 +0000 Subject: [PATCH] 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 | 2 +- include/libyuv/format_conversion.h | 17 ----------------- include/libyuv/version.h | 2 +- source/scale.cc | 4 ++-- 4 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 include/libyuv/format_conversion.h diff --git a/README.chromium b/README.chromium index af6500137..b334c5214 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1369 +Version: 1373 License: BSD License File: LICENSE diff --git a/include/libyuv/format_conversion.h b/include/libyuv/format_conversion.h deleted file mode 100644 index 537bc2cc0..000000000 --- a/include/libyuv/format_conversion.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * 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_ - diff --git a/include/libyuv/version.h b/include/libyuv/version.h index c715c4dca..6461cc310 100644 --- a/include/libyuv/version.h +++ b/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 diff --git a/source/scale.cc b/source/scale.cc index d757fb6dc..f4e52e6e1 100644 --- a/source/scale.cc +++ b/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);