generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename a function to avoid conflicts between almost duplicate neon functions

Browse Source 
There's a different version of the same function in the encoder,
but they're not identical - the encoder version has got stricter
alignment requirements.

If someone can confirm that it is ok to use the function from the
encoder, pixel_sad_neon.S in processing could be deleted, and the
encoder version moved to codec/common instead.
This commit is contained in:
Martin Storsjö 2014-03-05 11:39:04 +02:00
parent 4e4bfcc1bc
commit 8ba79262bf
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec/processing/src/arm/pixel_sad_neon.S
View File

@ -35,7 +35,7 @@
#include "arm_arch_common_macro.S"
WELS_ASM_FUNC_BEGIN WelsSampleSad8x8_neon
WELS_ASM_FUNC_BEGIN WelsProcessingSampleSad8x8_neon
stmdb sp!, {lr}
//Loading a horizontal line data (8 bytes)
vld1.8 {d0}, [r0], r1

2
codec/processing/src/scenechangedetection/SceneChangeDetection.cpp
View File

@ -133,7 +133,7 @@ void CSceneChangeDetection::InitSadFuncs (SadFuncPtr& pfSad, int32_t iCpuFlag)
#ifdef HAVE_NEON
if (iCpuFlag & WELS_CPU_NEON) {
pfSad = WelsSampleSad8x8_neon;
pfSad = WelsProcessingSampleSad8x8_neon;
}
#endif
}

2
codec/processing/src/scenechangedetection/SceneChangeDetectionCommon.h
View File

@ -62,7 +62,7 @@ WELSVP_EXTERN_C_END
#ifdef HAVE_NEON
WELSVP_EXTERN_C_BEGIN
SadFunc WelsSampleSad8x8_neon;
SadFunc WelsProcessingSampleSad8x8_neon;
WELSVP_EXTERN_C_END
#endif