diff options
author | Frank Barchard <fbarchard@google.com> | 2015-07-22 18:09:04 -0700 |
---|---|---|
committer | Frank Barchard <fbarchard@google.com> | 2015-07-22 18:09:04 -0700 |
commit | 3a3a89ccd40764579077e93bc303564c873aa7c1 (patch) | |
tree | dd556dec265cea853e672fb9c2ab5b7c3bc5d921 | |
parent | 5be90d23eedc13e5b83bb52a9e5918712c10be52 (diff) | |
download | libyuv-3a3a89ccd40764579077e93bc303564c873aa7c1.tar.gz |
rotate include and proto cleanup
R=harryjin@google.com
BUG=libyuv:468
Review URL: https://webrtc-codereview.appspot.com/55679005.
-rw-r--r-- | source/rotate.cc | 2 | ||||
-rw-r--r-- | source/rotate_argb.cc | 24 | ||||
-rw-r--r-- | source/rotate_common.cc | 7 | ||||
-rw-r--r-- | source/rotate_mips.cc | 1 | ||||
-rw-r--r-- | source/rotate_neon.cc | 1 | ||||
-rw-r--r-- | source/rotate_neon64.cc | 6 |
6 files changed, 15 insertions, 26 deletions
diff --git a/source/rotate.cc b/source/rotate.cc index 8e671ad9..b5f17e49 100644 --- a/source/rotate.cc +++ b/source/rotate.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "libyuv/rotate.h" +#include "libyuv/row.h" #include "libyuv/cpu_id.h" #include "libyuv/convert.h" diff --git a/source/rotate_argb.cc b/source/rotate_argb.cc index b9673db1..787c0ad1 100644 --- a/source/rotate_argb.cc +++ b/source/rotate_argb.cc @@ -27,24 +27,20 @@ extern "C" { (defined(__x86_64__) && !defined(__native_client__)) || defined(__i386__)) #define HAS_SCALEARGBROWDOWNEVEN_SSE2 void ScaleARGBRowDownEven_SSE2(const uint8* src_ptr, int src_stride, - int src_stepx, - uint8* dst_ptr, int dst_width); + int src_stepx, uint8* dst_ptr, int dst_width); #endif #if !defined(LIBYUV_DISABLE_NEON) && !defined(__native_client__) && \ (defined(__ARM_NEON__) || defined(LIBYUV_NEON) || defined(__aarch64__)) #define HAS_SCALEARGBROWDOWNEVEN_NEON void ScaleARGBRowDownEven_NEON(const uint8* src_ptr, int src_stride, - int src_stepx, - uint8* dst_ptr, int dst_width); + int src_stepx, uint8* dst_ptr, int dst_width); #endif void ScaleARGBRowDownEven_C(const uint8* src_ptr, int, - int src_stepx, - uint8* dst_ptr, int dst_width); + int src_stepx, uint8* dst_ptr, int dst_width); static void ARGBTranspose(const uint8* src, int src_stride, - uint8* dst, int dst_stride, - int width, int height) { + uint8* dst, int dst_stride, int width, int height) { int i; int src_pixel_step = src_stride >> 2; void (*ScaleARGBRowDownEven)(const uint8* src_ptr, int src_stride, @@ -68,8 +64,7 @@ static void ARGBTranspose(const uint8* src, int src_stride, } void ARGBRotate90(const uint8* src, int src_stride, - uint8* dst, int dst_stride, - int width, int height) { + uint8* dst, int dst_stride, int width, int height) { // Rotate by 90 is a ARGBTranspose with the source read // from bottom to top. So set the source pointer to the end // of the buffer and flip the sign of the source stride. @@ -79,8 +74,7 @@ void ARGBRotate90(const uint8* src, int src_stride, } void ARGBRotate270(const uint8* src, int src_stride, - uint8* dst, int dst_stride, - int width, int height) { + uint8* dst, int dst_stride, int width, int height) { // Rotate by 270 is a ARGBTranspose with the destination written // from bottom to top. So set the destination pointer to the end // of the buffer and flip the sign of the destination stride. @@ -90,8 +84,7 @@ void ARGBRotate270(const uint8* src, int src_stride, } void ARGBRotate180(const uint8* src, int src_stride, - uint8* dst, int dst_stride, - int width, int height) { + uint8* dst, int dst_stride, int width, int height) { // Swap first and last row and mirror the content. Uses a temporary row. align_buffer_64(row, width * 4); const uint8* src_bot = src + src_stride * (height - 1); @@ -166,8 +159,7 @@ void ARGBRotate180(const uint8* src, int src_stride, LIBYUV_API int ARGBRotate(const uint8* src_argb, int src_stride_argb, - uint8* dst_argb, int dst_stride_argb, - int width, int height, + uint8* dst_argb, int dst_stride_argb, int width, int height, enum RotationMode mode) { if (!src_argb || width <= 0 || height == 0 || !dst_argb) { return -1; diff --git a/source/rotate_common.cc b/source/rotate_common.cc index b53326ee..b33a9a0c 100644 --- a/source/rotate_common.cc +++ b/source/rotate_common.cc @@ -8,13 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "libyuv/rotate.h" - -#include "libyuv/cpu_id.h" -#include "libyuv/convert.h" -#include "libyuv/planar_functions.h" -#include "libyuv/rotate_row.h" #include "libyuv/row.h" +#include "libyuv/rotate_row.h" #ifdef __cplusplus namespace libyuv { diff --git a/source/rotate_mips.cc b/source/rotate_mips.cc index 70770fd0..b693c668 100644 --- a/source/rotate_mips.cc +++ b/source/rotate_mips.cc @@ -9,6 +9,7 @@ */ #include "libyuv/row.h" +#include "libyuv/rotate_row.h" #include "libyuv/basic_types.h" diff --git a/source/rotate_neon.cc b/source/rotate_neon.cc index a23a40fe..76043b3b 100644 --- a/source/rotate_neon.cc +++ b/source/rotate_neon.cc @@ -9,6 +9,7 @@ */ #include "libyuv/row.h" +#include "libyuv/rotate_row.h" #include "libyuv/basic_types.h" diff --git a/source/rotate_neon64.cc b/source/rotate_neon64.cc index 92358af7..f52c082b 100644 --- a/source/rotate_neon64.cc +++ b/source/rotate_neon64.cc @@ -9,6 +9,7 @@ */ #include "libyuv/row.h" +#include "libyuv/rotate_row.h" #include "libyuv/basic_types.h" @@ -21,11 +22,10 @@ extern "C" { #if !defined(LIBYUV_DISABLE_NEON) && defined(__aarch64__) static uvec8 kVTbl4x4Transpose = - { 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15 }; + { 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15 }; void TransposeWx8_NEON(const uint8* src, int src_stride, - uint8* dst, int dst_stride, - int width) { + uint8* dst, int dst_stride, int width) { const uint8* src_temp = NULL; int64 width64 = (int64) width; // Work around clang 3.4 warning. asm volatile ( |