From 60eee5ced691b0ab8f0b50af5f33c2dfd31c8500 Mon Sep 17 00:00:00 2001
From: lamipaul <paulobest25@gmail.com>
Date: Mon, 21 Nov 2022 13:48:46 +0100
Subject: [PATCH] Rapport with new struct

---
 RapportInfo2txt   | Bin 17208 -> 17072 bytes
 RapportInfo2txt.c |  37 ++++++++++++++++++++++---------------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/RapportInfo2txt b/RapportInfo2txt
index bd37a3124325287a72a2514fb3f5b8cd4ff90f05..eaec6d4a3e5d9220e79d216ec3cf989f36b46aaa 100755
GIT binary patch
delta 3477
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
QEJ4Z{7^D~{-?Eki0Gj4NApigX

delta 3988
zcmdnc%DAJAae{<UgCGMKIDkn8h6?M6TFba3I3QdJj)}MQxJ;ouQ;x|(jDDU4x)8|%
zTU2@h6NJA4N;3#R_#iGD0|P??R9^#BU&H2=jP{I*xQv?s(#OESFkvz$bG%5>n^IPt
zm`;Z3#0yi_8wO=Kx;EQQu3^>?<!4}EU}Rum0NKF6&<M7YfAUUdb;kC|51GXo*(W=)
z=udvZA~CsuMS_uMvLK5%qdk~Z0h6I%(hf{62I-jmz=&nC2#d&M0Tv0yO&}2#HwFfV
z$sdh{Wf>UK@(WV)7z#>DiW%bLi%Sxdv*VL9vg6YdGjk@pvU&^WWF{r+73b@jF}VA9
zIyuK1>6uLKXAP@oVt_zqC=K!)NQ8j_!~%JNi6NbV0TyNqBAJ=I3=GT+g;23lsZ36g
z+G?-|85m%J4~-gz1R;n-1vGGB;tCM)$^LA%jGU8u*~BHeAqv6d2YWCD4m`fed)dT!
zLBR<TV_@i*{E$tYcLG!mI|Bm)^W?W|;*(|Ad3YBfiLy?XWf!09!_LFI0ZEj7vM;;1
zB+MNkGY=ria!syf7oWU_orm`Vk|^)yjqIP<CkZHV1nDy{eEP2%JXuR%mS_ei0|UdS
zmx2HP|DW)gU+&kZ|EjY3lYa_in|%7Onybgaz%TE@zyOs=MdQb!@k1v^2+D=Fu`w`s
z^z!n9Dcge#3=IE8jr158zD)4wwT;vRNwNlkD9axuq8{C>d?0q~ffCOD5BTL9K)yK)
zr9FCWH9?ZSrb?4f3(7D()t&rOP*(FPD7BYrhk7*I9s)5vI-i#Ccy!wy(`8_I(fRNH
z{}(C$|NlS6x_7d^kaE3G?;I5dhrj<l8sC7DfJZZr3WJa3oznLnjc+*E85lbE{;~M`
z-=lNu2aCV|Q#`s^R5chF7(6;%Ul<<n=xzmxdNd#4@aSgn=rwia1xX!$G4<d7{~n#K
z0+xUOdo=F_Q4FPG9=*02ybKI4e*FFae+S4PFBh{g)H9$MB7wqV@aR1L;@98*|2>*t
zuy`=uIL=T~QG%)gWb0cVh^-0`TO}a2f+&cs7kC&LUNpmP)nj2`@aUcja+ODKeX9aU
zdFRDlpsc)a&oL&jrD=cv|L5P{`o{L}fByX^__w#J_<&d!(4BY8qt|v44+8_(KQ9VE
zPVI%5*gJtu7-UZ?$Q>TNrW+xSgeXi0DeMMG)&KYCJh%%~UhM-pz@yi8CdjoQ1;<-C
zEdTxo1=MTrZZO+ph6k$&BPhKIw190%<9~nhGk?^HG!Oo|QyyRg|EGEI=N<CsHBEwA
z2r~A?_doytH-pV!Y}^YnwuhO4p>Cx|cRk1vU^j>`FfhQ}pbc`vlRy9eBe}sE;f4v^
z3=I6+TU<dw$G;yGC{RywK<xxM`b7)EPG|tmumn4yW-HXG9-Rm4cY%rtn7!w?85myV
zqS*TqRInaz<$(o-UpJWTk$eH}p3DOd@(c_fj2ApuXFy%1WeJNesLS%X!D$2%{I7q5
zLIY$ZV}0XZ5N$8dz)-gg?yO_`xfmE2UTguY0|gf&st@>kvj6}84_AJ07Y|b4$$~tw
z@;6H0xxyU#nI92#mp=1H)n5R`-6g0|u((^r1#vAn?(7k+fW(~<BLhR-dZ-pq@<9&5
zwOkAgFLY3C#}ajF&;Y83BpQ!i(*UTQ;J7>U3lu^ypM$aimbgPnww@q+xBf!*^~)&?
z3=Bw7mk5ix6VT8|zTi>cdBNl0113=9^@_BD>;^FpKH%_RJmJ9_kqJp?7}2?e6B0lm
z4KEbHjs-;{BP2HeOE56hO@;>$G&W!U#NwxVkRSPbA|TNTE)zPBzo`F-6uZY?6#Rsi
zSRUQ6FH$_TWx!=%3G0h;u)5eECl7;b2gh)qUfa#83=EE8o}JemLp?jcI)*rQ{t5Ny
z)m@^>z!2=C`PZZQ4aW=lAOHV*9Q?~%BELCZOp;@hf(oP7f%pIaFJNF`xbPlgS;2?@
z{}UJ(7$QIZ|9^pjfnmY7|Nno0>g4Z}{S>vBI6h3SQj}ucFnOw?a+JjT|NlW{2q-u}
z7?hVwKx(08g2X^rg@J*ghk=2i@x%ZBZmbLp46b|vZA{L*Y>Cax%rdMz?9fWng@J)#
z3&_r|lZBMrSWbNX|9|pF1L4gDN{rl+unHeq!GqgCAj8uqPt=tc)Q|wN85krX6hpz}
zgSzsJ6_X$8>N9#w7SxkxJTuu)PhYSATKPg6Aq)&3CKu|-3u=JsdIkmtD8-O5d7+*^
zqs8Qpdh)y?kcJk+&;S4P873P#iBCSj?!wqG+0jUN@&P86$rJQF7!ORosP7|dXrO1T
zXP|3XnpB!sQfgRdWT0ngps4^6p1hGsX>yFg6h@E99}UDAMJ6j6iZXLDSWH$l6lcr;
z@mRPSG}tEx8M-lEnA~V6%FNI3VDd&oaVc1f73woE#mpecpdm5&kzpKT!DL4x@yQNG
zV$9+U4U-Fv#2E`FcN*z43QS&TBs%$=k(MMVSQ!~u7;2codKnZT6ocR7heqP{kqn?_
zmH@*BXu}vP$q)?{e}E>Q2Nj3K15AAjxLqp6AOLMyg9;Il+yt<=7()fLp#~BI;q44y
zd$r&#IglU-9|mg>g}3-XVj%no<XlFuqZz+Uerc><&jhwZ6vJp?Mo{}woB`JG2I&T2
z8K`<#TM{G&!unuwVFm$35D$T!z~)FWz!D8irj`lhbe_r6O#~$)7#SFZ7z7v;pa~F^
zyg}+RCLc5rm(*ZlU{C-hN@$>fWI(uO@<$VK#%W-3<zz)uamEcGwqz2>G$v5of>a^!
z5s)n74KQgk`J$OP;}<ZS9mJMYV*<6KB^emdY%vDOGI~sAG#9TAXJTLwWRhgyKvR<f
z5@!$sITLIh3z%eJC}x8AYlApMAQeI}@G*kyl46iRGe-xi9+q15q3WB#Zj;i2rwgb!
zLqAkQCa4-=U|;|j3=9kmQ^1a14k9IYgB-^siJ|v6$V)5_nIOFsKL!T<(&8fhoXjNs
z^yFmy3JbG%GZWpM%)HVH-SoUteM19%Jv}JGkPJ>PDlyc{XNZqaOv;QeNlc$?VD89h
zFgd_nY;w1`|K#W9Po&X%J`N7>&d%mj7O6~|4XhIw85<@~w9yyzfTjQ#eP;4S8+}1o
zDFUMvCJWl?3tB+S78q?XInY+0GXpA`F}c&$99}lT%BT;MFWS~KZkQZsr$70CoxtP?
zb_RkEprtU3UNHHhoj$y)3yYGaY?FoT^|)X~rG~_0FZ*wtu*^^}+0(&%vV()c<P8o2
zoUp9ZF!`i|IlR;?fX3>C$%2mgg0P$}U;v3zj>&=6@{>0>Ch#gi3sPAI1_p!4vQFBZ
V3FZ(re<ueznKQ*&P40410|1vVPpbd`

diff --git a/RapportInfo2txt.c b/RapportInfo2txt.c
index 30c0b15..ca885ba 100755
--- a/RapportInfo2txt.c
+++ b/RapportInfo2txt.c
@@ -7,13 +7,14 @@
 #define NTOAS_MAX 200
 
 #define RORQUAL_SAMPLE_RATE 4000
-#define RORQUAL_LENSIG RORQUAL_SAMPLE_RATE*60 // load 60sec
+#define RORQUAL_LENSIG RORQUAL_SAMPLE_RATE*30 // load 60sec
 #define RORQUAL_WINSIZE 4096
 #define RORQUAL_LENSPEC (RORQUAL_LENSIG - RORQUAL_WINSIZE)/RORQUAL_HOPSIZE
 #define RORQUAL_HOPSIZE 256
 #define RORQUAL_LENPRED RORQUAL_LENSPEC - (5-1)*3 //3 layers of kernel size 5
-#define RORQUAL_NSAMPLESTOSEND 3 // see cacha
-#define RORQUAL_SAMPLESPERSAMPLE 8000 // see cacha
+#define RORQUAL_RAPPORT_NSAMPLESTOSEND 3 // see cacha
+#define RORQUAL_RAPPORT_SAMPLE_RATE 128000
+#define RORQUAL_RAPPORT_SAMPLESPERSAMPLE 256000 // see cacha
 
 #define CACHA_SAMPLE_RATE 64000
 #define CACHA_LENSIG CACHA_SAMPLE_RATE*10 // load 10sec
@@ -21,9 +22,11 @@
 #define CACHA_LENSPEC (CACHA_LENSIG - CACHA_WINSIZE)/CACHA_HOPSIZE
 #define CACHA_HOPSIZE 256
 #define CACHA_LENPRED (((CACHA_LENSPEC - 6)/2 - 6)/2 -6)/2 // 3 layers hopsize 2 kernel 7
-#define CACHA_NSAMPLESTOSEND 10 // a sample is positionned at a high pred from the cnn, we extract the audio signal arround to send back via network
-#define CACHA_SAMPLESPERSAMPLE 6400 // number of audio samples per high pred sample to send back
+#define CACHA_RAPPORT_NSAMPLESTOSEND 10 // a sample is positionned at a high pred from the cnn, we extract the audio signal arround to send back via network
+#define CACHA_RAPPORT_SAMPLE_RATE 128000
+#define CACHA_RAPPORT_SAMPLESPERSAMPLE 12800// number of audio samples per high pred sample to send back
 
+#define RAPPORT_CHANNELS 5 // number of channels recorded to include in the report
 
 typedef struct{
     float predsC[CACHA_LENPRED]; //len of preds for 10sec signal
@@ -33,10 +36,10 @@ typedef struct{
     char fileName[50];      //Nom du fichier concerne
     int ToAs_cacha[NTOAS_MAX];
     unsigned char hydros_ToAs_cacha[NTOAS_MAX];
-    short predPeaksR[RORQUAL_NSAMPLESTOSEND]; //indices of predPeaks for rorqual
-    short predPeaksC[CACHA_NSAMPLESTOSEND]; //indices of predPeaks for cachalot
-    short int samplesR[RORQUAL_NSAMPLESTOSEND][RORQUAL_SAMPLESPERSAMPLE]; // samples to send back for rorqual
-    short int samplesC[CACHA_NSAMPLESTOSEND][CACHA_SAMPLESPERSAMPLE]; // samples to send back for cachalot
+    short predPeaksR[RORQUAL_RAPPORT_NSAMPLESTOSEND]; //indices of predPeaks for rorqual
+    short predPeaksC[CACHA_RAPPORT_NSAMPLESTOSEND]; //indices of predPeaks for cachalot
+    short int samplesR[RORQUAL_RAPPORT_NSAMPLESTOSEND][RORQUAL_RAPPORT_SAMPLESPERSAMPLE][RAPPORT_CHANNELS]; // samples to send back for rorqual
+    short int samplesC[CACHA_RAPPORT_NSAMPLESTOSEND][CACHA_RAPPORT_SAMPLESPERSAMPLE][RAPPORT_CHANNELS]; // samples to send back for cachalot
 }RAPPORT;
 
 int main(int argc, char* argv[]){
@@ -52,10 +55,10 @@ int main(int argc, char* argv[]){
     printf("Failed to open output file\n");
     return 0;
   }
-  RAPPORT rapport;
+  static RAPPORT rapport;
   fread(&rapport, sizeof(RAPPORT), 1, infile);
   printf("Writing into %s with %d fin whale pulses and %d sperm whale clicks \n", argv[1], rapport.numDetectionsRorqual, rapport.numDetectionsCachalot);
-  int i, j;
+  int i, j, k;
   fprintf(outfile, "Filename : %s \n", rapport.fileName);
   fprintf(outfile, "\n rorqual preds\n");
   for(i=0; i<RORQUAL_LENPRED; i++){
@@ -67,8 +70,10 @@ int main(int argc, char* argv[]){
   }
   fprintf(outfile, "\n rorqual samples\n");
   for(i=0; i<rapport.numDetectionsRorqual; i++){
-    for(j=0; j<RORQUAL_SAMPLESPERSAMPLE; j++){
-      fprintf(outfile, "%hd,", rapport.samplesR[i][j]);
+    for(j=0; j<RORQUAL_RAPPORT_SAMPLESPERSAMPLE; j++){
+      for(k=0; k<RAPPORT_CHANNELS; k++){
+        // fprintf(outfile, "%hd,", rapport.samplesR[i][j][k]);
+      }
     }
     fprintf(outfile, "\n");
   }
@@ -82,8 +87,10 @@ int main(int argc, char* argv[]){
   }
   fprintf(outfile, "\n cacha samples\n");
   for(i=0; i<rapport.numDetectionsCachalot; i++){
-    for(j=0; j<CACHA_SAMPLESPERSAMPLE; j++){
-      fprintf(outfile, "%hd,", rapport.samplesC[i][j]);
+    for(j=0; j<CACHA_RAPPORT_SAMPLESPERSAMPLE; j++){
+      for(k=0; k<RAPPORT_CHANNELS; k++){
+        // fprintf(outfile, "%hd,", rapport.samplesC[i][j][k]);
+      }
     }
     fprintf(outfile, "\n");
   }
-- 
GitLab