zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added isac WebRtcIsacfix_CalculateResidualEnergy() into dynamic Neon detection for

Browse Source 
Android NDK platform.
Review URL: https://webrtc-codereview.appspot.com/722009

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2621 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kma@webrtc.org
2012-08-16 15:43:57 +00:00
parent fd80070aa7
commit a15ea4965e
7 changed files with 110 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/modules/audio_coding/codecs/isac/fix/source/codec.h
View File

@ -46,7 +46,7 @@ int WebRtcIsacfix_EncodeStoredData(ISACFIX_EncInst_t *ISACenc_obj,
int BWnumber, int BWnumber,
float scale); float scale);
/************************** initialization functions *************************/ /* initialization functions */
void WebRtcIsacfix_InitMaskingEnc(MaskFiltstr_enc *maskdata); void WebRtcIsacfix_InitMaskingEnc(MaskFiltstr_enc *maskdata);
void WebRtcIsacfix_InitMaskingDec(MaskFiltstr_dec *maskdata); void WebRtcIsacfix_InitMaskingDec(MaskFiltstr_dec *maskdata);
@ -62,7 +62,7 @@ void WebRtcIsacfix_InitPitchAnalysis(PitchAnalysisStruct *State);
void WebRtcIsacfix_InitPlc( PLCstr *State ); void WebRtcIsacfix_InitPlc( PLCstr *State );
/**************************** transform functions ****************************/ /* transform functions */
void WebRtcIsacfix_InitTransform(); void WebRtcIsacfix_InitTransform();
@ -82,9 +82,7 @@ void WebRtcIsacfix_Spec2Time(WebRtc_Word16 *inreQ7,
/***************************** filterbank functions **************************/ /* filterbank functions */
void WebRtcIsacfix_SplitAndFilter1(WebRtc_Word16 *in, void WebRtcIsacfix_SplitAndFilter1(WebRtc_Word16 *in,
WebRtc_Word16 *LP16, WebRtc_Word16 *LP16,
@ -111,8 +109,7 @@ void WebRtcIsacfix_FilterAndCombine2(WebRtc_Word16 *tempin_ch1,
#endif #endif
/************************* normalized lattice filters ************************/ /* normalized lattice filters */
void WebRtcIsacfix_NormLatticeFilterMa(WebRtc_Word16 orderCoef, void WebRtcIsacfix_NormLatticeFilterMa(WebRtc_Word16 orderCoef,
WebRtc_Word32 *stateGQ15, WebRtc_Word32 *stateGQ15,
@ -130,6 +127,10 @@ void WebRtcIsacfix_NormLatticeFilterAr(WebRtc_Word16 orderCoef,
WebRtc_Word16 lo_hi, WebRtc_Word16 lo_hi,
WebRtc_Word16 *lat_outQ0); WebRtc_Word16 *lat_outQ0);
/* TODO(kma): Remove the following functions into individual header files. */
/* Internal functions in both C and ARM Neon versions */
int WebRtcIsacfix_AutocorrC(WebRtc_Word32* __restrict r, int WebRtcIsacfix_AutocorrC(WebRtc_Word32* __restrict r,
const WebRtc_Word16* __restrict x, const WebRtc_Word16* __restrict x,
WebRtc_Word16 N, WebRtc_Word16 N,
@ -143,7 +144,6 @@ void WebRtcIsacfix_FilterMaLoopC(int16_t input0,
int32_t* ptr1, int32_t* ptr1,
int32_t* ptr2); int32_t* ptr2);
// Functions for ARM-Neon platforms, in place of the above two generic C ones.
#if (defined WEBRTC_DETECT_ARM_NEON) || (defined WEBRTC_ARCH_ARM_NEON) #if (defined WEBRTC_DETECT_ARM_NEON) || (defined WEBRTC_ARCH_ARM_NEON)
int WebRtcIsacfix_AutocorrNeon(WebRtc_Word32* __restrict r, int WebRtcIsacfix_AutocorrNeon(WebRtc_Word32* __restrict r,
const WebRtc_Word16* __restrict x, const WebRtc_Word16* __restrict x,
@ -159,10 +159,7 @@ void WebRtcIsacfix_FilterMaLoopNeon(int16_t input0,
int32_t* ptr2); int32_t* ptr2);
#endif #endif
/**** Function pointers associated with /* Function pointers associated with the above functions. */
**** WebRtcIsacfix_AutocorrC() / WebRtcIsacfix_AutocorrNeon()
**** and WebRtcIsacfix_FilterMaLoopC() / WebRtcIsacfix_FilterMaLoopNeon().
****/
typedef int (*AutocorrFix)(WebRtc_Word32* __restrict r, typedef int (*AutocorrFix)(WebRtc_Word32* __restrict r,
const WebRtc_Word16* __restrict x, const WebRtc_Word16* __restrict x,
@ -179,5 +176,4 @@ typedef void (*FilterMaLoopFix)(int16_t input0,
int32_t* ptr2); int32_t* ptr2);
extern FilterMaLoopFix WebRtcIsacfix_FilterMaLoopFix; extern FilterMaLoopFix WebRtcIsacfix_FilterMaLoopFix;
#endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_CODEC_H_ */ #endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_CODEC_H_ */

15
src/modules/audio_coding/codecs/isac/fix/source/isacfix.c
View File

@ -15,15 +15,16 @@
* *
*/ */
#include "isacfix.h" #include "modules/audio_coding/codecs/isac/fix/interface/isacfix.h"
#include <stdlib.h> #include <stdlib.h>
#include "bandwidth_estimator.h" #include "modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h"
#include "codec.h" #include "modules/audio_coding/codecs/isac/fix/source/codec.h"
#include "modules/audio_coding/codecs/isac/fix/source/entropy_coding.h"
#include "modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h"
#include "modules/audio_coding/codecs/isac/fix/source/structs.h"
#include "system_wrappers/interface/cpu_features_wrapper.h" #include "system_wrappers/interface/cpu_features_wrapper.h"
#include "entropy_coding.h"
#include "structs.h"
/************************************************************************** /**************************************************************************
@ -179,6 +180,8 @@ WebRtc_Word16 WebRtcIsacfix_FreeInternal(ISACFIX_MainStruct *ISAC_main_inst)
static void WebRtcIsacfix_InitNeon(void) { static void WebRtcIsacfix_InitNeon(void) {
WebRtcIsacfix_AutocorrFix = WebRtcIsacfix_AutocorrNeon; WebRtcIsacfix_AutocorrFix = WebRtcIsacfix_AutocorrNeon;
WebRtcIsacfix_FilterMaLoopFix = WebRtcIsacfix_FilterMaLoopNeon; WebRtcIsacfix_FilterMaLoopFix = WebRtcIsacfix_FilterMaLoopNeon;
WebRtcIsacfix_CalculateResidualEnergy =
WebRtcIsacfix_CalculateResidualEnergyNeon;
} }
#endif #endif
@ -263,6 +266,8 @@ WebRtc_Word16 WebRtcIsacfix_EncoderInit(ISACFIX_MainStruct *ISAC_main_inst,
// Initiaze function pointers. // Initiaze function pointers.
WebRtcIsacfix_AutocorrFix = WebRtcIsacfix_AutocorrC; WebRtcIsacfix_AutocorrFix = WebRtcIsacfix_AutocorrC;
WebRtcIsacfix_FilterMaLoopFix = WebRtcIsacfix_FilterMaLoopC; WebRtcIsacfix_FilterMaLoopFix = WebRtcIsacfix_FilterMaLoopC;
WebRtcIsacfix_CalculateResidualEnergy =
WebRtcIsacfix_CalculateResidualEnergyC;
#ifdef WEBRTC_DETECT_ARM_NEON #ifdef WEBRTC_DETECT_ARM_NEON
if ((WebRtc_GetCPUFeaturesARM() & kCPUFeatureNEON) != 0) { if ((WebRtc_GetCPUFeaturesARM() & kCPUFeatureNEON) != 0) {

3
src/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
View File

@ -97,8 +97,9 @@
'<(webrtc_root)/common_audio/common_audio.gyp:signal_processing', '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
], ],
'sources': [ 'sources': [
'lattice_neon.S',
'filters_neon.c', 'filters_neon.c',
'lattice_neon.S',
'lpc_masking_model_neon.S',
], ],
}, },
], ],

7
src/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c
View File

@ -464,14 +464,14 @@ static __inline WebRtc_Word16 exp2_Q10_T(WebRtc_Word16 x) { // Both in and out
} }
// Declare a function pointer. // Declare function pointers.
AutocorrFix WebRtcIsacfix_AutocorrFix; AutocorrFix WebRtcIsacfix_AutocorrFix;
CalculateResidualEnergy WebRtcIsacfix_CalculateResidualEnergy;
#ifndef WEBRTC_ARCH_ARM_NEON
/* This routine calculates the residual energy for LPC. /* This routine calculates the residual energy for LPC.
* Formula as shown in comments inside. * Formula as shown in comments inside.
*/ */
int32_t WebRtcIsacfix_CalculateResidualEnergy(int lpc_order, int32_t WebRtcIsacfix_CalculateResidualEnergyC(int lpc_order,
int32_t q_val_corr, int32_t q_val_corr,
int q_val_polynomial, int q_val_polynomial,
int16_t* a_polynomial, int16_t* a_polynomial,
@ -537,7 +537,6 @@ int32_t WebRtcIsacfix_CalculateResidualEnergy(int lpc_order,
return residual_energy; return residual_energy;
} }
#endif
void WebRtcIsacfix_GetLpcCoef(WebRtc_Word16 *inLoQ0, void WebRtcIsacfix_GetLpcCoef(WebRtc_Word16 *inLoQ0,
WebRtc_Word16 *inHiQ0, WebRtc_Word16 *inHiQ0,

31
src/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h
View File

@ -24,13 +24,6 @@ extern "C" {
#include "structs.h" #include "structs.h"
int32_t WebRtcIsacfix_CalculateResidualEnergy(int lpc_order,
int32_t q_val_corr,
int q_offset,
int16_t* a_polynomial,
int32_t* corr_coeffs,
int* q_val_residual_energy);
void WebRtcIsacfix_GetVars(const WebRtc_Word16 *input, void WebRtcIsacfix_GetVars(const WebRtc_Word16 *input,
const WebRtc_Word16 *pitchGains_Q12, const WebRtc_Word16 *pitchGains_Q12,
WebRtc_UWord32 *oldEnergy, WebRtc_UWord32 *oldEnergy,
@ -45,6 +38,30 @@ void WebRtcIsacfix_GetLpcCoef(WebRtc_Word16 *inLoQ0,
WebRtc_Word16 *lo_coeffQ15, WebRtc_Word16 *lo_coeffQ15,
WebRtc_Word16 *hi_coeffQ15); WebRtc_Word16 *hi_coeffQ15);
typedef int32_t (*CalculateResidualEnergy)(int lpc_order,
int32_t q_val_corr,
int q_val_polynomial,
int16_t* a_polynomial,
int32_t* corr_coeffs,
int* q_val_residual_energy);
extern CalculateResidualEnergy WebRtcIsacfix_CalculateResidualEnergy;
int32_t WebRtcIsacfix_CalculateResidualEnergyC(int lpc_order,
int32_t q_val_corr,
int q_val_polynomial,
int16_t* a_polynomial,
int32_t* corr_coeffs,
int* q_val_residual_energy);
#if (defined WEBRTC_DETECT_ARM_NEON) || (defined WEBRTC_ARCH_ARM_NEON)
int32_t WebRtcIsacfix_CalculateResidualEnergyNeon(int lpc_order,
int32_t q_val_corr,
int q_val_polynomial,
int16_t* a_polynomial,
int32_t* corr_coeffs,
int* q_val_residual_energy);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif

8
src/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_neon.S
View File

@ -8,23 +8,23 @@
@ be found in the AUTHORS file in the root of the source tree. @ be found in the AUTHORS file in the root of the source tree.
@ @
@ Contains a function for WebRtcIsacfix_CalculateResidualEnergy() in @ Contains a function for WebRtcIsacfix_CalculateResidualEnergyNeon() in
@ iSAC codec, optimized for ARM Neon platform. Reference code in @ iSAC codec, optimized for ARM Neon platform. Reference code in
@ lpc_masking_model.c. @ lpc_masking_model.c.
.arch armv7-a .arch armv7-a
.fpu neon .fpu neon
.global WebRtcIsacfix_CalculateResidualEnergy .global WebRtcIsacfix_CalculateResidualEnergyNeon
.align 2 .align 2
@ int32_t WebRtcIsacfix_CalculateResidualEnergy(int lpc_order, @ int32_t WebRtcIsacfix_CalculateResidualEnergyNeon(int lpc_order,
@ int32_t q_val_corr, @ int32_t q_val_corr,
@ int q_val_polynomial, @ int q_val_polynomial,
@ int16_t* a_polynomial, @ int16_t* a_polynomial,
@ int32_t* corr_coeffs, @ int32_t* corr_coeffs,
@ int* q_val_residual_energy); @ int* q_val_residual_energy);
WebRtcIsacfix_CalculateResidualEnergy: WebRtcIsacfix_CalculateResidualEnergyNeon:
.fnstart .fnstart
.save {r4-r11} .save {r4-r11}
push {r4-r11} push {r4-r11}

26
src/modules/audio_coding/codecs/isac/fix/test/isacfix_unittest.cc
View File

@ -11,11 +11,13 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h" #include "modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h"
#include "system_wrappers/interface/cpu_features_wrapper.h"
class IsacUnitTest : public testing::Test { class IsacUnitTest : public testing::Test {
}; protected:
// Pass a function pointer to the Tester function.
TEST_F(IsacUnitTest, CalculateResidualEnergyTest) { void CalculateResidualEnergyTester(CalculateResidualEnergy
CalculateResidualEnergyFunction) {
const int kIntOrder = 10; const int kIntOrder = 10;
const int32_t kInt32QDomain = 5; const int32_t kInt32QDomain = 5;
const int kIntShift = 11; const int kIntShift = 11;
@ -27,7 +29,7 @@ TEST_F(IsacUnitTest, CalculateResidualEnergyTest) {
int32_t residual_energy = 0; int32_t residual_energy = 0;
// Test the code path where (residual_energy >= 0x10000). // Test the code path where (residual_energy >= 0x10000).
residual_energy = WebRtcIsacfix_CalculateResidualEnergy(kIntOrder, residual_energy = CalculateResidualEnergyFunction(kIntOrder,
kInt32QDomain, kIntShift, a, corr, &q_shift_residual); kInt32QDomain, kIntShift, a, corr, &q_shift_residual);
EXPECT_EQ(1789023310, residual_energy); EXPECT_EQ(1789023310, residual_energy);
EXPECT_EQ(2, q_shift_residual); EXPECT_EQ(2, q_shift_residual);
@ -38,7 +40,7 @@ TEST_F(IsacUnitTest, CalculateResidualEnergyTest) {
a[i] = 24575 >> i; a[i] = 24575 >> i;
corr[i] = i; corr[i] = i;
} }
residual_energy = WebRtcIsacfix_CalculateResidualEnergy(kIntOrder, residual_energy = CalculateResidualEnergyFunction(kIntOrder,
kInt32QDomain, kIntShift, a, corr, &q_shift_residual); kInt32QDomain, kIntShift, a, corr, &q_shift_residual);
EXPECT_EQ(1595279092, residual_energy); EXPECT_EQ(1595279092, residual_energy);
EXPECT_EQ(26, q_shift_residual); EXPECT_EQ(26, q_shift_residual);
@ -47,8 +49,20 @@ TEST_F(IsacUnitTest, CalculateResidualEnergyTest) {
for(int i = 0; i < kIntOrder + 1; i++) { for(int i = 0; i < kIntOrder + 1; i++) {
a[i] = 2457 >> i; a[i] = 2457 >> i;
} }
residual_energy = WebRtcIsacfix_CalculateResidualEnergy(kIntOrder, residual_energy = CalculateResidualEnergyFunction(kIntOrder,
kInt32QDomain, kIntShift, a, corr, &q_shift_residual); kInt32QDomain, kIntShift, a, corr, &q_shift_residual);
EXPECT_EQ(2029266944, residual_energy); EXPECT_EQ(2029266944, residual_energy);
EXPECT_EQ(33, q_shift_residual); EXPECT_EQ(33, q_shift_residual);
} }
};
TEST_F(IsacUnitTest, CalculateResidualEnergyTest) {
CalculateResidualEnergyTester(WebRtcIsacfix_CalculateResidualEnergyC);
#ifdef WEBRTC_DETECT_ARM_NEON
if ((WebRtc_GetCPUFeaturesARM() & kCPUFeatureNEON) != 0) {
CalculateResidualEnergyTester(WebRtcIsacfix_CalculateResidualEnergyNeon);
}
#elif defined(WEBRTC_ARCH_ARM_NEON)
CalculateResidualEnergyTester(WebRtcIsacfix_CalculateResidualEnergyNeon);
#endif
}