ref: c930cc57d2e2cf32a9ecf6aa2cebb8a3a785b3ad
parent: 4911460353b37000f5d928b75707acb14e7b2855
author: Michael Bradshaw <mjbshaw@google.com>
date: Fri Jan 27 11:07:26 EST 2017
Reduce the scope of Ne10 includes libopus only uses the DSP module of Ne10, and never uses the init functions. Signed-off-by: Michael Bradshaw <mjbshaw@google.com> Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>
--- a/celt/arm/celt_ne10_fft.c
+++ b/celt/arm/celt_ne10_fft.c
@@ -36,7 +36,6 @@
#endif
#endif
-#include <NE10_init.h>
#include <NE10_dsp.h>
#include "os_support.h"
#include "kiss_fft.h"
--- a/celt/dump_modes/dump_modes_arm_ne10.c
+++ b/celt/dump_modes/dump_modes_arm_ne10.c
@@ -60,7 +60,7 @@
fprintf(file, " %d %d",mode->Fs,mode->shortMdctSize*mode->nbShortMdcts);
}
fprintf(file, "\n * It contains static definitions for some pre-defined modes. */\n");
- fprintf(file, "#include <NE10_init.h>\n\n");
+ fprintf(file, "#include <NE10_types.h>\n\n");
}
void dump_modes_arch_finalize()
--- a/celt/static_modes_fixed_arm_ne10.h
+++ b/celt/static_modes_fixed_arm_ne10.h
@@ -1,7 +1,7 @@
/* The contents of this file was automatically generated by
* dump_mode_arm_ne10.c with arguments: 48000 960
* It contains static definitions for some pre-defined modes. */
-#include <NE10_init.h>
+#include <NE10_types.h>
#ifndef NE10_FFT_PARAMS48000_960
#define NE10_FFT_PARAMS48000_960
--- a/celt/static_modes_float_arm_ne10.h
+++ b/celt/static_modes_float_arm_ne10.h
@@ -1,7 +1,7 @@
/* The contents of this file was automatically generated by
* dump_mode_arm_ne10.c with arguments: 48000 960
* It contains static definitions for some pre-defined modes. */
-#include <NE10_init.h>
+#include <NE10_types.h>
#ifndef NE10_FFT_PARAMS48000_960
#define NE10_FFT_PARAMS48000_960
--- a/configure.ac
+++ b/configure.ac
@@ -426,7 +426,7 @@
AC_LINK_IFELSE(
[
AC_LANG_PROGRAM(
- [[#include <NE10_init.h>
+ [[#include <NE10_dsp.h>
]],
[[
ne10_fft_cfg_float32_t cfg;