sip-lab 1.28.12 → 1.30.0

package/src/addon.cpp

@@ -399,6 +399,40 @@ Napi::Value call_send_dtmf(const Napi::CallbackInfo &info) {
   return env.Null();
 }
 
+Napi::Value call_send_bfsk(const Napi::CallbackInfo &info) {
+  Napi::Env env = info.Env();
+
+  if (info.Length() != 2) {
+    Napi::Error::New(env,
+                     "Wrong number of arguments. Expected: call_id, params.")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+
+  if (!info[0].IsNumber()) {
+    Napi::TypeError::New(env, "call_id must be number.")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+  int call_id = info[0].As<Napi::Number>().Int32Value();
+
+  if (!info[1].IsString()) {
+    Napi::TypeError::New(env, "params must be a JSON string.")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+  const string json = info[1].As<Napi::String>().Utf8Value();
+
+  int res = pjw_call_send_bfsk(call_id, json.c_str());
+
+  if (res != 0) {
+    Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
+    return env.Null();
+  }
+
+  return env.Null();
+}
+
 Napi::Value call_reinvite(const Napi::CallbackInfo &info) {
   Napi::Env env = info.Env();
 
@@ -637,6 +671,141 @@ Napi::Value call_start_speech_recog(const Napi::CallbackInfo &info) {
   return env.Null();
 }
 
+Napi::Value call_start_inband_dtmf_detection(const Napi::CallbackInfo &info) {
+  Napi::Env env = info.Env();
+
+  if (info.Length() != 2) {
+    Napi::Error::New(env,
+                     "Wrong number of arguments. Expected: call_id, params.")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+
+  if (!info[0].IsNumber()) {
+    Napi::TypeError::New(env, "call_id must be number.")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+  int call_id = info[0].As<Napi::Number>().Int32Value();
+
+  if (!info[1].IsString()) {
+    Napi::TypeError::New(env, "params must be a JSON string.")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+  const string json = info[1].As<Napi::String>().Utf8Value();
+
+  int res = pjw_call_start_inband_dtmf_detection(call_id, json.c_str());
+
+  if (res != 0) {
+    Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
+    return env.Null();
+  }
+
+  return env.Null();
+}
+
+Napi::Value call_stop_inband_dtmf_detection(const Napi::CallbackInfo &info) {
+  Napi::Env env = info.Env();
+
+  if (info.Length() != 2) {
+    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+
+  if (!info[0].IsNumber()) {
+    Napi::TypeError::New(env, "call_id must be number.")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+  int call_id = info[0].As<Napi::Number>().Int32Value();
+
+  if (!info[1].IsString()) {
+    Napi::TypeError::New(env, "params must be a JSON string.")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+  const string json = info[1].As<Napi::String>().Utf8Value();
+
+  int res = pjw_call_stop_inband_dtmf_detection(call_id, json.c_str());
+
+  if (res != 0) {
+    Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
+    return env.Null();
+  }
+
+  return env.Null();
+}
+
+Napi::Value call_start_bfsk_detection(const Napi::CallbackInfo &info) {
+  Napi::Env env = info.Env();
+
+  if (info.Length() != 2) {
+    Napi::Error::New(env,
+                     "Wrong number of arguments. Expected: call_id, params.")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+
+  if (!info[0].IsNumber()) {
+    Napi::TypeError::New(env, "call_id must be number.")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+  int call_id = info[0].As<Napi::Number>().Int32Value();
+
+  if (!info[1].IsString()) {
+    Napi::TypeError::New(env, "params must be a JSON string.")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+  const string json = info[1].As<Napi::String>().Utf8Value();
+
+  int res = pjw_call_start_bfsk_detection(call_id, json.c_str());
+
+  if (res != 0) {
+    Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
+    return env.Null();
+  }
+
+  return env.Null();
+}
+
+Napi::Value call_stop_bfsk_detection(const Napi::CallbackInfo &info) {
+  Napi::Env env = info.Env();
+
+  if (info.Length() != 2) {
+    Napi::Error::New(env, "Wrong number of arguments. Expected: call_id")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+
+  if (!info[0].IsNumber()) {
+    Napi::TypeError::New(env, "call_id must be number.")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+  int call_id = info[0].As<Napi::Number>().Int32Value();
+
+  if (!info[1].IsString()) {
+    Napi::TypeError::New(env, "params must be a JSON string.")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+  const string json = info[1].As<Napi::String>().Utf8Value();
+
+  int res = pjw_call_stop_bfsk_detection(call_id, json.c_str());
+
+  if (res != 0) {
+    Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
+    return env.Null();
+  }
+
+  return env.Null();
+}
+
+
 
 Napi::Value call_stop_record_wav(const Napi::CallbackInfo &info) {
   Napi::Env env = info.Env();
@@ -1395,25 +1564,26 @@ Napi::Object init(Napi::Env env, Napi::Object exports) {
   exports.Set("call_respond", Napi::Function::New(env, call_respond));
   exports.Set("call_terminate", Napi::Function::New(env, call_terminate));
   exports.Set("call_send_dtmf", Napi::Function::New(env, call_send_dtmf));
+  exports.Set("call_send_bfsk", Napi::Function::New(env, call_send_bfsk));
   exports.Set("call_reinvite", Napi::Function::New(env, call_reinvite));
   exports.Set("call_send_request", Napi::Function::New(env, call_send_request));
-  exports.Set("call_start_record_wav",
-              Napi::Function::New(env, call_start_record_wav));
-  exports.Set("call_start_play_wav",
-              Napi::Function::New(env, call_start_play_wav));
-  exports.Set("call_start_fax", Napi::Function::New(env, call_start_fax));
 
+  exports.Set("call_start_record_wav", Napi::Function::New(env, call_start_record_wav));
+  exports.Set("call_start_play_wav", Napi::Function::New(env, call_start_play_wav));
+  exports.Set("call_start_fax", Napi::Function::New(env, call_start_fax));
   exports.Set("call_start_speech_synth", Napi::Function::New(env, call_start_speech_synth));
-
   exports.Set("call_start_speech_recog", Napi::Function::New(env, call_start_speech_recog));
+  exports.Set("call_start_inband_dtmf_detection", Napi::Function::New(env, call_start_inband_dtmf_detection));
+  exports.Set("call_start_bfsk_detection", Napi::Function::New(env, call_start_bfsk_detection));
 
-  exports.Set("call_stop_record_wav",
-              Napi::Function::New(env, call_stop_record_wav));
-  exports.Set("call_stop_play_wav",
-              Napi::Function::New(env, call_stop_play_wav));
+  exports.Set("call_stop_record_wav", Napi::Function::New(env, call_stop_record_wav));
+  exports.Set("call_stop_play_wav", Napi::Function::New(env, call_stop_play_wav));
   exports.Set("call_stop_fax", Napi::Function::New(env, call_stop_fax));
   exports.Set("call_stop_speech_synth", Napi::Function::New(env, call_stop_speech_synth));
   exports.Set("call_stop_speech_recog", Napi::Function::New(env, call_stop_speech_recog));
+  exports.Set("call_stop_inband_dtmf_detection", Napi::Function::New(env, call_stop_inband_dtmf_detection));
+  exports.Set("call_stop_bfsk_detection", Napi::Function::New(env, call_stop_bfsk_detection));
+
   exports.Set("call_get_stream_stat",
               Napi::Function::New(env, call_get_stream_stat));
   // exports.Set("call_refer", Napi::Function::New(env, call_refer));

package/src/event_templates.cpp

@@ -47,6 +47,14 @@ int make_evt_dtmf(char *dest, int size, long call_id, int digits_len,
                   call_id, digits_len, digits, mode, media_id);
 }
 
+int make_evt_bfsk(char *dest, int size, long call_id, int bits_len,
+                  const char *bits, int media_id) {
+  return snprintf(dest, size,
+                  "{\"event\": \"bfsk\", \"call_id\": %ld, \"bits\": "
+                  "\"%.*s\", \"media_id\": %i}",
+                  call_id, bits_len, bits, media_id);
+}
+
 int make_evt_call_ended(char *dest, int size, long call_id, int sip_msg_len,
                         const char *sip_msg) {
   printf("make_evt_call_ended sip_msg_len=%i sip_msg=%p\n", sip_msg_len,

package/src/event_templates.hpp

@@ -17,6 +17,9 @@ int make_evt_media_update(char *dest, int size, long call_id,
 int make_evt_dtmf(char *dest, int size, long call_id, int digits_len,
                   const char *digits, int mode, int media_id);
 
+int make_evt_bfsk(char *dest, int size, long call_id, int bits_len,
+                  const char *bits, int media_id);
+
 int make_evt_call_ended(char *dest, int size, long call_id, int sip_msg_len,
                         const char *sip_msg);
 

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

@@ -0,0 +1,23 @@
+#ifndef __PJMEDIA_BFSK_DET_H__
+#define __PJMEDIA_BFSK_DET_H__
+
+#include <pjmedia/port.h>
+
+PJ_BEGIN_DECL
+
+PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
+                unsigned clock_rate,
+                unsigned channel_count,
+                unsigned samples_per_frame,
+                unsigned bits_per_sample,
+                void (*cb)(pjmedia_port*,
+                    void *user_data,
+                    int bit),
+                void *user_data,
+                int freq_zero,
+                int freq_one,
+				pjmedia_port **p_port);
+
+PJ_END_DECL
+
+#endif	/* __PJMEDIA_BFSK_DET_H__ */

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

@@ -0,0 +1,289 @@
+/* $Id: bfsk_det.c 0000 2024-09-08 08:11:53Z mayamatakeshi $ */
+/* 
+ * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
+ * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
+
+#include <pjmedia/bfsk_det.h>
+#include <pjmedia/errno.h>
+#include <pjmedia/port.h>
+#include <pj/assert.h>
+#include <pj/pool.h>
+#include <pj/string.h>
+
+#include <math.h>
+
+#define SIGNATURE   PJMEDIA_SIGNATURE('b', 'f', 'd', 't')
+#define THIS_FILE   "bfsk_det.c"
+
+#if 0
+#   define TRACE_(expr)	PJ_LOG(4,expr)
+#else
+#   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);
+
+struct bfsk_det
+{
+    struct pjmedia_port	base;
+    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);
+    if(bit != 0 && bit != 1) return;
+
+    struct bfsk_det *dport = (struct bfsk_det*)user_data;
+
+    TRACE_((THIS_FILE, "bfsk_det bit detected: %c", bit)); 
+
+    if(!dport->bfsk_cb) return;
+
+    dport->bfsk_cb((pjmedia_port*)dport,
+        dport->bfsk_cb_user_data,
+        bit);
+}
+*/
+	
+PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
+				unsigned clock_rate,
+				unsigned channel_count,
+				unsigned samples_per_frame,
+				unsigned bits_per_sample,
+				void (*cb)(pjmedia_port*, 
+					void *user_data, 
+					int bit), 
+				void *user_data,
+                int freq_zero,
+                int freq_one,
+				pjmedia_port **p_port)
+{
+    printf("pjmedia_bfsk_det_create\n");
+    struct bfsk_det *det;
+
+    printf("p1\n");
+    const pj_str_t name = pj_str("bfsk_det");
+
+    PJ_ASSERT_RETURN(pool && clock_rate && channel_count && 
+		     samples_per_frame && bits_per_sample == 16 && 
+		     p_port != NULL, PJ_EINVAL);
+
+    PJ_ASSERT_RETURN(pool && p_port, PJ_EINVAL);
+
+    printf("p2\n");
+
+    det = PJ_POOL_ZALLOC_T(pool, struct bfsk_det);
+    PJ_ASSERT_RETURN(pool != NULL, PJ_ENOMEM);
+    printf("p3\n");
+
+    pjmedia_port_info_init(&det->base.info, &name, SIGNATURE, clock_rate,
+			   channel_count, bits_per_sample, samples_per_frame);
+
+    det->base.put_frame = &bfsk_det_put_frame;
+    det->base.on_destroy = &bfsk_det_on_destroy;
+
+    printf("p5\n");
+
+    det->bfsk_cb = cb;
+    det->bfsk_cb_user_data = user_data;
+
+    printf("p6\n");
+
+    det->clock_rate = clock_rate;
+    det->freq_zero = freq_zero;
+    det->freq_one = freq_one;
+
+    float threshold = 0.1;
+
+    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);
+
+    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");
+
+    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");
+
+    *p_port = &det->base; 
+    return PJ_SUCCESS;
+}
+
+static pj_status_t bfsk_det_put_frame(pjmedia_port *this_port, 
+				  pjmedia_frame *frame)
+{
+    printf("bfsk_det_put_frame\n");
+    if(frame->type != PJMEDIA_FRAME_TYPE_AUDIO) return PJ_SUCCESS;
+
+    struct bfsk_det *dport = (struct bfsk_det*) this_port;
+
+    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;
+}
+
+static pj_status_t bfsk_det_on_destroy(pjmedia_port *this_port)
+{
+    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);