Commit 96cd5095 authored by Simon Morlat's avatar Simon Morlat

update for lastest ortp

parent a51c2def
......@@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <math.h>
#define LOSS_RATE_MIN_INTERVAL 120
#define LOSS_RATE_MIN_TIME 3000
/**
* Analyses a received RTCP packet.
......@@ -262,7 +263,7 @@ MSQosAnalyzer * ms_simple_qos_analyzer_new(RtpSession *session){
obj->session=session;
obj->parent.desc=&simple_analyzer_desc;
obj->parent.type=MSQosAnalyzerAlgorithmSimple;
obj->parent.lre=ortp_loss_rate_estimator_new(LOSS_RATE_MIN_INTERVAL, session);
obj->parent.lre=ortp_loss_rate_estimator_new(LOSS_RATE_MIN_INTERVAL, LOSS_RATE_MIN_TIME, session);
return (MSQosAnalyzer*)obj;
}
......@@ -686,7 +687,7 @@ MSQosAnalyzer * ms_stateful_qos_analyzer_new(RtpSession *session){
obj->session=session;
obj->parent.desc=&stateful_analyzer_desc;
obj->parent.type=MSQosAnalyzerAlgorithmStateful;
obj->parent.lre=ortp_loss_rate_estimator_new(LOSS_RATE_MIN_INTERVAL, session);
obj->parent.lre=ortp_loss_rate_estimator_new(LOSS_RATE_MIN_INTERVAL, LOSS_RATE_MIN_TIME, session);
/*burst period will float the upload bandwidth assuming 5 sec RTCP reports interval*/
obj->burst_duration_ms=1000;
......
......@@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define WORSE_JITTER 0.2
#define WORSE_RT_PROP 5.0
#define SEQ_INTERVAL 120
#define TIME_INTERVAL 3000
struct _MSQualityIndicator{
......@@ -52,7 +53,7 @@ struct _MSQualityIndicator{
MSQualityIndicator *ms_quality_indicator_new(RtpSession *session){
MSQualityIndicator *qi=ms_new0(MSQualityIndicator,1);
qi->session=session;
qi->lr_estimator=ortp_loss_rate_estimator_new(SEQ_INTERVAL, qi->session);
qi->lr_estimator=ortp_loss_rate_estimator_new(SEQ_INTERVAL, TIME_INTERVAL, qi->session);
qi->rating=5.0;
qi->lq_rating=5.0;
qi->local_rating=1.0;
......
......@@ -342,7 +342,7 @@ static void loss_rate_estimation() {
int loss_rate = 15;
start_adaptive_stream(MSAudio, &marielle, &margaux, PCMA8_PAYLOAD_TYPE, 8000, 0, loss_rate, 0, 0);
ctx.estimator=ortp_loss_rate_estimator_new(120, marielle->audio_stream->ms.sessions.rtp_session);
ctx.estimator=ortp_loss_rate_estimator_new(120, 2500, marielle->audio_stream->ms.sessions.rtp_session);
ctx.q = ortp_ev_queue_new();
rtp_session_register_event_queue(marielle->audio_stream->ms.sessions.rtp_session, ctx.q);
ctx.loss_rate = loss_rate;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment