Skip to content

Commit

Permalink
Remove trailing whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
@mstorsjo
mstorsjo committed Jul 18, 2011
1 parent 42c1d78 commit 45efb96
Show file tree
Hide file tree
Showing 84 changed files with 1,373 additions and 1,373 deletions.
4 changes: 2 additions & 2 deletions amrwbenc/Android.mk
View file
Expand Up @@ -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 \
Expand Down Expand Up @@ -91,7 +91,7 @@ LOCAL_MODULE := libstagefright_amrwbenc

LOCAL_ARM_MODE := arm

LOCAL_STATIC_LIBRARIES :=
LOCAL_STATIC_LIBRARIES :=

LOCAL_SHARED_LIBRARIES :=

Expand Down
18 changes: 9 additions & 9 deletions amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
View file
Expand Up @@ -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
)
{
Expand Down Expand Up @@ -136,7 +136,7 @@ int encode(
return -1;
}

pfunc = dlsym(handle, "voGetAMRWBEncAPI");
pfunc = dlsym(handle, "voGetAMRWBEncAPI");
if(pfunc == 0)
{
printf("open function error......");
Expand All @@ -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);
Expand Down Expand Up @@ -214,7 +214,7 @@ int encode(
if(framenum == 1)
{
fwrite(OutputBuf, 1, outData.Length + size1, fdst);
fflush(fdst);
fflush(fdst);
}
else
{
Expand Down Expand Up @@ -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]);
Expand All @@ -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 ();
Expand Down
8 changes: 4 additions & 4 deletions amrwbenc/SampleCode/Android.mk
View file
Expand Up @@ -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

Expand All @@ -20,7 +20,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../../Include \

LOCAL_CFLAGS := $(VO_CFLAGS)

include $(BUILD_EXECUTABLE)


Expand Down
8 changes: 4 additions & 4 deletions amrwbenc/SampleCode/eclair/Makefile
View file
Expand Up @@ -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


Expand All @@ -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
Expand All @@ -52,5 +52,5 @@ VORELDIR:=../


# please modify here to be sure to see the doit.mk
include ../../../../Tools/doit.mk
include ../../../../Tools/doit.mk

8 changes: 4 additions & 4 deletions amrwbenc/SampleCode/ms.mk
View file
Expand Up @@ -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


6 changes: 3 additions & 3 deletions amrwbenc/build/eclair/ARMV5E/Makefile
View file
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

6 changes: 3 additions & 3 deletions amrwbenc/build/eclair/ARMV7/Makefile
View file
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

2 changes: 1 addition & 1 deletion amrwbenc/build/eclair/makefile
View file
Expand Up @@ -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'))

Expand Down
6 changes: 3 additions & 3 deletions amrwbenc/build/eclair/ms.mk
View file
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
8 changes: 4 additions & 4 deletions amrwbenc/inc/basic_op.h
View file
Expand Up @@ -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)))

Expand Down Expand Up @@ -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 */

/*___________________________________________________________________________
| |
Expand Down Expand Up @@ -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;
}
}
}
Expand Down
86 changes: 43 additions & 43 deletions amrwbenc/inc/homing.tab
View file
Expand Up @@ -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
};

Expand Down

0 comments on commit 45efb96

Please sign in to comment.