summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Marc Valin <jmvalin@jmvalin.ca>2015-12-05 14:31:54 -0500
committerJean-Marc Valin <jmvalin@jmvalin.ca>2015-12-05 15:29:22 -0500
commit473693ee67fd14478a721fb7482574660db49d72 (patch)
tree0c2af55d99386884475d37f032018db50433f706
parentc10327bce063b2b791cfc4c5117ca10c4c470c45 (diff)
downloadopus-exp_lbr_tune2.tar.gz
Forces trim to 5 on hybrid modeexp_lbr_tune2
This saves bits and makes more sense since alloc_trim_analysis() mostly looks at the lower bands that are coded with SILK
-rw-r--r--celt/celt_encoder.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index 7bdd1e49..e33b9906 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -1886,12 +1886,15 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm,
alloc_trim = 5;
if (tell+(6<<BITRES) <= total_bits - total_boost)
{
- if (st->lfe)
+ if (start > 0 || st->lfe)
+ {
+ st->stereo_saving = 0;
alloc_trim = 5;
- else
+ } else {
alloc_trim = alloc_trim_analysis(mode, X, bandLogE,
end, LM, C, N, &st->analysis, &st->stereo_saving, tf_estimate,
st->intensity, surround_trim, st->arch);
+ }
ec_enc_icdf(enc, alloc_trim, trim_icdf, 7);
tell = ec_tell_frac(enc);
}