sip-lab 1.32.0 → 1.34.0

package/README.md

@@ -8,6 +8,7 @@ It uses pjproject for SIP and media processing.
 It permits to:
   - make audio calls using UDP, TCP and TLS transports
   - send/receive DTMF inband/RFC2833/INFO.
+  - send/receive [BFSK](https://en.wikipedia.org/wiki/Frequency-shift_keying) bits.
   - play/record audio on a call from/to a wav file
   - send/receive fax (T.30 only)
   - send/receive MRCPv2 messages (TCP only, no TLS)
@@ -87,4 +88,8 @@ Although the code in written in *.cpp/*.hpp named files, this is not actually a
 
 It is mostly written in C using some C++ facilities.
 
+### Release Notes
+
+[ReleaseNotes](https://github.com/MayamaTakeshi/sip-lab/blob/master/RELEASE_NOTES.md)
+
 

package/binding.gyp

@@ -120,6 +120,7 @@
         'src/addon.cpp',
         'src/pjmedia/src/pjmedia/dtmfdet.c',
         'src/pjmedia/src/pjmedia/bfsk_det.c',
+        'src/pjmedia/src/pjmedia/bfsk_det2.c',
         'src/pjmedia/src/pjmedia/fax_port.c',
         'src/pjmedia/src/pjmedia/flite_port.c',
         'src/pjmedia/src/pjmedia/pocketsphinx_port.c',

package/build_deps.sh

@@ -39,7 +39,7 @@ then
     git clone https://github.com/MayamaTakeshi/bcg729
     cd bcg729
     git checkout faaa895862165acde6df8add722ba4f85a25007d
-    cmake . 
+    cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
     make
     mkdir -p lib
     cp -f src/libbcg729.a lib
@@ -70,6 +70,8 @@ EOF
 #define PJSUA_MAX_ACC (20000)
 #define PJ_IOQUEUE_MAX_HANDLES (1024)
 #define PJSUA_MAX_CALLS (20000)
+
+#define PJMEDIA_HAS_OPUS_CODEC 1
 EOF
     make dep && make clean && make
 fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sip-lab",
-  "version": "1.32.0",
+  "version": "1.34.0",
   "description": "",
   "main": "index.js",
   "engines": {

package/samples/100_calls.js

@@ -80,6 +80,11 @@ async function test() {
 
     await z.wait(events, 50000)
 
+    ocs.forEach(oc => {
+        sip.call.start_inband_dtmf_detection(oc.id)
+    })
+
+    // first send RFC2833 DTMF digits
     ocs.forEach(oc => {
         sip.call.send_dtmf(oc.id, {digits: '1234', mode: 0})
     })
@@ -92,10 +97,7 @@ async function test() {
         media_id: 0,
     })).value(), 50000)
 
-    ocs.forEach(oc => {
-        sip.call.start_inband_dtmf_detection(oc.id)
-    })
-
+    // now send inband DTMF digits
     z.store.ic_ids.forEach(ic_id => {
         sip.call.send_dtmf(ic_id, {digits: '4321', mode: 1})
     })

package/samples/g729.js

@@ -77,6 +77,23 @@ async function test() {
         },
     ], 1000)
 
+    sip.call.start_record_wav(oc.id, {file: './oc.wav'})
+    sip.call.start_record_wav(ic.id, {file: './ic.wav'})
+
+    sip.call.start_play_wav(oc.id, {file: 'samples/artifacts/yosemitesam.wav', end_of_file_event: true, no_loop: true})
+    sip.call.start_play_wav(ic.id, {file: 'samples/artifacts/yosemitesam.wav', end_of_file_event: true, no_loop: true})
+
+    await z.wait([
+        {
+            event: 'end_of_file',
+            call_id: oc.id,
+        },
+        {
+            event: 'end_of_file',
+            call_id: ic.id,
+        },
+    ], 3000)
+
     sip.call.reinvite(oc.id)
 
     await z.wait([
@@ -173,6 +190,9 @@ async function test() {
     assert(oc_stat.CodecInfo == 'G729/8000/1')
     assert(ic_stat.CodecInfo == 'G729/8000/1')
 
+    sip.call.stop_record_wav(oc.id)
+    sip.call.stop_record_wav(ic.id)
+
     sip.call.terminate(oc.id)
 
     await z.wait([

package/samples/opus.narrowband.js

@@ -0,0 +1,236 @@
+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')
+
+var assert = require('assert')
+
+async function test() {
+    //sip.set_log_level(6)
+    sip.dtmf_aggregation_on(500)
+
+    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: 'udp'})
+    t2 = sip.transport.create({address: "127.0.0.1", type: 'udp'})
+
+    console.log("t1", t1)
+    console.log("t2", t2)
+
+    console.log(sip.get_codecs())
+    sip.set_codecs("opus/48000/2:128")
+
+    flags = 0
+
+    oc = sip.call.create(t1.id, {from_uri: 'sip:alice@test.com', to_uri: `sip:bob@${t2.address}:${t2.port}`})
+
+    await z.wait([
+        {
+            event: "incoming_call",
+            call_id: m.collect("call_id"),
+        },
+        {
+            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',
+                'hdr_content_type': 'application/sdp',
+                $rb: '!{_}a=sendrecv',
+            }),
+        },
+    ], 1000)
+
+    sip.call.start_record_wav(oc.id, {file: './oc.wav'})
+    sip.call.start_record_wav(ic.id, {file: './ic.wav'})
+
+    sip.call.start_play_wav(oc.id, {file: 'samples/artifacts/yosemitesam.wav', end_of_file_event: true, no_loop: true})
+    sip.call.start_play_wav(ic.id, {file: 'samples/artifacts/yosemitesam.wav', end_of_file_event: true, no_loop: true})
+
+    await z.wait([
+        {
+            event: 'end_of_file',
+            call_id: oc.id,
+        },
+        {
+            event: 'end_of_file',
+            call_id: ic.id,
+        },
+    ], 3000)
+
+    sip.call.reinvite(oc.id)
+
+    await z.wait([
+        {
+            event: 'reinvite',
+            call_id: ic.id
+        },
+    ], 1000)
+
+    sip.call.respond(ic.id, {code: 200, reason: 'OK'})
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '100',
+            }),
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+                $rb: '!{_}a=sendrecv',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+        },
+    ], 500)
+
+    sip.call.reinvite(oc.id, false, 0)
+
+    await z.wait([
+        {
+            event: 'reinvite',
+            call_id: ic.id
+        },
+    ], 1000)
+
+    sip.call.respond(ic.id, {code: 200, reason: 'OK'})
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '100',
+            }),
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+                $rb: '!{_}a=sendrecv',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+        },
+    ], 500)
+
+    oc_stat = sip.call.get_stream_stat(oc.id, {media_id: 0})
+    ic_stat = sip.call.get_stream_stat(ic.id, {media_id: 0})
+
+    console.log(oc_stat)
+    console.log(ic_stat)
+
+    oc_stat = JSON.parse(oc_stat)
+    ic_stat = JSON.parse(ic_stat)
+
+    assert(oc_stat.CodecInfo == 'opus/8000/1')
+    assert(ic_stat.CodecInfo == 'opus/8000/1')
+
+    await z.sleep(100)
+
+    sip.call.send_dtmf(oc.id, {digits: '12', mode: 1})
+    sip.call.send_dtmf(ic.id, {digits: '21', mode: 1})
+
+    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)
+
+    console.log("Success")
+
+    sip.stop()
+    process.exit(0)
+}
+
+test()
+.catch(e => {
+    console.error(e)
+    process.exit(1)
+})

package/samples/{send_and_receive_bfsk.js.future → send_and_receive_bfsk.js}

@@ -71,11 +71,9 @@ async function test() {
               {
                 type: 'audio',
                 local: {
-                  port: 10000,
                   mode: 'sendrecv'
                 },
                 remote: {
-                  port: 10002,
                   mode: 'sendrecv'
                 },
               },
@@ -89,11 +87,9 @@ async function test() {
               {
                 type: 'audio',
                 local: {
-                  port: 10002,
                   mode: 'sendrecv'
                 },
                 remote: {
-                  port: 10000,
                   mode: 'sendrecv'
                 },
               }
@@ -104,33 +100,34 @@ async function test() {
     sip.call.start_record_wav(oc.id, {file: 'oc.wav'})
     sip.call.start_record_wav(ic.id, {file: 'ic.wav'})
 
-    await z.sleep(100)
-
-    sip.call.start_bfsk_detection(oc.id, {freq_zero: 880, freq_one: 1280})
-    //sip.call.start_bfsk_detection(ic.id, {freq_zero: 880, freq_one: 1280})
+    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})
 
     oc_bits = '1010'
     ic_bits = '1100'
 
-    sip.call.send_bfsk(ic.id, {bits: ic_bits, freq_zero: 880, freq_one: 1280})
-    //sip.call.send_bfsk(oc.id, {bits: oc_bits, freq_zero: 880, freq_one: 1280})
-
-    await z.wait([
-       {
-            event: 'bfsk',
-            call_id: ic.id,
-            bits: oc_bits,
-            media_id: 0
-       },
-       {
-            event: 'bfsk',
-            call_id: oc.id,
-            bits: ic_bits,
-            media_id: 0
-       },
-    ], 10000)
-
-    await z.sleep(1000)
+    // wait a little for voice path to open
+    await z.sleep(50)
+
+    for(var i=0 ; i<5 ; i++) {
+        sip.call.send_bfsk(ic.id, {bits: ic_bits, freq_zero: 500, freq_one: 2000})
+        sip.call.send_bfsk(oc.id, {bits: oc_bits, freq_zero: 500, freq_one: 2000})
+
+        await z.wait([
+           {
+                event: 'bfsk',
+                call_id: ic.id,
+                bits: oc_bits,
+                media_id: 0
+           },
+           {
+                event: 'bfsk',
+                call_id: oc.id,
+                bits: ic_bits,
+                media_id: 0
+           },
+        ], 10000)
+    }
 
     sip.call.stop_record_wav(oc.id)
     sip.call.stop_record_wav(ic.id)

package/samples/stop_with_cleanup.js

@@ -122,6 +122,13 @@ test()
 .catch(e => {
     console.error(e)
     sip.stop(true)
-    process.exit(0)
+
+    if(e == "SOME ERROR") {
+        console.log("Expected error catched")
+        process.exit(0)
+    } else {
+        console.log("Unexpected error catched")
+        process.exit(1)
+    }
 })
 

package/src/pjmedia/include/pjmedia/bfsk_det2.h

@@ -0,0 +1,23 @@
+#ifndef __PJMEDIA_BFSK_DET2_H__
+#define __PJMEDIA_BFSK_DET2_H__
+
+#include <pjmedia/port.h>
+
+PJ_BEGIN_DECL
+
+PJ_DEF(pj_status_t) pjmedia_bfsk_det2_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_DET2_H__ */

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

@@ -36,88 +36,106 @@
 #   define TRACE_(expr)
 #endif
 
-// Adapted https://github.com/ericksc/goertzel/blob/master/main.cpp
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
 
-#define PI 3.14159265358979
+// Converted by ChatGPT from https://github.com/hackergrrl/goertzel/blob/master/index.js
 
 typedef struct {
-	float coeff;
-	int fix_coeff;
-	int Q1;
-	int Q2;
-	double sine;
-	double cosine;
+    int freq;
+    int sampleRate;
+    int samplesPerFrame;
+    double targetMagnitude;  // Store the precomputed magnitude
 } goertzel_t;
 
-//Para definir punto fijo de 32 bits.
-int FIXED_POINT_16 = 16;
-int ONE_16 = 1 << 16;
+#define CHUNK_SIZE 16
+#define THRESHOLD 0.9
 
-int FIXED_POINT_30 = 30;
-int ONE_30 = 1 << 30;
+double precalcMagnitude(int freq, double rate) {
+    double t = 0.0;
+    double tstep = 1.0 / rate;
+    double samples[CHUNK_SIZE];
+    for (int i = 0; i < CHUNK_SIZE; i++) {
+        samples[i] = sin(2 * M_PI * freq * t);
+        t += tstep;
+    }
 
-int toFix( float val, int ONE ) {
-    // Escalamiento
-    return (int) (val * ONE);
-}
+    int k = (int)(0.5 + (CHUNK_SIZE * freq) / rate);
+    double w = (2 * M_PI / CHUNK_SIZE) * k;
+    double c = cos(w);
+    double s = sin(w);
+    double coeff = 2.0 * c;
+
+    double q0 = 0.0, q1 = 0.0, q2 = 0.0;
+    for (int i = 0; i < CHUNK_SIZE; i++) {
+        q0 = coeff * q1 - q2 + samples[i];
+        q2 = q1;
+        q1 = q0;
+    }
 
-float floatVal( int fix, int ONE ) {
-    return ((float) fix) / ONE;
-}
+    double real = q1 - q2 * c;
+    double imaginary = q2 * s;
+    double magSquared = real * real + imaginary * imaginary;
 
-int intVal( int fix, int FIXED_POINT ) {
-    return fix >> FIXED_POINT;
+    return magSquared;
 }
 
-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);
-}
+void goertzel_det_init(goertzel_t *g, int freq, int sample_rate) {
+    g->freq = freq;
+    g->sampleRate = sample_rate;
+    g->samplesPerFrame = CHUNK_SIZE;
 
-/* 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);
+    assert(g->sampleRate >= g->freq * 2);
+
+    g->samplesPerFrame = (int)floor(g->samplesPerFrame);
+
+    // Precompute the target magnitude and store it in the struct
+    g->targetMagnitude = precalcMagnitude(g->freq, g->sampleRate);
+    // printf("Target Magnitude: %f\n", g->targetMagnitude);
 }
 
-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 goertzel_mag(goertzel_t *g, void *samples) {
+    // Allocate an array of floats to hold normalized samples
+    float float_samples[CHUNK_SIZE];
+    uint8_t *byteBuffer = (uint8_t *)samples;  // Cast the void* to a byte array (uint8_t *)
+    for (int i = 0; i < CHUNK_SIZE ; i++) {
+        // Combine two consecutive bytes into a 16-bit signed integer (little-endian)
+        int16_t sample = byteBuffer[i * 2] | (byteBuffer[i * 2 + 1] << 8);
+        float_samples[i] = sample * 2.0f / 0x7FFF;
     }
 
-    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;
-}
+    /*
+    for (int i = 0; i < CHUNK_SIZE; i++) {
+        printf("%f,", float_samples[i]);
+    }
+    printf("\n");
+    */
+
+
+    int k = (int)(0.5f + (CHUNK_SIZE * g->freq) / g->sampleRate);
+    float w = (2.0f * M_PI / CHUNK_SIZE) * k;
+    float c = cosf(w);
+    float s = sinf(w);
+    float coeff = 2.0f * c;
+
+    float q0 = 0.0f, q1 = 0.0f, q2 = 0.0f;
+
+    for (int i = 0; i < CHUNK_SIZE; i++) {
+        q0 = coeff * q1 - q2 + float_samples[i];
+        q2 = q1;
+        q1 = q0;
+    }
 
+    float real = q1 - q2 * c;
+    float imaginary = q2 * s;
+    float magSquared = real * real + imaginary * imaginary;
+
+    float per = magSquared / g->targetMagnitude;
+    //printf("(freq=%i) MagSquared=%f targetMagnitude=%f per=%f\n", g->freq, magSquared, g->targetMagnitude, per);
+    return per;
+}
 
 
 static pj_status_t bfsk_det_put_frame(pjmedia_port *this_port, 
@@ -141,24 +159,6 @@ struct bfsk_det
     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,
@@ -172,10 +172,9 @@ PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
                 int freq_one,
 				pjmedia_port **p_port)
 {
-    printf("pjmedia_bfsk_det_create\n");
+    //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 && 
@@ -184,11 +183,8 @@ PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
 
     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);
@@ -196,13 +192,9 @@ PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
     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;
@@ -217,15 +209,10 @@ PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
 
     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("bfsk_det: 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");
+    goertzel_det_init(det->goertzel_zero, det->freq_zero, sample_rate);
+    goertzel_det_init(det->goertzel_one, det->freq_one, sample_rate);
 
     *p_port = &det->base; 
     return PJ_SUCCESS;
@@ -234,50 +221,56 @@ PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
 static pj_status_t bfsk_det_put_frame(pjmedia_port *this_port, 
 				  pjmedia_frame *frame)
 {
-    printf("bfsk_det_put_frame\n");
+    //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 size = frame->size;
     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);
+    //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("%02x", samples[i] & 0xFF);
+        printf("%02x", samples[i] >> 8 & 0xFF);
     }
     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;
+    */
+
+    for(int i=0 ; i<size/2/CHUNK_SIZE; i++) {
+        double zero_power = goertzel_mag(dport->goertzel_zero, &frame->buf[i*2*CHUNK_SIZE]);
+        double  one_power = goertzel_mag(dport->goertzel_one,  &frame->buf[i*2*CHUNK_SIZE]);
+
+        int zero = zero_power > THRESHOLD;
+        int  one =  one_power > THRESHOLD;
+
+        /*
+        printf("zero_power=%f zero_in_progress=%i zero=%i threshold=%f\n", zero_power, dport->zero_in_progress, zero, THRESHOLD);
+        printf(" one_power=%f  one_in_progress=%i  one=%i threshold=%f\n", one_power, dport->one_in_progress, one, THRESHOLD);
+        */
+
+        // 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/bfsk_det2.c

@@ -0,0 +1,226 @@
+/* $Id: bfsk_det2.c 0000 2024-09-29 09:41:55Z 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_det2.h>
+#include <pjmedia/errno.h>
+#include <pjmedia/port.h>
+#include <pj/assert.h>
+#include <pj/pool.h>
+#include <pj/string.h>
+
+#include <spandsp.h>
+#include <spandsp/expose.h>
+#include <spandsp/tone_detect.h>
+
+#include <math.h>
+
+#define SIGNATURE   PJMEDIA_SIGNATURE('b', 'f', 'd', '2')
+#define THIS_FILE   "bfsk_det2.c"
+
+#if 0
+#   define TRACE_(expr)	PJ_LOG(4,expr)
+#else
+#   define TRACE_(expr)
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+static pj_status_t bfsk_det2_put_frame(pjmedia_port *this_port, 
+				  pjmedia_frame *frame);
+static pj_status_t bfsk_det2_on_destroy(pjmedia_port *this_port);
+
+struct bfsk_det2
+{
+    struct pjmedia_port	base;
+    int clock_rate;
+    int freq_zero;
+    int freq_one;
+
+    int zero_in_progress;
+    int one_in_progress;
+
+    int32_t threshold;
+    int32_t energy;
+
+    goertzel_descriptor_t desc_zero;
+    goertzel_descriptor_t desc_one;
+
+    goertzel_state_t *goertzel_zero;
+    goertzel_state_t *goertzel_one;
+
+    void (*bfsk_cb)(pjmedia_port*, void*, int);
+    void *bfsk_cb_user_data;
+};
+
+#define DTMF_SAMPLES_PER_BLOCK                  102
+
+PJ_DEF(pj_status_t) pjmedia_bfsk_det2_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_det2_create\n");
+    struct bfsk_det2 *det;
+
+    const pj_str_t name = pj_str("bfsk_det2");
+
+    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);
+
+    det = PJ_POOL_ZALLOC_T(pool, struct bfsk_det2);
+    PJ_ASSERT_RETURN(pool != NULL, PJ_ENOMEM);
+
+    pjmedia_port_info_init(&det->base.info, &name, SIGNATURE, clock_rate,
+			   channel_count, bits_per_sample, samples_per_frame);
+
+    det->base.put_frame = &bfsk_det2_put_frame;
+    det->base.on_destroy = &bfsk_det2_on_destroy;
+
+    det->bfsk_cb = cb;
+    det->bfsk_cb_user_data = user_data;
+
+    det->clock_rate = clock_rate;
+    det->freq_zero = freq_zero;
+    det->freq_one = freq_one;
+
+    make_goertzel_descriptor(&det->desc_zero, freq_zero, DTMF_SAMPLES_PER_BLOCK);
+    make_goertzel_descriptor(&det->desc_one, freq_one, DTMF_SAMPLES_PER_BLOCK);
+
+    goertzel_init(&det->goertzel_zero, &det->desc_zero);
+    goertzel_init(&det->goertzel_one, &det->desc_one);
+
+    int sample_rate = clock_rate;
+
+    //printf("bfsk_det2: clock_rate=%u channel_count=%u samples_per_frame=%u bits_per_frame=%u", clock_rate, channel_count, samples_per_frame, bits_per_sample);
+
+    goertzel_det_init(&det->goertzel_zero, det->freq_zero, sample_rate);
+    goertzel_det_init(&det->goertzel_one, det->freq_one, sample_rate);
+
+    *p_port = &det->base; 
+    return PJ_SUCCESS;
+}
+
+static pj_status_t bfsk_det2_put_frame(pjmedia_port *this_port, 
+				  pjmedia_frame *frame)
+{
+    //printf("bfsk_det2 put_frame\n");
+    if(frame->type != PJMEDIA_FRAME_TYPE_AUDIO) return PJ_SUCCESS;
+
+    struct bfsk_det2 *dport = (struct bfsk_det2*) this_port;
+
+    int size = frame->size;
+    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;
+    int16_t * num_samples = frame->size/2;
+
+    /*
+    printf("Buffer contents:\n");
+    for (int i = 0; i < size; i++) {
+        printf("%02x", samples[i] & 0xFF);
+        printf("%02x", samples[i] >> 8 & 0xFF);
+    }
+    printf("\n");
+    */
+
+#if defined(SPANDSP_USE_FIXED_POINT)
+    int32_t row_energy[4];
+    int32_t col_energy[4];
+    int16_t xamp;
+    float famp;
+#else
+    float row_energy[4];
+    float col_energy[4];
+    float xamp;
+    float famp;
+#endif
+
+    float v1;
+    int i;
+    int j;
+    int sample;
+    int limit;
+    uint8_t hit;
+
+    for (sample = 0;  sample < num_samples;  sample = limit)
+    {
+        limit = num_samples;
+        for (j = sample;  j < limit;  j++)
+        {
+            xamp = samples[j];
+            xamp = goertzel_preadjust_amp(xamp);
+#if defined(SPANDSP_USE_FIXED_POINT)
+            dport->energy += ((int32_t) xamp*xamp);
+#else
+            dport->energy += xamp*xamp;
+#endif
+            goertzel_samplex(&dport->goertzel_zero, xamp);
+            goertzel_samplex(&dport->goertzel_one, xamp);
+        }
+    }
+    int32_t zero_power = goertzel_result(&dport->goertzel_zero);
+    int32_t one_power = goertzel_result(&dport->goertzel_one);
+
+    int zero = zero_power > dport->threshold;
+    int  one =  one_power > dport->threshold;
+
+    printf("zero_power=%f zero_in_progress=%i zero=%i threshold=%f\n", zero_power, dport->zero_in_progress, zero, dport->threshold);
+    printf(" one_power=%f  one_in_progress=%i  one=%i threshold=%f\n", one_power, dport->one_in_progress, one, dport->threshold);
+
+    // 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_det2_on_destroy(pjmedia_port *this_port)
+{
+    return PJ_SUCCESS;
+}

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

@@ -338,10 +338,25 @@ PJ_DEF(pj_status_t) pjmedia_ws_speech_port_create(pj_pool_t *pool,
 }
 
 static pj_status_t put_frame(pjmedia_port *this_port, pjmedia_frame *frame) {
+    printf("ws_speech_port put_frame\n");
     if(frame->type != PJMEDIA_FRAME_TYPE_AUDIO) return PJ_SUCCESS;
 
     struct ws_speech_t *port = (struct ws_speech_t*) this_port;
 
+    int size = PJMEDIA_PIA_SPF(&port->base.info);
+    int bps = PJMEDIA_PIA_BITS(&port->base.info);
+
+    printf("p=%x, size=%i bits_per_sample=%i\n", frame->buf, size, bps);
+
+    int16_t * samples = (int16_t*)frame->buf;
+
+    printf("Buffer contents:\n");
+    for (int i = 0; i < size; i++) {
+        printf("%02x", samples[i] & 0xFF);
+        printf("%02x", samples[i] >> 8 & 0xFF);
+    }
+    printf("\n");
+
     if(port->wc && port->connected) {
         pj_websock_send(port->wc, PJ_WEBSOCK_OP_BIN, PJ_TRUE, PJ_TRUE, frame->buf, frame->size); 
     }
@@ -364,7 +379,7 @@ static pj_status_t get_frame(pjmedia_port *this_port, pjmedia_frame *frame) {
     int len = PJMEDIA_PIA_SPF(&this_port->info)*2;
 
     if(port->buffering_count >= MINIMAl_BUFFERING && port->buffer_top > 0 && port->buffer_top >= len) {
-        printf("get_frame top=%i\n", port->buffer_top);
+        //printf("get_frame top=%i\n", port->buffer_top);
         memcpy(frame->buf, port->buffer, len);
         port->buffer_top -= len;
         memcpy(port->buffer, port->buffer + len, port->buffer_top);

package/src/sip.cpp

@@ -267,7 +267,7 @@ int ms_timestamp();
 bool g_shutting_down;
 
 int g_dtmf_inter_digit_timer = 0;
-int g_bfsk_inter_bit_timer = 200;
+int g_bfsk_inter_bit_timer = 50;
 
 pj_str_t g_sip_ipaddress;
 
@@ -1558,6 +1558,29 @@ int __pjw_init() {
     addon_log(L_DBG, "pjmedia_codec_opus_init failed\n");
     return 1;
   }
+  pjmedia_codec_param param;
+  pjmedia_codec_opus_config opus_cfg;
+
+  pjmedia_codec_mgr *codec_mgr;
+  codec_mgr = pjmedia_endpt_get_codec_mgr(g_med_endpt);
+
+  unsigned cnt = 1;
+  const pjmedia_codec_info *pci;
+
+  pj_str_t codec_id = pj_str((char*)"opus/48000/2");
+  pjmedia_codec_mgr_find_codecs_by_id(codec_mgr, &codec_id, &cnt, &pci, NULL);
+  pjmedia_codec_mgr_get_default_param(codec_mgr, pci, &param);
+  pjmedia_codec_opus_get_config(&opus_cfg);
+
+  opus_cfg.sample_rate = 8000;
+  opus_cfg.channel_cnt = 1;
+  opus_cfg.bit_rate = 8000;
+  status = pjmedia_codec_opus_set_default_param(&opus_cfg, &param);
+  if(status != PJ_SUCCESS)
+  {
+      addon_log(L_DBG, "pjmedia_codec_opus_set_default_param failed\n");
+      return 1;
+  }
 #endif
 
 #if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
@@ -6642,7 +6665,7 @@ int pjw_enable_telephone_event() {
 }
 
 int __pjw_shutdown(int clean_up) {
-	addon_log(L_DBG, "pjw_shutdown thread_id=%i\n", syscall(SYS_gettid));
+	//addon_log(L_DBG, "pjw_shutdown thread_id=%i\n", syscall(SYS_gettid));
 
 	g_shutting_down = true;