Bug 800688: remove local_dynamic_payload_type_value from negotiation r=ehugg,jesup

This commit is contained in:
Enda Mannion 2012-10-17 15:57:52 +01:00
parent f558cbdf60
commit 19a1757572

View File

@ -2653,7 +2653,6 @@ gsmsdp_negotiate_codec (fsmdef_dcb_t *dcb_p, cc_sdp_t *sdp_p,
int32_t num_match_payloads = 0;
int payload = RTP_NONE;
int remote_dynamic_payload_type_value = RTP_NONE;
int local_dynamic_payload_type_value = RTP_NONE;
int32_t payload_types_count = 0; // count for allocating right amout
// of memory for media->paylaods
@ -2823,17 +2822,14 @@ gsmsdp_negotiate_codec (fsmdef_dcb_t *dcb_p, cc_sdp_t *sdp_p,
/* we answer with same dynamic payload type value for a given dynamic payload type */
if (master_list_p == remote_media_types) {
remote_dynamic_payload_type_value = GET_DYN_PAYLOAD_TYPE_VALUE(master_list_p[i]);
local_dynamic_payload_type_value = GET_DYN_PAYLOAD_TYPE_VALUE(master_list_p[i]);
} else {
remote_dynamic_payload_type_value = GET_DYN_PAYLOAD_TYPE_VALUE(slave_list_p[j]);
local_dynamic_payload_type_value = GET_DYN_PAYLOAD_TYPE_VALUE(slave_list_p[j]);
}
} else { //if remote SDP is an answer
if (media->local_dynamic_payload_type_value == RTP_NONE ||
media->payload != media->previous_sdp.payload_type) {
/* If the the negotiated payload type is different from previous,
set it the local dynamic to payload type as this is what we offered*/
local_dynamic_payload_type_value = media->payload;
}
/* remote answer may not use the value that we offered for a given dynamic payload type */
if (master_list_p == remote_media_types) {