diff --git a/codec/build/iOS/processing/processing.xcodeproj/project.pbxproj b/codec/build/iOS/processing/processing.xcodeproj/project.pbxproj index 96b0c189..71e490d3 100644 --- a/codec/build/iOS/processing/processing.xcodeproj/project.pbxproj +++ b/codec/build/iOS/processing/processing.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 4CC6094F197E009D00BE8B8B /* down_sample_aarch64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 4CC6094E197E009D00BE8B8B /* down_sample_aarch64_neon.S */; }; 4CC6095A1980F34F00BE8B8B /* vaa_calc_aarch64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 4CC609591980F34F00BE8B8B /* vaa_calc_aarch64_neon.S */; }; + 4CD0FE36199082AD00375C9A /* pixel_sad_aarch64_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 4CD0FE35199082AD00375C9A /* pixel_sad_aarch64_neon.S */; }; 54994780196A3F3900BA3D87 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5499477F196A3F3900BA3D87 /* Foundation.framework */; }; 549947DF196A3FB400BA3D87 /* AdaptiveQuantization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 549947A9196A3FB400BA3D87 /* AdaptiveQuantization.cpp */; }; 549947E0196A3FB400BA3D87 /* adaptive_quantization.S in Sources */ = {isa = PBXBuildFile; fileRef = 549947AC196A3FB400BA3D87 /* adaptive_quantization.S */; }; @@ -50,6 +51,7 @@ /* Begin PBXFileReference section */ 4CC6094E197E009D00BE8B8B /* down_sample_aarch64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = down_sample_aarch64_neon.S; path = arm64/down_sample_aarch64_neon.S; sourceTree = ""; }; 4CC609591980F34F00BE8B8B /* vaa_calc_aarch64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = vaa_calc_aarch64_neon.S; path = arm64/vaa_calc_aarch64_neon.S; sourceTree = ""; }; + 4CD0FE35199082AD00375C9A /* pixel_sad_aarch64_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = pixel_sad_aarch64_neon.S; path = arm64/pixel_sad_aarch64_neon.S; sourceTree = ""; }; 5499477C196A3F3900BA3D87 /* libprocessing.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libprocessing.a; sourceTree = BUILT_PRODUCTS_DIR; }; 5499477F196A3F3900BA3D87 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 54994790196A3F3900BA3D87 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; @@ -112,6 +114,7 @@ 4CC6094D197E008B00BE8B8B /* arm64 */ = { isa = PBXGroup; children = ( + 4CD0FE35199082AD00375C9A /* pixel_sad_aarch64_neon.S */, 6C749B77197E2A2000A111F9 /* adaptive_quantization_aarch64_neon.S */, 4CC609591980F34F00BE8B8B /* vaa_calc_aarch64_neon.S */, 4CC6094E197E009D00BE8B8B /* down_sample_aarch64_neon.S */, @@ -354,6 +357,7 @@ 549947F1196A3FB400BA3D87 /* ScrollDetection.cpp in Sources */, 549947E4196A3FB400BA3D87 /* BackgroundDetection.cpp in Sources */, 549947F3196A3FB400BA3D87 /* vaacalcfuncs.cpp in Sources */, + 4CD0FE36199082AD00375C9A /* pixel_sad_aarch64_neon.S in Sources */, 549947E0196A3FB400BA3D87 /* adaptive_quantization.S in Sources */, 549947EB196A3FB400BA3D87 /* denoise_filter.cpp in Sources */, 549947ED196A3FB400BA3D87 /* downsamplefuncs.cpp in Sources */, diff --git a/codec/processing/src/arm64/pixel_sad_aarch64_neon.S b/codec/processing/src/arm64/pixel_sad_aarch64_neon.S new file mode 100644 index 00000000..0b8ead22 --- /dev/null +++ b/codec/processing/src/arm64/pixel_sad_aarch64_neon.S @@ -0,0 +1,50 @@ +/*! + * \copy + * Copyright (c) 2013, Cisco Systems + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + */ + +#ifdef HAVE_NEON_AARCH64 +.text +#include "arm_arch64_common_macro.S" + +WELS_ASM_AARCH64_FUNC_BEGIN WelsProcessingSampleSad8x8_AArch64_neon + ld1 {v0.8b}, [x0], x1 + ld1 {v1.8b}, [x2], x3 + uabdl v2.8h, v0.8b, v1.8b +.rept 7 + ld1 {v0.8b}, [x0], x1 + ld1 {v1.8b}, [x2], x3 + uabal v2.8h, v0.8b, v1.8b +.endr + saddlv s2, v2.8h + fmov w0, s2 +WELS_ASM_AARCH64_FUNC_END + +#endif \ No newline at end of file diff --git a/codec/processing/src/common/common.h b/codec/processing/src/common/common.h index efebade6..f5287e95 100644 --- a/codec/processing/src/common/common.h +++ b/codec/processing/src/common/common.h @@ -69,6 +69,12 @@ int32_t WelsProcessingSampleSad8x8_neon (uint8_t*, int32_t, uint8_t*, int32_t); WELSVP_EXTERN_C_END #endif +#ifdef HAVE_NEON_AARCH64 +WELSVP_EXTERN_C_BEGIN +int32_t WelsProcessingSampleSad8x8_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t); +WELSVP_EXTERN_C_END +#endif + WELSVP_NAMESPACE_END #endif diff --git a/codec/processing/src/scenechangedetection/SceneChangeDetection.h b/codec/processing/src/scenechangedetection/SceneChangeDetection.h index 8a77b277..439cc1e9 100644 --- a/codec/processing/src/scenechangedetection/SceneChangeDetection.h +++ b/codec/processing/src/scenechangedetection/SceneChangeDetection.h @@ -83,6 +83,12 @@ class CSceneChangeDetectorVideo { } #endif +#ifdef HAVE_NEON_AARCH64 + if (iCpuFlag & WELS_CPU_NEON) { + m_pfSad = WelsProcessingSampleSad8x8_AArch64_neon; + } +#endif + m_fSceneChangeMotionRatioLarge = SCENE_CHANGE_MOTION_RATIO_LARGE_VIDEO; m_fSceneChangeMotionRatioMedium = SCENE_CHANGE_MOTION_RATIO_MEDIUM; } diff --git a/codec/processing/targets.mk b/codec/processing/targets.mk index 9c871c91..f678c8ff 100644 --- a/codec/processing/targets.mk +++ b/codec/processing/targets.mk @@ -44,6 +44,7 @@ ifeq ($(ASM_ARCH), arm64) PROCESSING_ASM_ARM64_SRCS=\ $(PROCESSING_SRCDIR)/src/arm64/adaptive_quantization_aarch64_neon.S\ $(PROCESSING_SRCDIR)/src/arm64/down_sample_aarch64_neon.S\ + $(PROCESSING_SRCDIR)/src/arm64/pixel_sad_aarch64_neon.S\ $(PROCESSING_SRCDIR)/src/arm64/vaa_calc_aarch64_neon.S\ PROCESSING_OBJS += $(PROCESSING_ASM_ARM64_SRCS:.S=.$(OBJ))