sip-lab 1.22.0 → 1.24.0

package/src/sip.cpp

@@ -23,6 +23,7 @@
 #include "dtmfdet.h"
 #include "fax_port.h"
 #include "flite_port.h"
+#include "pocketsphinx_port.h"
 
 #include <ctime>
 
@@ -265,14 +266,6 @@ pjsip_route_hdr route_set;
 pjsip_route_hdr *route;
 const pj_str_t hname = pj_str((char *)"Route");
 
-#define CONF_PORTS 1024
-//#define CLOCK_RATE 16000
-#define CLOCK_RATE 8000
-#define CHANNEL_COUNT 1
-#define PTIME 20
-#define SAMPLES_PER_FRAME (CLOCK_RATE*PTIME/1000)
-#define BITS_PER_SAMPLE 16
-
 #define MAXDIGITS 256
 
 #define DTMF_MODE_RFC2833 0
@@ -324,6 +317,10 @@ struct AudioEndpoint {
 
   pj_str_t mode;
 
+  pjmedia_conf *conf;
+  pjmedia_master_port *master_port;
+  pjmedia_port *null_port;
+
   ConfBridgePort stream_cbp;
   ConfBridgePort wav_player_cbp;
   ConfBridgePort wav_writer_cbp;
@@ -331,6 +328,7 @@ struct AudioEndpoint {
   ConfBridgePort dtmfdet_cbp;
   ConfBridgePort fax_cbp;
   ConfBridgePort flite_cbp;
+  ConfBridgePort pocketsphinx_cbp;
 };
 
 struct VideoEndpoint {
@@ -433,10 +431,6 @@ struct Call {
   pjmedia_sdp_session *active_remote_sdp;
 
   bool local_sdp_answer_already_set;
-
-  pjmedia_conf *conf;
-  pjmedia_master_port *master_port;
-  pjmedia_port *null_port;
 };
 
 #define MAX_TCP_DATA 4096
@@ -472,6 +466,10 @@ PackageSet g_PackageSet;
 
 #define DEFAULT_EXPIRES 600
 
+#define CONNECTION_MODE_SOURCE 0
+#define CONNECTION_MODE_SINK 1
+#define CONNECTION_MODE_SOURCE_AND_SINK 2
+
 void handle_events() {
   pj_time_val tv = {0, 1};
   pjsip_endpt_handle_events(g_sip_endpt, &tv);
@@ -618,30 +616,31 @@ static void build_stream_stat(ostringstream &oss, pjmedia_rtcp_stat *stat,
 
 bool prepare_tonegen(Call *call, AudioEndpoint *ae);
 bool prepare_dtmfdet(Call *call, AudioEndpoint *ae);
-bool prepare_wav_player(Call *c, AudioEndpoint *ae, const char *file);
-bool prepare_wav_writer(Call *c, AudioEndpoint *ae, const char *file);
-bool prepare_fax(Call *c, AudioEndpoint *ae, bool is_sender, const char *file,
-                 unsigned flags);
-bool prepare_flite(Call *c, AudioEndpoint *ae, const char *voice);
+bool prepare_wav_player(Call *call, AudioEndpoint *ae, const char *file, unsigned flags, bool end_of_file_event);
+bool prepare_wav_writer(Call *call, AudioEndpoint *ae, const char *file);
+bool prepare_fax(Call *call, AudioEndpoint *ae, bool is_sender, const char *file, unsigned flags);
+bool prepare_flite(Call *call, AudioEndpoint *ae, const char *voice, bool end_of_speech_event);
+bool prepare_pocketsphinx(Call *call, AudioEndpoint *ae);
 
 void prepare_error_event(ostringstream *oss, char *scope, char *details);
 // void prepare_pjsipcall_error_event(ostringstream *oss, char *scope, char
 // *function, pj_status_t s);
 void append_status(ostringstream *oss, pj_status_t s);
 
-bool is_media_active(Call *c, MediaEndpoint *me);
+bool is_media_active(Call *call, MediaEndpoint *me);
 void close_media_endpoint(Call *call, MediaEndpoint *me);
 
-void close_media(Call *c);
+void close_media(Call *call);
 
-bool process_media(Call *c, pjsip_dialog *dlg, Document &document, bool answer);
+bool process_media(Call *call, pjsip_dialog *dlg, Document &document, bool answer);
 
 typedef pj_status_t (*audio_endpoint_stop_op_t)(Call *call, AudioEndpoint *ae);
 
 pj_status_t audio_endpoint_stop_play_wav(Call *call, AudioEndpoint *ae);
 pj_status_t audio_endpoint_stop_record_wav(Call *call, AudioEndpoint *ae);
 pj_status_t audio_endpoint_stop_fax(Call *call, AudioEndpoint *ae);
-pj_status_t audio_endpoint_stop_flite(Call *call, AudioEndpoint *ae);
+pj_status_t audio_endpoint_stop_speech_synth(Call *call, AudioEndpoint *ae);
+pj_status_t audio_endpoint_stop_speech_recog(Call *call, AudioEndpoint *ae);
 
 static pjsip_module mod_tester = {
     NULL,
@@ -716,23 +715,36 @@ find_endpoint_by_inband_dtmf_media_stream(Call *call,
   return -1;
 }
 
-pj_status_t setup_call_conf(Call *call) {
+pj_status_t create_audio_endpoint_conf(Call *call, AudioEndpoint *ae, pjmedia_port *stream_port) {
   pj_status_t status;
+  int conf_ports = 16;
+
+  unsigned sampling_rate = PJMEDIA_PIA_SRATE(&stream_port->info);
+  unsigned channel_count = PJMEDIA_PIA_CCNT(&stream_port->info);
+  unsigned samples_per_frame = PJMEDIA_PIA_SPF(&stream_port->info);
+  unsigned bits_per_sample = PJMEDIA_PIA_BITS(&stream_port->info);
+
   status = pjmedia_conf_create(call->inv->pool,
-                                 CONF_PORTS,
-                                 CLOCK_RATE,
-                                 CHANNEL_COUNT,
-                                 SAMPLES_PER_FRAME,
-                                 BITS_PER_SAMPLE,
+                                 conf_ports,
+                                 sampling_rate,
+                                 channel_count,
+                                 samples_per_frame,
+                                 bits_per_sample,
                                  PJMEDIA_CONF_NO_DEVICE,
-                                 &call->conf);
+                                 &ae->conf);
 
   if (status != PJ_SUCCESS) {
     addon_log(L_DBG, "pjmedia_conf_create failed\n");
     return false;
   }
 
-  status = pjmedia_null_port_create(call->inv->pool, CLOCK_RATE, CHANNEL_COUNT, SAMPLES_PER_FRAME, BITS_PER_SAMPLE, &call->null_port);
+  status = pjmedia_null_port_create(
+        call->inv->pool,
+        sampling_rate,
+        channel_count,
+        samples_per_frame,
+        bits_per_sample,
+        &ae->null_port);
   if (status != PJ_SUCCESS) {
     addon_log(L_DBG, "pjmedia_null_port_created failed\n");
     return false;
@@ -740,19 +752,19 @@ pj_status_t setup_call_conf(Call *call) {
     
   pjmedia_port *conf_port = NULL;
 
-  conf_port = pjmedia_conf_get_master_port(call->conf);
+  conf_port = pjmedia_conf_get_master_port(ae->conf);
   if (conf_port == NULL) {
     addon_log(L_DBG, "pjmedia_conf_get_master_port failed\n");
     return false;
   }
     
-  status = pjmedia_master_port_create(call->inv->pool, call->null_port, conf_port, 0, &call->master_port);
+  status = pjmedia_master_port_create(call->inv->pool, ae->null_port, conf_port, 0, &ae->master_port);
   if (status != PJ_SUCCESS) {
     addon_log(L_DBG, "pjmedia_master_port_create failed\n");
     return false;
   }
     
-  status = pjmedia_master_port_start(call->master_port);
+  status = pjmedia_master_port_start(ae->master_port);
   if (status != PJ_SUCCESS) {
     addon_log(L_DBG, "pjmedia_master_port_start failed\n");
     return false;
@@ -761,38 +773,6 @@ pj_status_t setup_call_conf(Call *call) {
   return PJ_SUCCESS;
 }
 
-void release_call_conf(Call *call) {
-    pj_status_t status;
-
-    if (call->master_port) {
-        status = pjmedia_master_port_stop(call->master_port);
-        if(status != PJ_SUCCESS) {
-            addon_log(L_DBG, "pjmedia_master_port_stop failed\n");
-        }
-        pjmedia_master_port_destroy(call->master_port, 0);
-        if(status != PJ_SUCCESS) {
-            addon_log(L_DBG, "pjmedia_master_port_destroy failed\n");
-        }
-        call->master_port = NULL;
-    }
-
-    if (call->conf) {
-        status = pjmedia_conf_destroy(call->conf);
-        if(status != PJ_SUCCESS) {
-            addon_log(L_DBG, "pjmedia_conf_destroy failed\n");
-        }
-        call->conf = NULL;
-    }
-
-    if (call->null_port) {
-        status = pjmedia_port_destroy(call->null_port);
-        if(status != PJ_SUCCESS) {
-            addon_log(L_DBG, "pjmedia_port_destroy(null_port) failed\n");
-        }
-        call->null_port = NULL;
-    }
-}
-
 static int find_endpoint_by_inband_dtmf_media_port(Call *call,
                                                    pjmedia_port *port) {
   for (int i = 0; i < call->media_count; i++) {
@@ -851,7 +831,7 @@ static void on_inband_dtmf(pjmedia_port *port, void *user_data, char digit) {
     ae->last_digit_timestamp[mode] = ms_timestamp();
     PJW_UNLOCK();
   } else {
-    char evt[256];
+    char evt[1024];
     make_evt_dtmf(evt, sizeof(evt), call_id, 1, &d, mode, media_id);
     dispatch_event(evt);
   }
@@ -868,11 +848,60 @@ static void on_fax_result(pjmedia_port *port, void *user_data, int result) {
     return;
   }
 
-  char evt[256];
+  char evt[1024];
   make_evt_fax_result(evt, sizeof(evt), call_id, result);
   dispatch_event(evt);
 }
 
+static void on_end_of_file(pjmedia_port *port, void *user_data) {
+  if (g_shutting_down)
+    return;
+
+  long call_id;
+  if (!g_call_ids.get_id((long)user_data, call_id)) {
+    printf(
+        "on_end_of_file: Failed to get call_id. Event will not be notified.\n");
+    return;
+  }
+
+  char evt[1024];
+  make_evt_end_of_file(evt, sizeof(evt), call_id);
+  dispatch_event(evt);
+}
+
+static void on_end_of_speech(pjmedia_port *port, void *user_data) {
+  if (g_shutting_down)
+    return;
+
+  long call_id;
+  if (!g_call_ids.get_id((long)user_data, call_id)) {
+    printf(
+        "on_end_of_speech: Failed to get call_id. Event will not be notified.\n");
+    return;
+  }
+
+  char evt[1024];
+  make_evt_end_of_speech(evt, sizeof(evt), call_id);
+  dispatch_event(evt);
+}
+
+static void on_speech_transcript(pjmedia_port*, void *user_data, char* transcript) {
+  if (g_shutting_down)
+    return;
+
+  long call_id;
+  if (!g_call_ids.get_id((long)user_data, call_id)) {
+    addon_log(
+        L_DBG,
+        "on_speech_transcript: Failed to get call_id. Event will not be notified.\n");
+    return;
+  }
+ 
+  char evt[1024];
+  make_evt_speech_transcript(evt, sizeof(evt), call_id, transcript);
+  dispatch_event(evt);
+}
+
 void dispatch_event(const char *evt) {
   addon_log(L_DBG, "dispach_event called with evt=%s\n", evt);
   // g_event_sink(evt);
@@ -3014,12 +3043,6 @@ int call_create(Transport *t, unsigned flags, pjsip_dialog *dlg,
   }
   // addon_log(L_DBG, "pjsip_dlg_add_usage OK\n");
 
-  status = setup_call_conf(call);
-  if (status != PJ_SUCCESS) {
-    set_error("setup_call_conf failed");
-    return -1;
-  }
-
   return call_id;
 }
 
@@ -3090,7 +3113,6 @@ pj_status_t send_dtmf(Call *call, const char *digits, int mode) {
   return PJ_SUCCESS;
 }
 
-// int pjw_call_send_dtmf(long call_id, const char *digits, int mode)
 int pjw_call_send_dtmf(long call_id, const char *json) {
 #define MAX_LENGTH                                                             \
   31 // pjsip allows for 31 digits (inband allows for 32 digits)
@@ -3098,32 +3120,40 @@ int pjw_call_send_dtmf(long call_id, const char *json) {
   PJW_LOCK();
   clear_error();
 
+  Call *call;
+
+  pj_status_t status;
+
   long val;
+
   char *digits;
   int mode = 0;
-  ;
 
-  Call *call;
+  MediaEndpoint *me;
+  AudioEndpoint *ae;
+  int res;
+
+  int media_id = -1;
 
   char buffer[MAX_JSON_INPUT];
 
   Document document;
 
-  const char *valid_params[] = {"digits", "mode", ""};
+  const char *valid_params[] = {"digits", "mode", "media_id", ""};
 
-  if (!parse_json(document, json, buffer, MAX_JSON_INPUT)) {
+  if (!g_call_ids.get(call_id, val)) {
+    set_error("Invalid call_id");
     goto out;
   }
+  call = (Call *)val;
 
-  if (!validate_params(document, valid_params)) {
+  if (!parse_json(document, json, buffer, MAX_JSON_INPUT)) {
     goto out;
   }
 
-  if (!g_call_ids.get(call_id, val)) {
-    set_error("Invalid call_id");
+  if (!validate_params(document, valid_params)) {
     goto out;
   }
-  call = (Call *)val;
 
   if (json_get_string_param(document, "digits", false, &digits) <= 0) {
     goto out;
@@ -3169,7 +3199,38 @@ int pjw_call_send_dtmf(long call_id, const char *json) {
   adjusted_digits[len] = 0;
   // addon_log(L_DBG, "adjusted_digits >>%s<<\n", adjusted_digits);
 
-  send_dtmf(call, adjusted_digits, mode);
+  res = json_get_int_param(document, "media_id", true, &media_id);
+  if (res <= 0) {
+    goto out;
+  }
+
+  if (NOT_FOUND_OPTIONAL == res) {
+    // send_dtmf to all audio endpoints
+    status = send_dtmf(call, adjusted_digits, mode);
+    if (status != PJ_SUCCESS) {
+      goto out;
+    }
+  } else {
+    // send_dtmf to specified media_id
+
+    if (media_id >= call->media_count) {
+      set_error("invalid media_id");
+      goto out;
+    }
+
+    me = (MediaEndpoint *)call->media[media_id];
+    if (ENDPOINT_TYPE_AUDIO != me->type) {
+      set_error("invalid media_id non audio");
+      goto out;
+    }
+
+    ae = (AudioEndpoint *)me->endpoint.audio;
+
+    status = audio_endpoint_send_dtmf(call, ae, digits, mode);
+    if (status != PJ_SUCCESS) {
+      goto out;
+    }
+  }
 
 out:
   PJW_UNLOCK();
@@ -3180,7 +3241,7 @@ out:
   return 0;
 }
 
-pj_status_t audio_endpoint_remove_port(Call *call, ConfBridgePort *cbp) {
+pj_status_t audio_endpoint_remove_port(Call *call, AudioEndpoint *ae, ConfBridgePort *cbp) {
   printf("audio_endpoint_remove_port\n");
   pj_status_t status;
 
@@ -3191,7 +3252,7 @@ pj_status_t audio_endpoint_remove_port(Call *call, ConfBridgePort *cbp) {
       pjmedia_conf_disconnect_port_from_sinks(conf, port);
     */
 
-    status = pjmedia_conf_remove_port(call->conf, cbp->slot);
+    status = pjmedia_conf_remove_port(ae->conf, cbp->slot);
     if (status != PJ_SUCCESS) {
       set_error("pjmedia_conf_remove_port failed");
       return false;
@@ -3443,7 +3504,15 @@ int count_media_by_type(Call *call, int type) {
   return total;
 }
 
-// int pjw_call_start_record_wav(long call_id, const char *file)
+int get_first_media_id_by_type(Call *call, int type) {
+  for (int i = 0; i < call->media_count; i++) {
+    MediaEndpoint *me = (MediaEndpoint *)call->media[i];
+    if (type == me->type)
+      return i;
+  }
+  return -1;
+}
+
 int pjw_call_start_record_wav(long call_id, const char *json) {
   PJW_LOCK();
   clear_error();
@@ -3452,7 +3521,7 @@ int pjw_call_start_record_wav(long call_id, const char *json) {
   Call *call;
   pj_status_t status;
 
-  unsigned  media_id = 0;
+  int media_id = -1;
 
   MediaEndpoint *me;
   AudioEndpoint *ae;
@@ -3497,7 +3566,13 @@ int pjw_call_start_record_wav(long call_id, const char *json) {
   }
 
   if (ae_count > 1) {
-    if (json_get_uint_param(document, "media_id", false, &media_id) <= 0) {
+    if (json_get_int_param(document, "media_id", false, &media_id) <= 0) {
+      goto out;
+    }
+  } else {
+    media_id = get_first_media_id_by_type(call, ENDPOINT_TYPE_AUDIO);
+    if(media_id < 0) {
+      set_error("could not resolve media_id");
       goto out;
     }
   }
@@ -3541,7 +3616,7 @@ out:
 }
 
 pj_status_t audio_endpoint_start_play_wav(Call *call, AudioEndpoint *ae,
-                                          const char *file) {
+                                          const char *file, unsigned flags, bool end_of_file_event) {
   pj_status_t status;
 
   if(!ae->stream_cbp.port) {
@@ -3555,14 +3630,34 @@ pj_status_t audio_endpoint_start_play_wav(Call *call, AudioEndpoint *ae,
     return -1;
   }
 
-  if (!prepare_wav_player(call, ae, file)) {
+  if (!prepare_wav_player(call, ae, file, flags, end_of_file_event)) {
+    return -1;
+  }
+
+  return PJ_SUCCESS;
+}
+
+pj_status_t audio_endpoint_start_fax(Call *call, AudioEndpoint *ae, bool is_sender, char *file, unsigned flags) {
+  pj_status_t status;
+
+  if(!ae->stream_cbp.port) {
+    set_error("stream port is not ready yet");
+    return -1;
+  }
+
+  // First stop and destroy existing port.
+  status = audio_endpoint_stop_fax(call, ae);
+  if(status != PJ_SUCCESS) {
+    return -1;
+  }
+
+  if (!prepare_fax(call, ae, is_sender, file, flags)) {
     return -1;
   }
 
   return PJ_SUCCESS;
 }
 
-// int pjw_call_start_play_wav(long call_id, const char *file)
 int pjw_call_start_play_wav(long call_id, const char *json) {
   PJW_LOCK();
   clear_error();
@@ -3573,16 +3668,25 @@ int pjw_call_start_play_wav(long call_id, const char *json) {
   MediaEndpoint *me;
   AudioEndpoint *ae;
   int ae_count;
+  int res;
 
-  unsigned media_id = 0;
+  int media_id = -1;
 
   char *file;
 
+  unsigned flags = 0;
+
+  bool end_of_file_event = false;
+
+  bool no_loop = false;
+
   char buffer[MAX_JSON_INPUT];
 
+  pj_status_t status;
+
   Document document;
 
-  const char *valid_params[] = {"file", "media_id", ""};
+  const char *valid_params[] = {"file", "media_id", "end_of_file_event", "no_loop", ""};
 
   if (!g_call_ids.get(call_id, val)) {
     set_error("Invalid call_id");
@@ -3614,26 +3718,49 @@ int pjw_call_start_play_wav(long call_id, const char *json) {
     goto out;
   }
 
-  if (ae_count > 1) {
-    if (json_get_uint_param(document, "media_id", false, &media_id) <= 0) {
-      goto out;
-    }
+  if (json_get_bool_param(document, "end_of_file_event", true, &end_of_file_event) <= 0) {
+    goto out;
   }
 
-  if ((int)media_id >= call->media_count) {
-    set_error("invalid media_id");
+  if (json_get_bool_param(document, "no_loop", true, &no_loop) <= 0) {
     goto out;
   }
 
-  me = (MediaEndpoint *)call->media[media_id];
-  if (ENDPOINT_TYPE_AUDIO != me->type) {
-    set_error("media_endpoint is not audio endpoint");
+  if(no_loop) {
+    flags |= PJMEDIA_FILE_NO_LOOP;
+  }
+
+  res = json_get_int_param(document, "media_id", true, &media_id);
+  if (res <= 0) {
     goto out;
   }
 
-  ae = (AudioEndpoint *)me->endpoint.audio;
+  if (NOT_FOUND_OPTIONAL == res) {
+    // start on all audio media endpoints
+    for (int i = 0; i < call->media_count; i++) {
+      MediaEndpoint *me = (MediaEndpoint *)call->media[i];
+      if (me->type == ENDPOINT_TYPE_AUDIO) {
+        AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
+        status = audio_endpoint_start_play_wav(call, ae, file, flags, end_of_file_event);
+        if (status != PJ_SUCCESS) goto out;
+      }
+    }
+  } else {
+    if (media_id >= call->media_count) {
+      set_error("invalid media_id");
+      goto out;
+    }
+
+    me = (MediaEndpoint *)call->media[media_id];
+    if (ENDPOINT_TYPE_AUDIO != me->type) {
+      set_error("media_endpoint is not audio endpoint");
+      goto out;
+    }
 
-  audio_endpoint_start_play_wav(call, ae, file);
+    ae = (AudioEndpoint *)me->endpoint.audio;
+
+    audio_endpoint_start_play_wav(call, ae, file, flags, end_of_file_event);
+  }
 
 out:
   PJW_UNLOCK();
@@ -3644,7 +3771,7 @@ out:
   return 0;
 }
 
-pj_status_t audio_endpoint_start_speech_synth(Call *call, AudioEndpoint *ae, const char * voice, const char *text) {
+pj_status_t audio_endpoint_start_speech_synth(Call *call, AudioEndpoint *ae, const char * voice, const char *text, unsigned flags, bool end_of_speech_event) {
   pj_status_t status;
 
   if(!ae->stream_cbp.port) {
@@ -3653,16 +3780,16 @@ pj_status_t audio_endpoint_start_speech_synth(Call *call, AudioEndpoint *ae, con
   }
 
   // First stop and destroy existing flite port.
-  status = audio_endpoint_stop_flite(call, ae);
+  status = audio_endpoint_stop_speech_synth(call, ae);
   if(status != PJ_SUCCESS) {
     return -1;
   }
 
-  if (!prepare_flite(call, ae, voice)) {
+  if (!prepare_flite(call, ae, voice, end_of_speech_event)) {
     return -1;
   }
 
-  pjmedia_flite_port_speak(ae->flite_cbp.port, text, 0);
+  pjmedia_flite_port_speak(ae->flite_cbp.port, text, flags);
 
   return PJ_SUCCESS;
 }
@@ -3674,21 +3801,30 @@ int pjw_call_start_speech_synth(long call_id, const char *json) {
   long val;
   Call *call;
 
+  pj_status_t status;
+
   MediaEndpoint *me;
   AudioEndpoint *ae;
   int ae_count;
+  int res;
 
-  unsigned media_id = 0;
+  int media_id = -1;
 
   char *voice;
 
   char *text;
 
+  bool end_of_speech_event = false;
+
+  unsigned flags = 0;
+
+  bool no_loop = false;
+
   char buffer[MAX_JSON_INPUT];
 
   Document document;
 
-  const char *valid_params[] = {"voice", "text", "media_id", ""};
+  const char *valid_params[] = {"voice", "text", "media_id", "end_of_speech_event", "no_loop", ""};
 
   if (!g_call_ids.get(call_id, val)) {
     set_error("Invalid call_id");
@@ -3729,26 +3865,49 @@ int pjw_call_start_speech_synth(long call_id, const char *json) {
     goto out;
   }
 
-  if (ae_count > 1) {
-    if (json_get_uint_param(document, "media_id", false, &media_id) <= 0) {
-      goto out;
-    }
+  if (json_get_bool_param(document, "end_of_speech_event", true, &end_of_speech_event) <= 0) {
+    goto out;
   }
 
-  if ((int)media_id >= call->media_count) {
-    set_error("invalid media_id");
+  if (json_get_bool_param(document, "no_loop", true, &no_loop) <= 0) {
     goto out;
   }
 
-  me = (MediaEndpoint *)call->media[media_id];
-  if (ENDPOINT_TYPE_AUDIO != me->type) {
-    set_error("media_endpoint is not audio endpoint");
+  if(no_loop) {
+    flags |= PJMEDIA_SPEECH_NO_LOOP;
+  }
+
+  res = json_get_int_param(document, "media_id", true, &media_id);
+  if (res <= 0) {
     goto out;
   }
 
-  ae = (AudioEndpoint *)me->endpoint.audio;
+  if (NOT_FOUND_OPTIONAL == res) {
+    // start on all audio media endpoints
+    for (int i = 0; i < call->media_count; i++) {
+      MediaEndpoint *me = (MediaEndpoint *)call->media[i];
+      if (me->type == ENDPOINT_TYPE_AUDIO) {
+        AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
+        status = audio_endpoint_start_speech_synth(call, ae, voice, text, flags, end_of_speech_event);
+        if (status != PJ_SUCCESS) goto out;
+      }
+    }
+  } else {
+    if ((int)media_id >= call->media_count) {
+      set_error("invalid media_id");
+      goto out;
+    }
+
+    me = (MediaEndpoint *)call->media[media_id];
+    if (ENDPOINT_TYPE_AUDIO != me->type) {
+      set_error("media_endpoint is not audio endpoint");
+      goto out;
+    }
 
-  audio_endpoint_start_speech_synth(call, ae, voice, text);
+    ae = (AudioEndpoint *)me->endpoint.audio;
+
+    audio_endpoint_start_speech_synth(call, ae, voice, text, flags, end_of_speech_event);
+  }
 
 out:
   PJW_UNLOCK();
@@ -3759,79 +3918,96 @@ out:
   return 0;
 }
 
-pj_status_t audio_endpoint_stop_flite(Call *call, AudioEndpoint *ae) {
-  return audio_endpoint_remove_port(call, &ae->flite_cbp);
-}
-
-pj_status_t call_stop_audio_endpoints_op(Call *call,
-                                         audio_endpoint_stop_op_t op) {
-  addon_log(L_DBG, "call_stop_audio_endpoints_op media_count=%d\n",
-            call->media_count);
+pj_status_t audio_endpoint_start_speech_recog(Call *call, AudioEndpoint *ae) {
   pj_status_t status;
-  for (int i = 0; i < call->media_count; i++) {
-    MediaEndpoint *me = (MediaEndpoint *)call->media[i];
-    if (ENDPOINT_TYPE_AUDIO != me->type)
-      continue;
 
-    AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
+  if(!ae->stream_cbp.port) {
+    set_error("stream port is not ready yet");
+    return -1;
+  }
 
-    status = op(call, ae);
-    if (status != PJ_SUCCESS) {
-      return status;
-    }
+  // First stop and destroy existing port.
+  status = audio_endpoint_stop_speech_recog(call, ae);
+  if(status != PJ_SUCCESS) {
+    return -1;
   }
 
-  return PJ_SUCCESS;
-}
+  if (!prepare_pocketsphinx(call, ae)) {
+    return -1;
+  }
 
-pj_status_t audio_endpoint_stop_play_wav(Call *call, AudioEndpoint *ae) {
-  return audio_endpoint_remove_port(call, &ae->wav_player_cbp);
+  return PJ_SUCCESS;
 }
 
-int pjw_call_stop_play_wav(long call_id, const char *json) {
+int pjw_call_start_speech_recog(long call_id, const char *json) {
   PJW_LOCK();
   clear_error();
 
+  long val;
   Call *call;
 
   pj_status_t status;
 
-  long val;
-
   MediaEndpoint *me;
   AudioEndpoint *ae;
+  int ae_count;
   int res;
 
-  unsigned media_id = 0;
+  int media_id = -1;
+
+  char *voice;
+
+  char *text;
+
+  bool end_of_speech_event = false;
+
+  unsigned flags = 0;
+
+  bool no_loop = false;
 
   char buffer[MAX_JSON_INPUT];
 
   Document document;
 
+  const char *valid_params[] = {"media_id", ""};
+
   if (!g_call_ids.get(call_id, val)) {
     set_error("Invalid call_id");
     goto out;
   }
   call = (Call *)val;
 
+  ae_count = count_media_by_type(call, ENDPOINT_TYPE_AUDIO);
+
+  if (ae_count == 0) {
+    set_error("No audio endpoint");
+    goto out;
+  }
+
   if (!parse_json(document, json, buffer, MAX_JSON_INPUT)) {
     goto out;
   }
 
-  res = json_get_uint_param(document, "media_id", true, &media_id);
+  if (!validate_params(document, valid_params)) {
+    goto out;
+  }
+
+  res = json_get_int_param(document, "media_id", true, &media_id);
   if (res <= 0) {
     goto out;
   }
 
   if (NOT_FOUND_OPTIONAL == res) {
-    // Stop play wav in all audio endpoints
-    status = call_stop_audio_endpoints_op(call, audio_endpoint_stop_play_wav);
-    if (status != PJ_SUCCESS) {
-      goto out;
+    // start on all audio media endpoints
+    for (int i = 0; i < call->media_count; i++) {
+      MediaEndpoint *me = (MediaEndpoint *)call->media[i];
+      if (me->type == ENDPOINT_TYPE_AUDIO) {
+        AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
+        status = audio_endpoint_start_speech_recog(call, ae);
+        if (status != PJ_SUCCESS) goto out;
+      }
     }
   } else {
-    // Stop play wav on specified media_id
-
     if ((int)media_id >= call->media_count) {
       set_error("invalid media_id");
       goto out;
@@ -3839,16 +4015,13 @@ int pjw_call_stop_play_wav(long call_id, const char *json) {
 
     me = (MediaEndpoint *)call->media[media_id];
     if (ENDPOINT_TYPE_AUDIO != me->type) {
-      set_error("invalid media_id non audio");
+      set_error("media_endpoint is not audio endpoint");
       goto out;
     }
 
     ae = (AudioEndpoint *)me->endpoint.audio;
 
-    status = audio_endpoint_stop_play_wav(call, ae);
-    if (status != PJ_SUCCESS) {
-      goto out;
-    }
+    audio_endpoint_start_speech_recog(call, ae);
   }
 
 out:
@@ -3860,23 +4033,42 @@ out:
   return 0;
 }
 
-pj_status_t audio_endpoint_stop_record_wav(Call *call, AudioEndpoint *ae) {
-  return audio_endpoint_remove_port(call, &ae->wav_writer_cbp);
+pj_status_t call_stop_op_on_all_audio_endpoints(Call *call,
+                                         audio_endpoint_stop_op_t op) {
+  addon_log(L_DBG, "call_stop_op_on_audio_endpoints media_count=%d\n",
+            call->media_count);
+  pj_status_t status;
+  for (int i = 0; i < call->media_count; i++) {
+    MediaEndpoint *me = (MediaEndpoint *)call->media[i];
+    if (ENDPOINT_TYPE_AUDIO != me->type)
+      continue;
+
+    AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
+
+    status = op(call, ae);
+    if (status != PJ_SUCCESS) {
+      return status;
+    }
+  }
+
+  return PJ_SUCCESS;
 }
 
-int pjw_call_stop_record_wav(long call_id, const char *json) {
+int audio_endpoint_stop_op(long call_id, const char *json, audio_endpoint_stop_op_t op) {
   PJW_LOCK();
   clear_error();
 
-  long val;
-  Call *call = (Call *)val;
+  Call *call;
+
   pj_status_t status;
 
+  long val;
+
   MediaEndpoint *me;
   AudioEndpoint *ae;
   int res;
 
-  unsigned media_id = 0;
+  int media_id = -1;
 
   char buffer[MAX_JSON_INPUT];
 
@@ -3892,21 +4084,19 @@ int pjw_call_stop_record_wav(long call_id, const char *json) {
     goto out;
   }
 
-  res = json_get_uint_param(document, "media_id", true, &media_id);
+  res = json_get_int_param(document, "media_id", true, &media_id);
   if (res <= 0) {
     goto out;
   }
 
   if (NOT_FOUND_OPTIONAL == res) {
-    // Stop record wav in all audio endpoints
-    status = call_stop_audio_endpoints_op(call, audio_endpoint_stop_record_wav);
-    if (status != PJ_SUCCESS) {
-      goto out;
-    }
+    // Stop op on all audio endpoints
+    status = call_stop_op_on_all_audio_endpoints(call, op);
+    if (status != PJ_SUCCESS) goto out;
   } else {
-    // Stop record wav on specified media_id
+    // Stop op on specified media
 
-    if ((int)media_id >= call->media_count) {
+    if (media_id >= call->media_count) {
       set_error("invalid media_id");
       goto out;
     }
@@ -3919,10 +4109,8 @@ int pjw_call_stop_record_wav(long call_id, const char *json) {
 
     ae = (AudioEndpoint *)me->endpoint.audio;
 
-    status = audio_endpoint_stop_record_wav(call, ae);
-    if (status != PJ_SUCCESS) {
-      goto out;
-    }
+    status = op(call, ae);
+    if (status != PJ_SUCCESS) goto out;
   }
 
 out:
@@ -3934,152 +4122,74 @@ out:
   return 0;
 }
 
-pj_status_t audio_endpoint_stop_fax(Call *call, AudioEndpoint *ae) {
-  return audio_endpoint_remove_port(call, &ae->fax_cbp);
+pj_status_t audio_endpoint_stop_speech_synth(Call *call, AudioEndpoint *ae) {
+  return audio_endpoint_remove_port(call, ae, &ae->flite_cbp);
 }
 
-int pjw_call_start_fax(long call_id, const char *json) {
-  PJW_LOCK();
-  clear_error();
-
-  long val;
-  Call *call;
-  pj_status_t status;
-
-  bool is_sender;
-  char *file;
-  unsigned flags = 0;
-  bool flag;
-
-  MediaEndpoint *me;
-  AudioEndpoint *ae;
-  int ae_count;
-
-  unsigned media_id = 0;
-
-  char buffer[MAX_JSON_INPUT];
-
-  const char *valid_params[] = {"is_sender", "file", "transmit_on_idle",
-                                "media_id", ""};
-
-  Document document;
-
-  if (!g_call_ids.get(call_id, val)) {
-    set_error("Invalid call_id");
-    goto out;
-  }
-  call = (Call *)val;
-
-  ae_count = count_media_by_type(call, ENDPOINT_TYPE_AUDIO);
-
-  if (ae_count == 0) {
-    set_error("No audio endpoint");
-    goto out;
-  }
-
-  if (!parse_json(document, json, buffer, MAX_JSON_INPUT)) {
-    goto out;
-  }
-
-  if (!validate_params(document, valid_params)) {
-    goto out;
-  }
-
-  if (json_get_string_param(document, "file", false, &file) <= 0) {
-    goto out;
-  }
-
-  if (!file[0]) {
-    set_error("file cannot be blank string");
-    goto out;
-  }
-
-  if (ae_count > 1) {
-    if (json_get_uint_param(document, "media_id", false, &media_id) <= 0) {
-      goto out;
-    }
-  }
-
-  if ((int)media_id >= call->media_count) {
-    set_error("invalid media_id");
-    goto out;
-  }
-
-  me = (MediaEndpoint *)call->media[media_id];
-  if (ENDPOINT_TYPE_AUDIO != me->type) {
-    set_error("media_endpoint is not audio endpoint");
-    goto out;
-  }
-
-  ae = (AudioEndpoint *)me->endpoint.audio;
-
-  if (!parse_json(document, json, buffer, MAX_JSON_INPUT)) {
-    goto out;
-  }
-
-  if (!validate_params(document, valid_params)) {
-    goto out;
-  }
+pj_status_t audio_endpoint_stop_speech_recog(Call *call, AudioEndpoint *ae) {
+  return audio_endpoint_remove_port(call, ae, &ae->pocketsphinx_cbp);
+}
 
-  if (json_get_bool_param(document, "is_sender", false, &is_sender) <= 0) {
-    goto out;
-  }
+pj_status_t audio_endpoint_stop_play_wav(Call *call, AudioEndpoint *ae) {
+  return audio_endpoint_remove_port(call, ae, &ae->wav_player_cbp);
+}
 
-  if (json_get_string_param(document, "file", false, &file) <= 0) {
-    goto out;
-  }
+pj_status_t audio_endpoint_stop_record_wav(Call *call, AudioEndpoint *ae) {
+  return audio_endpoint_remove_port(call, ae, &ae->wav_writer_cbp);
+}
 
-  if (!file[0]) {
-    set_error("file cannot be blank string");
-    goto out;
-  }
+pj_status_t audio_endpoint_stop_fax(Call *call, AudioEndpoint *ae) {
+  return audio_endpoint_remove_port(call, ae, &ae->fax_cbp);
+}
 
-  flag = false;
-  if (json_get_bool_param(document, "transmit_on_idle", true, &flag) <= 0) {
-    goto out;
-  } else {
-    if (flag)
-      flags |= FAX_FLAG_TRANSMIT_ON_IDLE;
-  }
 
-  // First stop and destroy existing fax port.
-  status = audio_endpoint_stop_fax(call, ae);
-  if(status != PJ_SUCCESS) {
-    set_error("audio_endpoint_stop_fax failed");
-    return -1;
-  }
 
-  if (!prepare_fax(call, ae, is_sender, file, flags)) {
-    set_error("prepare_fax failed");
-    goto out;
-  }
+int pjw_call_stop_speech_synth(long call_id, const char *json) {
+  return audio_endpoint_stop_op(call_id, json, audio_endpoint_stop_speech_synth);
+}
 
-out:
-  PJW_UNLOCK();
-  if (pjw_errorstring[0]) {
-    return -1;
-  }
+int pjw_call_stop_speech_recog(long call_id, const char *json) {
+  return audio_endpoint_stop_op(call_id, json, audio_endpoint_stop_speech_recog);
+}
 
-  return 0;
+int pjw_call_stop_play_wav(long call_id, const char *json) {
+  return audio_endpoint_stop_op(call_id, json, audio_endpoint_stop_play_wav);
+}
+  
+int pjw_call_stop_record_wav(long call_id, const char *json) {
+  return audio_endpoint_stop_op(call_id, json, audio_endpoint_stop_record_wav);
 }
 
 int pjw_call_stop_fax(long call_id, const char *json) {
+  return audio_endpoint_stop_op(call_id, json, audio_endpoint_stop_fax);
+}
+
+
+int pjw_call_start_fax(long call_id, const char *json) {
   PJW_LOCK();
   clear_error();
 
   long val;
   Call *call;
-
   pj_status_t status;
 
+  bool is_sender;
+  char *file;
+  unsigned flags = 0;
+  bool flag;
+
   MediaEndpoint *me;
   AudioEndpoint *ae;
+  int ae_count;
   int res;
 
-  unsigned media_id = 0;
+  int media_id = -1;
 
   char buffer[MAX_JSON_INPUT];
 
+  const char *valid_params[] = {"is_sender", "file", "transmit_on_idle",
+                                "media_id", ""};
+
   Document document;
 
   if (!g_call_ids.get(call_id, val)) {
@@ -4088,27 +4198,86 @@ int pjw_call_stop_fax(long call_id, const char *json) {
   }
   call = (Call *)val;
 
+  ae_count = count_media_by_type(call, ENDPOINT_TYPE_AUDIO);
+
+  if (ae_count == 0) {
+    set_error("No audio endpoint");
+    goto out;
+  }
+
   if (!parse_json(document, json, buffer, MAX_JSON_INPUT)) {
     goto out;
   }
 
-  res = json_get_uint_param(document, "media_id", true, &media_id);
-  if (res <= 0) {
+  if (!validate_params(document, valid_params)) {
     goto out;
   }
 
-  if (NOT_FOUND_OPTIONAL == res) {
-    // Stop fax in all audio endpoints
-    status = call_stop_audio_endpoints_op(call, audio_endpoint_stop_fax);
-    if (status != PJ_SUCCESS) {
-      goto out;
-    }
+  if (json_get_string_param(document, "file", false, &file) <= 0) {
+    goto out;
+  }
+
+  if (!file[0]) {
+    set_error("file cannot be blank string");
+    goto out;
+  }
+
+  if (json_get_bool_param(document, "is_sender", false, &is_sender) <= 0) {
+    goto out;
+  }
+
+  flag = false;
+  if (json_get_bool_param(document, "transmit_on_idle", true, &flag) <= 0) {
+    goto out;
   } else {
-    // Stop fax on specified media_id
+    if (flag)
+      flags |= FAX_FLAG_TRANSMIT_ON_IDLE;
+  }
 
-    if ((int)media_id >= call->media_count) {
-      set_error("invalid media_id");
-      goto out;
+  if(is_sender) {
+    // if we are sender we can do fax operaton to all media streams
+    res = json_get_int_param(document, "media_id", true, &media_id);
+    if (res <= 0) goto out;
+
+    if (NOT_FOUND_OPTIONAL == res) {
+      // start fax on all audio endpoints
+      for (int i = 0; i < call->media_count; i++) {
+        MediaEndpoint *me = (MediaEndpoint *)call->media[i];
+        if (ENDPOINT_TYPE_AUDIO == me->type) {
+          me = (MediaEndpoint *)call->media[i];
+          ae = (AudioEndpoint *)me->endpoint.audio;
+          status = audio_endpoint_start_fax(call, ae, is_sender, file, flags);
+          if(status != PJ_SUCCESS)  goto out;
+        }
+      }
+    } else {
+      if ((int)media_id >= call->media_count) {
+        set_error("invalid media_id");
+        goto out;
+      }
+
+      me = (MediaEndpoint *)call->media[media_id];
+      if (ENDPOINT_TYPE_AUDIO != me->type) {
+        set_error("invalid media_id non audio");
+        goto out;
+      }
+
+      ae = (AudioEndpoint *)me->endpoint.audio;
+
+      status = audio_endpoint_start_fax(call, ae, is_sender, file, flags);
+      if (status != PJ_SUCCESS) goto out;
+    }
+  } else {
+    // if we are not sender we can only start fax operation in a single media endpoint (otherwise, there would be more than one fax process writing to the same fax file)
+    res = json_get_int_param(document, "media_id", true, &media_id);
+    if (res <= 0) goto out;
+
+    if (NOT_FOUND_OPTIONAL == res) {
+      media_id = get_first_media_id_by_type(call, ENDPOINT_TYPE_AUDIO);
+      if(media_id < 0) {
+        set_error("could not resolve media_id");
+        goto out;
+      }
     }
 
     me = (MediaEndpoint *)call->media[media_id];
@@ -4119,10 +4288,11 @@ int pjw_call_stop_fax(long call_id, const char *json) {
 
     ae = (AudioEndpoint *)me->endpoint.audio;
 
+    // First stop and destroy existing fax port.
     status = audio_endpoint_stop_fax(call, ae);
-    if (status != PJ_SUCCESS) {
-      goto out;
-    }
+    if(status != PJ_SUCCESS) goto out;
+
+    if (!prepare_fax(call, ae, is_sender, file, flags)) goto out;
   }
 
 out:
@@ -4466,82 +4636,80 @@ bool start_tcp_media(Call *call, MediaEndpoint *me,
   return true;
 }
 
+void close_audio_endpoint_ports_and_conf(Call *call, AudioEndpoint *ae) {
+    pj_status_t status;
 
-bool restart_media_stream(Call *call, MediaEndpoint *me,
-                          const pjmedia_sdp_session *local_sdp,
-                          const pjmedia_sdp_session *remote_sdp, int idx) {
-  char evt[4096];
-  pjmedia_stream_info stream_info;
-
-  AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
-
-  pj_status_t status;
-
-  if(ae->stream_cbp.port) {
-    if(ae->tonegen_cbp.port) {
-      status = pjmedia_conf_disconnect_port(call->conf, ae->tonegen_cbp.slot, ae->stream_cbp.slot);
-      if (status != PJ_SUCCESS) {
-        make_evt_media_update(evt, sizeof(evt), call->id,
-                            "setup_failed (pjmedia_conf_disconnect_port for tonegen failed)", "");
-        dispatch_event(evt);
-        return false;
-      }
+    audio_endpoint_remove_port(call, ae, &ae->stream_cbp);
+    audio_endpoint_remove_port(call, ae, &ae->wav_player_cbp);
+    audio_endpoint_remove_port(call, ae, &ae->wav_writer_cbp);
+    audio_endpoint_remove_port(call, ae, &ae->tonegen_cbp);
+    audio_endpoint_remove_port(call, ae, &ae->dtmfdet_cbp);
+    audio_endpoint_remove_port(call, ae, &ae->fax_cbp);
+    audio_endpoint_remove_port(call, ae, &ae->flite_cbp);
+    audio_endpoint_remove_port(call, ae, &ae->pocketsphinx_cbp);
+
+    if (ae->master_port) {
+        status = pjmedia_master_port_stop(ae->master_port);
+        if(status != PJ_SUCCESS) {
+            addon_log(L_DBG, "pjmedia_master_port_stop failed\n");
+        }
+        pjmedia_master_port_destroy(ae->master_port, 0);
+        if(status != PJ_SUCCESS) {
+            addon_log(L_DBG, "pjmedia_master_port_destroy failed\n");
+        }
+        ae->master_port = NULL;
     }
 
-    if(ae->wav_player_cbp.port) {
-      status = pjmedia_conf_disconnect_port(call->conf, ae->wav_player_cbp.slot, ae->stream_cbp.slot);
-      if (status != PJ_SUCCESS) {
-        make_evt_media_update(evt, sizeof(evt), call->id,
-                           "setup_failed (pjmedia_conf_disconnect_port for wav_player failed)", "");
-        dispatch_event(evt);
-        return false;
-      }
+    if (ae->conf) {
+        status = pjmedia_conf_destroy(ae->conf);
+        if(status != PJ_SUCCESS) {
+            addon_log(L_DBG, "pjmedia_conf_destroy failed\n");
+        }
+        ae->conf = NULL;
     }
 
-    if(ae->dtmfdet_cbp.port) {
-      status = pjmedia_conf_disconnect_port(call->conf, ae->stream_cbp.slot, ae->dtmfdet_cbp.slot);
-      if (status != PJ_SUCCESS) {
-        make_evt_media_update(evt, sizeof(evt), call->id,
-                           "setup_failed (pjmedia_conf_disconnect_port for dtmfdet failed)", "");
-        dispatch_event(evt);
-        return false;
-      }
+    if (ae->null_port) {
+        status = pjmedia_port_destroy(ae->null_port);
+        if(status != PJ_SUCCESS) {
+            addon_log(L_DBG, "pjmedia_port_destroy(null_port) failed\n");
+        }
+        ae->null_port = NULL;
     }
+}
 
-    if(ae->fax_cbp.port) {
-      status = pjmedia_conf_disconnect_port(call->conf, ae->stream_cbp.slot, ae->fax_cbp.slot);
-      if (status != PJ_SUCCESS) {
-        make_evt_media_update(evt, sizeof(evt), call->id,
-                           "setup_failed (pjmedia_conf_disconnect_port fax dst failed)", "");
-        dispatch_event(evt);
-        return false;
-      }
-
-      status = pjmedia_conf_disconnect_port(call->conf, ae->fax_cbp.slot, ae->stream_cbp.slot);
-      if (status != PJ_SUCCESS) {
-        make_evt_media_update(evt, sizeof(evt), call->id,
-                           "setup_failed (pjmedia_conf_disconnect_port for fax src failed)", "");
-        dispatch_event(evt);
-        return false;
-      }
-    }
+bool connect_feature_port_to_stream_port(Call *call, AudioEndpoint *ae, ConfBridgePort *cbp, int connection_mode) {
+  pj_status_t status;
 
-    status = pjmedia_conf_remove_port(call->conf, ae->stream_cbp.slot);
+  if(connection_mode == CONNECTION_MODE_SOURCE || connection_mode == CONNECTION_MODE_SOURCE_AND_SINK) {
+    status = pjmedia_conf_connect_port(ae->conf, cbp->slot, ae->stream_cbp.slot, 0);
     if (status != PJ_SUCCESS) {
-      make_evt_media_update(evt, sizeof(evt), call->id,
-                           "setup_failed (pjmedia_conf_remove_port failed)", "");
+      set_error("pjmedia_conf_connect_port failed");
       return false;
     }
-    ae->stream_cbp.slot = 0;
-
-    status = pjmedia_port_destroy(ae->stream_cbp.port);
+  }
+  if(connection_mode == CONNECTION_MODE_SINK || connection_mode == CONNECTION_MODE_SOURCE_AND_SINK) {
+    status = pjmedia_conf_connect_port(ae->conf, ae->stream_cbp.slot, cbp->slot, 0);
+    printf("status=%i\n" ,status);
     if (status != PJ_SUCCESS) {
-      make_evt_media_update(evt, sizeof(evt), call->id,
-                           "setup_failed (pjmedia_port_destroy failed)", "");
+      set_error("pjmedia_conf_connect_port failed");
       return false;
     }
-    ae->stream_cbp.port = NULL;
-  } 
+  }
+  return true;
+}
+
+bool restart_media_stream(Call *call, MediaEndpoint *me,
+                          const pjmedia_sdp_session *local_sdp,
+                          const pjmedia_sdp_session *remote_sdp, int idx) {
+  char evt[4096];
+  pjmedia_stream_info stream_info;
+
+  AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
+
+  pj_status_t status;
+
+  pjmedia_port *old_port = ae->stream_cbp.port;
+  pjmedia_port *new_port;
 
   status =
       pjmedia_stream_info_from_sdp(&stream_info, call->inv->dlg->pool,
@@ -4607,7 +4775,7 @@ bool restart_media_stream(Call *call, MediaEndpoint *me,
     return false;
   }
 
-  status = pjmedia_stream_get_port(ae->med_stream, &ae->stream_cbp.port);
+  status = pjmedia_stream_get_port(ae->med_stream, &new_port);
   if (status != PJ_SUCCESS) {
     make_evt_media_update(evt, sizeof(evt), call->id,
                           "setup_failed (pjmedia_stream_get_port failed)", "");
@@ -4615,73 +4783,112 @@ bool restart_media_stream(Call *call, MediaEndpoint *me,
     return false;
   }
 
-  status = pjmedia_conf_add_port(call->conf, call->inv->pool, ae->stream_cbp.port, NULL, &ae->stream_cbp.slot);
-  if (status != PJ_SUCCESS) {
-    make_evt_media_update(evt, sizeof(evt), call->id,
-                          "setup_failed (pjmedia_conf_add_port failed)", "");
-    dispatch_event(evt);
-    return false;
-  }
-
-  if(!ae->dtmfdet_cbp.port) {
-    if(!prepare_dtmfdet(call, ae)) {
+  if(!old_port) {
+    printf("call_id=%i restart_media_stream !old_port (first SDP negotiation)\n", call->id);
+    status = create_audio_endpoint_conf(call, ae, new_port);
+    if (status != PJ_SUCCESS) {
       make_evt_media_update(evt, sizeof(evt), call->id,
-                          "setup_failed (prepare_dtmfdet failed)", "");
+                          "setup_failed (create_audio_endpoint_conf failed)", "");
       dispatch_event(evt);
       return false;
     }
-  }
 
-  if(ae->tonegen_cbp.port) {
-    status = pjmedia_conf_connect_port(call->conf, ae->tonegen_cbp.slot, ae->stream_cbp.slot, 0);
+    ae->stream_cbp.port = new_port;
+    status = pjmedia_conf_add_port(ae->conf, call->inv->pool, ae->stream_cbp.port, NULL, &ae->stream_cbp.slot);
     if (status != PJ_SUCCESS) {
       make_evt_media_update(evt, sizeof(evt), call->id,
-                          "setup_failed (pjmedia_conf_connect_port for tonegen failed)", "");
+                          "setup_failed (pjmedia_conf_add_port failed)", "");
       dispatch_event(evt);
       return false;
     }
-  }
 
-  if(ae->wav_player_cbp.port) {
-    status = pjmedia_conf_connect_port(call->conf, ae->wav_player_cbp.slot, ae->stream_cbp.slot, 0);
-    if (status != PJ_SUCCESS) {
+    // we always add dtmfdet to audio endpoints
+    if(!prepare_dtmfdet(call, ae)) {
       make_evt_media_update(evt, sizeof(evt), call->id,
-                          "setup_failed (pjmedia_conf_connect_port for wav_player failed)", "");
+                        "setup_failed (prepare_dtmfdet failed)", "");
       dispatch_event(evt);
       return false;
     }
-  }
-
-  if(ae->dtmfdet_cbp.port) {
-    status = pjmedia_conf_connect_port(call->conf, ae->stream_cbp.slot, ae->dtmfdet_cbp.slot, 0);
+  } else if(
+        (PJMEDIA_PIA_SRATE(&old_port->info) != PJMEDIA_PIA_SRATE(&new_port->info)) ||
+        (PJMEDIA_PIA_CCNT(&old_port->info) != PJMEDIA_PIA_CCNT(&new_port->info)) ||
+        (PJMEDIA_PIA_SPF(&old_port->info) != PJMEDIA_PIA_SPF(&new_port->info)) ||
+        (PJMEDIA_PIA_BITS(&old_port->info) != PJMEDIA_PIA_BITS(&new_port->info))) {
+    // stream characteristics changed so we need to destroy old conf and ports
+    printf("call_id=%i restart_media_stream: stream characteristics changed\n", call->id);
+    close_audio_endpoint_ports_and_conf(call, ae);
+
+    // then create a new conf
+    status = create_audio_endpoint_conf(call, ae, new_port);
     if (status != PJ_SUCCESS) {
       make_evt_media_update(evt, sizeof(evt), call->id,
-                          "setup_failed (pjmedia_conf_connect_port for dtmfdet failed)", "");
+                          "setup_failed (create_audio_endpoint_conf failed)", "");
       dispatch_event(evt);
       return false;
-
     }
-  }
 
-  if(ae->fax_cbp.port) {
-    status = pjmedia_conf_connect_port(call->conf, ae->stream_cbp.slot, ae->fax_cbp.slot, 0);
+    ae->stream_cbp.port = new_port;
+    status = pjmedia_conf_add_port(ae->conf, call->inv->pool, ae->stream_cbp.port, NULL, &ae->stream_cbp.slot);
     if (status != PJ_SUCCESS) {
       make_evt_media_update(evt, sizeof(evt), call->id,
-                          "setup_failed (pjmedia_conf_connect_port for fax dst failed)", "");
+                          "setup_failed (pjmedia_conf_add_port failed)", "");
       dispatch_event(evt);
       return false;
+    }
 
+    // we always add dtmfdet to audio endpoints
+    if(!prepare_dtmfdet(call, ae)) {
+      make_evt_media_update(evt, sizeof(evt), call->id,
+                        "setup_failed (prepare_dtmfdet failed)", "");
+      dispatch_event(evt);
+      return false;
     }
 
-    status = pjmedia_conf_connect_port(call->conf, ae->fax_cbp.slot, ae->stream_cbp.slot, 0);
+    // at this point we could try to recreate ports (see #91)
+  } else {
+    printf("call_id=%i restart_media_stream: stream characteristics no change\n", call->id);
+    // stream characteristics didn't change so just replace the stream port
+
+    audio_endpoint_remove_port(call, ae, &ae->stream_cbp);
+    ae->stream_cbp.port = new_port;
+    status = pjmedia_conf_add_port(ae->conf, call->inv->pool, ae->stream_cbp.port, NULL, &ae->stream_cbp.slot);
     if (status != PJ_SUCCESS) {
       make_evt_media_update(evt, sizeof(evt), call->id,
-                          "setup_failed (pjmedia_conf_connect_port for fax src failed)", "");
+                          "setup_failed (pjmedia_conf_add_port failed)", "");
       dispatch_event(evt);
       return false;
     }
-  }
 
+    // Need to connect ports to new stream port
+    if(ae->dtmfdet_cbp.port) {
+      if(!connect_feature_port_to_stream_port(call, ae, &ae->dtmfdet_cbp, CONNECTION_MODE_SINK)) return false;
+    }
+
+    if(ae->wav_writer_cbp.port) {
+      if(!connect_feature_port_to_stream_port(call, ae, &ae->wav_writer_cbp, CONNECTION_MODE_SINK)) return false;
+    }
+
+    if(ae->wav_player_cbp.port) {
+      if(!connect_feature_port_to_stream_port(call, ae, &ae->wav_player_cbp, CONNECTION_MODE_SOURCE)) return false;
+    }
+
+    if(ae->tonegen_cbp.port) {
+      if(!connect_feature_port_to_stream_port(call, ae, &ae->tonegen_cbp, CONNECTION_MODE_SOURCE)) return false;
+    }
+
+    if(ae->fax_cbp.port) {
+      if(!connect_feature_port_to_stream_port(call, ae, &ae->fax_cbp, CONNECTION_MODE_SOURCE_AND_SINK)) return false;
+    }
+
+    if(ae->flite_cbp.port) {
+      if(!connect_feature_port_to_stream_port(call, ae, &ae->flite_cbp, CONNECTION_MODE_SOURCE)) return false;
+    }
+
+    if(ae->pocketsphinx_cbp.port) {
+      if(!connect_feature_port_to_stream_port(call, ae, &ae->pocketsphinx_cbp, CONNECTION_MODE_SINK)) return false;
+    }
+  }
+  
   return true;
 }
 
@@ -4868,8 +5075,6 @@ static void on_state_changed(pjsip_inv_session *inv, pjsip_event *e) {
       }
     }
 
-    release_call_conf(call);
-
     long val;
     if (!g_call_ids.remove(call_id, val)) {
       addon_log(L_DBG, "g_call_ids.remove failed\n");
@@ -4889,6 +5094,7 @@ static void on_state_changed(pjsip_inv_session *inv, pjsip_event *e) {
       sip_msg = e->body.rx_msg.rdata->msg_info.msg_buf;
     }
 
+    printf("call_id=%li sip_msg_len=%i sip_msg=%p\n", call_id, sip_msg_len, sip_msg);
     make_evt_call_ended(evt, sizeof(evt), call_id, sip_msg_len, sip_msg);
     dispatch_event(evt);
   }
@@ -5259,13 +5465,6 @@ static pj_bool_t on_rx_request(pjsip_rx_data *rdata) {
     return PJ_TRUE;
   }
 
-  status = setup_call_conf(call);
-  if (status != PJ_SUCCESS) {
-    printf("setup_call_conf failed\n");
-    pjsip_endpt_respond_stateless(g_sip_endpt, rdata, 500, &reason, NULL, NULL);
-    return PJ_TRUE;
-  }
-
   // TODO: check if this is really necessary as we are calling
   // pjsip_dlg_add_usage subsequently
   inv->dlg->mod_data[mod_tester.id] = call;
@@ -6453,10 +6652,10 @@ bool process_media(Call *call, pjsip_dialog *dlg, Document &document, bool answe
   return true;
 }
 
-bool is_media_active(Call *c, MediaEndpoint *me) {
+bool is_media_active(Call *call, MediaEndpoint *me) {
   // check if media from call->media_neg is on call->media
-  for (int i = 0; i < c->media_count; ++i) {
-    if (me == c->media[i])
+  for (int i = 0; i < call->media_count; ++i) {
+    if (me == call->media[i])
       return true;
   }
   return false;
@@ -6464,18 +6663,14 @@ bool is_media_active(Call *c, MediaEndpoint *me) {
 
 void close_media_endpoint(Call *call, MediaEndpoint *me) {
   printf("close_media_endpoint %p\n", (void*)me);
+
+  pj_status_t status;
+
   if(!me) return;
 
   if (ENDPOINT_TYPE_AUDIO == me->type) {
     AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
-
-    audio_endpoint_remove_port(call, &ae->stream_cbp);
-    audio_endpoint_remove_port(call, &ae->wav_player_cbp);
-    audio_endpoint_remove_port(call, &ae->wav_writer_cbp);
-    audio_endpoint_remove_port(call, &ae->tonegen_cbp);
-    audio_endpoint_remove_port(call, &ae->dtmfdet_cbp);
-    audio_endpoint_remove_port(call, &ae->fax_cbp);
-
+    close_audio_endpoint_ports_and_conf(call, ae);
     close_media_transport(ae->med_transport);
     ae->med_transport = NULL;
   } else if (ENDPOINT_TYPE_MRCP == me->type) {
@@ -6499,17 +6694,17 @@ void close_media_endpoint(Call *call, MediaEndpoint *me) {
   me->port = 0;
 }
 
-void close_media(Call *c) {
-  printf("close_media call_id=%li\n", c->id);
-  for (int i = 0; i < c->media_count; ++i) {
-    MediaEndpoint *me = c->media[i];
-    close_media_endpoint(c, me);
+void close_media(Call *call) {
+  printf("close_media call_id=%i\n", call->id);
+  for (int i = 0; i < call->media_count; ++i) {
+    MediaEndpoint *me = call->media[i];
+    close_media_endpoint(call, me);
   }
-  c->media_count = 0;
+  call->media_count = 0;
 }
 
-bool prepare_tonegen(Call *c, AudioEndpoint *ae) {
-  printf("prepare_tone_gen call.id=%i\n", c->id);
+bool prepare_tonegen(Call *call, AudioEndpoint *ae) {
+  printf("prepare_tone_gen call.id=%i\n", call->id);
   pj_status_t status;
 
   if(ae->tonegen_cbp.port) {
@@ -6518,7 +6713,7 @@ bool prepare_tonegen(Call *c, AudioEndpoint *ae) {
   }
 
   status = pjmedia_tonegen_create(
-        c->inv->pool, PJMEDIA_PIA_SRATE(&ae->stream_cbp.port->info),
+        call->inv->pool, PJMEDIA_PIA_SRATE(&ae->stream_cbp.port->info),
         PJMEDIA_PIA_CCNT(&ae->stream_cbp.port->info),
         PJMEDIA_PIA_SPF(&ae->stream_cbp.port->info),
         PJMEDIA_PIA_BITS(&ae->stream_cbp.port->info), 0, &ae->tonegen_cbp.port);
@@ -6527,22 +6722,16 @@ bool prepare_tonegen(Call *c, AudioEndpoint *ae) {
     return false;
   }
 
-  status = pjmedia_conf_add_port(c->conf, c->inv->pool, ae->tonegen_cbp.port, NULL, &ae->tonegen_cbp.slot);
+  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, ae->tonegen_cbp.port, NULL, &ae->tonegen_cbp.slot);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_conf_add_port failed");
     return false;
   }
 
-  status = pjmedia_conf_connect_port(c->conf, ae->tonegen_cbp.slot, ae->stream_cbp.slot, 0);
-  if (status != PJ_SUCCESS) {
-    set_error("pjmedia_conf_connect_port failed");
-    return false;
-  }
-
-  return true;
+  return connect_feature_port_to_stream_port(call, ae, &ae->tonegen_cbp, CONNECTION_MODE_SOURCE);
 }
 
-bool prepare_wav_player(Call *c, AudioEndpoint *ae, const char *file) {
+bool prepare_wav_player(Call *call, AudioEndpoint *ae, const char *file, unsigned flags, bool end_of_file_event) {
   pj_status_t status;
 
   unsigned wav_ptime;
@@ -6550,10 +6739,10 @@ bool prepare_wav_player(Call *c, AudioEndpoint *ae, const char *file) {
               PJMEDIA_PIA_SRATE(&ae->stream_cbp.port->info);
 
   status = pjmedia_wav_player_port_create(
-                  c->inv->pool, 
+                  call->inv->pool, 
                   file,
                   wav_ptime,
-                  0,                  /* flags        */
+                  flags,
                   -1,                  /* buf size     */
                   &ae->wav_player_cbp.port
                   );
@@ -6563,26 +6752,28 @@ bool prepare_wav_player(Call *c, AudioEndpoint *ae, const char *file) {
     return false;
   }
 
-  status = pjmedia_conf_add_port(c->conf, c->inv->pool, ae->wav_player_cbp.port, NULL, &ae->wav_player_cbp.slot);
-  if (status != PJ_SUCCESS) {
-    set_error("pjmedia_conf_add_port failed");
-    return false;
+  if (end_of_file_event) {
+    status = pjmedia_wav_player_set_eof_cb2(ae->wav_player_cbp.port, (void*)call, on_end_of_file);
+    if (status != PJ_SUCCESS) {
+      set_error("pjmedia_wav_player_set_eof_cb2 failed");
+      return false;
+    }
   }
 
-  status = pjmedia_conf_connect_port(c->conf, ae->wav_player_cbp.slot, ae->stream_cbp.slot, 0);
+  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, ae->wav_player_cbp.port, NULL, &ae->wav_player_cbp.slot);
   if (status != PJ_SUCCESS) {
-    set_error("pjmedia_conf_connect_port failed");
+    set_error("pjmedia_conf_add_port failed");
     return false;
   }
 
-  return true;
+  return connect_feature_port_to_stream_port(call, ae, &ae->wav_player_cbp, CONNECTION_MODE_SOURCE);
 }
 
-bool prepare_wav_writer(Call *c, AudioEndpoint *ae, const char *file) {
+bool prepare_wav_writer(Call *call, AudioEndpoint *ae, const char *file) {
   pj_status_t status;
 
   status = pjmedia_wav_writer_port_create(
-      c->inv->pool, file, PJMEDIA_PIA_SRATE(&ae->stream_cbp.port->info),
+      call->inv->pool, file, PJMEDIA_PIA_SRATE(&ae->stream_cbp.port->info),
       PJMEDIA_PIA_CCNT(&ae->stream_cbp.port->info), PJMEDIA_PIA_SPF(&ae->stream_cbp.port->info),
       PJMEDIA_PIA_BITS(&ae->stream_cbp.port->info), PJMEDIA_FILE_WRITE_PCM, 0,
       (pjmedia_port **)&ae->wav_writer_cbp.port);
@@ -6591,122 +6782,131 @@ bool prepare_wav_writer(Call *c, AudioEndpoint *ae, const char *file) {
     return false;
   }
   
-  status = pjmedia_conf_add_port(c->conf, c->inv->pool, ae->wav_writer_cbp.port, NULL, &ae->wav_writer_cbp.slot);
+  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, ae->wav_writer_cbp.port, NULL, &ae->wav_writer_cbp.slot);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_conf_add_port failed");
     return false;
   }
 
-  status = pjmedia_conf_connect_port(c->conf, ae->stream_cbp.slot, ae->wav_writer_cbp.slot, 0);
-  if (status != PJ_SUCCESS) {
-    set_error("pjmedia_conf_connect_port failed");
-    return false;
-  }
-
-  return true;
+  return connect_feature_port_to_stream_port(call, ae, &ae->wav_writer_cbp, CONNECTION_MODE_SINK);
 }
 
-bool prepare_dtmfdet(Call *c, AudioEndpoint *ae) {
+bool prepare_dtmfdet(Call *call, AudioEndpoint *ae) {
   pj_status_t status;
   status = pjmedia_dtmfdet_create(
-      c->inv->pool, 
+      call->inv->pool, 
       PJMEDIA_PIA_SRATE(&ae->stream_cbp.port->info),
-      PJMEDIA_PIA_CCNT(&ae->stream_cbp.port->info), PJMEDIA_PIA_SPF(&ae->stream_cbp.port->info),
+      PJMEDIA_PIA_CCNT(&ae->stream_cbp.port->info),
+      PJMEDIA_PIA_SPF(&ae->stream_cbp.port->info),
       PJMEDIA_PIA_BITS(&ae->stream_cbp.port->info), 
-      on_inband_dtmf, c, &ae->dtmfdet_cbp.port);
+      on_inband_dtmf, call, &ae->dtmfdet_cbp.port);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_dtmfdet_create failed");
       return false;
   }
   
-  status = pjmedia_conf_add_port(c->conf, c->inv->pool, ae->dtmfdet_cbp.port, NULL, &ae->dtmfdet_cbp.slot);
+  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, ae->dtmfdet_cbp.port, NULL, &ae->dtmfdet_cbp.slot);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_conf_add_port failed");
     return false;
   }
 
-  status = pjmedia_conf_connect_port(c->conf, ae->stream_cbp.slot, ae->dtmfdet_cbp.slot, 0);
-  if (status != PJ_SUCCESS) {
-    set_error("pjmedia_conf_connect_port failed");
-    return false;
-  }
-
-  return true;
+  return connect_feature_port_to_stream_port(call, ae, &ae->dtmfdet_cbp, CONNECTION_MODE_SINK);
 }
 
-bool prepare_fax(Call *c, AudioEndpoint *ae, bool is_sender, const char *file,
+bool prepare_fax(Call *call, AudioEndpoint *ae, bool is_sender, const char *file,
                  unsigned flags) {
   pj_status_t status;
 
   status = pjmedia_fax_port_create(
-      c->inv->pool,
+      call->inv->pool,
       PJMEDIA_PIA_SRATE(&ae->stream_cbp.port->info),
       PJMEDIA_PIA_CCNT(&ae->stream_cbp.port->info),
       PJMEDIA_PIA_SPF(&ae->stream_cbp.port->info),
       PJMEDIA_PIA_BITS(&ae->stream_cbp.port->info),
-      on_fax_result, c, is_sender, file,
+      on_fax_result, call, is_sender, file,
       flags, &ae->fax_cbp.port);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_fax_port_create failed");
     return false;
   }
 
-  status = pjmedia_conf_add_port(c->conf, c->inv->pool, ae->fax_cbp.port, NULL, &ae->fax_cbp.slot);
+  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, ae->fax_cbp.port, NULL, &ae->fax_cbp.slot);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_conf_add_port failed");
     return false;
   }
 
-  status = pjmedia_conf_connect_port(c->conf, ae->fax_cbp.slot, ae->stream_cbp.slot, 0);
+  return connect_feature_port_to_stream_port(call, ae, &ae->fax_cbp, CONNECTION_MODE_SOURCE_AND_SINK);
+}
+
+bool prepare_flite(Call *call, AudioEndpoint *ae, const char *voice, bool end_of_speech_event) {
+  printf("prepare_flite call.id=%i\n", call->id);
+  pj_status_t status;
+
+  if(ae->flite_cbp.port) {
+    printf("already prepared\n");
+    return true;
+  }
+
+  status = pjmedia_flite_port_create(
+        call->inv->pool, PJMEDIA_PIA_SRATE(&ae->stream_cbp.port->info),
+        PJMEDIA_PIA_CCNT(&ae->stream_cbp.port->info),
+        PJMEDIA_PIA_SPF(&ae->stream_cbp.port->info),
+        PJMEDIA_PIA_BITS(&ae->stream_cbp.port->info), voice, &ae->flite_cbp.port);
   if (status != PJ_SUCCESS) {
-    set_error("pjmedia_conf_connect_port failed");
+    set_error("pjmedia_flite_port_create failed");
     return false;
   }
 
-  status = pjmedia_conf_connect_port(c->conf, ae->stream_cbp.slot, ae->fax_cbp.slot, 0);
+  if (end_of_speech_event) {
+    status = pjmedia_flite_port_set_eof_cb(ae->flite_cbp.port, (void*)call, on_end_of_speech);
+    if (status != PJ_SUCCESS) {
+      set_error("pjmedia_flite_port_set_eof_cb failed");
+      return false;
+    }
+  }
+
+  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, ae->flite_cbp.port, NULL, &ae->flite_cbp.slot);
   if (status != PJ_SUCCESS) {
-    set_error("pjmedia_conf_connect_port failed");
+    set_error("pjmedia_conf_add_port failed");
     return false;
   }
 
-  return true;
+  return connect_feature_port_to_stream_port(call, ae, &ae->flite_cbp, CONNECTION_MODE_SOURCE);
 }
 
-bool prepare_flite(Call *c, AudioEndpoint *ae, const char *voice) {
-  printf("prepare_flite call.id=%i\n", c->id);
+bool prepare_pocketsphinx(Call *call, AudioEndpoint *ae) {
+  printf("prepare_pocketsphinx call.id=%i\n", call->id);
   pj_status_t status;
 
-  if(ae->flite_cbp.port) {
+  if(ae->pocketsphinx_cbp.port) {
     printf("already prepared\n");
     return true;
   }
 
-  status = pjmedia_flite_port_create(
-        c->inv->pool, PJMEDIA_PIA_SRATE(&ae->stream_cbp.port->info),
+  status = pjmedia_pocketsphinx_port_create(
+        call->inv->pool, PJMEDIA_PIA_SRATE(&ae->stream_cbp.port->info),
         PJMEDIA_PIA_CCNT(&ae->stream_cbp.port->info),
         PJMEDIA_PIA_SPF(&ae->stream_cbp.port->info),
-        PJMEDIA_PIA_BITS(&ae->stream_cbp.port->info), NULL, 0, voice, &ae->flite_cbp.port);
+        PJMEDIA_PIA_BITS(&ae->stream_cbp.port->info), 
+        on_speech_transcript,
+        call,
+        &ae->pocketsphinx_cbp.port);
   if (status != PJ_SUCCESS) {
-    set_error("pjmedia_flite_port_create failed");
+    set_error("pjmedia_pocketsphinx_port_create failed");
     return false;
   }
 
-  status = pjmedia_conf_add_port(c->conf, c->inv->pool, ae->flite_cbp.port, NULL, &ae->flite_cbp.slot);
+  status = pjmedia_conf_add_port(ae->conf, call->inv->pool, ae->pocketsphinx_cbp.port, NULL, &ae->pocketsphinx_cbp.slot);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_conf_add_port failed");
     return false;
   }
 
-  status = pjmedia_conf_connect_port(c->conf, ae->flite_cbp.slot, ae->stream_cbp.slot, 0);
-  if (status != PJ_SUCCESS) {
-    set_error("pjmedia_conf_connect_port failed");
-    return false;
-  }
-
-  return true;
+  return connect_feature_port_to_stream_port(call, ae, &ae->pocketsphinx_cbp, CONNECTION_MODE_SINK);
 }
 
-
 void on_rx_notify(pjsip_evsub *sub, pjsip_rx_data *rdata, int *p_st_code,
                   pj_str_t **p_st_text, pjsip_hdr *res_hdr,
                   pjsip_msg_body **p_body) {
@@ -8012,7 +8212,7 @@ int pjw_call_send_tcp_msg(long call_id, const char *json) {
   MediaEndpoint *me;
   int res;
 
-  unsigned media_id = 0;
+  int media_id = -1;
 
   char buffer[MAX_JSON_INPUT];
 
@@ -8036,7 +8236,7 @@ int pjw_call_send_tcp_msg(long call_id, const char *json) {
   }
   size = strlen(msg);
 
-  res = json_get_uint_param(document, "media_id", true, &media_id);
+  res = json_get_int_param(document, "media_id", true, &media_id);
   if (res <= 0) {
     goto out;
   }
@@ -8050,7 +8250,7 @@ int pjw_call_send_tcp_msg(long call_id, const char *json) {
   } else {
     // Send msg to specified media_id
 
-    if ((int)media_id >= call->media_count) {
+    if (media_id >= call->media_count) {
       set_error("invalid media_id");
       goto out;
     }
@@ -8093,8 +8293,8 @@ static int g_now;
 
 void check_digit_buffer(Call *call, int mode) {
   // addon_log(L_DBG, "check_digit_buffer g_now=%i for call_id=%i and mode=%i
-  // timestamp=%i len=%i\n", g_now, c->id, mode, c->last_digit_timestamp[mode],
-  // c->DigitBufferLength[mode]);
+  // timestamp=%i len=%i\n", g_now, call->id, mode, call->last_digit_timestamp[mode],
+  // call->DigitBufferLength[mode]);
   char evt[1024];
 
   for (int i = 0; i < call->media_count; i++) {
@@ -8118,10 +8318,10 @@ void check_digit_buffer(Call *call, int mode) {
 }
 
 void check_digit_buffers(long id, long val) {
-  Call *c = (Call *)val;
+  Call *call = (Call *)val;
 
-  check_digit_buffer(c, DTMF_MODE_RFC2833);
-  check_digit_buffer(c, DTMF_MODE_INBAND);
+  check_digit_buffer(call, DTMF_MODE_RFC2833);
+  check_digit_buffer(call, DTMF_MODE_INBAND);
 }
 
 static int digit_buffer_thread(void *arg) {