Commit 65325093 authored by Gautier Pelloux-Prayer's avatar Gautier Pelloux-Prayer
Browse files

rebase on master

parent a6d87ce6
......@@ -150,6 +150,6 @@ MSBitrateController *ms_av_bitrate_controller_new(RtpSession *asession, MSFilter
MSBitrateController *ms_bandwidth_bitrate_controller_new(RtpSession *asession, MSFilter *aenc, RtpSession *vsession, MSFilter *venc){
return ms_bitrate_controller_new(
ms_stateful_qos_analyser_new(vsession),
ms_bandwidth_bitrate_driver_new(aenc,venc));
ms_bandwidth_bitrate_driver_new(asession, aenc, vsession, venc));
}
......@@ -320,6 +320,7 @@ static int bandwidth_dec_video_bitrate(MSBandwidthBitrateDriver *obj, const MSRa
ms_message("MSBandwidthBitrateDriver: targeting %i bps for video encoder.",new_br);
ms_filter_call_method(obj->venc,MS_FILTER_SET_BITRATE,&new_br);
obj->cur_bitrate=new_br;
rtp_session_set_target_upload_bandwidth(obj->vsession, obj->cur_bitrate);
return new_br==min_video_bitrate ? -1 : 0;
}
......@@ -339,6 +340,7 @@ static int bandwidth_inc_video_bitrate(MSBandwidthBitrateDriver *obj, const MSRa
}
ms_message("MSBandwidthBitrateDriver: increasing bitrate from %i to %i bps for video encoder.",obj->cur_bitrate,newbr);
obj->cur_bitrate=newbr;
rtp_session_set_target_upload_bandwidth(obj->vsession, obj->cur_bitrate);
ms_filter_call_method(obj->venc,MS_FILTER_SET_BITRATE,&obj->cur_bitrate);
return ret;
}
......
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