From f4d2c034a629726cf5978fdcac7f60c0af2e3add Mon Sep 17 00:00:00 2001
From: Gregory Maxwell <greg@xiph.org>
Date: Sun, 24 Nov 2013 06:49:01 -0800
Subject: [PATCH] Put custom_encoder_init decl behind CUSTOM_MODES. More
softclip tests.
This removes an unused definition warning when compiling without
custom modes.
---
include/opus_custom.h | 5 +++--
tests/test_opus_decode.c | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/include/opus_custom.h b/include/opus_custom.h
index dcfbcd8a2..41f36bf2f 100644
--- a/include/opus_custom.h
+++ b/include/opus_custom.h
@@ -140,6 +140,7 @@ OPUS_CUSTOM_EXPORT_STATIC OPUS_WARN_UNUSED_RESULT int opus_custom_encoder_get_si
int channels
) OPUS_ARG_NONNULL(1);
+# ifdef CUSTOM_MODES
/** Initializes a previously allocated encoder state
* The memory pointed to by st must be the size returned by opus_custom_encoder_get_size.
* This is intended for applications which use their own allocator instead of malloc.
@@ -152,12 +153,12 @@ OPUS_CUSTOM_EXPORT_STATIC OPUS_WARN_UNUSED_RESULT int opus_custom_encoder_get_si
* @param [in] channels <tt>int</tt>: Number of channels
* @return OPUS_OK Success or @ref opus_errorcodes
*/
-OPUS_CUSTOM_EXPORT_STATIC int opus_custom_encoder_init(
+OPUS_CUSTOM_EXPORT int opus_custom_encoder_init(
OpusCustomEncoder *st,
const OpusCustomMode *mode,
int channels
) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
-
+# endif
#endif
diff --git a/tests/test_opus_decode.c b/tests/test_opus_decode.c
index 88c6b21c9..9c0eb9c72 100644
--- a/tests/test_opus_decode.c
+++ b/tests/test_opus_decode.c
@@ -384,7 +384,7 @@ void test_soft_clip(void)
{
for (j=0;j<1024;j++)
{
- x[j]=(i&511)*(1/128.f)-2.f;
+ x[j]=(i&255)*(1/32.f)-4.f;
}
opus_pcm_soft_clip(&x[i],1024-i,1,s);
for (j=i;j<1024;j++)
@@ -397,7 +397,7 @@ void test_soft_clip(void)
{
for (j=0;j<1024;j++)
{
- x[j]=(i&511)*(1/128.f)-2.f;
+ x[j]=(i&255)*(1/32.f)-4.f;
}
opus_pcm_soft_clip(x,1024/i,i,s);
for (j=0;j<(1024/i)*i;j++)
--
GitLab