From 61466be698ae2ad167c69097be33ac9212052a16 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Wed, 6 Feb 2013 19:01:47 +0000 Subject: [PATCH] Enable bilinear instead of box filter if size of destination is greater than source / 2. BUG=185 TEST=unittest still passes Review URL: https://webrtc-codereview.appspot.com/1103005 git-svn-id: http://libyuv.googlecode.com/svn/trunk@563 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/scale.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index 5eba39059..0bbb6b431 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 561 +Version: 563 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index e08f1d237..62512cce9 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 561 +#define LIBYUV_VERSION 563 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/scale.cc b/source/scale.cc index 50927e8d3..ebe3d95a8 100644 --- a/source/scale.cc +++ b/source/scale.cc @@ -3229,7 +3229,7 @@ static void ScalePlaneDown(int src_width, int src_height, if (!filtering) { ScalePlaneSimple(src_width, src_height, dst_width, dst_height, src_stride, dst_stride, src_ptr, dst_ptr); - } else if (filtering == kFilterBilinear || src_height * 2 > dst_height) { + } else if (filtering == kFilterBilinear || dst_height * 2 > src_height) { // between 1/2x and 1x use bilinear ScalePlaneBilinear(src_width, src_height, dst_width, dst_height, src_stride, dst_stride, src_ptr, dst_ptr);