shithub: opus

Info  •  Files  •  Log  •  Branches

Fix warnings in pedantic build.

This should suppress our current issues with unused parameters,
 unused variables, and set-but-not-used variables.

--- a/celt/celt_encoder.c

+++ b/celt/celt_encoder.c

@@ -815,6 +815,8 @@

       trim -= MAX16(-QCONST16(2.f, 8), MIN16(QCONST16(2.f, 8),

             (opus_val16)(QCONST16(2.f, 8)*(analysis->tonality_slope+.05f))));

    }

+#else

+   (void)analysis;

 #endif

 #ifdef FIXED_POINT

@@ -1251,6 +1253,9 @@

       /*printf("%f %f ", analysis->tonality, tonal);*/

       target = tonal_target;

    }

+#else

+   (void)analysis;

+   (void)pitch_change;

 #endif

    if (has_surround_mask&&!lfe)

--- a/src/opus_encoder.c

+++ b/src/opus_encoder.c

@@ -838,6 +838,12 @@

          LM--;

       frame_size = (Fs/400<<LM);

    } else

+#else

+   (void)analysis_pcm;

+   (void)C;

+   (void)bitrate_bps;

+   (void)delay_compensation;

+   (void)downmix;

 #endif

    {

       frame_size = frame_size_select(frame_size, variable_duration, Fs);

@@ -957,9 +963,11 @@

     int total_buffer;

     opus_val16 stereo_width;

     const CELTMode *celt_mode;

+#ifndef DISABLE_FLOAT_API

     AnalysisInfo analysis_info;

     int analysis_read_pos_bak=-1;

     int analysis_read_subframe_bak=-1;

+#endif

     VARDECL(opus_val16, tmp_prefill);

     ALLOC_STACK;

@@ -985,9 +993,9 @@

     lsb_depth = IMIN(lsb_depth, st->lsb_depth);

-    analysis_info.valid = 0;

     celt_encoder_ctl(celt_enc, CELT_GET_MODE(&celt_mode));

 #ifndef DISABLE_FLOAT_API

+    analysis_info.valid = 0;

 #ifdef FIXED_POINT

     if (st->silk_mode.complexity >= 10 && st->Fs==48000)

 #else

@@ -1000,6 +1008,9 @@

              c1, c2, analysis_channels, st->Fs,

              lsb_depth, downmix, &analysis_info);

     }

+#else

+    (void)analysis_pcm;

+    (void)analysis_size;

 #endif

     st->voice_ratio = -1;