diff options
| author | Timothy B. Terriberry <tterribe@xiph.org> | 2014-12-26 19:31:39 +0300 |
|---|---|---|
| committer | Timothy B. Terriberry <tterribe@xiph.org> | 2014-12-26 19:31:39 +0300 |
| commit | 23f503ad1c388aa9171af931ccb2f114f0839e0e (patch) | |
| tree | 65d2af79b0299b522108ddefc06309ef6021e11c | |
| parent | 0b0a2b4d066c2be3d551ba6429854c20ae147204 (diff) | |
Fix warnings in pedantic build.
This should suppress our current issues with unused parameters,
unused variables, and set-but-not-used variables.
| -rw-r--r-- | celt/celt_encoder.c | 5 | ||||
| -rw-r--r-- | src/opus_encoder.c | 13 |
2 files changed, 17 insertions, 1 deletions
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c index 6e2827f6..86a3fbb5 100644 --- a/celt/celt_encoder.c +++ b/celt/celt_encoder.c @@ -815,6 +815,8 @@ static int alloc_trim_analysis(const CELTMode *m, const celt_norm *X, 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 @@ static int compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, opus_int32 /*printf("%f %f ", analysis->tonality, tonal);*/ target = tonal_target; } +#else + (void)analysis; + (void)pitch_change; #endif if (has_surround_mask&&!lfe) diff --git a/src/opus_encoder.c b/src/opus_encoder.c index cdcee083..d94163f4 100644 --- a/src/opus_encoder.c +++ b/src/opus_encoder.c @@ -838,6 +838,12 @@ opus_int32 compute_frame_size(const void *analysis_pcm, int frame_size, 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 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ 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 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ 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 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ c1, c2, analysis_channels, st->Fs, lsb_depth, downmix, &analysis_info); } +#else + (void)analysis_pcm; + (void)analysis_size; #endif st->voice_ratio = -1; |