Fix normalize

This commit is contained in:
2020-01-11 12:31:59 +00:00
parent fde4a597c7
commit 575537ae66
@@ -679,17 +679,21 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
} }
public double getPeakValue() { public double getPeakValue() {
return getPeakValue(false); return getPeakValue(false, true);
} }
public double getPeakValue(boolean useRaw) { public double getPeakValue(boolean useRaw) {
return getPeakValue(useRaw, true);
}
public double getPeakValue(boolean useRaw, boolean applyGain) {
double oldGain = gain; double oldGain = gain;
gain = 1.0d; gain = 1.0d;
double[][] samples = null; double[][] samples = null;
if (useRaw) { if (useRaw) {
samples = getRawAudioData(); samples = getRawAudioData();
} else { } else {
samples = getProcessedAudioData(); samples = getProcessedAudioData(true, applyGain);
} }
gain = oldGain; gain = oldGain;
if (samples == null) { if (samples == null) {
@@ -731,7 +735,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
public void normalize() { public void normalize() {
if (locked) return; if (locked) return;
double max = getPeakValue(); double max = getPeakValue(true, false);
double d = 0.708 / max; double d = 0.708 / max;
if (d > 1d) d = 1d; if (d > 1d) d = 1d;
setGain(d); setGain(d);
@@ -1155,10 +1159,14 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
} }
synchronized public double[][] getProcessedAudioData() { synchronized public double[][] getProcessedAudioData() {
return getProcessedAudioData(true); return getProcessedAudioData(true, true);
} }
synchronized public double[][] getProcessedAudioData(boolean effectsEnabled) { synchronized public double[][] getProcessedAudioData(boolean effectsEnabled) {
return getProcessedAudioData(effectsEnabled, true);
}
synchronized public double[][] getProcessedAudioData(boolean effectsEnabled, boolean applyGain) {
loadFile(); loadFile();
if (processedAudio != null) { if (processedAudio != null) {
return processedAudio; return processedAudio;