FS-9013 #resolve [Add vad talk time logging channel vars]

diff --git a/src/include/switch_core_media.h b/src/include/switch_core_media.h
index 82a0373e39b160c9348844e90b7a4301ab27d193..0d93ec4d581c76969bf621d8724afe8ae8822984 100644 (file)
--- a/src/include/switch_core_media.h
+++ b/src/include/switch_core_media.h
@@ -278,6 +278,7 @@ SWITCH_DECLARE(void) switch_core_media_resume(switch_core_session_t *session);
 SWITCH_DECLARE(void) switch_core_media_init(void);
 SWITCH_DECLARE(void) switch_core_media_deinit(void);
 SWITCH_DECLARE(void) switch_core_media_set_stats(switch_core_session_t *session);
+SWITCH_DECLARE(void) switch_core_media_sync_stats(switch_core_session_t *session);
 SWITCH_DECLARE(void) switch_core_session_wake_video_thread(switch_core_session_t *session);
 SWITCH_DECLARE(void) switch_core_session_clear_crypto(switch_core_session_t *session);
 

diff --git a/src/include/switch_rtp.h b/src/include/switch_rtp.h
index f222ce028c94e5d9aaf31d702b6c960c32e6b2fc..440b5cc9a46ac51cf1cc0003d3fee1132a0c859b 100644 (file)
--- a/src/include/switch_rtp.h
+++ b/src/include/switch_rtp.h
@@ -311,6 +311,8 @@ SWITCH_DECLARE(uint8_t) switch_rtp_ready(switch_rtp_t *rtp_session);
 */
 SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session);
 
+SWITCH_DECLARE(switch_status_t) switch_rtp_sync_stats(switch_rtp_t *rtp_session);
+
 /*! 
   \brief Acvite ICE on an RTP session
   \return SWITCH_STATUS_SUCCESS

diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index 0ad27cd4eb2fac2832ae8cc4cc951b493a431c0a..777c664d88dbc6b8687bbd22712ba7cd5098260a 100644 (file)
--- a/src/switch_core_media.c
+++ b/src/switch_core_media.c
@@ -1535,6 +1535,30 @@ static void set_stats(switch_core_session_t *session, switch_media_type_t type,
        }
 }
 
+SWITCH_DECLARE(void) switch_core_media_sync_stats(switch_core_session_t *session)
+{
+       switch_media_handle_t *smh;
+       switch_rtp_engine_t *a_engine, *v_engine;
+
+       switch_assert(session);
+
+       if (!(smh = session->media_handle)) {
+               return;
+       }
+
+       a_engine = &smh->engines[SWITCH_MEDIA_TYPE_AUDIO];
+       v_engine = &smh->engines[SWITCH_MEDIA_TYPE_VIDEO];      
+
+       if (a_engine->rtp_session) {
+               switch_rtp_sync_stats(a_engine->rtp_session);
+       }
+
+       if (v_engine->rtp_session) {
+               switch_rtp_sync_stats(v_engine->rtp_session);
+       }
+
+}
+
 SWITCH_DECLARE(void) switch_core_media_set_stats(switch_core_session_t *session)
 {
        
@@ -1542,6 +1566,8 @@ SWITCH_DECLARE(void) switch_core_media_set_stats(switch_core_session_t *session)
                return;
        }
 
+       switch_core_media_sync_stats(session);
+
        set_stats(session, SWITCH_MEDIA_TYPE_AUDIO, "audio");
        set_stats(session, SWITCH_MEDIA_TYPE_VIDEO, "video");
 }

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 683820015bda3d433dd06850a3fcccb2f09be815..a351af68cd29983ce2234b0f68116a926883678a 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -203,6 +203,9 @@ struct switch_rtp_vad_data {
        uint8_t start_count;
        uint8_t scan_freq;
        time_t next_scan;
+       switch_time_t start_talking;
+       switch_time_t stop_talking;
+       switch_time_t total_talk_time;
        int fire_events;
 };
 
@@ -4446,6 +4449,29 @@ SWITCH_DECLARE(uint8_t) switch_rtp_ready(switch_rtp_t *rtp_session)
        return ret;
 }
 
+SWITCH_DECLARE(switch_status_t) switch_rtp_sync_stats(switch_rtp_t *rtp_session)
+{
+       if (!rtp_session) {
+               return SWITCH_STATUS_FALSE;
+       }
+       
+       if (rtp_session->flags[SWITCH_RTP_FLAG_VAD]) {
+               switch_channel_t *channel = switch_core_session_get_channel(rtp_session->vad_data.session);
+
+               switch_channel_set_variable_printf(channel, "vad_total_talk_time_ms", "%u", (uint32_t)rtp_session->vad_data.total_talk_time / 1000);
+               switch_channel_set_variable_printf(channel, "vad_total_talk_time_sec", "%u", (uint32_t)rtp_session->vad_data.total_talk_time / 1000000);
+       }
+
+       do_mos(rtp_session, SWITCH_TRUE);
+
+       if (rtp_session->stats.inbound.error_log && !rtp_session->stats.inbound.error_log->stop) {
+               rtp_session->stats.inbound.error_log->stop = switch_micro_time_now();
+       }
+
+       return SWITCH_STATUS_SUCCESS;
+}
+
+
 SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session)
 {
        void *pop;
@@ -4468,10 +4494,8 @@ SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session)
        READ_DEC((*rtp_session));
        WRITE_DEC((*rtp_session));
 
-       do_mos(*rtp_session, SWITCH_TRUE);
-
-       if ((*rtp_session)->stats.inbound.error_log && !(*rtp_session)->stats.inbound.error_log->stop) {
-               (*rtp_session)->stats.inbound.error_log->stop = switch_micro_time_now();
+       if ((*rtp_session)->flags[SWITCH_RTP_FLAG_VAD]) {
+               switch_rtp_disable_vad(*rtp_session);
        }
 
        switch_mutex_lock((*rtp_session)->flag_mutex);
@@ -4533,10 +4557,6 @@ SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session)
                }
        }
 
-       if ((*rtp_session)->flags[SWITCH_RTP_FLAG_VAD]) {
-               switch_rtp_disable_vad(*rtp_session);
-       }
-
 #ifdef ENABLE_SRTP
        if ((*rtp_session)->flags[SWITCH_RTP_FLAG_SECURE_SEND]) {
                for(x = 0; x < 2; x++) {
@@ -7314,7 +7334,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
                uint32_t len = sizeof(decoded);
                time_t now = switch_epoch_time_now(NULL);
                send = 0;
-
+               
                if (rtp_session->vad_data.scan_freq && rtp_session->vad_data.next_scan <= now) {
                        rtp_session->vad_data.bg_count = rtp_session->vad_data.bg_level = 0;
                        rtp_session->vad_data.next_scan = now + rtp_session->vad_data.scan_freq;
@@ -7355,7 +7375,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
                                        } else {
                                                if (score > rtp_session->vad_data.bg_level && !switch_test_flag(&rtp_session->vad_data, SWITCH_VAD_FLAG_TALKING)) {
                                                        uint32_t diff = score - rtp_session->vad_data.bg_level;
-
+                                                       
                                                        if (rtp_session->vad_data.hangover_hits) {
                                                                rtp_session->vad_data.hangover_hits--;
                                                        }
@@ -7363,6 +7383,9 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
                                                        if (diff >= rtp_session->vad_data.diff_level || ++rtp_session->vad_data.hangunder_hits >= rtp_session->vad_data.hangunder) {
 
                                                                switch_set_flag(&rtp_session->vad_data, SWITCH_VAD_FLAG_TALKING);
+
+                                                               rtp_session->vad_data.start_talking = switch_time_now();
+
                                                                if (!(rtp_session->rtp_bugs & RTP_BUG_NEVER_SEND_MARKER)) {
                                                                        send_msg->header.m = 1;
                                                                }
@@ -7384,10 +7407,14 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
                                                        }
                                                        if (switch_test_flag(&rtp_session->vad_data, SWITCH_VAD_FLAG_TALKING)) {
                                                                if (++rtp_session->vad_data.hangover_hits >= rtp_session->vad_data.hangover) {
+                                                                       rtp_session->vad_data.stop_talking = switch_time_now();
+                                                                       rtp_session->vad_data.total_talk_time += (rtp_session->vad_data.stop_talking - rtp_session->vad_data.start_talking);
+
                                                                        switch_clear_flag(&rtp_session->vad_data, SWITCH_VAD_FLAG_TALKING);
+                                                                       
                                                                        rtp_session->vad_data.hangover_hits = rtp_session->vad_data.hangunder_hits = rtp_session->vad_data.cng_count = 0;
                                                                        if (switch_test_flag(&rtp_session->vad_data, SWITCH_VAD_FLAG_EVENTS_NOTALK)) {
-
+                                                                               
                                                                                if ((rtp_session->vad_data.fire_events & VAD_FIRE_NOT_TALK)) {
                                                                                        switch_event_t *event;
                                                                                        if (switch_event_create(&event, SWITCH_EVENT_NOTALK) == SWITCH_STATUS_SUCCESS) {
@@ -7672,6 +7699,9 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_enable_vad(switch_rtp_t *rtp_session,
        rtp_session->vad_data.start = 0;
        rtp_session->vad_data.next_scan = switch_epoch_time_now(NULL);
        rtp_session->vad_data.scan_freq = 0;
+       if (switch_test_flag(&rtp_session->vad_data, SWITCH_VAD_FLAG_TALKING)) {
+               rtp_session->vad_data.start_talking = switch_time_now();
+       }
        switch_rtp_set_flag(rtp_session, SWITCH_RTP_FLAG_VAD);
        switch_set_flag(&rtp_session->vad_data, SWITCH_VAD_FLAG_CNG);
        return SWITCH_STATUS_SUCCESS;