Merge (Debug->release)
This commit is contained in:
parent
3a4c3a30d9
commit
4d04330921
|
@ -261,7 +261,7 @@ static char* tdav_codec_opus_sdp_att_get(const tmedia_codec_t* codec, const char
|
||||||
return tsk_null;
|
return tsk_null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*if(tsk_striequals(att_name, "fmtp")){
|
if(tsk_striequals(att_name, "fmtp")){
|
||||||
char* fmtp = tsk_null;
|
char* fmtp = tsk_null;
|
||||||
tsk_sprintf(&fmtp, "maxplaybackrate=%d; sprop-maxcapturerate=%d; stereo=%d; sprop-stereo=%d; useinbandfec=%d; usedtx=%d",
|
tsk_sprintf(&fmtp, "maxplaybackrate=%d; sprop-maxcapturerate=%d; stereo=%d; sprop-stereo=%d; useinbandfec=%d; usedtx=%d",
|
||||||
TMEDIA_CODEC(opus)->in.rate,
|
TMEDIA_CODEC(opus)->in.rate,
|
||||||
|
@ -272,20 +272,6 @@ static char* tdav_codec_opus_sdp_att_get(const tmedia_codec_t* codec, const char
|
||||||
opus->decoder.dtx_enabled ? 1 : 0
|
opus->decoder.dtx_enabled ? 1 : 0
|
||||||
);
|
);
|
||||||
return fmtp;
|
return fmtp;
|
||||||
}*/
|
|
||||||
|
|
||||||
if(tsk_striequals(att_name, "fmtp")){
|
|
||||||
char* fmtp = tsk_null;
|
|
||||||
//tsk_sprintf(&fmtp, "maxplaybackrate=%d; sprop-maxcapturerate=%d; stereo=%d; sprop-stereo=%d; useinbandfec=%d; usedtx=%d",
|
|
||||||
tsk_sprintf(&fmtp, "maxplaybackrate=%d; stereo=%d; sprop-stereo=%d; useinbandfec=%d",
|
|
||||||
TMEDIA_CODEC(opus)->in.rate,
|
|
||||||
//TMEDIA_CODEC(opus)->out.rate,
|
|
||||||
(TMEDIA_CODEC_AUDIO(opus)->in.channels == 2) ? 1 : 0,
|
|
||||||
(TMEDIA_CODEC_AUDIO(opus)->out.channels == 2) ? 1 : 0,
|
|
||||||
opus->decoder.fec_enabled ? 1 : 0
|
|
||||||
//opus->decoder.dtx_enabled ? 1 : 0
|
|
||||||
);
|
|
||||||
return fmtp;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return tsk_null;
|
return tsk_null;
|
||||||
|
|
|
@ -873,7 +873,7 @@ const tsdp_header_M_t* tdav_session_av_get_lo(tdav_session_av_t* self, tsk_bool_
|
||||||
char* str = tsk_null;
|
char* str = tsk_null;
|
||||||
tsdp_header_A_t* cryptoA = tsk_null;
|
tsdp_header_A_t* cryptoA = tsk_null;
|
||||||
tsk_bool_t negotiate_srtp = (self->srtp_mode == tmedia_srtp_mode_optional);
|
tsk_bool_t negotiate_srtp = (self->srtp_mode == tmedia_srtp_mode_optional);
|
||||||
tsk_bool_t negotiate_avpf = 0;//(self->avpf_mode_set == tmedia_mode_optional);
|
tsk_bool_t negotiate_avpf = (self->avpf_mode_set == tmedia_mode_optional);
|
||||||
tsk_bool_t is_srtp_remote_mandatory = (base->M.ro && _sdp_str_contains(base->M.ro->proto, "SAVP"));
|
tsk_bool_t is_srtp_remote_mandatory = (base->M.ro && _sdp_str_contains(base->M.ro->proto, "SAVP"));
|
||||||
tsk_size_t profiles_index = 0;
|
tsk_size_t profiles_index = 0;
|
||||||
RTP_PROFILE_T profiles[RTP_PROFILES_COUNT] = { RTP_PROFILE_NONE };
|
RTP_PROFILE_T profiles[RTP_PROFILES_COUNT] = { RTP_PROFILE_NONE };
|
||||||
|
@ -945,7 +945,7 @@ const tsdp_header_M_t* tdav_session_av_get_lo(tdav_session_av_t* self, tsk_bool_
|
||||||
}
|
}
|
||||||
|
|
||||||
// "tcap"
|
// "tcap"
|
||||||
//_first_media_add_headers(self->local_sdp, TSDP_HEADER_A_VA_ARGS("tcap", tcap), tsk_null);
|
_first_media_add_headers(self->local_sdp, TSDP_HEADER_A_VA_ARGS("tcap", tcap), tsk_null);
|
||||||
TSK_FREE(tcap);
|
TSK_FREE(tcap);
|
||||||
|
|
||||||
acap_tag = TSK_MAX(acap_tag, acap_tag_connection);
|
acap_tag = TSK_MAX(acap_tag, acap_tag_connection);
|
||||||
|
|
|
@ -78,11 +78,11 @@ Must starts at 96 to be conform to RFC 5761 (rtcp-mux)
|
||||||
|
|
||||||
#define TMEDIA_CODEC_FORMAT_ILBC "96"
|
#define TMEDIA_CODEC_FORMAT_ILBC "96"
|
||||||
|
|
||||||
#define TMEDIA_CODEC_FORMAT_SPEEX_NB "101"
|
#define TMEDIA_CODEC_FORMAT_SPEEX_NB "97"
|
||||||
#define TMEDIA_CODEC_FORMAT_SPEEX_WB "98"
|
#define TMEDIA_CODEC_FORMAT_SPEEX_WB "98"
|
||||||
#define TMEDIA_CODEC_FORMAT_SPEEX_UWB "99"
|
#define TMEDIA_CODEC_FORMAT_SPEEX_UWB "99"
|
||||||
#define TMEDIA_CODEC_FORMAT_VP8 "100" /* Must to ease neg. with chrome and Asterisk */
|
#define TMEDIA_CODEC_FORMAT_VP8 "100" /* Must to ease neg. with chrome and Asterisk */
|
||||||
#define TMEDIA_CODEC_FORMAT_DTMF "97"
|
#define TMEDIA_CODEC_FORMAT_DTMF "101"
|
||||||
|
|
||||||
#define TMEDIA_CODEC_FORMAT_H263_2000 "102"
|
#define TMEDIA_CODEC_FORMAT_H263_2000 "102"
|
||||||
#define TMEDIA_CODEC_FORMAT_H263_1998 "103"
|
#define TMEDIA_CODEC_FORMAT_H263_1998 "103"
|
||||||
|
@ -90,12 +90,12 @@ Must starts at 96 to be conform to RFC 5761 (rtcp-mux)
|
||||||
#define TMEDIA_CODEC_FORMAT_H264_MP "105"
|
#define TMEDIA_CODEC_FORMAT_H264_MP "105"
|
||||||
#define TMEDIA_CODEC_FORMAT_H264_HP "106"
|
#define TMEDIA_CODEC_FORMAT_H264_HP "106"
|
||||||
|
|
||||||
#define TMEDIA_CODEC_FORMAT_AMR_WBP_BE "111"
|
#define TMEDIA_CODEC_FORMAT_AMR_WBP_BE "107"
|
||||||
#define TMEDIA_CODEC_FORMAT_AMR_WBP_OA "108"
|
#define TMEDIA_CODEC_FORMAT_AMR_WBP_OA "108"
|
||||||
#define TMEDIA_CODEC_FORMAT_AAC "109"
|
#define TMEDIA_CODEC_FORMAT_AAC "109"
|
||||||
#define TMEDIA_CODEC_FORMAT_AACPLUS "110"
|
#define TMEDIA_CODEC_FORMAT_AACPLUS "110"
|
||||||
|
|
||||||
#define TMEDIA_CODEC_FORMAT_OPUS "107"
|
#define TMEDIA_CODEC_FORMAT_OPUS "111"
|
||||||
|
|
||||||
#define TMEDIA_CODEC_FORMAT_AMR_NB_BE "112"
|
#define TMEDIA_CODEC_FORMAT_AMR_NB_BE "112"
|
||||||
#define TMEDIA_CODEC_FORMAT_AMR_NB_OA "113"
|
#define TMEDIA_CODEC_FORMAT_AMR_NB_OA "113"
|
||||||
|
|
|
@ -1034,13 +1034,11 @@ int tsip_dialog_add_common_headers(const tsip_dialog_t *self, tsip_request_t* re
|
||||||
case tsip_REFER:
|
case tsip_REFER:
|
||||||
case tsip_MESSAGE:
|
case tsip_MESSAGE:
|
||||||
case tsip_PUBLISH:
|
case tsip_PUBLISH:
|
||||||
//case tsip_REGISTER:
|
case tsip_REGISTER:
|
||||||
{
|
{
|
||||||
if(!earlyIMS || (earlyIMS && TSIP_REQUEST_IS_REGISTER(request))){
|
if(!earlyIMS || (earlyIMS && TSIP_REQUEST_IS_REGISTER(request))){
|
||||||
TSIP_MESSAGE_ADD_HEADER(request,
|
TSIP_MESSAGE_ADD_HEADER(request,
|
||||||
//TSIP_HEADER_P_PREFERRED_IDENTITY_VA_ARGS(preferred_identity)
|
TSIP_HEADER_P_PREFERRED_IDENTITY_VA_ARGS(preferred_identity)
|
||||||
TSIP_HEADER_DUMMY_VA_ARGS("P-Preferred-Identity", "sip:+393701212155@ims.indoona.net")
|
|
||||||
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue