source/libvpx/third_party/libyuv/include/libyuv/scale_row.h - Issue 996503002: libvpx: Pull from upstream

Unified Diff: source/libvpx/third_party/libyuv/include/libyuv/scale_row.h

Issue 996503002: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master

Patch Set: Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « source/libvpx/third_party/libyuv/include/libyuv/scale.h ('k') | source/libvpx/third_party/libyuv/include/libyuv/version.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: source/libvpx/third_party/libyuv/include/libyuv/scale_row.h

diff --git a/source/libvpx/third_party/libyuv/include/libyuv/scale_row.h b/source/libvpx/third_party/libyuv/include/libyuv/scale_row.h

index 3c495424f1a164d6bb2eeac7bcfe791e76a0db2f..27aa04b220266d6176fa523e240e95312fe1b5bc 100644

--- a/source/libvpx/third_party/libyuv/include/libyuv/scale_row.h

+++ b/source/libvpx/third_party/libyuv/include/libyuv/scale_row.h

@@ -44,21 +44,13 @@ extern "C" {

// The following are available on Neon platforms:

#if !defined(LIBYUV_DISABLE_NEON) && !defined(__native_client__) && \

- (defined(__ARM_NEON__) || defined(LIBYUV_NEON))

+ (defined(__ARM_NEON__) || defined(LIBYUV_NEON) || defined(__aarch64__))

#define HAS_SCALEROWDOWN2_NEON

#define HAS_SCALEROWDOWN4_NEON

#define HAS_SCALEROWDOWN34_NEON

#define HAS_SCALEROWDOWN38_NEON

#define HAS_SCALEARGBROWDOWNEVEN_NEON

#define HAS_SCALEARGBROWDOWN2_NEON

-#elif !defined(LIBYUV_DISABLE_NEON) && !defined(__native_client__) && \

- (defined(__aarch64__) || defined(LIBYUV_NEON))

-/* #define HAS_SCALEROWDOWN2_NEON */

-/* #define HAS_SCALEROWDOWN4_NEON */

-/* #define HAS_SCALEROWDOWN34_NEON */

-/* #define HAS_SCALEROWDOWN38_NEON */

-/* #define HAS_SCALEARGBROWDOWNEVEN_NEON */

-/* #define HAS_SCALEARGBROWDOWN2_NEON */

#endif

// The following are available on Mips platforms:

@@ -208,15 +200,6 @@ void ScaleRowDown2Linear_SSE2(const uint8* src_ptr, ptrdiff_t src_stride,

uint8* dst_ptr, int dst_width);

void ScaleRowDown2Box_SSE2(const uint8* src_ptr, ptrdiff_t src_stride,

uint8* dst_ptr, int dst_width);

-void ScaleRowDown2_Unaligned_SSE2(const uint8* src_ptr,

- ptrdiff_t src_stride,

- uint8* dst_ptr, int dst_width);

-void ScaleRowDown2Linear_Unaligned_SSE2(const uint8* src_ptr,

- ptrdiff_t src_stride,

- uint8* dst_ptr, int dst_width);

-void ScaleRowDown2Box_Unaligned_SSE2(const uint8* src_ptr,

- ptrdiff_t src_stride,

- uint8* dst_ptr, int dst_width);

void ScaleRowDown4_SSE2(const uint8* src_ptr, ptrdiff_t src_stride,

uint8* dst_ptr, int dst_width);

void ScaleRowDown4Box_SSE2(const uint8* src_ptr, ptrdiff_t src_stride,

@@ -267,10 +250,10 @@ void ScaleARGBFilterCols_SSSE3(uint8* dst_argb, const uint8* src_argb,

void ScaleARGBColsUp2_SSE2(uint8* dst_argb, const uint8* src_argb,

int dst_width, int x, int dx);

// Row functions.

-void ScaleARGBRowDownEven_NEON(const uint8* src_argb, int src_stride,

+void ScaleARGBRowDownEven_NEON(const uint8* src_argb, ptrdiff_t src_stride,

int src_stepx,

uint8* dst_argb, int dst_width);

-void ScaleARGBRowDownEvenBox_NEON(const uint8* src_argb, int src_stride,

+void ScaleARGBRowDownEvenBox_NEON(const uint8* src_argb, ptrdiff_t src_stride,

int src_stepx,

uint8* dst_argb, int dst_width);

void ScaleARGBRowDown2_NEON(const uint8* src_ptr, ptrdiff_t src_stride,