diff options
| author | Sadaf Ebrahimi <sadafebrahimi@google.com> | 2023-09-07 21:58:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-07 21:58:17 +0000 |
| commit | 2a34f96fcc741c16e20cee13773fcb0044ef8858 (patch) | |
| tree | 4c16984caadbb5518c5eef3a500b12b063422195 /include/libyuv/planar_functions.h | |
| parent | 514e319f1ca011850a0f8da3287e24d50606c92d (diff) | |
| parent | 68fc4c4e533638cf1bb70520720b299e97579f42 (diff) | |
| download | libyuv-2a34f96fcc741c16e20cee13773fcb0044ef8858.tar.gz | |
Merge changes from topic "upgrade-libyuv" into main am: f0da294809 am: 245ce73206 am: 497af62b0a am: 68fc4c4e53
Original change: https://android-review.googlesource.com/c/platform/external/libyuv/+/2740595
Change-Id: Iaffccbb629609d8d545487e056381d63334254fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'include/libyuv/planar_functions.h')
| -rw-r--r-- | include/libyuv/planar_functions.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/include/libyuv/planar_functions.h b/include/libyuv/planar_functions.h index 154f2f21..f9344721 100644 --- a/include/libyuv/planar_functions.h +++ b/include/libyuv/planar_functions.h @@ -30,7 +30,10 @@ extern "C" { #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 #if defined(__has_feature) -#if __has_feature(memory_sanitizer) +#if __has_feature(memory_sanitizer) && !defined(LIBYUV_DISABLE_NEON) +#define LIBYUV_DISABLE_NEON +#endif +#if __has_feature(memory_sanitizer) && !defined(LIBYUV_DISABLE_X86) #define LIBYUV_DISABLE_X86 #endif #endif @@ -827,15 +830,6 @@ int ARGBCopyYToAlpha(const uint8_t* src_y, int width, int height); -typedef void (*ARGBBlendRow)(const uint8_t* src_argb0, - const uint8_t* src_argb1, - uint8_t* dst_argb, - int width); - -// Get function to Alpha Blend ARGB pixels and store to destination. -LIBYUV_API -ARGBBlendRow GetARGBBlend(); - // Alpha Blend ARGB images and store to destination. // Source is pre-multiplied by alpha using ARGBAttenuate. // Alpha of destination is set to 255. |