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

Box filter start from 0,0. Fixes crash that overreads horizontally.

Browse Source 
BUG=185
TEST=scale_test
Review URL: https://webrtc-codereview.appspot.com/1094009

git-svn-id: http://libyuv.googlecode.com/svn/trunk@571 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2013-02-12 19:05:40 +00:00
parent a00da62e52
commit 5f8858665b
5 changed files with 9 additions and 8 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: 570 Version: 571
License: BSD License: BSD
License File: LICENSE License File: LICENSE

2
include/libyuv/row.h
View File

@ -245,7 +245,7 @@ extern "C" {
#define HAS_ARGBCOLORMATRIXROW_NEON #define HAS_ARGBCOLORMATRIXROW_NEON
#define HAS_ARGBGRAYROW_NEON #define HAS_ARGBGRAYROW_NEON
#define HAS_ARGBINTERPOLATEROW_NEON #define HAS_ARGBINTERPOLATEROW_NEON
//#define HAS_ARGBMULTIPLYROW_NEON // #define HAS_ARGBMULTIPLYROW_NEON
#define HAS_ARGBQUANTIZEROW_NEON #define HAS_ARGBQUANTIZEROW_NEON
#define HAS_ARGBSEPIAROW_NEON #define HAS_ARGBSEPIAROW_NEON
#define HAS_ARGBSHADEROW_NEON #define HAS_ARGBSHADEROW_NEON

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 570 #define LIBYUV_VERSION 571
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

6
source/scale.cc
View File

@ -3008,8 +3008,10 @@ static void ScalePlaneBox(int src_width, int src_height,
assert(dst_height > 0); assert(dst_height > 0);
int dx = (src_width << 16) / dst_width; int dx = (src_width << 16) / dst_width;
int dy = (src_height << 16) / dst_height; int dy = (src_height << 16) / dst_height;
int x = (dx >= 65536) ? ((dx >> 1) - 32768) : (dx >> 1); // int x = (dx >= 65536) ? ((dx >> 1) - 32768) : (dx >> 1);
int y = (dy >= 65536) ? ((dy >> 1) - 32768) : (dy >> 1); // int y = (dy >= 65536) ? ((dy >> 1) - 32768) : (dy >> 1);
int x = 0;
int y = 0;
int maxy = (src_height << 16); int maxy = (src_height << 16);
if (!IS_ALIGNED(src_width, 16) || (src_width > kMaxInputWidth) || if (!IS_ALIGNED(src_width, 16) || (src_width > kMaxInputWidth) ||
dst_height * 2 > src_height) { dst_height * 2 > src_height) {

5
unit_test/scale_test.cc
View File

@ -304,8 +304,7 @@ TEST_F(libyuvTest, ScaleDownBy8_Bilinear) {
EXPECT_LE(max_diff, 1); EXPECT_LE(max_diff, 1);
} }
// TODO(fbarchard): Fix bug. Re-enable. TEST_F(libyuvTest, ScaleDownBy8_Box) {
TEST_F(libyuvTest, DISABLED_ScaleDownBy8_Box) {
const int src_width = benchmark_width_; const int src_width = benchmark_width_;
const int src_height = benchmark_height_; const int src_height = benchmark_height_;
const int dst_width = src_width / 8; const int dst_width = src_width / 8;
@ -344,7 +343,7 @@ TEST_F(libyuvTest, ScaleDownBy16_Bilinear) {
EXPECT_LE(max_diff, 1); EXPECT_LE(max_diff, 1);
} }
TEST_F(libyuvTest, DISABLED_ScaleDownBy16_Box) { TEST_F(libyuvTest, ScaleDownBy16_Box) {
const int src_width = benchmark_width_; const int src_width = benchmark_width_;
const int src_height = benchmark_height_; const int src_height = benchmark_height_;
const int dst_width = src_width / 16; const int dst_width = src_width / 16;