MajenkoProjects/AudiobookRecorder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve caching policy

Browse Source
This commit is contained in:
Matt Jenkins
2019-07-23 12:44:24 +01:00
parent babd3d2052
commit c43cfc3b69
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/uk/co/majenko/audiobookrecorder/CacheManager.java
View File

@@ -18,6 +18,8 @@ public class CacheManager {
} }
cache.add(c); cache.add(c);
System.gc();
} }
public static void setCacheSize(int c) { public static void setCacheSize(int c) {

2
src/uk/co/majenko/audiobookrecorder/Options.java
View File

@@ -331,7 +331,7 @@ public class Options extends JDialog {
addSeparator(optionsPanel); addSeparator(optionsPanel);
cacheSize = addSpinner(optionsPanel, "Cache size:", 0, 5000, 1, getInteger("cache.size"), ""); cacheSize = addSpinner(optionsPanel, "Cache size:", 2, 100, 1, getInteger("cache.size"), "");
addSeparator(optionsPanel); addSeparator(optionsPanel);
tabs.add("Options", new JScrollPane(optionsPanel)); tabs.add("Options", new JScrollPane(optionsPanel));

22
src/uk/co/majenko/audiobookrecorder/Sentence.java
View File

@@ -68,7 +68,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
double[][] audioData = null; double[][] audioData = null;
// double[][] processedAudio = null; double[][] processedAudio = null;
RecordingThread recordingThread; RecordingThread recordingThread;
@@ -181,7 +181,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
} }
audioData = null; audioData = null;
// processedAudio = null; processedAudio = null;
storedFormat = null; storedFormat = null;
storedLength = -1; storedLength = -1;
@@ -558,7 +558,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
public void clearCache() { public void clearCache() {
audioData = null; audioData = null;
// processedAudio = null; processedAudio = null;
} }
public boolean lockedInCache() { public boolean lockedInCache() {
@@ -962,17 +962,20 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
} }
synchronized public double[][] getProcessedAudioData() { synchronized public double[][] getProcessedAudioData() {
long start = System.nanoTime();
loadFile(); loadFile();
// if (processedAudio != null) return processedAudio; long p1 = System.nanoTime();
if (processedAudio != null) return processedAudio;
if (audioData == null) return null; if (audioData == null) return null;
double[][] processedAudio = new double[audioData.length][2]; processedAudio = new double[audioData.length][2];
for (int i = 0; i < audioData.length; i++) { for (int i = 0; i < audioData.length; i++) {
processedAudio[i][LEFT] = audioData[i][LEFT]; processedAudio[i][LEFT] = audioData[i][LEFT];
processedAudio[i][RIGHT] = audioData[i][RIGHT]; processedAudio[i][RIGHT] = audioData[i][RIGHT];
} }
// Add processing in here. // Add processing in here.
long p2 = System.nanoTime();
String def = AudiobookRecorder.window.getDefaultEffectsChain(); String def = AudiobookRecorder.window.getDefaultEffectsChain();
Effect eff = AudiobookRecorder.window.effects.get(def); Effect eff = AudiobookRecorder.window.effects.get(def);
@@ -982,6 +985,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
eff.process(processedAudio); eff.process(processedAudio);
} }
long p3 = System.nanoTime();
if (effectChain != null) { if (effectChain != null) {
// Don't double up the default chain // Don't double up the default chain
if (!effectChain.equals(def)) { if (!effectChain.equals(def)) {
@@ -993,11 +997,19 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
} }
} }
long p4 = System.nanoTime();
// Add final master gain stage // Add final master gain stage
for (int i = 0; i < processedAudio.length; i++) { for (int i = 0; i < processedAudio.length; i++) {
processedAudio[i][LEFT] *= gain; processedAudio[i][LEFT] *= gain;
processedAudio[i][RIGHT] *= gain; processedAudio[i][RIGHT] *= gain;
} }
long p5 = System.nanoTime();
System.err.println("Time to load file: " + (p1 - start));
System.err.println("Time to clone data: " + (p2 - p1));
System.err.println("Time to apply default effect: " + (p3 - p2));
System.err.println("Time to apply selected effect: " + (p4 - p3));
System.err.println("Time to set gain: " + (p5 - p4));
return processedAudio; return processedAudio;
} }