Change in osmo-trx[master]: detectBurst(): Clear downsampling code path

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/25315 )

Change subject: detectBurst(): Clear downsampling code path
......................................................................

detectBurst(): Clear downsampling code path

downsampleBurst() and the Resampler below it clearly only support or are
confgiured for 1<->4 setup currently.

Change-Id: Iebaff7a34bd24e56627f148182859918accbfa82
---
M Transceiver52M/sigProcLib.cpp
1 file changed, 12 insertions(+), 8 deletions(-)

Approvals:
  Jenkins Builder: Verified
  dexter: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp
index b7c41ba..ff5e32f 100644
--- a/Transceiver52M/sigProcLib.cpp
+++ b/Transceiver52M/sigProcLib.cpp
@@ -34,6 +34,7 @@
 #include "Resampler.h"
 
 extern "C" {
+#include <osmocom/core/panic.h>
 #include "convolve.h"
 #include "scale.h"
 #include "mult.h"
@@ -1500,12 +1501,18 @@
   complex xcorr;
   int rc = 1;
 
-  if (sps == 4) {
-    dec = downsampleBurst(burst);
-    corr_in = dec;
-    sps = 1;
-  } else {
+  switch (sps) {
+  case 1:
     corr_in = &burst;
+    break;
+  case 4:
+    dec = downsampleBurst(burst);
+     /* Running at the downsampled rate at this point: */
+     corr_in = dec;
+     sps = 1;
+     break;
+  default:
+     osmo_panic("%s:%d SPS %d not supported! Only 1 or 4 supported", __FILE__, __LINE__, sps);
   }
 
   /* Correlate */
@@ -1515,9 +1522,6 @@
     goto del_ret;
   }
 
-  /* Running at the downsampled rate at this point */
-  sps = 1;
-
   /* Peak detection - place restrictions at correlation edges */
   ebp->amp = fastPeakDetect(corr, &ebp->toa);
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25315
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: Iebaff7a34bd24e56627f148182859918accbfa82
Gerrit-Change-Number: 25315
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210902/f4bd896d/attachment.htm>