diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-11-07 14:18:11 -0500 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-11-07 14:18:31 -0500 |
| commit | 4b14ebb59276c84664e8dc605f41985a9e52b1e4 (patch) | |
| tree | 7ee88e1722262b2373542f8042b03affd46b2da4 | |
| parent | 301cd3fed4d35cfa6c2e91e9fb567acae715c701 (diff) | |
| download | opus-4b14ebb59276c84664e8dc605f41985a9e52b1e4.tar.gz | |
disable some analysis
| -rw-r--r-- | celt/celt_encoder.c | 6 | ||||
| -rw-r--r-- | src/opus_encoder.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c index 77de1b6e..2896976d 100644 --- a/celt/celt_encoder.c +++ b/celt/celt_encoder.c @@ -839,7 +839,7 @@ static int alloc_trim_analysis(const CELTMode *m, const celt_norm *X, trim -= SHR16(surround_trim, DB_SHIFT-8); trim -= 2*SHR16(tf_estimate, 14-8); #ifndef DISABLE_FLOAT_API - if (analysis->valid) + if (0 && analysis->valid) { trim -= MAX16(-QCONST16(2.f, 8), MIN16(QCONST16(2.f, 8), (opus_val16)(QCONST16(2.f, 8)*(analysis->tonality_slope+.05f)))); @@ -1242,7 +1242,7 @@ static int compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, opus_int32 /*printf("%f %f %f %f %d %d ", st->analysis.activity, st->analysis.tonality, tf_estimate, st->stereo_saving, tot_boost, coded_bands);*/ #ifndef DISABLE_FLOAT_API - if (analysis->valid && analysis->activity<.4) + if (0 && analysis->valid && analysis->activity<.4) target -= (opus_int32)((coded_bins<<BITRES)*(.4f-analysis->activity)); #endif /* Stereo savings */ @@ -2083,7 +2083,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm, bits -= anti_collapse_rsv; signalBandwidth = end-1; #ifndef DISABLE_FLOAT_API - if (st->analysis.valid) + if (0 && st->analysis.valid) { int min_bandwidth; if (equiv_rate < (opus_int32)32000*C) diff --git a/src/opus_encoder.c b/src/opus_encoder.c index a3bb1add..9c67e02a 100644 --- a/src/opus_encoder.c +++ b/src/opus_encoder.c @@ -1216,7 +1216,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ st->voice_ratio = -1; st->detected_bandwidth = 0; - if (analysis_info.valid) + if (0 && analysis_info.valid) { int analysis_bandwidth; if (st->signal_type == OPUS_AUTO) |