Adding constrained VBR mode

This commit is contained in:
Jean-Marc Valin 2011-03-14 15:11:44 -04:00
parent d8571e4b87
commit b55b66119b
5 changed files with 25 additions and 1 deletions

View file

@ -360,6 +360,7 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
if (st->use_vbr)
{
celt_encoder_ctl(st->celt_enc, CELT_SET_VBR(1));
celt_encoder_ctl(st->celt_enc, CELT_SET_VBR_CONSTRAINT(st->vbr_constraint));
celt_encoder_ctl(st->celt_enc, CELT_SET_BITRATE(st->bitrate_bps));
nb_compr_bytes = max_data_bytes-1;
} else {
@ -616,6 +617,18 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
*value = st->voice_ratio;
}
break;
case OPUS_SET_VBR_CONSTRAINT_REQUEST:
{
int value = va_arg(ap, int);
st->vbr_constraint = value;
}
break;
case OPUS_GET_VBR_CONSTRAINT_REQUEST:
{
int *value = va_arg(ap, int*);
*value = st->vbr_constraint;
}
break;
default:
fprintf(stderr, "unknown opus_encoder_ctl() request: %d", request);
break;