diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2015-07-23 19:24:04 -0500 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2015-08-19 17:09:58 -0500 |
| commit | 1a549ed134b45c757d8d1cd5d0c66df4285a9150 (patch) | |
| tree | 7bbf5ab302f79b574d7807f5f99311357e42a5ae /channels/chan_unistim.c | |
| parent | aacb46b56ae684d8f5d8affab31d9c45b149e733 (diff) | |
rtp_engine.c: Initial split of payload types into rx and tx mappings.
There are numerous problems with the current implementation of the RTP
payload type mapping in Asterisk. It uses only one mapping structure to
associate payload types to codecs. The single mapping is overkill if all
of the payload type values are well known values. Dynamic payload type
mappings do not work as well with the single mapping because RFC3264
allows each side of the link to negotiate different dynamic mappings for
what they want to receive. Not only could you have the same codec mapped
for sending and receiving on different payload types you could wind up
with the same payload type mapped to different codecs for each direction.
1) An independent payload type mapping is needed for sending and
receiving.
2) The receive mapping needs to keep track of previous mappings because of
the slack to when negotiation happens and current packets in flight using
the old mapping arrive.
3) The transmit mapping only needs to keep track of the current negotiated
values since we are sending the packets and know when the switchover takes
place.
* Needed to create ast_rtp_codecs_payload_code_tx() and make some callers
use the new function because ast_rtp_codecs_payload_code() was used for
mappings in both directions.
* Needed to create ast_rtp_codecs_payloads_xover() for cases where we need
to pass preferred codec mappings to the peer channel for early media
bridging or when we need to prefer the offered mapping that RFC3264 says
we SHOULD use.
* ast_rtp_codecs_payloads_xover() and ast_rtp_codecs_payload_code_tx() are
the only new public functions created. All the others were only used for
the tx or rx mapping direction so the function doxygen now reflects which
direction the function operates.
* chan_mgcp.c: Removed call to ast_rtp_codecs_payloads_clear() as doing
that makes no sense when processing an incoming SDP. We would be wiping
out any mappings that we set for the possible outgoing SDP we sent
earlier.
ASTERISK-25166
Reported by: Kevin Harwell
ASTERISK-17410
Reported by: Boris Fox
Change-Id: Iaf6c227bca68cb7c414cf2fd4108a8ac98bd45ac
Diffstat (limited to 'channels/chan_unistim.c')
| -rw-r--r-- | channels/chan_unistim.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index a3c0ffd5c..874f6b2dc 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -2709,7 +2709,8 @@ static void send_start_rtp(struct unistim_subchannel *sub) } pte = sub->parent->parent->session; - codec = ast_rtp_codecs_payload_code(ast_rtp_instance_get_codecs(sub->rtp), 1, ast_channel_readformat(sub->owner), 0); + codec = ast_rtp_codecs_payload_code_tx(ast_rtp_instance_get_codecs(sub->rtp), + 1, ast_channel_readformat(sub->owner), 0); if ((ast_format_cmp(ast_channel_readformat(sub->owner), ast_format_ulaw) == AST_FORMAT_CMP_EQUAL) || (ast_format_cmp(ast_channel_readformat(sub->owner), ast_format_alaw) == AST_FORMAT_CMP_EQUAL)) { if (unistimdebug) { |