Fix dump_modes output for fixed-point NE10.
authorTimothy B. Terriberry <tterribe@xiph.org>
Wed, 7 Oct 2015 23:45:44 +0000 (19:45 -0400)
committerJean-Marc Valin <jmvalin@jmvalin.ca>
Wed, 7 Oct 2015 23:50:43 +0000 (19:50 -0400)
Some of the fields present in NE10's float state struct are not
 present in the fixed-point version, but we were generating
 initializers for them anyway.
Also, the float modes were not up-to-date with the output of
 dump_modes.

celt/dump_modes/dump_modes_arm_ne10.c
celt/static_modes_fixed_arm_ne10.h
celt/static_modes_float_arm_ne10.h

index 23f9a00..47578cd 100644 (file)
@@ -133,10 +133,12 @@ void dump_mode_arch(CELTMode *mode)
       fprintf(file, "NULL,\n");  /* buffer */
       fprintf(file, "(%s *)&ne10_twiddles_%d[%d],\n",
               NE10_FFT_CPX_TYPE_T_STR, mode->mdct.kfft[k]->nfft, cfg->nfft);
+#if !defined(FIXED_POINT)
       fprintf(file, "/* is_forward_scaled = true */\n");
       fprintf(file, "(ne10_int32_t) 1,\n");
       fprintf(file, "/* is_backward_scaled = false */\n");
       fprintf(file, "(ne10_int32_t) 0,\n");
+#endif
       fprintf(file, "};\n");
 
       fprintf(file, "static const arch_fft_state cfg_arch_%d = {\n",
index 9e137b9..b8ef0ce 100644 (file)
@@ -343,10 +343,6 @@ static const ne10_fft_state_int32_t ne10_fft_state_int32_t_480 = {
 (ne10_fft_cpx_int32_t *)ne10_twiddles_480,
 NULL,
 (ne10_fft_cpx_int32_t *)&ne10_twiddles_480[120],
-/* is_forward_scaled = true */
-(ne10_int32_t) 1,
-/* is_backward_scaled = false */
-(ne10_int32_t) 0,
 };
 static const arch_fft_state cfg_arch_480 = {
 1,
@@ -359,10 +355,6 @@ static const ne10_fft_state_int32_t ne10_fft_state_int32_t_240 = {
 (ne10_fft_cpx_int32_t *)ne10_twiddles_240,
 NULL,
 (ne10_fft_cpx_int32_t *)&ne10_twiddles_240[60],
-/* is_forward_scaled = true */
-(ne10_int32_t) 1,
-/* is_backward_scaled = false */
-(ne10_int32_t) 0,
 };
 static const arch_fft_state cfg_arch_240 = {
 1,
@@ -375,10 +367,6 @@ static const ne10_fft_state_int32_t ne10_fft_state_int32_t_120 = {
 (ne10_fft_cpx_int32_t *)ne10_twiddles_120,
 NULL,
 (ne10_fft_cpx_int32_t *)&ne10_twiddles_120[30],
-/* is_forward_scaled = true */
-(ne10_int32_t) 1,
-/* is_backward_scaled = false */
-(ne10_int32_t) 0,
 };
 static const arch_fft_state cfg_arch_120 = {
 1,
@@ -391,10 +379,6 @@ static const ne10_fft_state_int32_t ne10_fft_state_int32_t_60 = {
 (ne10_fft_cpx_int32_t *)ne10_twiddles_60,
 NULL,
 (ne10_fft_cpx_int32_t *)&ne10_twiddles_60[15],
-/* is_forward_scaled = true */
-(ne10_int32_t) 1,
-/* is_backward_scaled = false */
-(ne10_int32_t) 0,
 };
 static const arch_fft_state cfg_arch_60 = {
 1,
index 5bcec70..934a82a 100644 (file)
@@ -337,7 +337,7 @@ static const ne10_fft_cpx_float32_t ne10_twiddles_60[60] = {
 {-0.95105654f,-0.30901679f}, {-1.0000000f,8.7422777e-08f}, {-0.95105654f,0.30901697f},
 {-0.80901694f,0.58778536f}, {-0.58778507f,0.80901712f}, {-0.30901709f,0.95105648f},
 };
-static const ne10_fft_state_float32_t ne10_fft_state_float32_480 = {
+static const ne10_fft_state_float32_t ne10_fft_state_float32_t_480 = {
 120,
 (ne10_int32_t *)ne10_factors_480,
 (ne10_fft_cpx_float32_t *)ne10_twiddles_480,
@@ -350,10 +350,10 @@ NULL,
 };
 static const arch_fft_state cfg_arch_480 = {
 1,
-(void *)&ne10_fft_state_float32_480,
+(void *)&ne10_fft_state_float32_t_480,
 };
 
-static const ne10_fft_state_float32_t ne10_fft_state_float32_240 = {
+static const ne10_fft_state_float32_t ne10_fft_state_float32_t_240 = {
 60,
 (ne10_int32_t *)ne10_factors_240,
 (ne10_fft_cpx_float32_t *)ne10_twiddles_240,
@@ -366,10 +366,10 @@ NULL,
 };
 static const arch_fft_state cfg_arch_240 = {
 1,
-(void *)&ne10_fft_state_float32_240,
+(void *)&ne10_fft_state_float32_t_240,
 };
 
-static const ne10_fft_state_float32_t ne10_fft_state_float32_120 = {
+static const ne10_fft_state_float32_t ne10_fft_state_float32_t_120 = {
 30,
 (ne10_int32_t *)ne10_factors_120,
 (ne10_fft_cpx_float32_t *)ne10_twiddles_120,
@@ -382,10 +382,10 @@ NULL,
 };
 static const arch_fft_state cfg_arch_120 = {
 1,
-(void *)&ne10_fft_state_float32_120,
+(void *)&ne10_fft_state_float32_t_120,
 };
 
-static const ne10_fft_state_float32_t ne10_fft_state_float32_60 = {
+static const ne10_fft_state_float32_t ne10_fft_state_float32_t_60 = {
 15,
 (ne10_int32_t *)ne10_factors_60,
 (ne10_fft_cpx_float32_t *)ne10_twiddles_60,
@@ -398,7 +398,7 @@ NULL,
 };
 static const arch_fft_state cfg_arch_60 = {
 1,
-(void *)&ne10_fft_state_float32_60,
+(void *)&ne10_fft_state_float32_t_60,
 };
 
 #endif  /* end NE10_FFT_PARAMS48000_960 */