From 5174817d3627fe740d3903b341dafa7109d44be8 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jmvalin@jmvalin.ca>
Date: Fri, 8 Nov 2013 19:54:03 -0500
Subject: [PATCH] Hides OPUS_FRAMESIZE_VARIABLE from the API until it actually
works
---
celt/celt.h | 4 ++++
include/opus_defines.h | 1 -
tests/test_opus_api.c | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/celt/celt.h b/celt/celt.h
index 112f6f295..ad1c1d847 100644
--- a/celt/celt.h
+++ b/celt/celt.h
@@ -66,6 +66,10 @@ typedef struct {
/* Encoder/decoder Requests */
+/* Expose this option again when variable framesize actually works */
+#define OPUS_FRAMESIZE_VARIABLE 5010 /**< Optimize the frame size dynamically */
+
+
#define CELT_SET_PREDICTION_REQUEST 10002
/** Controls the use of interframe prediction.
0=Independent frames
diff --git a/include/opus_defines.h b/include/opus_defines.h
index af371b442..c39a60e31 100644
--- a/include/opus_defines.h
+++ b/include/opus_defines.h
@@ -206,7 +206,6 @@ extern "C" {
#define OPUS_FRAMESIZE_20_MS 5004 /**< Use 20 ms frames */
#define OPUS_FRAMESIZE_40_MS 5005 /**< Use 40 ms frames */
#define OPUS_FRAMESIZE_60_MS 5006 /**< Use 60 ms frames */
-#define OPUS_FRAMESIZE_VARIABLE 5010 /**< Optimize the frame size dynamically */
/**@}*/
diff --git a/tests/test_opus_api.c b/tests/test_opus_api.c
index fa1dabe70..6cbd2fa50 100644
--- a/tests/test_opus_api.c
+++ b/tests/test_opus_api.c
@@ -1374,7 +1374,7 @@ opus_int32 test_enc_api(void)
if(err!=OPUS_OK)test_failed();
cfgs++;
CHECK_SETGET(OPUS_SET_EXPERT_FRAME_DURATION(i),OPUS_GET_EXPERT_FRAME_DURATION(&i),0,-1,
- OPUS_FRAMESIZE_VARIABLE,OPUS_FRAMESIZE_ARG,
+ OPUS_FRAMESIZE_60_MS,OPUS_FRAMESIZE_ARG,
" OPUS_SET_EXPERT_FRAME_DURATION ............... OK.\n",
" OPUS_GET_EXPERT_FRAME_DURATION ............... OK.\n")
--
GitLab