coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-07 01:06:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
fbarchard@google.com 2015-04-17 18:04:09 +00:00
parent e52b9c3405
commit 812f59ed40
4 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.chromium
View File

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

17
include/libyuv/format_conversion.h
View File

@ -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_

2
include/libyuv/version.h
View File

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

4
source/scale.cc
View File

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