shithub: opus

Info  •  Files  •  Log  •  Branches

s/OPUS_SET_VBR_FLAG/OPUS_SET_VBR/

--- a/src/opus.h

+++ b/src/opus.h

@@ -95,10 +95,10 @@

 #define OPUS_GET_BITRATE_REQUEST 3

 #define OPUS_GET_BITRATE(x) OPUS_GET_BITRATE_REQUEST, __check_int_ptr(x)

-#define OPUS_SET_VBR_FLAG_REQUEST 6

-#define OPUS_SET_VBR_FLAG(x) OPUS_SET_VBR_FLAG_REQUEST, __check_int(x)

-#define OPUS_GET_VBR_FLAG_REQUEST 7

-#define OPUS_GET_VBR_FLAG(x) OPUS_GET_VBR_FLAG_REQUEST, __check_int_ptr(x)

+#define OPUS_SET_VBR_REQUEST 6

+#define OPUS_SET_VBR(x) OPUS_SET_VBR_REQUEST, __check_int(x)

+#define OPUS_GET_VBR_REQUEST 7

+#define OPUS_GET_VBR(x) OPUS_GET_VBR_REQUEST, __check_int_ptr(x)

 #define OPUS_SET_BANDWIDTH_REQUEST 8

 #define OPUS_SET_BANDWIDTH(x) OPUS_SET_BANDWIDTH_REQUEST, __check_int(x)

--- a/src/opus_encoder.c

+++ b/src/opus_encoder.c

@@ -872,7 +872,7 @@

             *value = st->silk_mode.packetLossPercentage;

         }

         break;

-        case OPUS_SET_VBR_FLAG_REQUEST:

+        case OPUS_SET_VBR_REQUEST:

         {

             int value = va_arg(ap, int);

             st->use_vbr = value;

@@ -879,7 +879,7 @@

             st->silk_mode.useCBR = 1-value;

         }

         break;

-        case OPUS_GET_VBR_FLAG_REQUEST:

+        case OPUS_GET_VBR_REQUEST:

         {

             int *value = va_arg(ap, int*);

             *value = st->use_vbr;

--- a/src/test_opus.c

+++ b/src/test_opus.c

@@ -270,7 +270,7 @@

     opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate_bps));

     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_COMPLEXITY(complexity));

     opus_encoder_ctl(enc, OPUS_SET_INBAND_FEC_FLAG(use_inbandfec));