shithub: openh264

Info  •  Files  •  Log  •  Branches

Rename a function to avoid conflicts between almost duplicate neon functions

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.

--- a/codec/processing/src/arm/pixel_sad_neon.S

+++ b/codec/processing/src/arm/pixel_sad_neon.S

@@ -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

--- a/codec/processing/src/scenechangedetection/SceneChangeDetection.cpp

+++ b/codec/processing/src/scenechangedetection/SceneChangeDetection.cpp

@@ -133,7 +133,7 @@

 #ifdef HAVE_NEON

   if (iCpuFlag & WELS_CPU_NEON) {

-    pfSad = WelsSampleSad8x8_neon;

+    pfSad = WelsProcessingSampleSad8x8_neon;

   }

 #endif

 }

--- a/codec/processing/src/scenechangedetection/SceneChangeDetectionCommon.h

+++ b/codec/processing/src/scenechangedetection/SceneChangeDetectionCommon.h

@@ -62,7 +62,7 @@

 #ifdef HAVE_NEON

 WELSVP_EXTERN_C_BEGIN

-SadFunc      WelsSampleSad8x8_neon;

+SadFunc      WelsProcessingSampleSad8x8_neon;

 WELSVP_EXTERN_C_END

 #endif