diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-02-20 04:08:04 -0500 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-02-20 04:08:34 -0500 |
| commit | 51f4a32ec2b62fd7c53e7b901fefd38ff95e7cc2 (patch) | |
| tree | e963338c7c0b091ed7d03512fb6d7b62d096ccc0 /include | |
| parent | 10a34a5dd66ff45538ac3843eab7802d260e160f (diff) | |
| download | opus-51f4a32ec2b62fd7c53e7b901fefd38ff95e7cc2.tar.gz | |
Adds support for delayed decision
Variable duration option renamed to OPUS_SET_EXPERT_FRAME_DURATION,
with new API.
Also moves up the analysis to avoid having to do int->float conversion
on large buffers.
Diffstat (limited to 'include')
| -rw-r--r-- | include/opus_defines.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include/opus_defines.h b/include/opus_defines.h index e9434aab..203144a7 100644 --- a/include/opus_defines.h +++ b/include/opus_defines.h @@ -149,8 +149,8 @@ extern "C" { #define OPUS_SET_LSB_DEPTH_REQUEST 4036 #define OPUS_GET_LSB_DEPTH_REQUEST 4037 #define OPUS_GET_LAST_PACKET_DURATION_REQUEST 4039 -#define OPUS_SET_EXPERT_VARIABLE_DURATION_REQUEST 4040 -#define OPUS_GET_EXPERT_VARIABLE_DURATION_REQUEST 4041 +#define OPUS_SET_EXPERT_FRAME_DURATION_REQUEST 4040 +#define OPUS_GET_EXPERT_FRAME_DURATION_REQUEST 4041 /* Don't use 4045, it's already taken by OPUS_GET_GAIN_REQUEST */ @@ -186,6 +186,15 @@ extern "C" { #define OPUS_BANDWIDTH_SUPERWIDEBAND 1104 /**<12 kHz bandpass @hideinitializer*/ #define OPUS_BANDWIDTH_FULLBAND 1105 /**<20 kHz bandpass @hideinitializer*/ +#define OPUS_FRAMESIZE_ARG 5000 /**< Select frame size from the argument (default) */ +#define OPUS_FRAMESIZE_2_5_MS 5001 /**< Use 2.5 ms frames */ +#define OPUS_FRAMESIZE_5_MS 5002 /**< Use 5 ms frames */ +#define OPUS_FRAMESIZE_10_MS 5003 /**< Use 10 ms frames */ +#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 */ + /**@}*/ @@ -541,7 +550,7 @@ extern "C" { * <dt>1</dt><dd>Enable variable duration.</dd> * </dl> * @hideinitializer */ -#define OPUS_SET_EXPERT_VARIABLE_DURATION(x) OPUS_SET_EXPERT_VARIABLE_DURATION_REQUEST, __opus_check_int(x) +#define OPUS_SET_EXPERT_FRAME_DURATION(x) OPUS_SET_EXPERT_FRAME_DURATION_REQUEST, __opus_check_int(x) /** Gets the encoder's configured use of variable duration frames. * @see OPUS_SET_EXPERT_VARIABLE_DURATION * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values: @@ -550,7 +559,7 @@ extern "C" { * <dt>1</dt><dd>variable duration enabled.</dd> * </dl> * @hideinitializer */ -#define OPUS_GET_EXPERT_VARIABLE_DURATION(x) OPUS_GET_EXPERT_VARIABLE_DURATION_REQUEST, __opus_check_int_ptr(x) +#define OPUS_GET_EXPERT_FRAME_DURATION(x) OPUS_GET_EXPERT_FRAME_DURATION_REQUEST, __opus_check_int_ptr(x) /**@}*/ |