sip-lab 1.29.0 → 1.30.0

package/samples_extra/ws_speech_server.start_bfsk_detection.js.future

@@ -0,0 +1,164 @@
+var sip = require ('../index.js')
+var Zeq = require('@mayama/zeq')
+var z = new Zeq()
+var m = require('data-matching')
+var sip_msg = require('sip-matching')
+var sdp = require('sdp-matching')
+
+function stringToBinary(str) {
+  return str.split('').map(char => {
+    return char.charCodeAt(0).toString(2).padStart(8, '0');
+  }).join('');
+}
+
+async function test() {
+    //sip.set_log_level(6)
+    sip.dtmf_aggregation_on(500)
+
+    sip.set_codecs("PCMU/8000/1:128")
+
+    z.trap_events(sip.event_source, 'event', (evt) => {
+        var e = evt.args[0]
+        return e
+    })
+
+    console.log(sip.start((data) => { console.log(data)} ))
+
+    t1 = sip.transport.create({address: "127.0.0.1", type: 'tcp'})
+    t2 = sip.transport.create({address: "127.0.0.1", type: 'tcp'})
+
+    console.log("t1", t1)
+    console.log("t2", t2)
+
+    oc = sip.call.create(t1.id, {
+        from_uri: '"abc"<sip:alice@test.com>',
+        to_uri: `sip:bob@${t2.address}:${t2.port}`,
+    })
+
+    await z.wait([
+        {
+            event: "incoming_call",
+            call_id: m.collect("call_id"),
+            msg: sip_msg({
+                $rm: 'INVITE',
+                $fU: 'alice',
+                $fd: 'test.com',
+                $tU: 'bob',
+            }),
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '100',
+                $rr: 'Trying',
+            }),
+        },
+    ], 1000)
+
+    ic = {
+        id: z.store.call_id,
+        sip_call_id: z.store.sip_call_id,
+    }
+
+    sip.call.respond(ic.id, {
+        code: 200,
+        reason:'OK',
+    })
+
+    await z.wait([
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+            }),
+        },
+    ], 1000)
+
+    sip.call.start_record_wav(oc.id, {file: './oc.wav'})
+    sip.call.start_record_wav(ic.id, {file: './ic.wav'})
+
+    sip.call.start_bfsk_detection(oc.id, {freq_zero: 500, freq_one: 2000})
+    sip.call.start_bfsk_detection(ic.id, {freq_zero: 500, freq_one: 2000})
+
+    await z.sleep(100)
+
+    sip.call.start_speech_synth(oc.id, {server_url: 'ws://0.0.0.0:8080', engine: 'bfsk-ss', voice: '5', language: '500:2000', text: 'a', times: 1})
+    sip.call.start_speech_synth(ic.id, {server_url: 'ws://0.0.0.0:8080', engine: 'bfsk-ss', voice: '5', language: '500:2000', text: 'b', times: 1})
+
+    await z.wait([
+        {
+            event: 'speech_synth_complete',
+            call_id: ic.id,
+        },
+        {
+            event: 'speech_synth_complete',
+            call_id: oc.id,
+        },
+        {
+            event: 'bfsk',
+            call_id: oc.id,
+            bits: stringToBinary('b'),
+        },
+        {
+            event: 'bfsk',
+            call_id: ic.id,
+            bits: stringToBinary('a'),
+        }
+    ], 3000)
+
+    await z.sleep(1000)
+
+    sip.call.stop_record_wav(oc.id)
+    sip.call.stop_record_wav(ic.id)
+
+    sip.call.terminate(oc.id)
+
+    await z.wait([
+        {
+            event: 'call_ended',
+            call_id: oc.id,
+        },
+        {
+            event: 'call_ended',
+            call_id: ic.id,
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'BYE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+            }),
+        },
+    ], 1000)
+
+    await z.sleep(100)
+
+    console.log("Success")
+
+    sip.stop()
+}
+
+
+test()
+.catch(e => {
+    console.error(e)
+    process.exit(1)
+})
+

package/src/pjmedia/include/pjmedia/bfsk_det.h

@@ -16,8 +16,6 @@ PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
                 void *user_data,
                 int freq_zero,
                 int freq_one,
-                int min_level,
-                int baud_rate,
 				pjmedia_port **p_port);
 
 PJ_END_DECL

package/src/pjmedia/include/pjmedia/ws_speech_port.h

@@ -21,6 +21,7 @@ PJ_DEF(pj_status_t) pjmedia_ws_speech_port_create( pj_pool_t *pool,
 				unsigned bits_per_sample,
                 pj_websock_endpoint *ws_endpt,
                 const char *server_url,
+                const char *uuid,
                 const char *ss_engine,
                 const char *ss_voice,
                 const char *ss_language,

package/src/pjmedia/src/pjmedia/bfsk_det.c

@@ -25,8 +25,7 @@
 #include <pj/pool.h>
 #include <pj/string.h>
 
-#include <spandsp.h>
-#include <spandsp/expose.h>
+#include <math.h>
 
 #define SIGNATURE   PJMEDIA_SIGNATURE('b', 'f', 'd', 't')
 #define THIS_FILE   "bfsk_det.c"
@@ -37,6 +36,90 @@
 #   define TRACE_(expr)
 #endif
 
+// Adapted https://github.com/ericksc/goertzel/blob/master/main.cpp
+
+#define PI 3.14159265358979
+
+typedef struct {
+	float coeff;
+	int fix_coeff;
+	int Q1;
+	int Q2;
+	double sine;
+	double cosine;
+} goertzel_t;
+
+//Para definir punto fijo de 32 bits.
+int FIXED_POINT_16 = 16;
+int ONE_16 = 1 << 16;
+
+int FIXED_POINT_30 = 30;
+int ONE_30 = 1 << 30;
+
+int toFix( float val, int ONE ) {
+    // Escalamiento
+    return (int) (val * ONE);
+}
+
+float floatVal( int fix, int ONE ) {
+    return ((float) fix) / ONE;
+}
+
+int intVal( int fix, int FIXED_POINT ) {
+    return fix >> FIXED_POINT;
+}
+
+int mul(int fix_coeff, int Q1, int FIXED_POINT_mixed) {
+    // Manejo de 64 bit para el resultado inmedianto de la multiplicación
+    // Conversion a 32 bits para posterior uso
+    return (int)((long long int)fix_coeff * (long long int)Q1 >> FIXED_POINT_mixed);
+}
+
+/* Call this routine before every "block" (size=N) of samples. */
+void goertzel_det_reset(goertzel_t *g)
+{
+    g->Q2 = 0;
+    g->Q1 = 0;
+}
+/* Call this once, to precompute the constants. */
+void goertzel_det_init(goertzel_t *g, float frequency, float sampling_rate, int samples_per_frame)
+{
+    int k;
+    double floatN;
+    double omega;
+    floatN = (double)samples_per_frame;
+    k = (int)(0.5 + ((floatN * frequency) / sampling_rate));
+    omega = (2.0 * PI * k) / floatN;
+    g->sine = sin(omega);
+    g->cosine = cos(omega);
+    g->coeff = 2.0 * g->cosine;
+    g->fix_coeff = toFix(g->coeff, ONE_30);
+    printf("For sampling_rate = %f", sampling_rate);
+    printf("samples_per_frame = %d", samples_per_frame);
+    printf(" and frequency = %f,\n", frequency);
+    printf("k = %d and coeff = %f\n\n", k, g->coeff);
+    goertzel_det_reset(g);
+}
+
+float goertzel_mag(goertzel_t *g, int *buf, int size)
+{
+    for (int index = 0; index < size; index++)
+    {
+        // Punto fijo 32. INT
+        int Q0;
+        Q0 = mul(g->fix_coeff, g->Q1, 30) - g->Q2 + toFix(buf[index], ONE_16);
+        g->Q2 = g->Q1;
+        g->Q1 = Q0;
+    }
+
+    float result;
+    result = floatVal(g->Q1, ONE_16) * floatVal(g->Q1,ONE_16) + floatVal(g->Q2,ONE_16) * floatVal(g->Q2,ONE_16) - floatVal(g->Q1,ONE_16) * floatVal(g->Q2,ONE_16) * g->coeff;
+    goertzel_det_reset(g);
+    return result;
+}
+
+
+
 static pj_status_t bfsk_det_put_frame(pjmedia_port *this_port, 
 				  pjmedia_frame *frame);
 static pj_status_t bfsk_det_on_destroy(pjmedia_port *this_port);
@@ -44,11 +127,21 @@ static pj_status_t bfsk_det_on_destroy(pjmedia_port *this_port);
 struct bfsk_det
 {
     struct pjmedia_port	base;
-    fsk_rx_state_t state;
+    int clock_rate;
+    int freq_zero;
+    int freq_one;
+
+    int zero_in_progress;
+    int one_in_progress;
+
+    goertzel_t *goertzel_zero;
+    goertzel_t *goertzel_one;
+
     void (*bfsk_cb)(pjmedia_port*, void*, int);
     void *bfsk_cb_user_data;
 };
 
+/*
 static void bfsk_det_bit_callback(void *user_data, int bit)
 {
     printf("bfsk_det_bit_callback got bit=%i\n", bit);
@@ -64,6 +157,7 @@ static void bfsk_det_bit_callback(void *user_data, int bit)
         dport->bfsk_cb_user_data,
         bit);
 }
+*/
 	
 PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
 				unsigned clock_rate,
@@ -76,13 +170,10 @@ PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
 				void *user_data,
                 int freq_zero,
                 int freq_one,
-                int min_level,
-                int baud_rate,
 				pjmedia_port **p_port)
 {
     printf("pjmedia_bfsk_det_create\n");
     struct bfsk_det *det;
-    fsk_spec_t *fsk_spec;
 
     printf("p1\n");
     const pj_str_t name = pj_str("bfsk_det");
@@ -102,8 +193,6 @@ PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
     pjmedia_port_info_init(&det->base.info, &name, SIGNATURE, clock_rate,
 			   channel_count, bits_per_sample, samples_per_frame);
 
-    printf("p4\n");
-
     det->base.put_frame = &bfsk_det_put_frame;
     det->base.on_destroy = &bfsk_det_on_destroy;
 
@@ -112,28 +201,28 @@ PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
     det->bfsk_cb = cb;
     det->bfsk_cb_user_data = user_data;
 
-    fsk_spec = PJ_POOL_ZALLOC_T(pool, fsk_spec_t);
-    PJ_ASSERT_RETURN(pool != NULL, PJ_ENOMEM);
     printf("p6\n");
 
-    fsk_spec->name = "bfsk";
-    fsk_spec->freq_zero = freq_zero;
-    fsk_spec->freq_one = freq_one;
-    fsk_spec->min_level = min_level;
-    fsk_spec->baud_rate = baud_rate;
+    det->clock_rate = clock_rate;
+    det->freq_zero = freq_zero;
+    det->freq_one = freq_one;
 
-    int sync_mode = 0;
+    float threshold = 0.1;
 
-    printf("p7\n");
-    fsk_rx_state_t *res = fsk_rx_init(&det->state, fsk_spec, sync_mode, &bfsk_det_bit_callback, (void*)det);
-    if(res != &det->state) {
-       printf("fsx_rx_init failed\n"); 
-    }
+    det->goertzel_zero = PJ_POOL_ZALLOC_T(pool, goertzel_t);
+    PJ_ASSERT_RETURN(pool != NULL, PJ_ENOMEM);
+
+    det->goertzel_one = PJ_POOL_ZALLOC_T(pool, goertzel_t);
+    PJ_ASSERT_RETURN(pool != NULL, PJ_ENOMEM);
 
-    //fsk_rx_init(&(det->state), &preset_fsk_specs[FSK_V21CH2], FSK_FRAME_MODE_SYNC, &bfsk_det_bit_callback, (void*)det);
+    int sample_rate = clock_rate;
+
+    goertzel_det_init(det->goertzel_zero, det->freq_zero, sample_rate, samples_per_frame);
+    goertzel_det_init(det->goertzel_one, det->freq_one, sample_rate, samples_per_frame);
+
+    printf("p7\n");
 
-    printf("p8\n");
-    TRACE_((THIS_FILE, "bfsk_det created: %u/%u/%u/%u", clock_rate, 
+    TRACE_((THIS_FILE, "bfsk_det created: clock_rate=%u channel_count=%u samples_per_frame=%u bits_per_frame=%u", clock_rate, 
 	    channel_count, samples_per_frame, bits_per_sample));
 
     printf("fsk_rx_init done\n");
@@ -150,9 +239,46 @@ static pj_status_t bfsk_det_put_frame(pjmedia_port *this_port,
 
     struct bfsk_det *dport = (struct bfsk_det*) this_port;
 
-    printf("p=%x, size=%i\n", frame->buf, PJMEDIA_PIA_SPF(&dport->base.info));
-    fsk_rx(&dport->state, (const pj_int16_t *)frame->buf,
-		PJMEDIA_PIA_SPF(&dport->base.info));
+    int size = PJMEDIA_PIA_SPF(&dport->base.info);
+    int bps = PJMEDIA_PIA_BITS(&dport->base.info);
+
+    printf("p=%x, size=%i clock_rate=%i bits_per_sample=%i\n", frame->buf, size, dport->clock_rate, bps);
+
+    int16_t * samples = (int16_t*)frame->buf;
+
+    printf("Buffer contents:\n");
+    for (int i = 0; i < size; i++) {
+        printf("%04x ", samples[i] & 0xFFFF);
+    }
+    printf("\n");
+
+    float zero_power = goertzel_mag(dport->goertzel_zero, frame->buf, size);
+    float  one_power = goertzel_mag(dport->goertzel_one,  frame->buf, size);
+
+    int zero = zero_power > 1000000000.0;
+    int  one =  one_power > 1000000000.0;
+
+    printf("zero_power=%f zero_in_progress=%i zero=%i\n", zero_power, dport->zero_in_progress, zero);
+    printf("one_power=%f one_in_progress=%i  one=%i\n", one_power, dport->one_in_progress, one);
+
+
+    // Check for zero signal extinction
+    if(dport->zero_in_progress && zero == 0) {
+        printf("notifying bit=0\n");
+        dport->bfsk_cb((pjmedia_port*)dport, dport->bfsk_cb_user_data, 0);
+        dport->zero_in_progress = 0;
+    } else {
+        dport->zero_in_progress = zero;
+    }
+
+    // Check for one signal extinction
+    if(dport->one_in_progress && one == 0) {
+        printf("notifying bit=1\n");
+        dport->bfsk_cb((pjmedia_port*)dport, dport->bfsk_cb_user_data, 1);
+        dport->one_in_progress = 0;
+    } else {
+        dport->one_in_progress = one;
+    }
 
     return PJ_SUCCESS;
 }

package/src/pjmedia/src/pjmedia/ws_speech_port.cpp

@@ -70,6 +70,8 @@ struct ws_speech_t
 
     int sample_rate;
 
+    char *uuid;
+
     char *ss_engine;
     char *ss_voice;
     char *ss_language;
@@ -112,6 +114,7 @@ static pj_bool_t on_connect_complete(pj_websock_t *c, pj_status_t status)
 
         // Add members to the "args" object
         args.AddMember("sampleRate", port->sample_rate, allocator);
+        args.AddMember("uuid", rapidjson::Value(port->uuid, allocator), allocator);
         args.AddMember("engine", rapidjson::Value(port->ss_engine, allocator), allocator);
         args.AddMember("voice", rapidjson::Value(port->ss_voice, allocator), allocator);
         args.AddMember("language", rapidjson::Value(port->ss_language, allocator), allocator);
@@ -145,6 +148,7 @@ static pj_bool_t on_connect_complete(pj_websock_t *c, pj_status_t status)
 
         // Add members to the "args" object
         args.AddMember("sampleRate", port->sample_rate, allocator);
+        args.AddMember("uuid", rapidjson::Value(port->uuid, allocator), allocator);
         args.AddMember("engine", rapidjson::Value(port->sr_engine, allocator), allocator);
         args.AddMember("language", rapidjson::Value(port->sr_language, allocator), allocator);
 
@@ -237,6 +241,7 @@ PJ_DEF(pj_status_t) pjmedia_ws_speech_port_create(pj_pool_t *pool,
 				unsigned bits_per_sample,
                 struct pj_websock_endpoint *ws_endpt,
                 const char *server_url,
+                const char *uuid,
                 const char *ss_engine,
                 const char *ss_voice,
                 const char *ss_language,
@@ -265,6 +270,9 @@ PJ_DEF(pj_status_t) pjmedia_ws_speech_port_create(pj_pool_t *pool,
 
     port->sample_rate = clock_rate;
 
+    port->uuid = (char*)pj_pool_alloc(pool, strlen(uuid) + 1);
+    pj_ansi_strcpy(port->uuid, uuid);
+
     if(ss_engine) {
       port->ss_engine = (char*)pj_pool_alloc(pool, strlen(ss_engine) + 1);
       pj_ansi_strcpy(port->ss_engine, ss_engine);