mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-21 13:05:43 -05:00
ComplexMixerFactory logged an unrecognized implementation warning when calibration had not been run (e.g. CI) before falling back to the scalar mixer. All SIMD component factories now map UNCALIBRATED to the scalar implementation explicitly. Co-authored-by: denny <dennis.sheirer@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -42,6 +42,7 @@ public class ChannelDFTFactory
|
|||||||
case VECTOR_SIMD_PREFERRED:
|
case VECTOR_SIMD_PREFERRED:
|
||||||
return new VectorChannelDFT(channelCount);
|
return new VectorChannelDFT(channelCount);
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
|
case UNCALIBRATED:
|
||||||
default:
|
default:
|
||||||
return new ScalarChannelDFT(channelCount);
|
return new ScalarChannelDFT(channelCount);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ public class DcRemovalFilterFactory
|
|||||||
case VECTOR_SIMD_PREFERRED:
|
case VECTOR_SIMD_PREFERRED:
|
||||||
return new VectorDcRemovalFilter(gain);
|
return new VectorDcRemovalFilter(gain);
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
|
case UNCALIBRATED:
|
||||||
default:
|
default:
|
||||||
return new ScalarDcRemovalFilter(gain);
|
return new ScalarDcRemovalFilter(gain);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ public class FmDemodulatorFactory
|
|||||||
case VECTOR_SIMD_512:
|
case VECTOR_SIMD_512:
|
||||||
return new VectorFMDemodulator512();
|
return new VectorFMDemodulator512();
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
|
case UNCALIBRATED:
|
||||||
default:
|
default:
|
||||||
return new ScalarFMDemodulator();
|
return new ScalarFMDemodulator();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ public class ComplexGainFactory
|
|||||||
return new VectorComplexGainControl();
|
return new VectorComplexGainControl();
|
||||||
}
|
}
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
|
case UNCALIBRATED:
|
||||||
default:
|
default:
|
||||||
return new ComplexGainControl();
|
return new ComplexGainControl();
|
||||||
}
|
}
|
||||||
@@ -64,6 +65,7 @@ public class ComplexGainFactory
|
|||||||
return new VectorComplexGain(gain);
|
return new VectorComplexGain(gain);
|
||||||
}
|
}
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
|
case UNCALIBRATED:
|
||||||
default:
|
default:
|
||||||
return new ScalarComplexGain(gain);
|
return new ScalarComplexGain(gain);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ public class MagnitudeFactory
|
|||||||
case VECTOR_SIMD_512:
|
case VECTOR_SIMD_512:
|
||||||
return new VectorMagnitudeCalculator512();
|
return new VectorMagnitudeCalculator512();
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
|
case UNCALIBRATED:
|
||||||
default:
|
default:
|
||||||
return new ScalarMagnitudeCalculator();
|
return new ScalarMagnitudeCalculator();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ public class ComplexMixerFactory
|
|||||||
return new VectorComplexMixer(frequency, sampleRate);
|
return new VectorComplexMixer(frequency, sampleRate);
|
||||||
}
|
}
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
|
case UNCALIBRATED:
|
||||||
{
|
{
|
||||||
return new ScalarComplexMixer(frequency, sampleRate);
|
return new ScalarComplexMixer(frequency, sampleRate);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ public class OscillatorFactory
|
|||||||
case VECTOR_SIMD_PREFERRED:
|
case VECTOR_SIMD_PREFERRED:
|
||||||
return new VectorRealOscillator(frequency, sampleRate);
|
return new VectorRealOscillator(frequency, sampleRate);
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
|
case UNCALIBRATED:
|
||||||
default:
|
default:
|
||||||
return new ScalarRealOscillator(frequency, sampleRate);
|
return new ScalarRealOscillator(frequency, sampleRate);
|
||||||
}
|
}
|
||||||
@@ -69,6 +70,7 @@ public class OscillatorFactory
|
|||||||
case VECTOR_SIMD_PREFERRED:
|
case VECTOR_SIMD_PREFERRED:
|
||||||
return new VectorComplexOscillator(frequency, sampleRate);
|
return new VectorComplexOscillator(frequency, sampleRate);
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
|
case UNCALIBRATED:
|
||||||
default:
|
default:
|
||||||
return new ScalarComplexOscillator(frequency, sampleRate);
|
return new ScalarComplexOscillator(frequency, sampleRate);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,7 +45,8 @@ public class DifferentialDemodulatorFactory
|
|||||||
case VECTOR_SIMD_128 -> new DifferentialDemodulatorFloatVector128(sampleRate, symbolRate);
|
case VECTOR_SIMD_128 -> new DifferentialDemodulatorFloatVector128(sampleRate, symbolRate);
|
||||||
case VECTOR_SIMD_256 -> new DifferentialDemodulatorFloatVector256(sampleRate, symbolRate);
|
case VECTOR_SIMD_256 -> new DifferentialDemodulatorFloatVector256(sampleRate, symbolRate);
|
||||||
case VECTOR_SIMD_512 -> new DifferentialDemodulatorFloatVector512(sampleRate, symbolRate);
|
case VECTOR_SIMD_512 -> new DifferentialDemodulatorFloatVector512(sampleRate, symbolRate);
|
||||||
default -> new DifferentialDemodulatorFloatScalar(sampleRate, symbolRate); //Includes SCALAR case
|
case SCALAR, UNCALIBRATED -> new DifferentialDemodulatorFloatScalar(sampleRate, symbolRate);
|
||||||
|
default -> new DifferentialDemodulatorFloatScalar(sampleRate, symbolRate);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ public class DMRSoftSyncDetectorFactory
|
|||||||
case VECTOR_SIMD_512:
|
case VECTOR_SIMD_512:
|
||||||
return new DMRSoftSyncDetectorVector512();
|
return new DMRSoftSyncDetectorVector512();
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
|
case UNCALIBRATED:
|
||||||
default:
|
default:
|
||||||
return new DMRSoftSyncDetectorScalar();
|
return new DMRSoftSyncDetectorScalar();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ public class NXDNSyncDetectorFactory
|
|||||||
case VECTOR_SIMD_512:
|
case VECTOR_SIMD_512:
|
||||||
return new NXDNSoftSyncDetectorVector512();
|
return new NXDNSoftSyncDetectorVector512();
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
|
case UNCALIBRATED:
|
||||||
default:
|
default:
|
||||||
return new NXDNSoftSyncDetectorScalar();
|
return new NXDNSoftSyncDetectorScalar();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ public class P25P1SoftSyncDetectorFactory
|
|||||||
case VECTOR_SIMD_512:
|
case VECTOR_SIMD_512:
|
||||||
return new P25P1SoftSyncDetectorVector512();
|
return new P25P1SoftSyncDetectorVector512();
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
|
case UNCALIBRATED:
|
||||||
default:
|
default:
|
||||||
return new P25P1SoftSyncDetectorScalar();
|
return new P25P1SoftSyncDetectorScalar();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user