Changeset 6140 for pjproject/trunk/pjmedia/src/pjmedia/echo_webrtc.c

Timestamp:

Jan 28, 2020 6:58:45 AM (4 years ago)

Author:

ming

Message:

Closed #2143: Add AEC info to call info & statistics dump

File:

• pjproject/trunk/pjmedia/src/pjmedia/echo_webrtc.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia/echo_webrtc.c

@@ -23 +23 @@
 #include <pj/log.h>
 #include <pj/pool.h>
+#include <pj/string.h>
 
 #if defined(PJMEDIA_HAS_WEBRTC_AEC) && PJMEDIA_HAS_WEBRTC_AEC != 0
@@ -50 +51 @@
     #define WebRtcAec_BufferFarend WebRtcAecm_BufferFarend
     #define AecConfig AecmConfig
-    #define SHOW_DELAY_METRICS  0
     typedef short sample;
 #else
@@ -57 +57 @@
     typedef float sample;
 
-    /* If SHOW_DELAY_METRICS is set to non-zero, delay metrics stats will
-     * be printed every SHOW_DELAY_METRICS-th call to webrtc_aec_cancel_echo().
-     * For example, if ptime is 20ms, set this to 250 to print the metrics
-     * every 250*20/1000=5 seconds.
-     */
-    #define SHOW_DELAY_METRICS  0
-    
 #endif
 
 #define BUF_LEN                 160
+
+/* Set this to 0 to disable metrics calculation. */
+#define SHOW_DELAY_METRICS      1
 
 typedef struct webrtc_ec
@@ -80 +76 @@
     sample      tmp_buf[BUF_LEN];
     sample      tmp_buf2[BUF_LEN];
-#if SHOW_DELAY_METRICS
-    unsigned    counter;
-#endif
 } webrtc_ec;
 
@@ -356 +349 @@
     }
 
-#if SHOW_DELAY_METRICS
-    if (++echo->counter >= SHOW_DELAY_METRICS) {
-        int median, std;
-        float frac_delay;
-
-        if (WebRtcAec_GetDelayMetrics(echo->AEC_inst, &median, &std,
-                                      &frac_delay) == 0)
-        {
-            PJ_LOG(3, (THIS_FILE, "WebRTC delay metrics: median=%d, std=%d, "
-                                  "fraction of poor delays=%f",
-                                  median, std, frac_delay));
-        }
-        echo->counter = 0;
-    }
-#endif
-
     return PJ_SUCCESS;
 }
 
-#endif
+
+PJ_DEF(pj_status_t) webrtc_aec_get_stat(void *state,
+                                        pjmedia_echo_stat *p_stat)
+{
+    webrtc_ec *echo = (webrtc_ec*) state;
+
+    if (WebRtcAec_GetDelayMetrics(echo->AEC_inst, &p_stat->median,
+                                  &p_stat->std, &p_stat->frac_delay) != 0)
+    {
+        return PJ_EUNKNOWN;
+    }
+
+    p_stat->name = "WebRTC AEC";
+    p_stat->stat_info.ptr = p_stat->buf_;
+    p_stat->stat_info.slen =
+        pj_ansi_snprintf(p_stat->buf_, sizeof(p_stat->buf_),
+                         "WebRTC delay metric: median=%d, std=%d, "
+                         "frac of poor delay=%.02f",
+                         p_stat->median, p_stat->std, p_stat->frac_delay);
+
+    return PJ_SUCCESS;
+}
+
+
+#endif