update to spandsp-0.0.6pre12

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13311 d0543943-73ff-0310-b7d9-9358b9ac24b2

libs/spandsp/src/spandsp/private/v22bis.h

@@ -22,12 +22,40 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v22bis.h,v 1.9 2009/04/26 09:50:28 steveu Exp $
+ * $Id: v22bis.h,v 1.10 2009/04/29 12:37:45 steveu Exp $
  */
 
 #if !defined(_SPANDSP_PRIVATE_V22BIS_H_)
 #define _SPANDSP_PRIVATE_V22BIS_H_
 
+/*! Segments of the training sequence on the receive side */
+enum
+{
+    V22BIS_RX_TRAINING_STAGE_NORMAL_OPERATION,
+    V22BIS_RX_TRAINING_STAGE_SYMBOL_ACQUISITION,
+    V22BIS_RX_TRAINING_STAGE_LOG_PHASE,
+    V22BIS_RX_TRAINING_STAGE_UNSCRAMBLED_ONES,
+    V22BIS_RX_TRAINING_STAGE_UNSCRAMBLED_ONES_SUSTAINING,
+    V22BIS_RX_TRAINING_STAGE_SCRAMBLED_ONES_AT_1200,
+    V22BIS_RX_TRAINING_STAGE_SCRAMBLED_ONES_AT_1200_SUSTAINING,
+    V22BIS_RX_TRAINING_STAGE_WAIT_FOR_SCRAMBLED_ONES_AT_2400,
+    V22BIS_RX_TRAINING_STAGE_PARKED
+};
+
+/*! Segments of the training sequence on the transmit side */
+enum
+{
+    V22BIS_TX_TRAINING_STAGE_NORMAL_OPERATION = 0,
+    V22BIS_TX_TRAINING_STAGE_INITIAL_TIMED_SILENCE,
+    V22BIS_TX_TRAINING_STAGE_INITIAL_SILENCE,
+    V22BIS_TX_TRAINING_STAGE_U11,
+    V22BIS_TX_TRAINING_STAGE_U0011,
+    V22BIS_TX_TRAINING_STAGE_S11,
+    V22BIS_TX_TRAINING_STAGE_TIMED_S11,
+    V22BIS_TX_TRAINING_STAGE_S1111,
+    V22BIS_TX_TRAINING_STAGE_PARKED
+};
+
 /*!
     V.22bis modem descriptor. This defines the working state for a single instance
     of a V.22bis modem.
@@ -195,6 +223,8 @@ int v22bis_rx_restart(v22bis_state_t *s);
 
 void v22bis_report_status_change(v22bis_state_t *s, int status);
 
+void v22bis_equalizer_coefficient_reset(v22bis_state_t *s);
+
 #if defined(__cplusplus)
 }
 #endif

libs/spandsp/src/spandsp/v22bis.h

@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v22bis.h,v 1.41 2009/04/25 10:18:50 steveu Exp $
+ * $Id: v22bis.h,v 1.42 2009/04/29 12:37:45 steveu Exp $
  */
 
 /*! \file */
@@ -150,13 +150,20 @@ SPAN_DECLARE(void) v22bis_tx_power(v22bis_state_t *s, float power);
     \return 0 for OK, -1 for bad parameter. */
 SPAN_DECLARE(int) v22bis_restart(v22bis_state_t *s, int bit_rate);
 
-/*! Request a retrain for a V.22bis modem context. A rate change may also be resquested.
+/*! Request a retrain for a V.22bis modem context. A rate change may also be requested.
     \brief Request a retrain for a V.22bis modem context.
     \param s The modem context.
     \param bit_rate The bit rate of the modem. Valid values are 1200 and 2400.
-    \return 0 for OK, -1 for bad parameter. */
+    \return 0 for OK, -1 for request rejected. */
 SPAN_DECLARE(int) v22bis_request_retrain(v22bis_state_t *s, int bit_rate);
 
+/*! Request a loopback 2 for a V.22bis modem context.
+    \brief Request a loopback 2 for a V.22bis modem context.
+    \param s The modem context.
+    \param enable TRUE to enable loopback, or FALSE to disable it.
+    \return 0 for OK, -1 for request reject. */
+SPAN_DECLARE(int) v22bis_remote_loopback(v22bis_state_t *s, int enable);
+
 /*! Report the current operating bit rate of a V.22bis modem context.
     \brief Report the current operating bit rate of a V.22bis modem context
     \param s The modem context. */

libs/spandsp/src/spandsp/version.h

@@ -30,9 +30,9 @@
 
 /* The date and time of the version are in UTC form. */
 
-#define SPANDSP_RELEASE_DATE            20090427
-#define SPANDSP_RELEASE_TIME            151958
-#define SPANDSP_RELEASE_DATETIME_STRING "20090427 151958"
+#define SPANDSP_RELEASE_DATE            20090502
+#define SPANDSP_RELEASE_TIME            044449
+#define SPANDSP_RELEASE_DATETIME_STRING "20090502 044449"
 
 #endif
 /*- End of file ------------------------------------------------------------*/

libs/spandsp/src/t38_terminal.c

@@ -22,7 +22,7 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: t38_terminal.c,v 1.124 2009/03/13 14:49:56 steveu Exp $
+ * $Id: t38_terminal.c,v 1.125 2009/05/02 04:43:48 steveu Exp $
  */
 
 /*! \file */
@@ -566,6 +566,8 @@ static int stream_non_ecm(t38_terminal_state_t *s)
             /* Create a 75ms silence */
             if (fe->t38.current_tx_indicator != T38_IND_NO_SIGNAL)
                 delay = t38_core_send_indicator(&fe->t38, T38_IND_NO_SIGNAL, fe->t38.indicator_tx_count);
+            else
+                delay = 75000;
             fe->timed_step = T38_TIMED_STEP_NON_ECM_MODEM_2;
             fe->next_tx_samples = fe->samples;
             break;
@@ -663,6 +665,8 @@ static int stream_hdlc(t38_terminal_state_t *s)
             /* Create a 75ms silence */
             if (fe->t38.current_tx_indicator != T38_IND_NO_SIGNAL)
                 delay = t38_core_send_indicator(&fe->t38, T38_IND_NO_SIGNAL, fe->t38.indicator_tx_count);
+            else
+                delay = 75000;
             fe->timed_step = T38_TIMED_STEP_HDLC_MODEM_2;
             fe->next_tx_samples = fe->samples;
             break;

libs/spandsp/src/t4.c

@@ -1668,9 +1668,14 @@ static void encode_eol(t4_state_t *s)
     }
     if (s->row_bits)
     {
-        /* We may need to pad the row to a minimum length. */
-        if (s->row_bits + length < s->min_bits_per_row)
-            put_encoded_bits(s, 0, s->min_bits_per_row - (s->row_bits + length));
+        /* We may need to pad the row to a minimum length, unless we are in T.6 mode.
+           In T.6 we only come here at the end of the page to add the EOFB marker, which
+           is like two 1D EOLs. */
+        if (s->line_encoding != T4_COMPRESSION_ITU_T6)
+        {
+            if (s->row_bits + length < s->min_bits_per_row)
+                put_encoded_bits(s, 0, s->min_bits_per_row - (s->row_bits + length));
+        }
         put_encoded_bits(s, code, length);
         update_row_bit_info(s);
     }
@@ -1678,6 +1683,10 @@ static void encode_eol(t4_state_t *s)
     {
         /* We don't pad zero length rows. They are the consecutive EOLs which end a page. */
         put_encoded_bits(s, code, length);
+        /* Don't do the full update row bit info, or the minimum suddenly drops to the
+           length of an EOL. Just clear the row bits, so we treat the next EOL as an
+           end of page EOL, with no padding. */
+        s->row_bits = 0;
     }
 }
 /*- End of function --------------------------------------------------------*/
@@ -2183,8 +2192,9 @@ SPAN_DECLARE(int) t4_tx_start_page(t4_state_t *s)
             encode_eol(s);
     }
 
-    /* Force any partial byte in progress to flush */
-    put_encoded_bits(s, 0, 7);
+    /* Force any partial byte in progress to flush using ones. Any post EOL padding when
+       sending is normally ones, so this is consistent. */
+    put_encoded_bits(s, 0xFF, 7);
     s->bit_pos = 7;
     s->bit_ptr = 0;
     s->line_image_size = s->image_size*8;

libs/spandsp/src/v22bis_tx.c

@@ -22,12 +22,13 @@
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: v22bis_tx.c,v 1.61 2009/04/25 10:18:50 steveu Exp $
+ * $Id: v22bis_tx.c,v 1.62 2009/04/29 12:37:45 steveu Exp $
  */
 
 /*! \file */
 
-/* THIS IS A WORK IN PROGRESS - NOT YET FUNCTIONAL! */
+/* THIS IS A WORK IN PROGRESS - It is basically functional, but it is not feature
+   complete, and doesn't reliably sync over the signal and noise level ranges it should! */
 
 #if defined(HAVE_CONFIG_H)
 #include "config.h"
@@ -240,20 +241,6 @@ Both ends should accept unscrambled binary 1 or binary 0 as the preamble.
 
 #define ms_to_symbols(t)    (((t)*600)/1000)
 
-/* Segments of the training sequence */
-enum
-{
-    V22BIS_TX_TRAINING_STAGE_NORMAL_OPERATION = 0,
-    V22BIS_TX_TRAINING_STAGE_INITIAL_TIMED_SILENCE,
-    V22BIS_TX_TRAINING_STAGE_INITIAL_SILENCE,
-    V22BIS_TX_TRAINING_STAGE_U11,
-    V22BIS_TX_TRAINING_STAGE_U0011,
-    V22BIS_TX_TRAINING_STAGE_S11,
-    V22BIS_TX_TRAINING_STAGE_TIMED_S11,
-    V22BIS_TX_TRAINING_STAGE_S1111,
-    V22BIS_TX_TRAINING_STAGE_PARKED
-};
-
 static const int phase_steps[4] =
 {
     1, 0, 2, 3
@@ -598,6 +585,7 @@ SPAN_DECLARE(int) v22bis_restart(v22bis_state_t *s, int bit_rate)
 
 SPAN_DECLARE(int) v22bis_request_retrain(v22bis_state_t *s, int bit_rate)
 {
+    /* TODO: support bit rate switching */
     switch (bit_rate)
     {
     case 2400:
@@ -606,7 +594,33 @@ SPAN_DECLARE(int) v22bis_request_retrain(v22bis_state_t *s, int bit_rate)
     default:
         return -1;
     }
-    /* TODO: Implement retrain and bit rate change */
+    /* TODO: support bit rate changes */
+    /* Retrain is only valid when we are normal operation at 2400bps */
+    if (s->rx.training != V22BIS_RX_TRAINING_STAGE_NORMAL_OPERATION
+        ||
+        s->tx.training != V22BIS_TX_TRAINING_STAGE_NORMAL_OPERATION
+        ||
+        s->negotiated_bit_rate != 2400)
+    {
+        return -1;
+    }
+    /* Send things back into the training process at the appropriate point.
+       The far end should detect the S1 signal, and reciprocate. */
+    span_log(&s->logging, SPAN_LOG_FLOW, "+++ Initiating a retrain\n");
+    s->rx.pattern_repeats = 0;
+    s->rx.training_count = 0;
+    s->rx.training = V22BIS_RX_TRAINING_STAGE_SCRAMBLED_ONES_AT_1200;
+    s->tx.training_count = 0;
+    s->tx.training = V22BIS_TX_TRAINING_STAGE_U0011;
+    v22bis_equalizer_coefficient_reset(s);
+    v22bis_report_status_change(s, SIG_STATUS_MODEM_RETRAIN_OCCURRED);
+    return 0;
+}
+/*- End of function --------------------------------------------------------*/
+
+SPAN_DECLARE(int) v22bis_remote_loopback(v22bis_state_t *s, int enable)
+{
+    /* TODO: */
     return -1;
 }
 /*- End of function --------------------------------------------------------*/

libs/spandsp/tests/fax_decode.c

@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: fax_decode.c,v 1.54 2009/02/10 13:06:47 steveu Exp $
+ * $Id: fax_decode.c,v 1.55 2009/04/29 12:37:45 steveu Exp $
  */
 
 /*! \page fax_decode_page FAX decoder
@@ -229,7 +229,7 @@ static void hdlc_accept(void *user_data, const uint8_t *msg, int len, int ok)
     {
         if (msg[0] != 0xFF  ||  !(msg[1] == 0x03  ||  msg[1] == 0x13))
         {
-            fprintf(stderr, "Bad frame header - %02x %02x", msg[0], msg[1]);
+            fprintf(stderr, "Bad frame header - %02x %02x\n", msg[0], msg[1]);
             return;
         }
         print_frame("HDLC: ", msg, len);

libs/spandsp/tests/tsb85_tests.sh

@@ -15,7 +15,7 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
-# $Id: tsb85_tests.sh,v 1.6 2008/09/11 15:13:42 steveu Exp $
+# $Id: tsb85_tests.sh,v 1.7 2009/04/30 15:04:20 steveu Exp $
 #
 
 run_tsb85_test()
@@ -54,11 +54,12 @@ for TEST in OREN01 OREN02 OREN03 OREN04 OREN05 OREN06 OREN07 OREN08 OREN09 OREN1
     run_tsb85_test
 done
 
+# MRGX03 is failing because the V.27ter modemsays it trained on HDLC
 # MRGX05 is failing because we don't distinguish MPS immediately after MCF from MPS after
 # a corrupt image signal.
 
 #for TEST in MRGX01 MRGX02 MRGX03 MRGX04 MRGX05 MRGX06 MRGX07 MRGX08 ; do
-for TEST in MRGX01 MRGX02 MRGX03 MRGX04 MRGX06 MRGX07 MRGX08 ; do
+for TEST in MRGX01 MRGX02 MRGX04 MRGX06 MRGX07 MRGX08 ; do
     run_tsb85_test
 done
 
@@ -94,7 +95,8 @@ for TEST in OTGC10 OTGC11 ; do
     run_tsb85_test
 done
 
-for TEST in OTEN01 OTEN02 OTEN03 OTEN04 OTEN05 OTEN06 ; do
+#for TEST in OTEN01 OTEN02 OTEN03 OTEN04 OTEN05 OTEN06 ; do
+for TEST in OTEN01 OTEN03 OTEN04 OTEN05 OTEN06 ; do
     run_tsb85_test
 done