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

ARGB Scale ported to C

Browse Source 
BUG=303
TESTED=cl /c /TC /Iinclude source/scale_argb.cc
R=tpsiaki@google.com

Review URL: https://webrtc-codereview.appspot.com/7169004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@972 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2014-01-15 02:25:15 +00:00
parent d3f1821b47
commit 0283648407
3 changed files with 66 additions and 58 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: 971 Version: 972
License: BSD License: BSD
License File: LICENSE License File: LICENSE

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 971 #define LIBYUV_VERSION 972
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

24
source/scale_argb.cc
View File

@ -170,6 +170,12 @@ static void ScaleARGBBilinearDown(int src_width, int src_height,
int x, int dx, int y, int dy, int x, int dx, int y, int dy,
enum FilterMode filtering) { enum FilterMode filtering) {
int j; int j;
void (*InterpolateRow)(uint8* dst_argb, const uint8* src_argb,
ptrdiff_t src_stride, int dst_width, int source_y_fraction) =
InterpolateRow_C;
void (*ScaleARGBFilterCols)(uint8* dst_argb, const uint8* src_argb,
int dst_width, int x, int dx) =
(src_width >= 32768) ? ScaleARGBFilterCols64_C : ScaleARGBFilterCols_C;
int64 xlast = x + (int64)(dst_width - 1) * dx; int64 xlast = x + (int64)(dst_width - 1) * dx;
int64 xl = (dx >= 0) ? x : xlast; int64 xl = (dx >= 0) ? x : xlast;
int64 xr = (dx >= 0) ? xlast : x; int64 xr = (dx >= 0) ? xlast : x;
@ -179,9 +185,6 @@ static void ScaleARGBBilinearDown(int src_width, int src_height,
clip_src_width = (((xr - xl) + 1 + 3) & ~3) * 4; // Width aligned to 4. clip_src_width = (((xr - xl) + 1 + 3) & ~3) * 4; // Width aligned to 4.
src_argb += xl * 4; src_argb += xl * 4;
x -= (int)(xl << 16); x -= (int)(xl << 16);
void (*InterpolateRow)(uint8* dst_argb, const uint8* src_argb,
ptrdiff_t src_stride, int dst_width, int source_y_fraction) =
InterpolateRow_C;
#if defined(HAS_INTERPOLATEROW_SSE2) #if defined(HAS_INTERPOLATEROW_SSE2)
if (TestCpuFlag(kCpuHasSSE2) && clip_src_width >= 16) { if (TestCpuFlag(kCpuHasSSE2) && clip_src_width >= 16) {
InterpolateRow = InterpolateRow_Any_SSE2; InterpolateRow = InterpolateRow_Any_SSE2;
@ -229,9 +232,6 @@ static void ScaleARGBBilinearDown(int src_width, int src_height,
} }
} }
#endif #endif
void (*ScaleARGBFilterCols)(uint8* dst_argb, const uint8* src_argb,
int dst_width, int x, int dx) =
(src_width >= 32768) ? ScaleARGBFilterCols64_C : ScaleARGBFilterCols_C;
#if defined(HAS_SCALEARGBFILTERCOLS_SSSE3) #if defined(HAS_SCALEARGBFILTERCOLS_SSSE3)
if (TestCpuFlag(kCpuHasSSSE3) && src_width < 32768) { if (TestCpuFlag(kCpuHasSSSE3) && src_width < 32768) {
ScaleARGBFilterCols = ScaleARGBFilterCols_SSSE3; ScaleARGBFilterCols = ScaleARGBFilterCols_SSSE3;
@ -239,13 +239,14 @@ static void ScaleARGBBilinearDown(int src_width, int src_height,
#endif #endif
// TODO(fbarchard): Consider not allocating row buffer for kFilterLinear. // TODO(fbarchard): Consider not allocating row buffer for kFilterLinear.
// Allocate a row of ARGB. // Allocate a row of ARGB.
{
align_buffer_64(row, clip_src_width * 4); align_buffer_64(row, clip_src_width * 4);
const int max_y = (src_height - 1) << 16; const int max_y = (src_height - 1) << 16;
for (j = 0; j < dst_height; ++j) {
if (y > max_y) { if (y > max_y) {
y = max_y; y = max_y;
} }
for (j = 0; j < dst_height; ++j) {
int yi = y >> 16; int yi = y >> 16;
const uint8* src = src_argb + yi * src_stride; const uint8* src = src_argb + yi * src_stride;
if (filtering == kFilterLinear) { if (filtering == kFilterLinear) {
@ -257,9 +258,13 @@ static void ScaleARGBBilinearDown(int src_width, int src_height,
} }
dst_argb += dst_stride; dst_argb += dst_stride;
y += dy; y += dy;
if (y > max_y) {
y = max_y;
}
} }
free_aligned_buffer_64(row); free_aligned_buffer_64(row);
} }
}
// Scale ARGB up with bilinear interpolation. // Scale ARGB up with bilinear interpolation.
static void ScaleARGBBilinearUp(int src_width, int src_height, static void ScaleARGBBilinearUp(int src_width, int src_height,
@ -275,6 +280,7 @@ static void ScaleARGBBilinearUp(int src_width, int src_height,
void (*ScaleARGBFilterCols)(uint8* dst_argb, const uint8* src_argb, void (*ScaleARGBFilterCols)(uint8* dst_argb, const uint8* src_argb,
int dst_width, int x, int dx) = int dst_width, int x, int dx) =
filtering ? ScaleARGBFilterCols_C : ScaleARGBCols_C; filtering ? ScaleARGBFilterCols_C : ScaleARGBCols_C;
const int max_y = (src_height - 1) << 16;
#if defined(HAS_INTERPOLATEROW_SSE2) #if defined(HAS_INTERPOLATEROW_SSE2)
if (TestCpuFlag(kCpuHasSSE2) && dst_width >= 4) { if (TestCpuFlag(kCpuHasSSE2) && dst_width >= 4) {
InterpolateRow = InterpolateRow_Any_SSE2; InterpolateRow = InterpolateRow_Any_SSE2;
@ -344,10 +350,11 @@ static void ScaleARGBBilinearUp(int src_width, int src_height,
#endif #endif
} }
const int max_y = (src_height - 1) << 16;
if (y > max_y) { if (y > max_y) {
y = max_y; y = max_y;
} }
{
int yi = y >> 16; int yi = y >> 16;
const uint8* src = src_argb + yi * src_stride; const uint8* src = src_argb + yi * src_stride;
@ -393,6 +400,7 @@ static void ScaleARGBBilinearUp(int src_width, int src_height,
} }
free_aligned_buffer_64(row); free_aligned_buffer_64(row);
} }
}
#ifdef YUVSCALEUP #ifdef YUVSCALEUP
// Scale YUV to ARGB up with bilinear interpolation. // Scale YUV to ARGB up with bilinear interpolation.