[rffft] Add filename parameter parsing for SatDump .wav files

Signed-off-by: Martin Herren (HB9FXX) <[email protected]>

README.md

@@ -92,4 +92,6 @@ It is also possible to read WAV files. This is compatible with any WAV file, 16
 
     ./rffft -i recording.wav -f 97400000 -s 48000 -F wav -T "YYYY-MM-DDTHH:MM:SS"
 
+For WAV files exported from SatDump the `-P` options will automatically extract the correct parameters from the filename.
+
 The output spectrograms can be viewed and analysed using `rfplot`.

rffft.c

@@ -175,7 +175,7 @@ int main(int argc,char *argv[])
     wav_reader = sox_open_read(infname, NULL, NULL, NULL);
 
     if (wav_reader == NULL) {
-      fprintf(stderr, "Error opening file %s", infile);
+      fprintf(stderr, "Error opening file %s", infname);
       exit(-1);
     }
 

rffft_internal.c

@@ -11,8 +11,9 @@
 //   - 2023-08-05_08-02-00_16000000SPS_2274000000Hz.s8
 //   - 2023-08-05_18-02-45-534_16000000SPS_2284000000Hz.s16
 //   - 2023-08-05_18-02-45-1691258565.534000_16000000SPS_2284000000Hz.f32
+//   - 2023-08-07_16-36-47-1691426207.749000_2400000SPS_100000000Hz.wav
 //   s8: char, s16 short int, f32 float.
-//   SatDump also supports .wav and compressed versions of s8/s16/f32 with .ziq
+//   SatDump also supports a compressed versions of s8/s16/f32 with .ziq
 //   extension. Those are not yet supported
 //   timestamp can have an added milliseconds field, configurable. This feature
 //   was broken during some time so files with this convention still exists.
@@ -56,6 +57,8 @@ int rffft_params_from_filename(char * filename, double * samplerate, double * fr
       *format = 'i';
     } else if ((strlen(p_format) == 3) && (strncmp("f32", p_format, 3) == 0)) {
       *format = 'f';
+    } else if ((strlen(p_format) == 3) && (strncmp("wav", p_format, 3) == 0)) {
+      *format = 'w';
     } else {
       printf("Unsupported SatDump format %s\n", p_format);
       return -1;
@@ -91,6 +94,8 @@ int rffft_params_from_filename(char * filename, double * samplerate, double * fr
       *format = 'i';
     } else if ((strlen(p_format) == 3) && (strncmp("f32", p_format, 3) == 0)) {
       *format = 'f';
+    } else if ((strlen(p_format) == 3) && (strncmp("wav", p_format, 3) == 0)) {
+      *format = 'w';
     } else {
       printf("Unsupported SatDump format %s\n", p_format);
       return -1;
@@ -125,6 +130,8 @@ int rffft_params_from_filename(char * filename, double * samplerate, double * fr
       *format = 'i';
     } else if ((strlen(p_format) == 3) && (strncmp("f32", p_format, 3) == 0)) {
       *format = 'f';
+    } else if ((strlen(p_format) == 3) && (strncmp("wav", p_format, 3) == 0)) {
+      *format = 'w';
     } else {
       printf("Unsupported SatDump format %s\n", p_format);
       return -1;

rffft_internal.h

@@ -12,7 +12,7 @@ extern "C" {
 // output:
 // samplerate: parsed samplerate
 // frequency: parsed frequency
-// format: parsed sample format: char: 'c', int: 'i', float: 'f'
+// format: parsed sample format: char: 'c', int: 'i', float: 'f', wav: 'w'
 // starttime: parsed start time string formatted YYYY-MM-DDTHH:MM:SS.sss
 int rffft_params_from_filename(char * filename, double * samplerate, double * frequency, char * format, char * starttime);
 

tests/tests_rffft_internal.c

@@ -43,6 +43,14 @@ void rffft_internal_parse_satdump_filenames(void **state) {
   assert_memory_equal(&ref_format, &format, 1);
   assert_string_equal("2023-08-05T18:02:45.534", starttime);
 
+  // wav file with milliseconds
+  ref_format = 'w';
+  assert_int_equal(0, rffft_params_from_filename("2023-08-07_16-36-47-749_2400000SPS_100000000Hz.wav", &samplerate, &frequency, &format, starttime));
+  assert_float_equal(2.4e6, samplerate, 1e-12);
+  assert_float_equal(100e6, frequency, 1e-12);
+  assert_memory_equal(&ref_format, &format, 1);
+  assert_string_equal("2023-08-07T16:36:47.749", starttime);
+
   assert_int_equal(-1, rffft_params_from_filename("2023-08-05-19:59:30_16000000SPS_402000000Hz.f32", &samplerate, &frequency, &format, starttime));
 }