Commit 45efb962 authored by Martin Storsjo's avatar Martin Storsjo

Remove trailing whitespace

parent 42c1d789
......@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
include frameworks/base/media/libstagefright/codecs/common/Config.mk
LOCAL_PRELINK_MODULE := false
LOCAL_SRC_FILES := \
AMRWBEncoder.cpp \
src/autocorr.c \
......@@ -91,7 +91,7 @@ LOCAL_MODULE := libstagefright_amrwbenc
LOCAL_ARM_MODE := arm
LOCAL_STATIC_LIBRARIES :=
LOCAL_STATIC_LIBRARIES :=
LOCAL_SHARED_LIBRARIES :=
......
......@@ -70,10 +70,10 @@ int GetNextBuf(FILE* inFile,unsigned char* dst,int size)
typedef int (VO_API * VOGETAUDIOENCAPI) (VO_AUDIO_CODECAPI * pEncHandle);
int encode(
int mode,
int mode,
short allow_dtx,
VOAMRWBFRAMETYPE frameType,
const char* srcfile,
const char* srcfile,
const char* dstfile
)
{
......@@ -136,7 +136,7 @@ int encode(
return -1;
}
pfunc = dlsym(handle, "voGetAMRWBEncAPI");
pfunc = dlsym(handle, "voGetAMRWBEncAPI");
if(pfunc == 0)
{
printf("open function error......");
......@@ -159,7 +159,7 @@ int encode(
printf("get APIs error......");
goto safe_exit;
}
#endif
#endif
//####################################### Init Encoding Section #########################################
ret = AudioAPI.Init(&hCodec, VO_AUDIO_CodingAMRWB, &useData);
......@@ -214,7 +214,7 @@ int encode(
if(framenum == 1)
{
fwrite(OutputBuf, 1, outData.Length + size1, fdst);
fflush(fdst);
fflush(fdst);
}
else
{
......@@ -323,7 +323,7 @@ int main(int argc, char **argv) // for gcc compiler;
case '1': frameType = VOAMRWB_ITU;
break;
case '2': frameType = VOAMRWB_RFC3267 ;
break;
break;
default:
usage();
printf ("Invalid parameter '%s'.\n", argv [arg]);
......@@ -338,11 +338,11 @@ int main(int argc, char **argv) // for gcc compiler;
} else {
switch (filename) {
case 0:
case 0:
inFileName = argv[arg];
break;
case 1:
outFileName = argv[arg];
case 1:
outFileName = argv[arg];
break;
default:
usage ();
......
......@@ -2,15 +2,15 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := AMRWB_E_SAMPLE.c
LOCAL_SRC_FILES += \
../../../Common/cmnMemory.c
../../../Common/cmnMemory.c
LOCAL_MODULE := TestvoAMRWBEnc
LOCAL_ARM_MODE := arm
LOCAL_STATIC_LIBRARIES :=
LOCAL_STATIC_LIBRARIES :=
LOCAL_SHARED_LIBRARIES := libvoAMRWBEnc
......@@ -20,7 +20,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../../Include \
LOCAL_CFLAGS := $(VO_CFLAGS)
include $(BUILD_EXECUTABLE)
......
......@@ -25,8 +25,8 @@ VOMT:= exe
# module macros
# please append the additional macro definitions here for your module if necessary.
# e.g. -DVISUALON, macro VISUALON defined for your module
# please append the additional macro definitions here for your module if necessary.
# e.g. -DVISUALON, macro VISUALON defined for your module
VOMM:= #ARMV5E
......@@ -36,7 +36,7 @@ VOTARGET:= voAMRWBEnc_Test
# please modify here to be sure to see the g1.mk
include ../../../../Tools/eclair.mk
include ../../../../Tools/eclair.mk
# dependent libraries.
VODEPLIBS:=-ldl
......@@ -52,5 +52,5 @@ VORELDIR:=../
# please modify here to be sure to see the doit.mk
include ../../../../Tools/doit.mk
include ../../../../Tools/doit.mk
......@@ -15,10 +15,10 @@
# */
# please list all objects needed by your target here
OBJS:=AMRWB_E_SAMPLE.o cmnMemory.o
# please list all directories that all source files relative with your module(.h .c .cpp) locate
# please list all directories that all source files relative with your module(.h .c .cpp) locate
VOSRCDIR:=../ \
../../../../Common \
../../../../Include
......@@ -25,7 +25,7 @@ VOMT:= lib
# module macros
# please append the additional macro definitions here for your module if necessary.
# please append the additional macro definitions here for your module if necessary.
ifeq ($(VOTT), v5)
VOMM:=-DARM -DASM_OPT
endif
......@@ -35,7 +35,7 @@ VOTARGET:= libvoAMRWBEncv5
# please modify here to be sure to see the g1.mk
include ../../../../../Tools/eclair.mk
include ../../../../../Tools/eclair.mk
# dependent libraries.
VODEPLIBS:=-ldl -lstdc++ -lcutils
......@@ -49,5 +49,5 @@ include ../ms.mk
VORELDIR:=../../../../../../Release
# please modify here to be sure to see the doit.mk
include ../../../../../Tools/doit.mk
include ../../../../../Tools/doit.mk
......@@ -25,7 +25,7 @@ VOMT:= lib
# module macros
# please append the additional macro definitions here for your module if necessary.
# please append the additional macro definitions here for your module if necessary.
ifeq ($(VOTT), v7)
VOMM:=-DARM -DARMV7 -DASM_OPT
endif
......@@ -35,7 +35,7 @@ VOTARGET:= libvoAMRWBEncv7
# please modify here to be sure to see the g1.mk
include ../../../../../Tools/eclair.mk
include ../../../../../Tools/eclair.mk
# dependent libraries.
VODEPLIBS:=-ldl -lstdc++ -lcutils
......@@ -49,5 +49,5 @@ include ../ms.mk
VORELDIR:=../../../../../../Release
# please modify here to be sure to see the doit.mk
include ../../../../../Tools/doit.mk
include ../../../../../Tools/doit.mk
......@@ -15,7 +15,7 @@
# */
# Just acting as Father Makefile of Modules
# please keep the name 'makefile' unchanged
# Module Subdirs
VOMSD:=$(dir $(shell find . -name 'Makefile'))
......
......@@ -13,10 +13,10 @@
# ** See the License for the specific language governing permissions and
# ** limitations under the License.
# */
# please list all directories that all source files relative with your module(.h .c .cpp) locate
# please list all directories that all source files relative with your module(.h .c .cpp) locate
VOSRCDIR:=../../../inc \
../../../src \
../../../../../Include
../../../../../Include
# please list all objects needed by your target here
OBJS:= autocorr.o az_isp.o bits.o c2t64fx.o c4t64fx.o convolve.o cor_h_x.o decim54.o \
......@@ -25,7 +25,7 @@ OBJS:= autocorr.o az_isp.o bits.o c2t64fx.o c4t64fx.o convolve.o cor_h_x.o decim
oper_32b.o p_med_ol.o pit_shrp.o pitch_f4.o pred_lt4.o preemph.o q_gain2.o q_pulse.o \
qisf_ns.o qpisf_2s.o random.o residu.o scale.o stream.o syn_filt.o updt_tar.o util.o \
voAMRWBEnc.o voicefac.o wb_vad.o weight_a.o
ifeq ($(VOTT), v5)
OBJS += cor_h_vec_opt.o Deemph_32_opt.o Dot_p_opt.o Filt_6k_7k_opt.o residu_asm_opt.o \
......
......@@ -33,7 +33,7 @@
#define static_vo static __inline__
#else
#define static_vo static __inline
#endif
#endif
#define saturate(L_var1) (((L_var1) > 0X00007fffL) ? (MAX_16): (((L_var1) < (Word32) 0xffff8000L) ? (MIN_16): ((L_var1) & 0xffff)))
......@@ -87,7 +87,7 @@ static_vo Word32 L_shr (Word32 L_var1, Word16 var2); /* Long shift right
static_vo Word32 L_shr_r (Word32 L_var1, Word16 var2); /* Long shift right with round, 3 */
static_vo Word16 norm_s (Word16 var1); /* Short norm, 15 */
static_vo Word16 div_s (Word16 var1, Word16 var2); /* Short division, 18 */
static_vo Word16 norm_l (Word32 L_var1); /* Long norm, 30 */
static_vo Word16 norm_l (Word32 L_var1); /* Long norm, 30 */
/*___________________________________________________________________________
| |
......@@ -1030,8 +1030,8 @@ static_vo Word16 div_s (Word16 var1, Word16 var2)
L_num <<= 1;
if (L_num >= L_denom)
{
L_num -= L_denom;
var_out += 1;
L_num -= L_denom;
var_out += 1;
}
}
}
......
......@@ -33,89 +33,89 @@
static const Word16 dfh_M7k[PRMN_7k] =
{
3168, 29954, 29213, 16121,
64, 13440, 30624, 16430,
3168, 29954, 29213, 16121,
64, 13440, 30624, 16430,
19008
};
static const Word16 dfh_M9k[PRMN_9k] =
{
3168, 31665, 9943, 9123,
15599, 4358, 20248, 2048,
3168, 31665, 9943, 9123,
15599, 4358, 20248, 2048,
17040, 27787, 16816, 13888
};
static const Word16 dfh_M12k[PRMN_12k] =
{
3168, 31665, 9943, 9128,
3647, 8129, 30930, 27926,
18880, 12319, 496, 1042,
4061, 20446, 25629, 28069,
3168, 31665, 9943, 9128,
3647, 8129, 30930, 27926,
18880, 12319, 496, 1042,
4061, 20446, 25629, 28069,
13948
};
static const Word16 dfh_M14k[PRMN_14k] =
{
3168, 31665, 9943, 9131,
24815, 655, 26616, 26764,
7238, 19136, 6144, 88,
4158, 25733, 30567, 30494,
3168, 31665, 9943, 9131,
24815, 655, 26616, 26764,
7238, 19136, 6144, 88,
4158, 25733, 30567, 30494,
221, 20321, 17823
};
static const Word16 dfh_M16k[PRMN_16k] =
{
3168, 31665, 9943, 9131,
24815, 700, 3824, 7271,
26400, 9528, 6594, 26112,
108, 2068, 12867, 16317,
23035, 24632, 7528, 1752,
3168, 31665, 9943, 9131,
24815, 700, 3824, 7271,
26400, 9528, 6594, 26112,
108, 2068, 12867, 16317,
23035, 24632, 7528, 1752,
6759, 24576
};
static const Word16 dfh_M18k[PRMN_18k] =
{
3168, 31665, 9943, 9135,
14787, 14423, 30477, 24927,
25345, 30154, 916, 5728,
18978, 2048, 528, 16449,
2436, 3581, 23527, 29479,
8237, 16810, 27091, 19052,
3168, 31665, 9943, 9135,
14787, 14423, 30477, 24927,
25345, 30154, 916, 5728,
18978, 2048, 528, 16449,
2436, 3581, 23527, 29479,
8237, 16810, 27091, 19052,
0
};
static const Word16 dfh_M20k[PRMN_20k] =
{
3168, 31665, 9943, 9129,
8637, 31807, 24646, 736,
28643, 2977, 2566, 25564,
12930, 13960, 2048, 834,
3270, 4100, 26920, 16237,
31227, 17667, 15059, 20589,
3168, 31665, 9943, 9129,
8637, 31807, 24646, 736,
28643, 2977, 2566, 25564,
12930, 13960, 2048, 834,
3270, 4100, 26920, 16237,
31227, 17667, 15059, 20589,
30249, 29123, 0
};
static const Word16 dfh_M23k[PRMN_23k] =
{
3168, 31665, 9943, 9132,
16748, 3202, 28179, 16317,
30590, 15857, 19960, 8818,
21711, 21538, 4260, 16690,
20224, 3666, 4194, 9497,
16320, 15388, 5755, 31551,
14080, 3574, 15932, 50,
3168, 31665, 9943, 9132,
16748, 3202, 28179, 16317,
30590, 15857, 19960, 8818,
21711, 21538, 4260, 16690,
20224, 3666, 4194, 9497,
16320, 15388, 5755, 31551,
14080, 3574, 15932, 50,
23392, 26053, 31216
};
static const Word16 dfh_M24k[PRMN_24k] =
{
3168, 31665, 9943, 9134,
24776, 5857, 18475, 28535,
29662, 14321, 16725, 4396,
29353, 10003, 17068, 20504,
720, 0, 8465, 12581,
28863, 24774, 9709, 26043,
7941, 27649, 13965, 15236,
3168, 31665, 9943, 9134,
24776, 5857, 18475, 28535,
29662, 14321, 16725, 4396,
29353, 10003, 17068, 20504,
720, 0, 8465, 12581,
28863, 24774, 9709, 26043,
7941, 27649, 13965, 15236,
18026, 22047, 16681, 3968
};
......
......@@ -42,7 +42,7 @@ const static Word16 table[129] = {
/* slope in Q11 used to compute y = acos(x) */
const static Word16 slope[128] = {
const static Word16 slope[128] = {
-26214, -9039, -5243, -3799, -2979, -2405, -2064, -1771,
-1579, -1409, -1279, -1170, -1079, -1004, -933, -880,
-827, -783, -743, -708, -676, -647, -621, -599,
......
......@@ -25,20 +25,20 @@
*/
#ifndef __LOG2_H__
#define __LOG2_H__
/*
********************************************************************************
* INCLUDE FILES
********************************************************************************
*/
#include "typedef.h"
/*
********************************************************************************
* DEFINITION OF DATA TYPES
********************************************************************************
*/
/*
********************************************************************************
* DECLARATION OF PROTOTYPES
......
......@@ -98,7 +98,7 @@ static Word16 sort_1265[253] = {
244, 61, 111, 164, 214, 65, 115, 168, 218, 70,
120, 173, 223, 74, 124, 177, 227, 79, 129, 182,
232, 83, 133, 186, 236, 88, 138, 191, 241, 92,
142, 195, 245
142, 195, 245
};
static Word16 sort_1425[285] = {
......@@ -205,7 +205,7 @@ static Word16 sort_1825[365] = {
257, 243, 229, 356, 159, 119, 67, 187, 173, 145,
240, 77, 304, 332, 314, 342, 109, 254, 81, 278,
105, 91, 346, 318, 183, 250, 197, 328, 95, 155,
169, 268, 226, 236, 264
169, 268, 226, 236, 264
};
static Word16 sort_1985[397] = {
......@@ -248,7 +248,7 @@ static Word16 sort_1985[397] = {
128, 118, 303, 104, 379, 182, 114, 375, 200, 96,
293, 172, 214, 365, 279, 86, 289, 351, 347, 357,
261, 186, 176, 271, 90, 100, 147, 322, 275, 361,
71, 332, 61, 265, 157, 246, 236
71, 332, 61, 265, 157, 246, 236
};
static Word16 sort_2305[461] = {
......@@ -349,7 +349,7 @@ static Word16 sort_2385[477] = {
132, 453, 336, 425, 325, 347, 126, 104, 137, 458,
352, 243, 447, 115, 341, 210, 330, 221, 232, 436,
465, 319, 359, 111, 454, 228, 217, 122, 443, 348,
239, 250, 133, 144, 432, 337, 326
239, 250, 133, 144, 432, 337, 326
};
static Word16 sort_SID[35] = {
......
......@@ -26,7 +26,7 @@ Contains: VOME API Buffer Operator Implement Header
#define __STREAM_H__
#include "voMem.h"
#define Frame_Maxsize 1024 * 2 //Work Buffer 10K
#define Frame_Maxsize 1024 * 2 //Work Buffer 10K
#define Frame_MaxByte 640 //AMR_WB Encoder one frame 320 samples = 640 Bytes
#define MIN(a,b) ((a) < (b)? (a) : (b))
......@@ -35,7 +35,7 @@ typedef struct{
unsigned char *frame_ptr;
unsigned char *frame_ptr_bk;
int set_len;
int framebuffer_len;
int framebuffer_len;
int frame_storelen;
int used_len;
}FrameStream;
......
......@@ -31,7 +31,7 @@
/*
* this is the original code from the ETSI file typedef.h
*/
#if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(_MSC_VER) || defined(__ZTC__)
typedef signed char Word8;
typedef short Word16;
......
......@@ -45,7 +45,7 @@
* OSF only defined if the current platform is an Alpha
* PC only defined if the current platform is a PC
* SUN only defined if the current platform is a Sun
*
*
* LSBFIRST is defined if the byte order on this platform is
* "least significant byte first" -> defined on DEC Alpha
* and PC, undefined on Sun
......@@ -68,7 +68,7 @@
/*
********************************************************************************
* DEFINITION OF CONSTANTS
* DEFINITION OF CONSTANTS
********************************************************************************
*/
/*
......@@ -197,7 +197,7 @@ typedef int Bool;
#define Syn_filt_32 voAWB_Syn_filt_32
#define Isf_isp voAWB_Isf_isp
#define Levinson voAWB_Levinson
#define median5 voAWB_median5
#define median5 voAWB_median5
#define Pred_lt4 voAWB_Pred_lt4
#define Reorder_isf voAWB_Reorder_isf
#define Dpisf_2s_36b voAWB_Dpisf_2s_36b
......
......@@ -30,10 +30,10 @@
.section .text
.global Deemph_32_asm
Deemph_32_asm:
STMFD r13!, {r4 - r12, r14}
STMFD r13!, {r4 - r12, r14}
MOV r4, #2 @i=0
LDRSH r6, [r0], #2 @load x_hi[0]
LDRSH r7, [r1], #2 @load x_lo[0]
......@@ -47,9 +47,9 @@ Deemph_32_asm:
ADD r12, r10, r7, LSL #4 @L_tmp += x_lo[0] << 4
MOV r10, r12, LSL #3 @L_tmp <<= 3
MUL r9, r5, r8
LDRSH r6, [r0], #2 @load x_hi[1]
LDRSH r6, [r0], #2 @load x_hi[1]
QDADD r10, r10, r9
LDRSH r7, [r1], #2 @load x_lo[1]
LDRSH r7, [r1], #2 @load x_lo[1]
MOV r12, r10, LSL #1 @L_tmp = L_mac(L_tmp, *mem, fac)
QADD r10, r12, r11
MOV r14, r10, ASR #16 @y[0] = round(L_tmp)
......@@ -94,9 +94,9 @@ LOOP:
BLT LOOP
STR r14, [r3]
STRH r14, [r2]
STRH r14, [r2]
LDMFD r13!, {r4 - r12, r15}
LDMFD r13!, {r4 - r12, r15}
@ENDP
.END
......
......@@ -31,7 +31,7 @@
Dot_product12_asm:
STMFD r13!, {r4 - r12, r14}
STMFD r13!, {r4 - r12, r14}
MOV r4, #0 @ L_sum = 0
MOV r5, #0 @ i = 0
......@@ -41,13 +41,13 @@ LOOP:
LDR r8, [r0], #4
SMLABB r4, r6, r7, r4
LDR r9, [r1], #4
SMLATT r4, r6, r7, r4
SMLATT r4, r6, r7, r4
LDR r6, [r0], #4
SMLABB r4, r8, r9, r4
LDR r7, [r1], #4
SMLATT r4, r8, r9, r4
SMLATT r4, r8, r9, r4
LDR r8, [r0], #4
SMLABB r4, r6, r7, r4
......@@ -58,7 +58,7 @@ LOOP:
CMP r5, r2
SMLATT r4, r8, r9, r4
BLT LOOP
MOV r12, r4, LSL #1
ADD r12, r12, #1 @ L_sum = (L_sum << 1) + 1
MOV r4, r12
......@@ -69,12 +69,12 @@ LOOP:
SUB r10, r10, #1 @ sft = norm_l(L_sum)
MOV r0, r12, LSL r10 @ L_sum = L_sum << sft
RSB r11, r10, #30 @ *exp = 30 - sft
STRH r11, [r3]
STRH r11, [r3]
Dot_product12_end:
LDMFD r13!, {r4 - r12, r15}
LDMFD r13!, {r4 - r12, r15}
@ENDFUNC
.END
......@@ -23,7 +23,7 @@
@******************************************************************
@ r0 --- signal[]
@ r1 --- lg
@ r2 --- mem[]
@ r2 --- mem[]
.section .text
.global Filt_6k_7k_asm
......@@ -32,7 +32,7 @@
Filt_6k_7k_asm:
STMFD r13!, {r4 - r12, r14}
STMFD r13!, {r4 - r12, r14}
SUB r13, r13, #240 @ x[L_SUBFR16k + (L_FIR - 1)]
MOV r8, r0 @ copy signal[] address
MOV r4, r1 @ copy lg address
......@@ -43,9 +43,9 @@ Filt_6k_7k_asm:
MOV r2, #30 @ L_FIR - 1
BL voAWB_Copy @ memcpy(x, mem, (L_FIR - 1)<<1)
LDR r10, Lable1 @ get fir_7k address
LDR r10, Lable1 @ get fir_7k address
MOV r14, #0
MOV r14, #0
MOV r3, r8 @ change myMemCopy to Copy, due to Copy will change r3 content
ADD r6, r13, #60 @ get x[L_FIR - 1] address
MOV r7, r3 @ get signal[i]
......@@ -76,14 +76,14 @@ LOOP1:
STRH r12, [r6], #2
ADD r14, r14, #8
CMP r14, #80
BLT LOOP1
BLT LOOP1
STR r5, [sp, #-4] @ PUSH r5 to stack
@ not use registers: r4, r10, r12, r14, r5
MOV r4, r13
MOV r5, #0 @ i = 0
MOV r4, r13
MOV r5, #0 @ i = 0
LOOP2:
LDR r0, [r10]
......@@ -111,13 +111,13 @@ LOOP2:
LDRSH r8, [r4, #10] @ load x[i+5]
LDRSH r9, [r4, #50] @ load x[i+25]
SMLABT r14, r1, r0, r14 @ (x[i+3] + x[i+27]) * fir_7k[3]
ADD r8, r8, r9 @ x[i+5] + x[i+25]
ADD r8, r8, r9 @ x[i+5] + x[i+25]
LDR r0, [r10, #8]
LDRSH r1, [r4, #12] @ x[i+6]
LDRSH r2, [r4, #48] @ x[i+24]
SMLABB r14, r6, r0, r14 @ (x[i+4] + x[i+26]) * fir_7k[4]
LDRSH r6, [r4, #14] @ x[i+7]
LDRSH r6, [r4, #14] @ x[i+7]
LDRSH r7, [r4, #46] @ x[i+23]
SMLABT r14, r8, r0, r14 @ (x[i+5] + x[i+25]) * fir_7k[5]
LDR r0, [r10, #12]
......@@ -125,8 +125,8 @@ LOOP2:
ADD r6, r6, r7 @ (x[i+7] + x[i+23])
SMLABB r14, r1, r0, r14 @ (x[i+6] + x[i+24]) * fir_7k[6]
LDRSH r8, [r4, #16] @ x[i+8]
LDRSH r9, [r4, #44] @ x[i+22]
SMLABT r14, r6, r0, r14 @ (x[i+7] + x[i+23]) * fir_7k[7]
LDRSH r9, [r4, #44] @ x[i+22]
SMLABT r14, r6, r0, r14 @ (x[i+7] + x[i+23]) * fir_7k[7]
LDR r0, [r10, #16]
LDRSH r1, [r4, #18] @ x[i+9]
LDRSH r2, [r4, #42] @ x[i+21]
......@@ -144,7 +144,7 @@ LOOP2:
LDRSH r2, [r4, #36] @ x[i+18]
SMLABB r14, r6, r0, r14 @ (x[i+10] + x[i+20]) * fir_7k[10]
LDRSH r6, [r4, #26] @ x[i+13]
ADD r8, r8, r9 @ (x[i+11] + x[i+19])
ADD r8, r8, r9 @ (x[i+11] + x[i+19])
LDRSH r7, [r4, #34] @ x[i+17]
SMLABT r14, r8, r0, r14 @ (x[i+11] + x[i+19]) * fir_7k[11]
LDR r0, [r10, #24]
......@@ -152,31 +152,31 @@ LOOP2:
LDRSH r8, [r4, #28] @ x[i+14]
SMLABB r14, r1, r0, r14 @ (x[i+12] + x[i+18]) * fir_7k[12]
ADD r6, r6, r7 @ (x[i+13] + x[i+17])
LDRSH r9, [r4, #32] @ x[i+16]
LDRSH r9, [r4, #32] @ x[i+16]
SMLABT r14, r6, r0, r14 @ (x[i+13] + x[i+17]) * fir_7k[13]
LDR r0, [r10, #28]
LDR r0, [r10, #28]
ADD r8, r8, r9 @ (x[i+14] + x[i+16])
LDRSH r1, [r4, #30] @ x[i+15]
SMLABB r14, r8, r0, r14 @ (x[i+14] + x[i+16]) * fir_7k[14]
SMLABT r14, r1, r0, r14 @ x[i+15] * fir_7k[15]
SMLABT r14, r1, r0, r14 @ x[i+15] * fir_7k[15]
ADD r5, r5, #1
ADD r14, r14, #0x4000
ADD r4, r4, #2
ADD r4, r4, #2
MOV r1, r14, ASR #15
CMP r5, #80
STRH r1, [r3], #2 @signal[i] = (L_tmp + 0x4000) >> 15
BLT LOOP2
BLT LOOP2
LDR r1, [sp, #-4] @mem address
ADD r0, r13, #160 @x + lg
MOV r2, #30
BL voAWB_Copy
Filt_6k_7k_end:
ADD r13, r13, #240
LDMFD r13!, {r4 - r12, r15}
ADD r13, r13, #240
LDMFD r13!, {r4 - r12, r15}
Lable1:
.word voAWB_fir_6k_7k
@ENDFUNC
......
......@@ -32,8 +32,8 @@
@ r6 --- corr_norm[]
.section .text
.global Norm_corr_asm
.section .text
.global Norm_corr_asm
.extern Convolve_asm
.extern Isqrt_n
@******************************
......@@ -47,17 +47,17 @@
.equ T_MIN , 212
.equ T_MAX , 216
.equ CORR_NORM , 220