summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Marc Valin <jmvalin@jmvalin.ca>2013-06-13 02:29:33 -0400
committerJean-Marc Valin <jmvalin@jmvalin.ca>2013-06-13 16:19:11 -0400
commit3be9b3b05cff8267d7cb3c77ba72a3d4b29a0e2e (patch)
tree52596bae52b9285a31d9c896a494f0bfa5380ca2
parent21d0c7f4225fed958011f2dbd9898f163ec35f3a (diff)
downloadopus-exp_temporal.tar.gz
Some tuning of temporal VBR.exp_temporal
Now reduce the effect as the bitrate goes up and don't boost already-boosted transients.
-rw-r--r--celt/celt_encoder.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index ab1246ed..2e97de2e 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -1211,9 +1211,11 @@ static int compute_vbr(const CELTMode *mode, AnalysisInfo *analysis, opus_int32
}
- if (1) {
- opus_val16 factor = temporal_shaping*.1;
- factor = MAX16(-.5, MIN16(.5, factor));
+ if (tf_estimate < .2) {
+ opus_val16 amount;
+ opus_val16 factor;
+ amount = MAX16(0, MIN16(.25, .000006f*(68000-bitrate)));
+ factor = temporal_shaping*amount;
target += factor*target;
}