Separate valid audio packets and all audio packets

Author: TheDaChicken

src/main.c

@@ -72,6 +72,7 @@ typedef struct {
 
     unsigned int program;
     unsigned int audio_ready;
+    unsigned int audio_packets_valid;
     unsigned int audio_packets;
     unsigned int audio_bytes;
     unsigned int audio_errors;
@@ -347,13 +348,19 @@ static void callback(const nrsc5_event_t *evt, void *opaque)
             st->audio_bytes += evt->hdc.count * sizeof(evt->hdc.data[0]);
             if (evt->hdc.flags & NRSC5_PKT_FLAGS_CRC_ERROR)
                 st->audio_errors++;
+            else
+                st->audio_packets_valid++;
 
-            if (st->audio_packets >= 32) {
-                log_info("Audio bit rate: %.1f kbps", (float)st->audio_bytes * 8 * NRSC5_SAMPLE_RATE_AUDIO / NRSC5_AUDIO_FRAME_SAMPLES / st->audio_packets / 1000);
+            if (st->audio_packets_valid >= 32) {
+                log_info("Audio bit rate: %.1f kbps", (float)st->audio_bytes * 8 * NRSC5_SAMPLE_RATE_AUDIO / NRSC5_AUDIO_FRAME_SAMPLES / st->audio_packets_valid / 1000);
+                st->audio_packets_valid = 0;
+                st->audio_bytes = 0;
+            }
+            if (st->audio_packets >= 32)
+            {
                 if (st->audio_errors > 0)
                     log_warn("Audio packet CRC mismatches: %d", st->audio_errors);
                 st->audio_packets = 0;
-                st->audio_bytes = 0;
                 st->audio_errors = 0;
             }
         }

support/cli.py

@@ -26,6 +26,7 @@ def __init__(self):
         self.wav_output = None
         self.raw_output = None
         self.hdc_output = None
+        self.audio_packets_valid = 0
         self.audio_packets = 0
         self.audio_bytes = 0
         self.audio_errors = 0
@@ -229,14 +230,18 @@ def callback(self, evt_type, evt):
                 self.audio_bytes += len(evt.data)
                 if evt.flags & nrsc5.PacketFlags.CRC_ERROR:
                     self.audio_errors += 1
+                else:
+                    self.audio_packets_valid += 1
 
-                if self.audio_packets >= 32:
+                if self.audio_packets_valid >= 32:
                     logging.info("Audio bit rate: %.1f kbps", self.audio_bytes * 8 * nrsc5.SAMPLE_RATE_AUDIO
-                                 / nrsc5.AUDIO_FRAME_SAMPLES / self.audio_packets / 1000)
+                                 / nrsc5.AUDIO_FRAME_SAMPLES / self.audio_packets_valid / 1000)
+                    self.audio_packets_valid = 0
+                    self.audio_bytes = 0
+                if self.audio_packets >= 32:
                     if self.audio_errors > 0:
                         logging.warning("Audio packet CRC mismatches: %d", self.audio_errors)
                     self.audio_packets = 0
-                    self.audio_bytes = 0
                     self.audio_errors = 0
         elif evt_type == nrsc5.EventType.AUDIO:
             if evt.program == self.args.program: