Commit 9c0663d7 authored by Frank Barchard's avatar Frank Barchard

Revert "clang-tidy and clang-format applied"

This reverts commit cfff527a.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> clang-tidy and clang-format applied
> 
> TBR=braveyao@chromium.org
> Bug: None
> Test: local arm builds still pass
> Change-Id: Iac042fbaad940e01fc4ce228a104d3d561b80f92
> Reviewed-on: https://chromium-review.googlesource.com/929999
> Reviewed-by: Frank Barchard <fbarchard@chromium.org>

TBR=fbarchard@chromium.org,braveyao@chromium.org

Change-Id: I4ee92ceeaa3c34bce3f20bf759dd30593807ad3f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: None
Reviewed-on: https://chromium-review.googlesource.com/930141Reviewed-by: 's avatarFrank Barchard <fbarchard@chromium.org>
parent cfff527a
...@@ -547,6 +547,7 @@ int ARGB4444ToARGB(const uint8_t* src_argb4444, ...@@ -547,6 +547,7 @@ int ARGB4444ToARGB(const uint8_t* src_argb4444,
int width, int width,
int height); int height);
// Aliases // Aliases
#define AB30ToARGB AR30ToABGR #define AB30ToARGB AR30ToABGR
#define AB30ToABGR AR30ToARGB #define AB30ToABGR AR30ToARGB
...@@ -561,6 +562,7 @@ int AR30ToARGB(const uint8_t* src_ar30, ...@@ -561,6 +562,7 @@ int AR30ToARGB(const uint8_t* src_ar30,
int width, int width,
int height); int height);
// Convert AR30 To ABGR. // Convert AR30 To ABGR.
LIBYUV_API LIBYUV_API
int AR30ToABGR(const uint8_t* src_ar30, int AR30ToABGR(const uint8_t* src_ar30,
......
...@@ -512,8 +512,8 @@ int I010ToAB30(const uint16_t* src_y, ...@@ -512,8 +512,8 @@ int I010ToAB30(const uint16_t* src_y,
int dst_stride_ab30, int dst_stride_ab30,
int width, int width,
int height) { int height) {
return I010ToAR30Matrix(src_y, src_stride_y, src_v, src_stride_v, src_u, return I010ToAR30Matrix(src_y, src_stride_y, src_v,
src_stride_u, dst_ab30, dst_stride_ab30, src_stride_v, src_u, src_stride_u, dst_ab30, dst_stride_ab30,
&kYvuI601Constants, width, height); &kYvuI601Constants, width, height);
} }
...@@ -529,8 +529,8 @@ int H010ToAB30(const uint16_t* src_y, ...@@ -529,8 +529,8 @@ int H010ToAB30(const uint16_t* src_y,
int dst_stride_ab30, int dst_stride_ab30,
int width, int width,
int height) { int height) {
return I010ToAR30Matrix(src_y, src_stride_y, src_v, src_stride_v, src_u, return I010ToAR30Matrix(src_y, src_stride_y, src_v,
src_stride_u, dst_ab30, dst_stride_ab30, src_stride_v, src_u, src_stride_u, dst_ab30, dst_stride_ab30,
&kYvuH709Constants, width, height); &kYvuH709Constants, width, height);
} }
......
...@@ -29,9 +29,9 @@ static void ARGBTranspose(const uint8_t* src_argb, ...@@ -29,9 +29,9 @@ static void ARGBTranspose(const uint8_t* src_argb,
int height) { int height) {
int i; int i;
int src_pixel_step = src_stride_argb >> 2; int src_pixel_step = src_stride_argb >> 2;
void (*ScaleARGBRowDownEven)( void (*ScaleARGBRowDownEven)(const uint8_t* src_argb, ptrdiff_t src_stride_argb,
const uint8_t* src_argb, ptrdiff_t src_stride_argb, int src_step, int src_step, uint8_t* dst_argb, int dst_width) =
uint8_t* dst_argb, int dst_width) = ScaleARGBRowDownEven_C; ScaleARGBRowDownEven_C;
#if defined(HAS_SCALEARGBROWDOWNEVEN_SSE2) #if defined(HAS_SCALEARGBROWDOWNEVEN_SSE2)
if (TestCpuFlag(kCpuHasSSE2)) { if (TestCpuFlag(kCpuHasSSE2)) {
ScaleARGBRowDownEven = ScaleARGBRowDownEven_Any_SSE2; ScaleARGBRowDownEven = ScaleARGBRowDownEven_Any_SSE2;
...@@ -75,8 +75,7 @@ void ARGBRotate90(const uint8_t* src_argb, ...@@ -75,8 +75,7 @@ void ARGBRotate90(const uint8_t* src_argb,
// of the buffer and flip the sign of the source stride. // of the buffer and flip the sign of the source stride.
src_argb += src_stride_argb * (height - 1); src_argb += src_stride_argb * (height - 1);
src_stride_argb = -src_stride_argb; src_stride_argb = -src_stride_argb;
ARGBTranspose(src_argb, src_stride_argb, dst_argb, dst_stride_argb, width, ARGBTranspose(src_argb, src_stride_argb, dst_argb, dst_stride_argb, width, height);
height);
} }
void ARGBRotate270(const uint8_t* src_argb, void ARGBRotate270(const uint8_t* src_argb,
...@@ -90,8 +89,7 @@ void ARGBRotate270(const uint8_t* src_argb, ...@@ -90,8 +89,7 @@ void ARGBRotate270(const uint8_t* src_argb,
// of the buffer and flip the sign of the destination stride. // of the buffer and flip the sign of the destination stride.
dst_argb += dst_stride_argb * (width - 1); dst_argb += dst_stride_argb * (width - 1);
dst_stride_argb = -dst_stride_argb; dst_stride_argb = -dst_stride_argb;
ARGBTranspose(src_argb, src_stride_argb, dst_argb, dst_stride_argb, width, ARGBTranspose(src_argb, src_stride_argb, dst_argb, dst_stride_argb, width, height);
height);
} }
void ARGBRotate180(const uint8_t* src_argb, void ARGBRotate180(const uint8_t* src_argb,
...@@ -108,8 +106,7 @@ void ARGBRotate180(const uint8_t* src_argb, ...@@ -108,8 +106,7 @@ void ARGBRotate180(const uint8_t* src_argb,
int y; int y;
void (*ARGBMirrorRow)(const uint8_t* src_argb, uint8_t* dst_argb, int width) = void (*ARGBMirrorRow)(const uint8_t* src_argb, uint8_t* dst_argb, int width) =
ARGBMirrorRow_C; ARGBMirrorRow_C;
void (*CopyRow)(const uint8_t* src_argb, uint8_t* dst_argb, int width) = void (*CopyRow)(const uint8_t* src_argb, uint8_t* dst_argb, int width) = CopyRow_C;
CopyRow_C;
#if defined(HAS_ARGBMIRRORROW_NEON) #if defined(HAS_ARGBMIRRORROW_NEON)
if (TestCpuFlag(kCpuHasNEON)) { if (TestCpuFlag(kCpuHasNEON)) {
ARGBMirrorRow = ARGBMirrorRow_Any_NEON; ARGBMirrorRow = ARGBMirrorRow_Any_NEON;
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment