Use SPREAD_AGGRESSIVE on non-transient hybrid frames

f705e9b5 · Jean-Marc Valin · 8229f07d · f705e9b5
Commit f705e9b5 authored Jun 06, 2016 by Jean-Marc Valin
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

celt/celt_encoder.c celt/celt_encoder.c +9 -1

No files found.
--- 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;