nordic-dev.net/PAMGuard
nordic-dev.net/PAMGuard
2
0
Fork 0
mirror of https://github.com/PAMGuard/PAMGuard.git synced 2025-02-21 03:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix problem with merged files in acquisition. Was not working correctly

Browse Source 
and likely to merge files that shouldn't be merged.
This commit is contained in:
Douglas Gillespie 2022-02-08 10:51:43 +00:00
parent cff60ad335
commit cf3d6f3a6d
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Acquisition/FolderInputSystem.java
View File

@ -558,23 +558,35 @@ public class FolderInputSystem extends FileInputSystem implements PamSettings{
boolean ans = false; boolean ans = false;
if (folderInputParameters.mergeFiles == false) return false; if (folderInputParameters.mergeFiles == false) return false;
long fileEndTime = 0;
long currFileStart = 0;
long currFileLength = 0;
long currFileEnd = 0;
if (currentFile >= 0) {
try {
WavFileType currentWav = allFiles.get(currentFile);
currFileStart = getFileStartTime(currentWav.getAbsoluteFile());
if (audioStream != null) {
fileSamples = audioStream.getFrameLength();
currFileLength = (long) (fileSamples * 1000 / audioStream.getFormat().getFrameRate());
currFileEnd = currFileStart + currFileLength;
}
}
catch (Exception e) {
}
}
if (currFileEnd == 0) {
// System.out.println("OpenNextfile " + currentFile + " " + allFiles.get(currentFile).getName());
// also check to see if the start time of the next file is the same as the
// end time of the current file.
currFileEnd = PamCalendar.getTimeInMillis();
long lastBit = (long) ((blockSamples * 1000L) / getSampleRate());
currFileEnd += lastBit;
}
if (++currentFile < allFiles.size()) { if (++currentFile < allFiles.size()) {
if (currentFile >= 0) {
WavFileType currentWav = allFiles.get(currentFile);
fileEndTime = getFileStartTime(currentWav.getAbsoluteFile());
fileEndTime += currentWav.getDurationInSeconds()* 1000.;
}
else {
// System.out.println("OpenNextfile " + currentFile + " " + allFiles.get(currentFile).getName());
// also check to see if the start time of the next file is the same as the
// end time of the current file.
fileEndTime = PamCalendar.getTimeInMillis();
long lastBit = (long) ((blockSamples * 1000L) / getSampleRate());
fileEndTime += lastBit;
}
long newStartTime = getFileStartTime(getCurrentFile()); long newStartTime = getFileStartTime(getCurrentFile());
long diff = newStartTime - fileEndTime; long diff = newStartTime - currFileEnd;
if (diff > 2000 || diff < -5000 || newStartTime == 0) { if (diff > 2000 || diff < -5000 || newStartTime == 0) {
currentFile--; currentFile--;
return false; return false;

2
src/RightWhaleEdgeDetector/RWStandardClassifier.java
View File

@ -69,7 +69,7 @@ public class RWStandardClassifier implements RWClassifier {
@Override @Override
public int getSoundClass(RWESound aSound) { public int getSoundClass(RWESound aSound) {
int soundType = 0; int soundType = 0;
if (!isTonal(aSound)) { if (!isTonal(aSound)) {
return 0; return 0;
} }