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
This commit is contained in:
Pau Espin 2021-09-01 19:42:46 +02:00
parent ecea734b97
commit 8803f923f9
1 changed files with 12 additions and 8 deletions

View File

@ -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 @@ static int detectBurst(const signalVector &burst,
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 @@ static int detectBurst(const signalVector &burst,
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);