eden-emu/opus
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s/OPUS_SET_VBR_FLAG/OPUS_SET_VBR/

Browse source
This commit is contained in:
Jean-Marc Valin 2011-08-18 16:55:24 -04:00
parent 6bb1c1838d
commit d7f6700f16
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/opus.h
View file

@ -95,10 +95,10 @@ extern "C" {
#define OPUS_GET_BITRATE_REQUEST 3 #define OPUS_GET_BITRATE_REQUEST 3
#define OPUS_GET_BITRATE(x) OPUS_GET_BITRATE_REQUEST, __check_int_ptr(x) #define OPUS_GET_BITRATE(x) OPUS_GET_BITRATE_REQUEST, __check_int_ptr(x)
#define OPUS_SET_VBR_FLAG_REQUEST 6 #define OPUS_SET_VBR_REQUEST 6
#define OPUS_SET_VBR_FLAG(x) OPUS_SET_VBR_FLAG_REQUEST, __check_int(x) #define OPUS_SET_VBR(x) OPUS_SET_VBR_REQUEST, __check_int(x)
#define OPUS_GET_VBR_FLAG_REQUEST 7 #define OPUS_GET_VBR_REQUEST 7
#define OPUS_GET_VBR_FLAG(x) OPUS_GET_VBR_FLAG_REQUEST, __check_int_ptr(x) #define OPUS_GET_VBR(x) OPUS_GET_VBR_REQUEST, __check_int_ptr(x)
#define OPUS_SET_BANDWIDTH_REQUEST 8 #define OPUS_SET_BANDWIDTH_REQUEST 8
#define OPUS_SET_BANDWIDTH(x) OPUS_SET_BANDWIDTH_REQUEST, __check_int(x) #define OPUS_SET_BANDWIDTH(x) OPUS_SET_BANDWIDTH_REQUEST, __check_int(x)

4
src/opus_encoder.c
View file

@ -872,14 +872,14 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
*value = st->silk_mode.packetLossPercentage; *value = st->silk_mode.packetLossPercentage;
} }
break; break;
case OPUS_SET_VBR_FLAG_REQUEST: case OPUS_SET_VBR_REQUEST:
{ {
int value = va_arg(ap, int); int value = va_arg(ap, int);
st->use_vbr = value; st->use_vbr = value;
st->silk_mode.useCBR = 1-value; st->silk_mode.useCBR = 1-value;
} }
break; break;
case OPUS_GET_VBR_FLAG_REQUEST: case OPUS_GET_VBR_REQUEST:
{ {
int *value = va_arg(ap, int*); int *value = va_arg(ap, int*);
*value = st->use_vbr; *value = st->use_vbr;

2
src/test_opus.c
View file

@ -270,7 +270,7 @@ int main(int argc, char *argv[])
opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate_bps)); opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate_bps));
opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(bandwidth)); opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(bandwidth));
opus_encoder_ctl(enc, OPUS_SET_VBR_FLAG(use_vbr)); opus_encoder_ctl(enc, OPUS_SET_VBR(use_vbr));
opus_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(cvbr)); opus_encoder_ctl(enc, OPUS_SET_VBR_CONSTRAINT(cvbr));
opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(complexity)); opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(complexity));
opus_encoder_ctl(enc, OPUS_SET_INBAND_FEC_FLAG(use_inbandfec)); opus_encoder_ctl(enc, OPUS_SET_INBAND_FEC_FLAG(use_inbandfec));