FS-6825 #resolve #comment caused by regression in commit 0732c0b0
pertaining to FS-6825
This commit is contained in:
parent
295fcce8a8
commit
d2f8fca18a
|
@ -3480,7 +3480,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
|
|||
match = (map->rm_pt == imp->ianacode) ? 1 : 0;
|
||||
} else {
|
||||
match = (!strcasecmp(rm_encoding, imp->iananame) &&
|
||||
((map->rm_pt < 96 && imp->ianacode < 96) || (map->rm_pt > 96 && imp->ianacode > 96)) &&
|
||||
((map->rm_pt < 96 && imp->ianacode < 96) || (map->rm_pt > 95 && imp->ianacode > 95)) &&
|
||||
(remote_codec_rate == codec_rate || fmtp_remote_codec_rate == imp->actual_samples_per_second)) ? 1 : 0;
|
||||
if (fmtp_remote_codec_rate) {
|
||||
remote_codec_rate = fmtp_remote_codec_rate;
|
||||
|
@ -8410,7 +8410,7 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
|
|||
} else {
|
||||
if (map->rm_encoding) {
|
||||
match = !strcasecmp(map->rm_encoding, imp->iananame) &&
|
||||
((map->rm_pt < 96 && imp->ianacode < 96) || (map->rm_pt > 96 && imp->ianacode > 96));
|
||||
((map->rm_pt < 96 && imp->ianacode < 96) || (map->rm_pt > 95 && imp->ianacode > 95));
|
||||
} else {
|
||||
match = 0;
|
||||
}
|
||||
|
@ -8440,7 +8440,7 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
|
|||
} else {
|
||||
if (map->rm_encoding) {
|
||||
match = !strcasecmp(map->rm_encoding, imp->iananame) &&
|
||||
((map->rm_pt < 96 && imp->ianacode < 96) || (map->rm_pt > 96 && imp->ianacode > 96));
|
||||
((map->rm_pt < 96 && imp->ianacode < 96) || (map->rm_pt > 95 && imp->ianacode > 95));
|
||||
} else {
|
||||
match = 0;
|
||||
}
|
||||
|
@ -8487,7 +8487,7 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
|
|||
} else {
|
||||
if (map->rm_encoding) {
|
||||
match = !strcasecmp(map->rm_encoding, imp->iananame) &&
|
||||
((map->rm_pt < 96 && imp->ianacode < 96) || (map->rm_pt > 96 && imp->ianacode > 96));
|
||||
((map->rm_pt < 96 && imp->ianacode < 96) || (map->rm_pt > 95 && imp->ianacode > 95));
|
||||
} else {
|
||||
match = 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue