diff options
author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-06-06 20:43:13 +0300 |
---|---|---|
committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2016-07-08 00:20:07 +0300 |
commit | 43e038d67f0014a6638d40de83185243fd686b30 (patch) | |
tree | b9516798fe0c77fa9059585b0b1a30607e25386a | |
parent | f4e2ca3b6fc375acef801720e98a5fcd9a1ae1af (diff) |
Use SPREAD_AGGRESSIVE on non-transient hybrid frames
-rw-r--r-- | celt/celt_encoder.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c index 29f67c94..9486bd16 100644 --- a/celt/celt_encoder.c +++ b/celt/celt_encoder.c @@ -1800,7 +1800,15 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm, { st->tapset_decision = 0; st->spread_decision = SPREAD_NORMAL; - } else if (shortBlocks || st->complexity < 3 || nbAvailableBytes < 10*C || hybrid) + } else if (hybrid) + { + if (st->complexity == 0) + st->spread_decision = SPREAD_NONE; + else if (isTransient) + st->spread_decision = SPREAD_NORMAL; + else + st->spread_decision = SPREAD_AGGRESSIVE; + } else if (shortBlocks || st->complexity < 3 || nbAvailableBytes < 10*C) { if (st->complexity == 0) st->spread_decision = SPREAD_NONE; |