From e16ac1a30c0bafc7d30a4ff05e77bcf69fe9dd85 Mon Sep 17 00:00:00 2001 From: Carlos Date: Fri, 12 Nov 2021 07:46:10 +0100 Subject: [PATCH] repair submodules --- .gitmodules | 3 - components/opus/CMakeLists.txt | 18 --- components/opus/component.mk | 12 -- components/opus/config.h | 208 --------------------------------- components/opus/opus | 1 - 5 files changed, 242 deletions(-) delete mode 100644 components/opus/CMakeLists.txt delete mode 100644 components/opus/component.mk delete mode 100644 components/opus/config.h delete mode 160000 components/opus/opus diff --git a/.gitmodules b/.gitmodules index b6ebb88..9f5f81f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "components/opus/opus"] - path = components/opus/opus - url = https://github.com/xiph/opus [submodule "components/esp-dsp"] path = components/esp-dsp url = https://github.com/espressif/esp-dsp diff --git a/components/opus/CMakeLists.txt b/components/opus/CMakeLists.txt deleted file mode 100644 index 6ddb221..0000000 --- a/components/opus/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -file(GLOB srcs "opus/src/*.c") -file(GLOB silk "opus/silk/*.c") -file(GLOB celt "opus/celt/*.c") -file(GLOB fixed "opus/slik/fixed/*.c") -file(GLOB float "opus/slik/float/*.c") - - -idf_component_register(SRCS "${srcs}" "${silk}" "${celt}" "${fixed}" "${float}" - INCLUDE_DIRS . - "opus/include" - "opus/silk" - "opus/silk/fixed" - "opus/silk/float" - "opus/celt" - ) - -set_source_files_properties(opus/silk/quant_LTP_gains.c PROPERTIES COMPILE_FLAGS -Wno-maybe-uninitialized) -target_compile_definitions(${COMPONENT_TARGET} PRIVATE "-DHAVE_CONFIG_H") diff --git a/components/opus/component.mk b/components/opus/component.mk deleted file mode 100644 index 024e046..0000000 --- a/components/opus/component.mk +++ /dev/null @@ -1,12 +0,0 @@ -# -# Main Makefile. This is basically the same as a component makefile. -# -# This Makefile should, at the very least, just include $(SDK_PATH)/make/component_common.mk. By default, -# this will take the sources in the src/ directory, compile them and link them into -# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable, -# please read the ESP-IDF documents if you need to do this. -# - -COMPONENT_SRCDIRS := opus/src opus/silk opus/silk/fixed opus/celt -COMPONENT_ADD_INCLUDEDIRS := . opus/include opus/silk opus/silk/fixed opus/celt -CFLAGS += -DHAVE_CONFIG_H diff --git a/components/opus/config.h b/components/opus/config.h deleted file mode 100644 index 03f3999..0000000 --- a/components/opus/config.h +++ /dev/null @@ -1,208 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Get CPU Info by asm method */ -/* #undef CPU_INFO_BY_ASM */ - -/* Get CPU Info by c method */ -/* #undef CPU_INFO_BY_C */ - -/* Custom modes */ -/* #undef CUSTOM_MODES */ - -/* Do not build the float API */ -//#define DISABLE_FLOAT_API 1 - -/* Assertions */ -/* #undef ENABLE_ASSERTIONS */ - -/* Ambisonics Support */ -/* #undef ENABLE_EXPERIMENTAL_AMBISONICS */ - -/* Enable bitstream changes from draft-ietf-codec-opus-update */ -/* #undef ENABLE_UPDATE_DRAFT */ - -/* Debug fixed-point implementation */ -/* #undef FIXED_DEBUG */ - -/* Compile as fixed-point (for machines without a fast enough FPU) */ -#define FIXED_POINT 1 - -/* Float approximations */ -/* #undef FLOAT_APPROX */ - -/* Fuzzing */ -/* #undef FUZZING */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ALLOCA_H */ - -/* NE10 library is installed on host. Make sure it is on target! */ -/* #undef HAVE_ARM_NE10 */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ -#define HAVE_DLFCN_H 1 -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the `lrint' function. */ -/* #undef HAVE_LRINT */ -#define HAVE_LRINT 1 -/* Define to 1 if you have the `lrintf' function. */ -/* #undef HAVE_LRINTF */ -#define HAVE_LRINTF 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_MEMORY_H */ -#define HAVE_MEMORY_H 1 -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have the `__malloc_hook' function. */ -/* #undef HAVE___MALLOC_HOOK */ - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#define LT_OBJDIR ".libs/" - -/* Make use of ARM asm optimization */ -/* #undef OPUS_ARM_ASM */ - -/* Use generic ARMv4 inline asm optimizations */ -/* #undef OPUS_ARM_INLINE_ASM */ - -/* Use ARMv5E inline asm optimizations */ -/* #undef OPUS_ARM_INLINE_EDSP */ - -/* Use ARMv6 inline asm optimizations */ -/* #undef OPUS_ARM_INLINE_MEDIA */ - -/* Use ARM NEON inline asm optimizations */ -/* #undef OPUS_ARM_INLINE_NEON */ - -/* Define if assembler supports EDSP instructions */ -/* #undef OPUS_ARM_MAY_HAVE_EDSP */ - -/* Define if assembler supports ARMv6 media instructions */ -/* #undef OPUS_ARM_MAY_HAVE_MEDIA */ - -/* Define if compiler supports NEON instructions */ -/* #undef OPUS_ARM_MAY_HAVE_NEON */ - -/* Compiler supports ARMv7/Aarch64 Neon Intrinsics */ -/* #undef OPUS_ARM_MAY_HAVE_NEON_INTR */ - -/* Define if binary requires Aarch64 Neon Intrinsics */ -/* #undef OPUS_ARM_PRESUME_AARCH64_NEON_INTR */ - -/* Define if binary requires EDSP instruction support */ -/* #undef OPUS_ARM_PRESUME_EDSP */ - -/* Define if binary requires ARMv6 media instruction support */ -/* #undef OPUS_ARM_PRESUME_MEDIA */ - -/* Define if binary requires NEON instruction support */ -/* #undef OPUS_ARM_PRESUME_NEON */ - -/* Define if binary requires NEON intrinsics support */ -/* #undef OPUS_ARM_PRESUME_NEON_INTR */ - -/* This is a build of OPUS */ -#define OPUS_BUILD /**/ - -/* Run bit-exactness checks between optimized and c implementations */ -/* #undef OPUS_CHECK_ASM */ - -/* Use run-time CPU capabilities detection */ -/* #undef OPUS_HAVE_RTCD */ - -/* Compiler supports X86 AVX Intrinsics */ -/* #undef OPUS_X86_MAY_HAVE_AVX */ - -/* Compiler supports X86 SSE Intrinsics */ -/* #undef OPUS_X86_MAY_HAVE_SSE */ - -/* Compiler supports X86 SSE2 Intrinsics */ -/* #undef OPUS_X86_MAY_HAVE_SSE2 */ - -/* Compiler supports X86 SSE4.1 Intrinsics */ -/* #undef OPUS_X86_MAY_HAVE_SSE4_1 */ - -/* Define if binary requires AVX intrinsics support */ -/* #undef OPUS_X86_PRESUME_AVX */ - -/* Define if binary requires SSE intrinsics support */ -/* #undef OPUS_X86_PRESUME_SSE */ - -/* Define if binary requires SSE2 intrinsics support */ -/* #undef OPUS_X86_PRESUME_SSE2 */ - -/* Define if binary requires SSE4.1 intrinsics support */ -/* #undef OPUS_X86_PRESUME_SSE4_1 */ - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "opus@xiph.org" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "opus" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "opus 1.3.1" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "opus" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "1.3.1" - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Make use of alloca */ -/* #undef USE_ALLOCA */ - -/* Use C99 variable-size arrays */ -#define VAR_ARRAYS 1 - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif - -/* Define to the equivalent of the C99 'restrict' keyword, or to - nothing if this is not supported. Do not define if restrict is - supported directly. */ -#define restrict __restrict -/* Work around a bug in Sun C++: it does not support _Restrict or - __restrict__, even though the corresponding Sun C compiler ends up with - "#define restrict _Restrict" or "#define restrict __restrict__" in the - previous line. Perhaps some future version of Sun C++ will work with - restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ -#if defined __SUNPRO_CC && !defined __RESTRICT -#define _Restrict -#define __restrict__ -#endif diff --git a/components/opus/opus b/components/opus/opus deleted file mode 160000 index df9c4c8..0000000 --- a/components/opus/opus +++ /dev/null @@ -1 +0,0 @@ -Subproject commit df9c4c8e562b952ca14fa90ef21dff9a8dd2b3a4