Updates to spands test data

libs/spandsp/spandsp/tones.dtd

@@ -35,6 +35,7 @@
 <!ELEMENT call-waiting-tone (step)* >
 <!ATTLIST call-waiting-tone
   domain    CDATA   #IMPLIED
+  type      CDATA   #IMPLIED
   >
 <!ELEMENT pay-tone (step)* >
 <!ATTLIST pay-tone
@@ -190,4 +191,5 @@
   level                 CDATA   #IMPLIED
   length                CDATA   #IMPLIED
   recorded-announcement CDATA   #IMPLIED
+  recognition-length    CDATA   #IMPLIED
   >

libs/spandsp/src/v29tx_constellation_maps.h

@@ -24,18 +24,26 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#if !defined(FP_SCALE)
+#if defined(SPANDSP_USE_FIXED_POINT)
+#define FP_SCALE(x)     ((int16_t) x)
+#else
+#define FP_SCALE(x)     (x)
+#endif
+#endif
+
 #if defined(SPANDSP_USE_FIXED_POINT)
 static const complexi16_t v29_abab_constellation[6] =
 #else
 static const complexf_t v29_abab_constellation[6] =
 #endif
 {
-    { 3, -3},           /* 315deg high 9600 */
-    {-3,  0},           /* 180deg low       */
-    { 1, -1},           /* 315deg low 7200  */
-    {-3,  0},           /* 180deg low       */
-    { 0, -3},           /* 270deg low 4800  */
-    {-3,  0}            /* 180deg low       */
+    {FP_SCALE( 3.0f), FP_SCALE(-3.0f)},         /* 315deg high 9600 */
+    {FP_SCALE(-3.0f), FP_SCALE( 0.0f)},         /* 180deg low       */
+    {FP_SCALE( 1.0f), FP_SCALE(-1.0f)},         /* 315deg low 7200  */
+    {FP_SCALE(-3.0f), FP_SCALE( 0.0f)},         /* 180deg low       */
+    {FP_SCALE( 0.0f), FP_SCALE(-3.0f)},         /* 270deg low 4800  */
+    {FP_SCALE(-3.0f), FP_SCALE( 0.0f)}          /* 180deg low       */
 };
 
 #if defined(SPANDSP_USE_FIXED_POINT)
@@ -44,12 +52,12 @@ static const complexi16_t v29_cdcd_constellation[6] =
 static const complexf_t v29_cdcd_constellation[6] =
 #endif
 {
-    { 3,  0},           /*   0deg low 9600  */
-    {-3,  3},           /* 135deg high      */
-    { 3,  0},           /*   0deg low 7200  */
-    {-1,  1},           /* 135deg low       */
-    { 3,  0},           /*   0deg low 4800  */
-    { 0,  3}            /*  90deg low       */
+    {FP_SCALE( 3.0f), FP_SCALE( 0.0f)},         /*   0deg low 9600  */
+    {FP_SCALE(-3.0f), FP_SCALE( 3.0f)},         /* 135deg high      */
+    {FP_SCALE( 3.0f), FP_SCALE( 0.0f)},         /*   0deg low 7200  */
+    {FP_SCALE(-1.0f), FP_SCALE( 1.0f)},         /* 135deg low       */
+    {FP_SCALE( 3.0f), FP_SCALE( 0.0f)},         /*   0deg low 4800  */
+    {FP_SCALE( 0.0f), FP_SCALE( 3.0f)}          /*  90deg low       */
 };
 
 #if defined(SPANDSP_USE_FIXED_POINT)
@@ -58,22 +66,22 @@ static const complexi16_t v29_9600_constellation[16] =
 static const complexf_t v29_9600_constellation[16] =
 #endif
 {
-    { 3,  0},           /*   0deg low  */
-    { 1,  1},           /*  45deg low  */
-    { 0,  3},           /*  90deg low  */
-    {-1,  1},           /* 135deg low  */
-    {-3,  0},           /* 180deg low  */
-    {-1, -1},           /* 225deg low  */
-    { 0, -3},           /* 270deg low  */
-    { 1, -1},           /* 315deg low  */
-    { 5,  0},           /*   0deg high */
-    { 3,  3},           /*  45deg high */
-    { 0,  5},           /*  90deg high */
-    {-3,  3},           /* 135deg high */
-    {-5,  0},           /* 180deg high */
-    {-3, -3},           /* 225deg high */
-    { 0, -5},           /* 270deg high */
-    { 3, -3}            /* 315deg high */
+    {FP_SCALE( 3.0f), FP_SCALE( 0.0f)},         /*   0deg low  */
+    {FP_SCALE( 1.0f), FP_SCALE( 1.0f)},         /*  45deg low  */
+    {FP_SCALE( 0.0f), FP_SCALE( 3.0f)},         /*  90deg low  */
+    {FP_SCALE(-1.0f), FP_SCALE( 1.0f)},         /* 135deg low  */
+    {FP_SCALE(-3.0f), FP_SCALE( 0.0f)},         /* 180deg low  */
+    {FP_SCALE(-1.0f), FP_SCALE(-1.0f)},         /* 225deg low  */
+    {FP_SCALE( 0.0f), FP_SCALE(-3.0f)},         /* 270deg low  */
+    {FP_SCALE( 1.0f), FP_SCALE(-1.0f)},         /* 315deg low  */
+    {FP_SCALE( 5.0f), FP_SCALE( 0.0f)},         /*   0deg high */
+    {FP_SCALE( 3.0f), FP_SCALE( 3.0f)},         /*  45deg high */
+    {FP_SCALE( 0.0f), FP_SCALE( 5.0f)},         /*  90deg high */
+    {FP_SCALE(-3.0f), FP_SCALE( 3.0f)},         /* 135deg high */
+    {FP_SCALE(-5.0f), FP_SCALE( 0.0f)},         /* 180deg high */
+    {FP_SCALE(-3.0f), FP_SCALE(-3.0f)},         /* 225deg high */
+    {FP_SCALE( 0.0f), FP_SCALE(-5.0f)},         /* 270deg high */
+    {FP_SCALE( 3.0f), FP_SCALE(-3.0f)}          /* 315deg high */
 };
 
 /*- End of file ------------------------------------------------------------*/