Commit 82704810 authored by Ghislain MARY's avatar Ghislain MARY

Set DSCP value after the remote address has been set (this is needed for DSCP...

Set DSCP value after the remote address has been set (this is needed for DSCP to be set correctly on Windows).
parent b838e5af
......@@ -136,6 +136,7 @@ struct _MediaStream {
bool_t is_beginning;
bool_t owns_sessions;
bool_t pad;
int dscp;
/**
* defines encoder target network bit rate, uses #media_stream_set_target_network_bitrate() setter.
* */
......
......@@ -803,6 +803,7 @@ int audio_stream_start_from_io(AudioStream *stream, RtpProfile *profile, const c
stream->dtmfgen=NULL;
rtp_session_signal_connect(rtps,"telephone-event",(RtpCallback)on_dtmf_received,stream);
rtp_session_signal_connect(rtps,"payload_type_changed",(RtpCallback)audio_stream_payload_type_changed,stream);
rtp_session_set_dscp(rtps, stream->ms.dscp);
if (stream->ms.state==MSStreamPreparing){
/*we were using the dummy preload graph, destroy it but keep sound filters unless no soundcard is given*/
......
......@@ -203,7 +203,10 @@ void media_stream_get_local_rtp_stats(MediaStream *stream, rtp_stats_t *lstats)
int media_stream_set_dscp(MediaStream *stream, int dscp) {
ms_message("Setting DSCP to %i for %s stream.", dscp, media_stream_type_str(stream));
return rtp_session_set_dscp(stream->sessions.rtp_session, dscp);
stream->dscp = dscp;
if ((stream->sessions.rtp_session != NULL) && (stream->sessions.rtp_session->rtp.gs.rem_addr.ss_family != AF_UNSPEC))
return rtp_session_set_dscp(stream->sessions.rtp_session, dscp);
return 0;
}
void media_stream_enable_adaptive_bitrate_control(MediaStream *stream, bool_t enabled) {
......
......@@ -887,6 +887,7 @@ static int video_stream_start_with_source_and_output(VideoStream *stream, RtpPro
rtp_session_signal_connect(stream->ms.sessions.rtp_session,"payload_type_changed",
(RtpCallback)video_stream_payload_type_changed,&stream->ms);
rtp_session_set_dscp(rtps, stream->ms.dscp);
rtp_session_get_jitter_buffer_params(stream->ms.sessions.rtp_session,&jbp);
jbp.max_packets=1000;//needed for high resolution video
......
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