Refactor prototypes to use the ARG_QEXT macro

Change-Id: Iea4e9895785551acc6c73ccb0708a3752858f9fe Signed-off-by: Jean-Marc Valin <jeanmarcv@google.com>
xiph · Feb 13, 2025 · 2060b3f · 2060b3f
1 parent e173883
commit 2060b3f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 42 deletions.
diff --git a/celt/bands.c b/celt/bands.c
@@ -1143,17 +1143,12 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
          /* Finally do the actual quantization */
          if (encode)
          {
-            cm = alg_quant(X, N, K, spread, B, ec, gain, ctx->resynth,
-#ifdef ENABLE_QEXT
-                           ctx->ext_ec, extra_bits,
-#endif
+            cm = alg_quant(X, N, K, spread, B, ec, gain, ctx->resynth
+                           ARG_QEXT(ctx->ext_ec) ARG_QEXT(extra_bits),
                            ctx->arch);
          } else {
             cm = alg_unquant(X, N, K, spread, B, ec, gain
-#ifdef ENABLE_QEXT
-                             , ctx->ext_ec, extra_bits
-#endif
-                  );
+                             ARG_QEXT(ctx->ext_ec) ARG_QEXT(extra_bits));
          }
 #ifdef ENABLE_QEXT
       } else if (ext_b > 2*N<<BITRES)
@@ -1611,10 +1606,8 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
       int dual_stereo, int intensity, int *tf_res, opus_int32 total_bits,
       opus_int32 balance, ec_ctx *ec, int LM, int codedBands,
       opus_uint32 *seed, int complexity, int arch, int disable_inv
-#ifdef ENABLE_QEXT
-      , ec_ctx *ext_ec, int *extra_pulses, opus_int32 ext_total_bits, const int *cap
-#endif
-      )
+      ARG_QEXT(ec_ctx *ext_ec) ARG_QEXT(int *extra_pulses)
+      ARG_QEXT(opus_int32 ext_total_bits) ARG_QEXT(const int *cap))
 {
    int i;
    opus_int32 remaining_bits;

diff --git a/celt/bands.h b/celt/bands.h
@@ -109,10 +109,8 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
       int dual_stereo, int intensity, int *tf_res, opus_int32 total_bits,
       opus_int32 balance, ec_ctx *ec, int M, int codedBands, opus_uint32 *seed,
       int complexity, int arch, int disable_inv
-#ifdef ENABLE_QEXT
-      , ec_ctx *ext_ec, int *extra_pulses, opus_int32 total_ext_bits, const int *cap
-#endif
-      );
+      ARG_QEXT(ec_ctx *ext_ec) ARG_QEXT(int *extra_pulses)
+      ARG_QEXT(opus_int32 total_ext_bits) ARG_QEXT(const int *cap));
 
 void anti_collapse(const CELTMode *m, celt_norm *X_,
       unsigned char *collapse_masks, int LM, int C, int size, int start,

diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c
@@ -1393,10 +1393,8 @@ int celt_decode_with_ec_dred(CELTDecoder * OPUS_RESTRICT st, const unsigned char
          NULL, pulses, shortBlocks, spread_decision, dual_stereo, intensity, tf_res,
          len*(8<<BITRES)-anti_collapse_rsv, balance, dec, LM, codedBands, &st->rng, 0,
          st->arch, st->disable_inv
-#ifdef ENABLE_QEXT
-      , &ext_dec, extra_pulses, qext_bytes*(8<<BITRES), cap
-#endif
-         );
+         ARG_QEXT(&ext_dec) ARG_QEXT(extra_pulses)
+         ARG_QEXT(qext_bytes*(8<<BITRES)) ARG_QEXT(cap));
 
 #ifdef ENABLE_QEXT
    if (qext_mode) {

diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
@@ -2585,10 +2585,8 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_res * pcm, in
          bandE, pulses, shortBlocks, st->spread_decision,
          dual_stereo, st->intensity, tf_res, nbCompressedBytes*(8<<BITRES)-anti_collapse_rsv,
          balance, enc, LM, codedBands, &st->rng, st->complexity, st->arch, st->disable_inv
-#ifdef ENABLE_QEXT
-      , &ext_enc, extra_pulses, qext_bytes*(8<<BITRES), cap
-#endif
-         );
+         ARG_QEXT(&ext_enc) ARG_QEXT(extra_pulses)
+         ARG_QEXT(qext_bytes*(8<<BITRES)) ARG_QEXT(cap));
 
 #ifdef ENABLE_QEXT
    if (qext_mode) {

diff --git a/celt/vq.c b/celt/vq.c
@@ -526,11 +526,8 @@ static int ec_dec_refine(ec_enc *dec, opus_int32 up, int extra_bits, int use_ent
 #endif
 
 unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
-      opus_val32 gain, int resynth,
-#ifdef ENABLE_QEXT
-      ec_enc *ext_enc, int extra_bits,
-#endif
-      int arch)
+      opus_val32 gain, int resynth
+      ARG_QEXT(ec_enc *ext_enc) ARG_QEXT(int extra_bits), int arch)
 {
    VARDECL(int, iy);
    opus_val32 yy;
@@ -600,10 +597,7 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
     the final normalised signal in the current band. */
 unsigned alg_unquant(celt_norm *X, int N, int K, int spread, int B,
       ec_dec *dec, opus_val32 gain
-#ifdef ENABLE_QEXT
-      , ec_enc *ext_dec, int extra_bits
-#endif
-      )
+      ARG_QEXT(ec_enc *ext_dec) ARG_QEXT(int extra_bits))
 {
    opus_val32 Ryy;
    unsigned collapse_mask;

diff --git a/celt/vq.h b/celt/vq.h
@@ -74,11 +74,8 @@ opus_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch);
  * @ret A mask indicating which blocks in the band received pulses
 */
 unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
-      opus_val32 gain, int resynth,
-#ifdef ENABLE_QEXT
-      ec_enc *ext_enc, int extra_bits,
-#endif
-      int arch);
+      opus_val32 gain, int resynth
+      ARG_QEXT(ec_enc *ext_enc) ARG_QEXT(int extra_bits), int arch);
 
 /** Algebraic pulse decoder
  * @param X Decoded normalised spectrum (returned)
@@ -89,10 +86,7 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc,
  */
 unsigned alg_unquant(celt_norm *X, int N, int K, int spread, int B,
       ec_dec *dec, opus_val32 gain
-#ifdef ENABLE_QEXT
-      , ec_enc *ext_dec, int extra_bits
-#endif
-      );
+      ARG_QEXT(ec_enc *ext_dec) ARG_QEXT(int extra_bits));
 
 void renormalise_vector(celt_norm *X, int N, opus_val32 gain, int arch);