diff options
| author | System Administrator <root@Mamadous-MacBook-Pro.local> | 2016-02-25 00:54:48 +0100 |
|---|---|---|
| committer | System Administrator <root@Mamadous-MacBook-Pro.local> | 2016-02-25 00:54:48 +0100 |
| commit | 3d46d2f68c23e39f6862d71854d5ebed495836b4 (patch) | |
| tree | b6df1fe108905a90bc5dd013a4815f0c17dbcb68 /tinyDAV | |
| parent | 40a8a15df631bbfd55736ba1f521f95fdc4a7e8d (diff) | |
| download | doubango-3d46d2f68c23e39f6862d71854d5ebed495836b4.zip doubango-3d46d2f68c23e39f6862d71854d5ebed495836b4.tar.gz | |
Update cfscket transport to report correct in/out bytes
Diffstat (limited to 'tinyDAV')
| -rwxr-xr-x | tinyDAV/src/video/tdav_session_video.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tinyDAV/src/video/tdav_session_video.c b/tinyDAV/src/video/tdav_session_video.c index 755323a..c867605 100755 --- a/tinyDAV/src/video/tdav_session_video.c +++ b/tinyDAV/src/video/tdav_session_video.c @@ -614,12 +614,12 @@ static int tdav_session_video_rtcp_cb(const void* callback_data, const trtp_rtcp case trtp_rtcp_psfb_fci_type_afb: { if (psfb->afb.type == trtp_rtcp_psfb_afb_type_remb) { uint64_t bw_up_reported_kpbs = ((psfb->afb.remb.mantissa << psfb->afb.remb.exp) >> 10); - TSK_DEBUG_INFO("Receiving RTCP-AFB-REMB (%u), exp=%u, mantissa=%u, bandwidth=%ukbps", ((const trtp_rtcp_report_fb_t*)psfb)->ssrc_media, psfb->afb.remb.exp, psfb->afb.remb.mantissa, bw_up_reported_kpbs); + TSK_DEBUG_INFO("Receiving RTCP-AFB-REMB (%u), exp=%u, mantissa=%u, bandwidth=%llukbps", ((const trtp_rtcp_report_fb_t*)psfb)->ssrc_media, psfb->afb.remb.exp, psfb->afb.remb.mantissa, bw_up_reported_kpbs); if (base->congestion_ctrl_enabled) { if (session->qos_metrics.bw_up_est_kbps != 0) { float q3 = bw_up_reported_kpbs / (float)session->qos_metrics.bw_up_est_kbps; q3 = TSK_CLAMP(0.f, q3, 1.f); - TSK_DEBUG_INFO("bw_up_estimated_kbps=%llu, bw_up_reported_kpbs=%llu, q3=%f", session->qos_metrics.bw_up_est_kbps, bw_up_reported_kpbs, q3); + TSK_DEBUG_INFO("bw_up_estimated_kbps=%u, bw_up_reported_kpbs=%llu, q3=%f", session->qos_metrics.bw_up_est_kbps, bw_up_reported_kpbs, q3); tsk_mutex_lock(video->h_mutex_qos); session->qos_metrics.q3 = (session->qos_metrics.q3 + q3) / (video->q3_n++ ? 2.f : 1.f); tsk_mutex_unlock(video->h_mutex_qos); @@ -1539,7 +1539,7 @@ static int _tdav_session_video_report_bw_usage_and_jcng(tdav_session_video_t* se jcng_q = q5; } } - TSK_DEBUG_INFO("video with congestion control enabled: est_bw_down=%llukbps, est_jcng=%f", session->qos_metrics.bw_down_est_kbps, jcng_q); + TSK_DEBUG_INFO("video with congestion control enabled: est_bw_down=%ukbps, est_jcng=%f", session->qos_metrics.bw_down_est_kbps, jcng_q); ret = trtp_manager_set_app_bw_and_jcng(base->rtp_manager, INT_MAX/* unused */, (int32_t)session->qos_metrics.bw_down_est_kbps, jcng_q); self->last_sendreport_time = tsk_time_now(); } |
