Merge branch 'ArtemPisarenko-improve_nco_vco_quality_s'

jgaeddert · May 22, 2024 · cbccbf3 · cbccbf3
2 parents 1c53720 + ac83562
commit cbccbf3
Show file tree

Hide file tree

Showing 4 changed files with 459 additions and 68 deletions.
diff --git a/include/liquid.h b/include/liquid.h
@@ -9073,11 +9073,19 @@ int ofdmframesync_debug_print(ofdmframesync _q, const char * _filename);
 //
 
 // oscillator type
-//  LIQUID_NCO  :   numerically-controlled oscillator (fast)
-//  LIQUID_VCO  :   "voltage"-controlled oscillator (precise)
 typedef enum {
+    // numerically-controlled oscillator (fastest in all aspects)
     LIQUID_NCO=0,
-    LIQUID_VCO
+
+    // "voltage"-controlled oscillator (precise)
+    LIQUID_VCO,
+    LIQUID_VCO_INTERP=LIQUID_VCO,
+
+    // fast at computing output but having separate limited API,
+    // and each time frequency being set it does dynamic (re-)allocating and
+    // calculating of lookup table with resulting memory size and speed slowdown
+    // proportional to divider coefficient value)
+    LIQUID_VCO_DIRECT
 } liquid_ncotype;
 
 #define LIQUID_NCO_MANGLE_FLOAT(name) LIQUID_CONCAT(nco_crcf, name)
@@ -9092,7 +9100,7 @@ typedef enum {
 typedef struct NCO(_s) * NCO();                                             \
                                                                             \
 /* Create nco object with either fixed-point or floating-point phase    */  \
-/*  _type   : oscillator type, _type in {LIQUID_NCO, LIQUID_VCO}        */  \
+/*  _type   : oscillator type                                           */  \
 NCO() NCO(_create)(liquid_ncotype _type);                                   \
                                                                             \
 /* Copy object including all internal objects and state                 */  \
@@ -9138,6 +9146,22 @@ int NCO(_set_phase)(NCO() _q,                                               \
 int NCO(_adjust_phase)(NCO() _q,                                            \
                        T     _dphi);                                        \
                                                                             \
+/* Get frequency of nco object as fraction of sample rate (n/m)         */  \
+/*  _q      : nco object                                                */  \
+/*  _n      : pointer to output multiplier coefficient (normalized)     */  \
+/*  _m      : pointer to output divider coefficient (normalized)        */  \
+void NCO(_get_vcodirect_frequency)(NCO()         _q,                        \
+                                   int*          _n,                        \
+                                   unsigned int* _m);                       \
+                                                                            \
+/* Set frequency of nco object as fraction of sample rate (n/m)         */  \
+/*  _q      : nco object                                                */  \
+/*  _n      : input multiplier coefficient                              */  \
+/*  _m      : input divider coefficient                                 */  \
+void NCO(_set_vcodirect_frequency)(NCO()        _q,                         \
+                                   int          _n,                         \
+                                   unsigned int _m);                        \
+                                                                            \
 /* Increment phase by internal phase step (frequency)                   */  \
 int NCO(_step)(NCO() _q);                                                   \
                                                                             \