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 02:29:33 -0400
commit2b9df35eac5d5095937d08f69cc1be4dfddd68c3 (patch)
treeec1413a86e35fc734662961266bffa0f62866650
parent6c6eb89880ebdfff2c4d64823d2ec9c7206c7066 (diff)
downloadopus-exp_temporal1.tar.gz
Some tuning of temporal VBR.exp_temporal1
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 a8006e39..d21443f1 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -1210,9 +1210,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;
}