sip-lab 1.22.0 → 1.23.0

package/src/sip.cpp

@@ -618,11 +618,11 @@ 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_player(Call *c, AudioEndpoint *ae, const char *file, unsigned flags, bool end_of_file_event);
 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_flite(Call *c, AudioEndpoint *ae, const char *voice, bool end_of_speech_event);
 
 void prepare_error_event(ostringstream *oss, char *scope, char *details);
 // void prepare_pjsipcall_error_event(ostringstream *oss, char *scope, char
@@ -641,7 +641,7 @@ 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);
 
 static pjsip_module mod_tester = {
     NULL,
@@ -851,7 +851,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 +868,44 @@ 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);
+}
+
+
 void dispatch_event(const char *evt) {
   addon_log(L_DBG, "dispach_event called with evt=%s\n", evt);
   // g_event_sink(evt);
@@ -3090,7 +3123,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 +3130,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 +3209,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();
@@ -3443,7 +3514,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 +3531,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 +3576,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 +3626,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 +3640,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 +3678,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 +3728,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;
+    }
 
-  audio_endpoint_start_play_wav(call, ae, file);
+    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;
+
+    audio_endpoint_start_play_wav(call, ae, file, flags, end_of_file_event);
+  }
 
 out:
   PJW_UNLOCK();
@@ -3644,7 +3781,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 +3790,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 +3811,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 +3875,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;
+    }
+
+    ae = (AudioEndpoint *)me->endpoint.audio;
 
-  audio_endpoint_start_speech_synth(call, ae, voice, text);
+    audio_endpoint_start_speech_synth(call, ae, voice, text, flags, end_of_speech_event);
+  }
 
 out:
   PJW_UNLOCK();
@@ -3759,13 +3928,9 @@ 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,
+pj_status_t call_stop_op_on_all_audio_endpoints(Call *call,
                                          audio_endpoint_stop_op_t op) {
-  addon_log(L_DBG, "call_stop_audio_endpoints_op media_count=%d\n",
+  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++) {
@@ -3784,11 +3949,7 @@ pj_status_t call_stop_audio_endpoints_op(Call *call,
   return PJ_SUCCESS;
 }
 
-pj_status_t audio_endpoint_stop_play_wav(Call *call, AudioEndpoint *ae) {
-  return audio_endpoint_remove_port(call, &ae->wav_player_cbp);
-}
-
-int pjw_call_stop_play_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();
 
@@ -3802,7 +3963,7 @@ int pjw_call_stop_play_wav(long call_id, const char *json) {
   AudioEndpoint *ae;
   int res;
 
-  unsigned media_id = 0;
+  int media_id = -1;
 
   char buffer[MAX_JSON_INPUT];
 
@@ -3818,21 +3979,19 @@ int pjw_call_stop_play_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 play wav in all audio endpoints
-    status = call_stop_audio_endpoints_op(call, audio_endpoint_stop_play_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 play 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;
     }
@@ -3845,10 +4004,8 @@ int pjw_call_stop_play_wav(long call_id, const char *json) {
 
     ae = (AudioEndpoint *)me->endpoint.audio;
 
-    status = audio_endpoint_stop_play_wav(call, ae);
-    if (status != PJ_SUCCESS) {
-      goto out;
-    }
+    status = op(call, ae);
+    if (status != PJ_SUCCESS) goto out;
   }
 
 out:
@@ -3860,84 +4017,41 @@ 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 audio_endpoint_stop_speech_synth(Call *call, AudioEndpoint *ae) {
+  return audio_endpoint_remove_port(call, &ae->flite_cbp);
 }
 
-int pjw_call_stop_record_wav(long call_id, const char *json) {
-  PJW_LOCK();
-  clear_error();
-
-  long val;
-  Call *call = (Call *)val;
-  pj_status_t status;
-
-  MediaEndpoint *me;
-  AudioEndpoint *ae;
-  int res;
-
-  unsigned media_id = 0;
-
-  char buffer[MAX_JSON_INPUT];
-
-  Document document;
-
-  if (!g_call_ids.get(call_id, val)) {
-    set_error("Invalid call_id");
-    goto out;
-  }
-  call = (Call *)val;
-
-  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) {
-    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;
-    }
-  } else {
-    // Stop record wav on specified media_id
+pj_status_t audio_endpoint_stop_play_wav(Call *call, AudioEndpoint *ae) {
+  return audio_endpoint_remove_port(call, &ae->wav_player_cbp);
+}
 
-    if ((int)media_id >= call->media_count) {
-      set_error("invalid media_id");
-      goto out;
-    }
+pj_status_t audio_endpoint_stop_record_wav(Call *call, AudioEndpoint *ae) {
+  return audio_endpoint_remove_port(call, &ae->wav_writer_cbp);
+}
 
-    me = (MediaEndpoint *)call->media[media_id];
-    if (ENDPOINT_TYPE_AUDIO != me->type) {
-      set_error("invalid media_id non audio");
-      goto out;
-    }
+pj_status_t audio_endpoint_stop_fax(Call *call, AudioEndpoint *ae) {
+  return audio_endpoint_remove_port(call, &ae->fax_cbp);
+}
 
-    ae = (AudioEndpoint *)me->endpoint.audio;
 
-    status = audio_endpoint_stop_record_wav(call, ae);
-    if (status != PJ_SUCCESS) {
-      goto out;
-    }
-  }
 
-out:
-  PJW_UNLOCK();
-  if (pjw_errorstring[0]) {
-    return -1;
-  }
+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);
+}
 
-  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);
 }
 
-pj_status_t audio_endpoint_stop_fax(Call *call, AudioEndpoint *ae) {
-  return audio_endpoint_remove_port(call, &ae->fax_cbp);
+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();
@@ -3954,8 +4068,9 @@ int pjw_call_start_fax(long call_id, const char *json) {
   MediaEndpoint *me;
   AudioEndpoint *ae;
   int ae_count;
+  int res;
 
-  unsigned media_id = 0;
+  int media_id = -1;
 
   char buffer[MAX_JSON_INPUT];
 
@@ -3994,46 +4109,10 @@ int pjw_call_start_fax(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 ((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;
-  }
-
   if (json_get_bool_param(document, "is_sender", false, &is_sender) <= 0) {
     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;
-  }
-
   flag = false;
   if (json_get_bool_param(document, "transmit_on_idle", true, &flag) <= 0) {
     goto out;
@@ -4042,73 +4121,50 @@ int pjw_call_start_fax(long call_id, const char *json) {
       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;
-  }
-
-out:
-  PJW_UNLOCK();
-  if (pjw_errorstring[0]) {
-    return -1;
-  }
-
-  return 0;
-}
-
-int pjw_call_stop_fax(long call_id, const char *json) {
-  PJW_LOCK();
-  clear_error();
-
-  long val;
-  Call *call;
-
-  pj_status_t status;
-
-  MediaEndpoint *me;
-  AudioEndpoint *ae;
-  int res;
-
-  unsigned media_id = 0;
-
-  char buffer[MAX_JSON_INPUT];
-
-  Document document;
-
-  if (!g_call_ids.get(call_id, val)) {
-    set_error("Invalid call_id");
-    goto out;
-  }
-  call = (Call *)val;
+  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;
+      }
 
-  if (!parse_json(document, json, buffer, MAX_JSON_INPUT)) {
-    goto out;
-  }
+      me = (MediaEndpoint *)call->media[media_id];
+      if (ENDPOINT_TYPE_AUDIO != me->type) {
+        set_error("invalid media_id non audio");
+        goto out;
+      }
 
-  res = json_get_uint_param(document, "media_id", true, &media_id);
-  if (res <= 0) {
-    goto out;
-  }
+      ae = (AudioEndpoint *)me->endpoint.audio;
 
-  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;
+      status = audio_endpoint_start_fax(call, ae, is_sender, file, flags);
+      if (status != PJ_SUCCESS) goto out;
     }
   } else {
-    // Stop fax on specified media_id
-
-    if ((int)media_id >= call->media_count) {
-      set_error("invalid media_id");
-      goto out;
+    // 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 +4175,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:
@@ -4889,6 +4946,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);
   }
@@ -6475,6 +6533,7 @@ void close_media_endpoint(Call *call, MediaEndpoint *me) {
     audio_endpoint_remove_port(call, &ae->tonegen_cbp);
     audio_endpoint_remove_port(call, &ae->dtmfdet_cbp);
     audio_endpoint_remove_port(call, &ae->fax_cbp);
+    audio_endpoint_remove_port(call, &ae->flite_cbp);
 
     close_media_transport(ae->med_transport);
     ae->med_transport = NULL;
@@ -6500,7 +6559,7 @@ void close_media_endpoint(Call *call, MediaEndpoint *me) {
 }
 
 void close_media(Call *c) {
-  printf("close_media call_id=%li\n", c->id);
+  printf("close_media call_id=%i\n", c->id);
   for (int i = 0; i < c->media_count; ++i) {
     MediaEndpoint *me = c->media[i];
     close_media_endpoint(c, me);
@@ -6542,7 +6601,7 @@ bool prepare_tonegen(Call *c, AudioEndpoint *ae) {
   return true;
 }
 
-bool prepare_wav_player(Call *c, AudioEndpoint *ae, const char *file) {
+bool prepare_wav_player(Call *c, AudioEndpoint *ae, const char *file, unsigned flags, bool end_of_file_event) {
   pj_status_t status;
 
   unsigned wav_ptime;
@@ -6553,7 +6612,7 @@ bool prepare_wav_player(Call *c, AudioEndpoint *ae, const char *file) {
                   c->inv->pool, 
                   file,
                   wav_ptime,
-                  0,                  /* flags        */
+                  flags,
                   -1,                  /* buf size     */
                   &ae->wav_player_cbp.port
                   );
@@ -6563,6 +6622,14 @@ bool prepare_wav_player(Call *c, AudioEndpoint *ae, const char *file) {
     return false;
   }
 
+  if (end_of_file_event) {
+    status = pjmedia_wav_player_set_eof_cb2(ae->wav_player_cbp.port, (void*)c, on_end_of_file);
+    if (status != PJ_SUCCESS) {
+      set_error("pjmedia_wav_player_set_eof_cb2 failed");
+      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");
@@ -6672,7 +6739,7 @@ bool prepare_fax(Call *c, AudioEndpoint *ae, bool is_sender, const char *file,
   return true;
 }
 
-bool prepare_flite(Call *c, AudioEndpoint *ae, const char *voice) {
+bool prepare_flite(Call *c, AudioEndpoint *ae, const char *voice, bool end_of_speech_event) {
   printf("prepare_flite call.id=%i\n", c->id);
   pj_status_t status;
 
@@ -6685,12 +6752,20 @@ bool prepare_flite(Call *c, AudioEndpoint *ae, const char *voice) {
         c->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), voice, &ae->flite_cbp.port);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_flite_port_create failed");
     return false;
   }
 
+  if (end_of_speech_event) {
+    status = pjmedia_flite_port_set_eof_cb(ae->flite_cbp.port, (void*)c, on_end_of_speech);
+    if (status != PJ_SUCCESS) {
+      set_error("pjmedia_flite_port_set_eof_cb failed");
+      return false;
+    }
+  }
+
   status = pjmedia_conf_add_port(c->conf, c->inv->pool, ae->flite_cbp.port, NULL, &ae->flite_cbp.slot);
   if (status != PJ_SUCCESS) {
     set_error("pjmedia_conf_add_port failed");
@@ -8012,7 +8087,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 +8111,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 +8125,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;
     }