Permalink
Browse files

Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

  • Loading branch information...
2 parents 0a3fcc3 + 62a62ef commit b4cee0f871e0f5a2abd6c6f05b65710b69423f2c Jean-Baptiste Queru committed with android code review Jan 13, 2012
Showing with 5,071 additions and 5,071 deletions.
  1. +1 −1 media/libstagefright/codecs/aacenc/Android.mk
  2. +4 −4 media/libstagefright/codecs/aacenc/SampleCode/AAC_E_SAMPLES.c
  3. +111 −111 media/libstagefright/codecs/aacenc/basic_op/basic_op.h
  4. +2 −2 media/libstagefright/codecs/aacenc/basic_op/basicop2.c
  5. +76 −76 media/libstagefright/codecs/aacenc/basic_op/oper_32b.c
  6. +8 −8 media/libstagefright/codecs/aacenc/basic_op/oper_32b.h
  7. +1 −1 media/libstagefright/codecs/aacenc/basic_op/typedef.h
  8. +5 −5 media/libstagefright/codecs/aacenc/basic_op/typedefs.h
  9. +1 −1 media/libstagefright/codecs/aacenc/inc/aac_rom.h
  10. +1 −1 media/libstagefright/codecs/aacenc/inc/aacenc_core.h
  11. +2 −2 media/libstagefright/codecs/aacenc/inc/adj_thr.h
  12. +1 −1 media/libstagefright/codecs/aacenc/inc/adj_thr_data.h
  13. +1 −1 media/libstagefright/codecs/aacenc/inc/bitenc.h
  14. +4 −4 media/libstagefright/codecs/aacenc/inc/interface.h
  15. +3 −3 media/libstagefright/codecs/aacenc/inc/line_pe.h
  16. +1 −1 media/libstagefright/codecs/aacenc/inc/psy_const.h
  17. +2 −2 media/libstagefright/codecs/aacenc/inc/psy_main.h
  18. +1 −1 media/libstagefright/codecs/aacenc/inc/qc_main.h
  19. +1 −1 media/libstagefright/codecs/aacenc/inc/quantize.h
  20. +1 −1 media/libstagefright/codecs/aacenc/inc/sf_estim.h
  21. +1 −1 media/libstagefright/codecs/aacenc/inc/stat_bits.h
  22. +1 −1 media/libstagefright/codecs/aacenc/inc/tns_param.h
  23. +1 −1 media/libstagefright/codecs/aacenc/inc/transform.h
  24. +1,230 −1,230 media/libstagefright/codecs/aacenc/src/aac_rom.c
  25. +24 −24 media/libstagefright/codecs/aacenc/src/aacenc.c
  26. +21 −21 media/libstagefright/codecs/aacenc/src/aacenc_core.c
  27. +182 −182 media/libstagefright/codecs/aacenc/src/adj_thr.c
  28. +103 −103 media/libstagefright/codecs/aacenc/src/asm/ARMV5E/AutoCorrelation_v5.s
  29. +40 −40 media/libstagefright/codecs/aacenc/src/asm/ARMV5E/CalcWindowEnergy_v5.s
  30. +33 −33 media/libstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
  31. +77 −77 media/libstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
  32. +72 −72 media/libstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
  33. +69 −69 media/libstagefright/codecs/aacenc/src/asm/ARMV5E/band_nrg_v5.s
  34. +36 −36 media/libstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
  35. +44 −44 media/libstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
  36. +60 −60 media/libstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
  37. +15 −15 media/libstagefright/codecs/aacenc/src/band_nrg.c
  38. +390 −390 media/libstagefright/codecs/aacenc/src/bit_cnt.c
  39. +32 −32 media/libstagefright/codecs/aacenc/src/bitbuffer.c
  40. +55 −55 media/libstagefright/codecs/aacenc/src/bitenc.c
  41. +73 −73 media/libstagefright/codecs/aacenc/src/block_switch.c
  42. +23 −23 media/libstagefright/codecs/aacenc/src/channel_map.c
  43. +73 −73 media/libstagefright/codecs/aacenc/src/dyn_bits.c
  44. +36 −36 media/libstagefright/codecs/aacenc/src/grp_data.c
  45. +18 −18 media/libstagefright/codecs/aacenc/src/interface.c
  46. +26 −26 media/libstagefright/codecs/aacenc/src/line_pe.c
  47. +1 −1 media/libstagefright/codecs/aacenc/src/memalign.c
  48. +30 −30 media/libstagefright/codecs/aacenc/src/ms_stereo.c
  49. +13 −13 media/libstagefright/codecs/aacenc/src/pre_echo_control.c
  50. +52 −52 media/libstagefright/codecs/aacenc/src/psy_configuration.c
  51. +44 −44 media/libstagefright/codecs/aacenc/src/psy_main.c
  52. +72 −72 media/libstagefright/codecs/aacenc/src/qc_main.c
  53. +65 −65 media/libstagefright/codecs/aacenc/src/quantize.c
  54. +253 −253 media/libstagefright/codecs/aacenc/src/sf_estim.c
  55. +29 −29 media/libstagefright/codecs/aacenc/src/stat_bits.c
  56. +128 −128 media/libstagefright/codecs/aacenc/src/tns.c
  57. +80 −80 media/libstagefright/codecs/aacenc/src/transform.c
  58. +2 −2 media/libstagefright/codecs/amrwbenc/Android.mk
  59. +4 −4 media/libstagefright/codecs/amrwbenc/inc/basic_op.h
  60. +43 −43 media/libstagefright/codecs/amrwbenc/inc/homing.tab
  61. +1 −1 media/libstagefright/codecs/amrwbenc/inc/isp_isf.tab
  62. +3 −3 media/libstagefright/codecs/amrwbenc/inc/log2.h
  63. +4 −4 media/libstagefright/codecs/amrwbenc/inc/mime_io.tab
  64. +2 −2 media/libstagefright/codecs/amrwbenc/inc/stream.h
  65. +1 −1 media/libstagefright/codecs/amrwbenc/inc/typedef.h
  66. +3 −3 media/libstagefright/codecs/amrwbenc/inc/typedefs.h
  67. +6 −6 media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
  68. +8 −8 media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
  69. +23 −23 media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
  70. +25 −25 media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s
  71. +22 −22 media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
  72. +28 −28 media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/convolve_opt.s
  73. +16 −16 media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
  74. +5 −5 media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
  75. +54 −54 media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
  76. +6 −6 media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
  77. +30 −30 media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
  78. +6 −6 media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
  79. +12 −12 media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
  80. +35 −35 media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
  81. +28 −28 media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Norm_Corr_neon.s
  82. +14 −14 media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
  83. +35 −35 media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/convolve_neon.s
  84. +17 −17 media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
  85. +16 −16 media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
  86. +26 −26 media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/residu_asm_neon.s
  87. +18 −18 media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
  88. +15 −15 media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
  89. +4 −4 media/libstagefright/codecs/amrwbenc/src/autocorr.c
  90. +26 −26 media/libstagefright/codecs/amrwbenc/src/az_isp.c
  91. +10 −10 media/libstagefright/codecs/amrwbenc/src/bits.c
  92. +55 −55 media/libstagefright/codecs/amrwbenc/src/c2t64fx.c
  93. +165 −165 media/libstagefright/codecs/amrwbenc/src/c4t64fx.c
  94. +5 −5 media/libstagefright/codecs/amrwbenc/src/convolve.c
  95. +11 −11 media/libstagefright/codecs/amrwbenc/src/cor_h_x.c
  96. +2 −2 media/libstagefright/codecs/amrwbenc/src/decim54.c
  97. +11 −11 media/libstagefright/codecs/amrwbenc/src/deemph.c
  98. +45 −45 media/libstagefright/codecs/amrwbenc/src/dtx.c
  99. +6 −6 media/libstagefright/codecs/amrwbenc/src/g_pitch.c
  100. +9 −9 media/libstagefright/codecs/amrwbenc/src/gpclip.c
  101. +3 −3 media/libstagefright/codecs/amrwbenc/src/hp400.c
  102. +2 −2 media/libstagefright/codecs/amrwbenc/src/hp50.c
  103. +2 −2 media/libstagefright/codecs/amrwbenc/src/hp6k.c
  104. +27 −27 media/libstagefright/codecs/amrwbenc/src/hp_wsp.c
  105. +3 −3 media/libstagefright/codecs/amrwbenc/src/int_lpc.c
  106. +12 −12 media/libstagefright/codecs/amrwbenc/src/isp_az.c
  107. +4 −4 media/libstagefright/codecs/amrwbenc/src/isp_isf.c
  108. +12 −12 media/libstagefright/codecs/amrwbenc/src/levinson.c
  109. +4 −4 media/libstagefright/codecs/amrwbenc/src/log2.c
  110. +6 −6 media/libstagefright/codecs/amrwbenc/src/lp_dec2.c
  111. +7 −7 media/libstagefright/codecs/amrwbenc/src/math_op.c
  112. +1 −1 media/libstagefright/codecs/amrwbenc/src/mem_align.c
  113. +25 −25 media/libstagefright/codecs/amrwbenc/src/p_med_ol.c
  114. +8 −8 media/libstagefright/codecs/amrwbenc/src/pitch_f4.c
  115. +2 −2 media/libstagefright/codecs/amrwbenc/src/pred_lt4.c
  116. +8 −8 media/libstagefright/codecs/amrwbenc/src/preemph.c
  117. +31 −31 media/libstagefright/codecs/amrwbenc/src/q_gain2.c
  118. +28 −28 media/libstagefright/codecs/amrwbenc/src/q_pulse.c
  119. +12 −12 media/libstagefright/codecs/amrwbenc/src/qisf_ns.c
  120. +72 −72 media/libstagefright/codecs/amrwbenc/src/qpisf_2s.c
  121. +1 −1 media/libstagefright/codecs/amrwbenc/src/residu.c
  122. +4 −4 media/libstagefright/codecs/amrwbenc/src/scale.c
  123. +3 −3 media/libstagefright/codecs/amrwbenc/src/stream.c
  124. +7 −7 media/libstagefright/codecs/amrwbenc/src/syn_filt.c
  125. +1 −1 media/libstagefright/codecs/amrwbenc/src/updt_tar.c
  126. +101 −101 media/libstagefright/codecs/amrwbenc/src/voAMRWBEnc.c
  127. +1 −1 media/libstagefright/codecs/amrwbenc/src/voicefac.c
  128. +83 −83 media/libstagefright/codecs/amrwbenc/src/wb_vad.c
  129. +1 −1 media/libstagefright/codecs/amrwbenc/src/weight_a.c
  130. +3 −3 media/libstagefright/codecs/common/Config.mk
  131. +9 −9 media/libstagefright/codecs/common/include/voAMRWB.h
  132. +1 −1 media/libstagefright/codecs/common/include/voAudio.h
  133. +1 −1 media/libstagefright/codecs/common/include/voIndex.h
@@ -59,7 +59,7 @@ LOCAL_MODULE := libstagefright_aacenc
LOCAL_ARM_MODE := arm
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES :=
LOCAL_SHARED_LIBRARIES :=
@@ -29,11 +29,11 @@
#include "cmnMemory.h"
#define VO_AAC_E_OUTPUT 1
-#define READ_SIZE (1024*8)
+#define READ_SIZE (1024*8)
unsigned char outBuf[1024*8];
unsigned char inBuf[READ_SIZE];
-const char* HelpString =
+const char* HelpString =
"VisualOn AAC encoder Usage:\n"
"voAACEncTest -if <inputfile.pcm> -of <outputfile.aac> -sr <samplerate> -ch <channel> -br <bitrate> -adts <adts> \n"
"-if input file name \n"
@@ -49,7 +49,7 @@ static int parsecmdline(int argc, char **argv,char **input_filename, char **ou
{
// notice that:
// bitRate/nChannels > 8000
- // bitRate/nChannels < 160000
+ // bitRate/nChannels < 160000
// bitRate/nChannels < sampleRate*6
param->adtsUsed = 1;
param->bitRate = 0;
@@ -69,7 +69,7 @@ static int parsecmdline(int argc, char **argv,char **input_filename, char **ou
{
argv++;
argc--;
- *input_filename = *argv;
+ *input_filename = *argv;
}
else if (!strcmp(*argv, "-of"))
{
Oops, something went wrong. Retry.

0 comments on commit b4cee0f

Please sign in to comment.