retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #1018 in FS/freeswitch from ~GIAVAC/fs-9643-master:feature/FS-9643-mod_opus-log-encoded-stats-at-end to master 

* commit '6c11284d34c9261322776af36ff9c76b2531a68b':
  FS-9643 mod_opus Log encoded stats at end of call  Log count of encoded FEC frames in debug mode
This commit is contained in:
Brian West 2016-10-25 14:11:12 -05:00
parent 621c8a6135 6c11284d34
commit a79636b5cc
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/mod/codecs/mod_opus/mod_opus.c
View File

@ -96,6 +96,14 @@ struct dec_stats {
};
typedef struct dec_stats dec_stats_t;
struct enc_stats {
uint32_t frame_counter;
uint32_t encoded_bytes;
uint32_t encoded_msec;
uint32_t fec_counter;
};
typedef struct enc_stats enc_stats_t;
struct codec_control_state {
int keep_fec;
opus_int32 current_bitrate;
@ -117,6 +125,7 @@ struct opus_context {
int look_check;
int look_ts;
dec_stats_t decoder_stats;
enc_stats_t encoder_stats;
codec_control_state_t control_state;
};
@ -689,6 +698,17 @@ static switch_status_t switch_opus_destroy(switch_codec_t *codec)
context->decoder_object = NULL;
}
if (context->encoder_object) {
switch_core_session_t *session = codec->session;
int avg_encoded_bitrate = 0;
if (session) {
if (context->encoder_stats.frame_counter > 0) {
avg_encoded_bitrate = (context->encoder_stats.encoded_bytes * 8) / (context->encoder_stats.encoded_msec / 1000);
}
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,"Opus encoder stats: Frames[%d] Bytes encoded[%d] Encoded length ms[%d] Average encoded bitrate bps[%d] FEC frames (only for debug mode) [%d]\n",
context->encoder_stats.frame_counter, context->encoder_stats.encoded_bytes, context->encoder_stats.encoded_msec, avg_encoded_bitrate, context->encoder_stats.fec_counter);
}
opus_encoder_destroy(context->encoder_object);
context->encoder_object = NULL;
}
@ -722,6 +742,20 @@ static switch_status_t switch_opus_encode(switch_codec_t *codec,
if (bytes > 0) {
*encoded_data_len = (uint32_t) bytes;
context->encoder_stats.frame_counter++;
if (context->enc_frame_size > 0) {
context->encoder_stats.encoded_msec += codec->implementation->microseconds_per_packet / 1000;
}
context->encoder_stats.encoded_bytes += (uint32_t)bytes;
if (globals.debug || context->debug > 1) {
// This stat is expensive, so get it only when in debug mode
if (switch_opus_has_fec((uint8_t *)encoded_data, bytes)) {
context->encoder_stats.fec_counter++;
}
}
return SWITCH_STATUS_SUCCESS;
}