Update cfscket transport to report correct in/out bytes

This commit is contained in:
System Administrator 2016-02-25 00:54:48 +01:00
parent 40a8a15df6
commit 3d46d2f68c
58 changed files with 9818 additions and 9814 deletions

0
.gitignore vendored Normal file → Executable file
View File

0
AStyle.sh Normal file → Executable file
View File

0
bindings/csharp/QoS.cs Normal file → Executable file
View File

0
bindings/java/QoS.java Normal file → Executable file
View File

0
bindings/java/android/QoS.java Normal file → Executable file
View File

0
thirdparties/mac/include/srtp/config.h Normal file → Executable file
View File

0
thirdparties/mac/lib/i386/libcrypto.a Normal file → Executable file
View File

0
thirdparties/mac/lib/i386/libsrtp.a Normal file → Executable file
View File

0
thirdparties/mac/lib/i386/libssl.a Normal file → Executable file
View File

0
thirdparties/mac/lib/x86_64/libcrypto.a Normal file → Executable file
View File

0
thirdparties/mac/lib/x86_64/libsrtp.a Normal file → Executable file
View File

0
thirdparties/mac/lib/x86_64/libssl.a Normal file → Executable file
View File

View File

@ -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();
}

View File

@ -319,6 +319,7 @@ static int recvData(tnet_transport_t *transport, transport_socket_xt* active_soc
if (len && buffer) {
tnet_transport_event_t* e = tnet_transport_event_create(event_data, transport->callback_data, active_socket->fd);
transport->bytes_in += len;
if (e && buffer && len) {
e->data = buffer;
buffer = NULL;
@ -485,6 +486,7 @@ tsk_size_t tnet_transport_send(const tnet_transport_handle_t *handle, tnet_fd_t
}
bail:
transport->bytes_out += numberOfBytesSent;
return numberOfBytesSent;
}
@ -517,6 +519,7 @@ tsk_size_t tnet_transport_sendto(const tnet_transport_handle_t *handle, tnet_fd_
}
bail:
transport->bytes_out += numberOfBytesSent;
return numberOfBytesSent;
}
@ -1034,6 +1037,7 @@ void __CFSocketCallBack(CFSocketRef s, CFSocketCallBackType callbackType, CFData
int len = (int)CFDataGetLength((CFDataRef)data);
if (ptr && len > 0) {
tnet_transport_event_t* e = tnet_transport_event_create(event_data, transport->callback_data, sock->fd);
transport->bytes_in += len;
if (e) {
e->data = tsk_malloc(len);
if (e->data) {

0
website/.htaccess Normal file → Executable file
View File