From 19384e04ab232de8f19ef2e404b61007d31091f6 Mon Sep 17 00:00:00 2001
From: lamipaul <paulobest25@gmail.com>
Date: Thu, 26 Jan 2023 15:16:55 +0100
Subject: [PATCH] new rapport params

---
 Rapport2wavs.py   |  35 +++++++++++++++++------------------
 RapportInfo2txt   | Bin 17072 -> 16368 bytes
 RapportInfo2txt.c |   7 ++++---
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Rapport2wavs.py b/Rapport2wavs.py
index 11ce8f9..6b0340d 100644
--- a/Rapport2wavs.py
+++ b/Rapport2wavs.py
@@ -6,11 +6,12 @@ parser = argparse.ArgumentParser()
 parser.add_argument('filename')
 args = parser.parse_args()
 
-RORQUAL_HOPSIZE, RORQUAL_WINSIZE, RORQUAL_FE = 256, 4096, 4000
-CACHA_HOPSIZE, CACHA_WINSIZE, CACHA_FE = 256, 512, 64000
-RAPPORT_FE = 128_000
-rorqual_predPos = lambda p: int(((p * RORQUAL_HOPSIZE + (RORQUAL_WINSIZE/2 + RORQUAL_HOPSIZE * 13) / 2) / RORQUAL_FE - 1) * RAPPORT_FE)
-cacha_predPos = lambda p: int(((p * CACHA_HOPSIZE * 8 + (CACHA_WINSIZE + CACHA_HOPSIZE * 7 * 6) / 2) / CACHA_FE - 0.05) * RAPPORT_FE)
+RORQUAL_HOPSIZE, RORQUAL_WINSIZE, RORQUAL_FE, RORQUAL_SAMPLEPERSAMPLE = 256, 4096, 4000, 25600
+CACHA_HOPSIZE, CACHA_WINSIZE, CACHA_FE, CACHA_SAMPLEPERSAMPLE = 256, 512, 64000, 12800
+CACHA_RAPPORT_FE, RORQUAL_RAPPORT_FE, RAPPORT_N_CHANNELS = 128_000, 128_00, 5
+CACHA_NUM_DETEC, RORQUAL_NUM_DETEC = 10, 3
+rorqual_predPos = lambda p: int(((p * RORQUAL_HOPSIZE + (RORQUAL_WINSIZE/2 + RORQUAL_HOPSIZE * 13) / 2) / RORQUAL_FE - 1) * RORQUAL_RAPPORT_FE)
+cacha_predPos = lambda p: int(((p * CACHA_HOPSIZE * 8 + (CACHA_WINSIZE + CACHA_HOPSIZE * 7 * 6) / 4 ) / CACHA_FE - 0.05) * CACHA_RAPPORT_FE)
 
 file = open(args.filename, 'r')
 lines = iter(file.readlines())
@@ -19,26 +20,24 @@ for l in lines:
     if l == ' rorqual predPeaks\n':
         l = next(lines)
         if ',' in l:
+            sig = np.zeros((30 * RORQUAL_RAPPORT_FE, RAPPORT_N_CHANNELS), dtype='int16')
+            peaks = np.array(l[:-2].split(',')).astype(int)
             l = next(lines)
-            if ',' in l:
-                sig = np.zeros((30 * 128_000, 5), dtype='int16')
-                peaks = np.array(l[:-2].split(',')).astype(int)
+            for p in peaks[:RORQUAL_NUM_DETEC]:
                 l = next(lines)
-                for p in peaks:
-                    l = next(lines)
-                    samples = np.array(l[:-2].split(',')).astype('int16').reshape(-1, 5)
-                    sig[rorqual_predPos(p):rorqual_predPos(p)+256000] = samples
-                sf.write(f'{args.filename[:-8]}_rorqual.wav', sig, RAPPORT_FE)
+                samples = np.array(l[:-2].split(',')).astype('int16').reshape(-1, RAPPORT_N_CHANNELS)
+                sig[rorqual_predPos(p):rorqual_predPos(p)+RORQUAL_SAMPLEPERSAMPLE] = samples[:min(rorqual_predPos(p)+RORQUAL_SAMPLEPERSAMPLE, len(sig))-rorqual_predPos(p)]
+            sf.write(f'{args.filename[:-8]}_rorqual.wav', sig, RORQUAL_RAPPORT_FE)
     if l == ' cacha predPeaks\n':
         l = next(lines)
         if ',' in l:
-            sig = np.zeros((10 * 128_000, 5), dtype='int16')
+            sig = np.zeros((10 * CACHA_RAPPORT_FE, RAPPORT_N_CHANNELS), dtype='int16')
             peaks = np.array(l[:-2].split(',')).astype(int)
             l = next(lines)
-            for p in peaks:
+            for p in peaks[:CACHA_NUM_DETEC]:
                 l = next(lines)
-                samples = np.array(l[:-2].split(',')).astype('int16').reshape(-1, 5)
-                sig[cacha_predPos(p):cacha_predPos(p)+12800] = samples
-            sf.write(f'{args.filename[:-8]}_cacha.wav', sig, RAPPORT_FE)
+                samples = np.array(l[:-2].split(',')).astype('int16').reshape(-1, RAPPORT_N_CHANNELS)
+                sig[cacha_predPos(p):cacha_predPos(p)+CACHA_SAMPLEPERSAMPLE] = samples
+            sf.write(f'{args.filename[:-8]}_cacha.wav', sig, CACHA_RAPPORT_FE)
 
 file.close()
diff --git a/RapportInfo2txt b/RapportInfo2txt
index fe26c0854764098b3757999fa6823120478d86f0..be9448a1b15a8fb4ace1ea1c416955ef833250a5 100755
GIT binary patch
delta 4265
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

literal 17072
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

diff --git a/RapportInfo2txt.c b/RapportInfo2txt.c
index b10c2e9..ca1f568 100755
--- a/RapportInfo2txt.c
+++ b/RapportInfo2txt.c
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
+#include <math.h>
 
 #define NTOAS_MAX 200
 
@@ -13,8 +14,8 @@
 #define RORQUAL_HOPSIZE 256
 #define RORQUAL_LENPRED RORQUAL_LENSPEC - (5-1)*3 //3 layers of kernel size 5
 #define RORQUAL_RAPPORT_NSAMPLESTOSEND 3 // see cacha
-#define RORQUAL_RAPPORT_SAMPLE_RATE 128000
-#define RORQUAL_RAPPORT_SAMPLESPERSAMPLE 256000 // see cacha
+#define RORQUAL_RAPPORT_SAMPLE_RATE 12800
+#define RORQUAL_RAPPORT_SAMPLESPERSAMPLE 25600 // see cacha
 
 #define CACHA_SAMPLE_RATE 64000
 #define CACHA_LENSIG CACHA_SAMPLE_RATE*10 // load 10sec
@@ -86,7 +87,7 @@ int main(int argc, char* argv[]){
     fprintf(outfile, "%hd,", rapport.predPeaksC[i]);
   }
   fprintf(outfile, "\n cacha samples\n");
-  for(i=0; i<rapport.numDetectionsCachalot; i++){
+  for(i=0; i < fmin(rapport.numDetectionsCachalot, CACHA_RAPPORT_NSAMPLESTOSEND); i++){
     for(j=0; j<CACHA_RAPPORT_SAMPLESPERSAMPLE; j++){
       for(k=0; k<RAPPORT_CHANNELS; k++){
         fprintf(outfile, "%hd,", rapport.samplesC[i][j][k]);
-- 
GitLab