From 580b307fd791c0997a8831bc800bba87797bfb7e Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Mon, 20 May 2013 22:25:57 +0200 Subject: Sync opus codec to upstream git Sync opus codec to upstream commit 02fed471a4568852d6618e041c4f2af0d7730ee2 (August 30 2013) This brings in a lot of optimizations but also makes the diff between our codec and the upstream much smaller as most of our optimizations have been upstreamed or supeceded. Speedups across the board for CELT mode files: 64kbps 128kbps H300 9.82MHz 15.48MHz c200 4.86MHz 9.63MHz fuze v1 10.32MHz 15.92MHz For the silk mode test file (16kbps) arm targets get a speedup of about 2MHz while the H300 is 7.8MHz slower, likely because it's now using the pseudostack more rather than the real stack which is in iram. Patches to get around that are upcomming. Change-Id: Ifecf963e461c51ac42e09dac1e91bc4bc3b12fa3 --- lib/rbcodec/codecs/libopus/config.h | 55 +++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 lib/rbcodec/codecs/libopus/config.h (limited to 'lib/rbcodec/codecs/libopus/config.h') diff --git a/lib/rbcodec/codecs/libopus/config.h b/lib/rbcodec/codecs/libopus/config.h new file mode 100644 index 0000000000..e2d9b1e9aa --- /dev/null +++ b/lib/rbcodec/codecs/libopus/config.h @@ -0,0 +1,55 @@ +#ifndef CONFIG_H +#define CONFIG_H + +#include "rbcodecconfig.h" +#include "codeclib.h" +#include "ogg/ogg.h" + +/* general stuff */ +#define OPUS_BUILD + +/* alloc stuff */ +#define NONTHREADSAFE_PSEUDOSTACK + +#define OVERRIDE_OPUS_ALLOC +#define OVERRIDE_OPUS_FREE +#define OVERRIDE_OPUS_ALLOC_SCRATCH + +#define opus_alloc _ogg_malloc +#define opus_free _ogg_free +#define opus_alloc_scratch _ogg_malloc + +/* lrint */ +#define HAVE_LRINTF 0 +#define HAVE_LRINT 0 + +/* embedded stuff */ +#define FIXED_POINT +#define DISABLE_FLOAT_API +#define EMBEDDED_ARM 1 + +/* undefinitions */ +#ifdef ABS +#undef ABS +#endif +#ifdef MIN +#undef MIN +#endif +#ifdef MAX +#undef MAX +#endif + +#if defined(CPU_ARM) +#if ARM_ARCH == 4 +#define ARMv4_ASM +#elif ARM_ARCH > 4 +#define ARMv5E_ASM +#endif +#endif + +#if defined(CPU_COLDFIRE) +#define CF_ASM +#endif + +#endif /* CONFIG_H */ + -- cgit v1.2.3