eden-emu/opus
15
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-06-07 07:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Implements OPUS_{GET,SET}_LSB_DEPTH

Browse source 
This implements an API used in future encoders to avoid dynalloc doing silly things
on periodic LSB patterns and to reduce the bitrate on near-silence.
This commit is contained in:
Jean-Marc Valin 2012-07-11 02:54:47 -04:00 • committed by Gregory Maxwell
parent 02f19c26f1
commit 1cd5d95b3f
4 changed files with 42 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
celt/celt.c
View file

@ -156,6 +156,7 @@ struct OpusCustomEncoder {
int signalling; int signalling;
int constrained_vbr; /* If zero, VBR can do whatever it likes with the rate */ int constrained_vbr; /* If zero, VBR can do whatever it likes with the rate */
int loss_rate; int loss_rate;
int lsb_depth;
/* Everything beyond this point gets cleared on a reset */ /* Everything beyond this point gets cleared on a reset */
#define ENCODER_RESET_START rng #define ENCODER_RESET_START rng
@ -266,6 +267,7 @@ OPUS_CUSTOM_NOSTATIC int opus_custom_encoder_init(CELTEncoder *st, const CELTMod
st->vbr = 0; st->vbr = 0;
st->force_intra = 0; st->force_intra = 0;
st->complexity = 5; st->complexity = 5;
st->lsb_depth=24;
opus_custom_encoder_ctl(st, OPUS_RESET_STATE); opus_custom_encoder_ctl(st, OPUS_RESET_STATE);
@ -1823,6 +1825,20 @@ int opus_custom_encoder_ctl(CELTEncoder * OPUS_RESTRICT st, int request, ...)
st->stream_channels = value; st->stream_channels = value;
} }
break; break;
case OPUS_SET_LSB_DEPTH_REQUEST:
{
opus_int32 value = va_arg(ap, opus_int32);
if (value<8 || value>24)
goto bad_arg;
st->lsb_depth=value;
}
break;
case OPUS_GET_LSB_DEPTH_REQUEST:
{
opus_int32 *value = va_arg(ap, opus_int32*);
*value=st->lsb_depth;
}
break;
case OPUS_RESET_STATE: case OPUS_RESET_STATE:
{ {
int i; int i;

13
include/opus_defines.h
View file

@ -142,6 +142,8 @@ extern "C" {
#define OPUS_GET_PITCH_REQUEST 4033 #define OPUS_GET_PITCH_REQUEST 4033
#define OPUS_SET_GAIN_REQUEST 4034 #define OPUS_SET_GAIN_REQUEST 4034
#define OPUS_GET_GAIN_REQUEST 4045 #define OPUS_GET_GAIN_REQUEST 4045
#define OPUS_SET_LSB_DEPTH_REQUEST 4036
#define OPUS_GET_LSB_DEPTH_REQUEST 4037
/* Macros to trigger compilation errors when the wrong types are provided to a CTL */ /* Macros to trigger compilation errors when the wrong types are provided to a CTL */
#define __opus_check_int(x) (((void)((x) == (opus_int32)0)), (opus_int32)(x)) #define __opus_check_int(x) (((void)((x) == (opus_int32)0)), (opus_int32)(x))
@ -464,6 +466,17 @@ extern "C" {
* @hideinitializer */ * @hideinitializer */
#define OPUS_GET_BANDWIDTH(x) OPUS_GET_BANDWIDTH_REQUEST, __opus_check_int_ptr(x) #define OPUS_GET_BANDWIDTH(x) OPUS_GET_BANDWIDTH_REQUEST, __opus_check_int_ptr(x)
/** Configures the depth of signal being encoded.
* This is a hint which helps the encoder identify silence and near-silence.
* The supported values are between 8 and 24 (default)
* @param[in] x <tt>opus_int32</tt>: Input precision
* @hideinitializer */
#define OPUS_SET_LSB_DEPTH(x) OPUS_SET_LSB_DEPTH_REQUEST, __opus_check_int(x)
/** Gets the encoder's configured signal depth. @see OPUS_SET_LSB_DEPTH
*
* @param[out] x <tt>opus_int32*</tt>: Input precision
* @hideinitializer */
#define OPUS_GET_LSB_DEPTH(x) OPUS_GET_LSB_DEPTH_REQUEST, __opus_check_int_ptr(x)
/**@}*/ /**@}*/
/** @defgroup opus_decoderctls Decoder related CTLs /** @defgroup opus_decoderctls Decoder related CTLs

1
src/opus_demo.c
View file

@ -498,6 +498,7 @@ int main(int argc, char *argv[])
opus_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(packet_loss_perc)); opus_encoder_ctl(enc, OPUS_SET_PACKET_LOSS_PERC(packet_loss_perc));
opus_encoder_ctl(enc, OPUS_GET_LOOKAHEAD(&skip)); opus_encoder_ctl(enc, OPUS_GET_LOOKAHEAD(&skip));
opus_encoder_ctl(enc, OPUS_SET_LSB_DEPTH(16));
} }
if (!encode_only) if (!encode_only)
{ {

12
src/opus_encoder.c
View file

@ -1537,6 +1537,18 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
*value = st->rangeFinal; *value = st->rangeFinal;
} }
break; break;
case OPUS_SET_LSB_DEPTH_REQUEST:
{
opus_int32 value = va_arg(ap, opus_int32);
ret = celt_encoder_ctl(celt_enc, OPUS_SET_LSB_DEPTH(value));
}
break;
case OPUS_GET_LSB_DEPTH_REQUEST:
{
opus_int32 *value = va_arg(ap, opus_int32*);
celt_encoder_ctl(celt_enc, OPUS_GET_LSB_DEPTH(value));
}
break;
case OPUS_RESET_STATE: case OPUS_RESET_STATE:
{ {
void *silk_enc; void *silk_enc;