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

Scale horizontally by 2 but vertically anything.

Browse Source 
BUG=none
TEST=set LIBYUV_WIDTH=320 set LIBYUV_HEIGHT=90 libyuvTest.ARGBScaleFrom640x360_Bilinear
Review URL: https://webrtc-codereview.appspot.com/1477006

git-svn-id: http://libyuv.googlecode.com/svn/trunk@695 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2013-05-15 19:51:33 +00:00
parent 927eb2c1f6
commit 3db4588bf9
3 changed files with 25 additions and 27 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
URL: http://code.google.com/p/libyuv/
Version: 694
Version: 695
License: BSD
License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 694
#define LIBYUV_VERSION 695
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

48
source/scale_argb.cc
View File

@ -743,7 +743,7 @@ static void ScaleARGBDown2(int /* src_width */, int /* src_height */,
int x, int dx, int y, int dy,
FilterMode filtering) {
assert(dx == 65536 * 2); // Test scale factor of 2.
assert(dy == 65536 * 2);
assert((dy & 0x1ffff) == 0); // Test vertical scale is multiple of 2.
void (*ScaleARGBRowDown2)(const uint8* src_argb, ptrdiff_t src_stride,
uint8* dst_argb, int dst_width) =
filtering ? ScaleARGBRowDown2Int_C : ScaleARGBRowDown2_C;
@ -762,11 +762,12 @@ static void ScaleARGBDown2(int /* src_width */, int /* src_height */,
}
#endif
src_argb += (y >> 16) * src_stride + (x >> 16) * 4;
int row_stride = src_stride * (dy >> 16);
// TODO(fbarchard): Loop through source height to allow odd height.
for (int y = 0; y < dst_height; ++y) {
ScaleARGBRowDown2(src_argb, src_stride, dst_argb, dst_width);
src_argb += (src_stride << 1);
src_argb += row_stride;
dst_argb += dst_stride;
}
}
@ -1115,35 +1116,32 @@ static void ScaleARGB(const uint8* src, int src_stride,
filtering = (FilterMode)atoi(filter_override); // NOLINT
}
#endif
if (dst_width == src_width && dst_height == src_height) {
// Straight copy.
ARGBCopy(src + (y >> 16) * src_stride + (x >> 16) * 4, src_stride,
dst, dst_stride, clip_width, clip_height);
return;
}
// TODO(fbarchard): Allow different vertical scales.
if (2 * dst_width == src_width && 2 * dst_height == src_height) {
// Optimized 1/2.
ScaleARGBDown2(src_width, src_height,
clip_width, clip_height,
src_stride, dst_stride, src, dst,
x, dx, y, dy, filtering);
return;
}
// TODO(fbarchard): Remove this divide, reusing dx and dy.
int scale_down_x = src_width / dst_width;
int scale_down_y = src_height / dst_height;
if (dst_width * scale_down_x == src_width &&
dst_height * scale_down_y == src_height) {
if (!(scale_down_x & 1) && !(scale_down_y & 1)) {
// Optimized even scale down. ie 4, 6, 8, 10x.
// Special case for integer step values.
if (((dx | dy) & 0xffff) == 0) {
// Optimized even scale down. ie 2, 4, 6, 8, 10x.
if (!(dx & 0x10000) && !(dy & 0x10000)) {
if ((dx >> 16) == 2) {
// Optimized 1/2 horizontal.
ScaleARGBDown2(src_width, src_height, clip_width, clip_height,
src_stride, dst_stride, src, dst,
x, dx, y, dy, filtering);
return;
}
ScaleARGBDownEven(src_width, src_height, clip_width, clip_height,
src_stride, dst_stride, src, dst,
x, dx, y, dy, filtering);
return;
}
if ((scale_down_x & 1) && (scale_down_y & 1)) {
// Optimized odd scale down. ie 3, 5, 7, 9x.
if ((dx & 0x10000) && (dy & 0x10000)) {
filtering = kFilterNone;
if (dst_width == src_width && dst_height == src_height) {
// Straight copy.
ARGBCopy(src + (y >> 16) * src_stride + (x >> 16) * 4, src_stride,
dst, dst_stride, clip_width, clip_height);
return;
}
}
}
// Arbitrary scale up and/or down.