core: Remove unused/incomplete SDP modules.
authorRichard Mudgett <rmudgett@digium.com>
Fri, 22 Dec 2017 19:11:53 +0000 (13:11 -0600)
committerJoshua Colp <jcolp@digium.com>
Wed, 25 Apr 2018 18:58:24 +0000 (15:58 -0300)
Change-Id: Icc28fbdc46f58e54a21554e6fe8b078f841b1f86

include/asterisk/sdp.h [deleted file]
include/asterisk/sdp_options.h [deleted file]
include/asterisk/sdp_state.h [deleted file]
include/asterisk/sdp_translator.h [deleted file]
main/sdp.c [deleted file]
main/sdp_options.c [deleted file]
main/sdp_private.h [deleted file]
main/sdp_state.c [deleted file]
main/sdp_translator.c [deleted file]
res/res_sdp_translator_pjmedia.c [deleted file]
tests/test_sdp.c [deleted file]

diff --git a/include/asterisk/sdp.h b/include/asterisk/sdp.h
deleted file mode 100644 (file)
index 7684695..0000000
+++ /dev/null
@@ -1,703 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2017, Digium, Inc.
- *
- * Mark Michelson <mmichelson@digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-/* NOTE: It is unlikely that you need to include this file. You probably will only need
- * this if you are an SDP translator, or if you are an inner part of the SDP API
- */
-
-#ifndef _SDP_PRIV_H
-#define _SDP_PRIV_H
-
-#include "asterisk/vector.h"
-#include "asterisk/format.h"
-#include "asterisk/sdp_state.h"
-#include "asterisk/stream.h"
-
-/*!
- * \brief Structure representing an SDP Attribute
- */
-struct ast_sdp_a_line {
-       /*! Attribute name */
-       char *name;
-       /*! Attribute value. For attributes that have no value, this will be an empty string */
-       char *value;
-};
-
-/*!
- * \brief A collection of SDP Attributes
- */
-AST_VECTOR(ast_sdp_a_lines, struct ast_sdp_a_line *);
-
-/*!
- * \brief Structure representing an SDP Connection
- */
-struct ast_sdp_c_line {
-       /* IP family string (e.g. IP4 or IP6) */
-       char *address_type;
-       /* Connection address. Can be an IP address or FQDN */
-       char *address;
-};
-
-/*!
- * \brief Structre representing SDP Media Payloads
- */
-struct ast_sdp_payload {
-       /* Media format description */
-       char *fmt;
-};
-
-/*!
- * \brief A collection of SDP Media Payloads
- */
-AST_VECTOR(ast_sdp_payloads, struct ast_sdp_payload *);
-
-/*!
- * \brief Structure representing an SDP Media Stream
- *
- * This contains both the m line, as well as its
- * constituent a lines.
- */
-struct ast_sdp_m_line {
-       /*! Media type (e.g. "audio" or "video") */
-       char *type;
-       /*! RTP profile string (e.g. "RTP/AVP") */
-       char *proto;
-       /*! Port number in m line */
-       uint16_t port;
-       /*! Number of ports specified in m line */
-       uint16_t port_count;
-       /*! RTP payloads */
-       struct ast_sdp_payloads *payloads;
-       /*! Connection information for this media stream */
-       struct ast_sdp_c_line *c_line;
-       /*! The attributes for this media stream */
-       struct ast_sdp_a_lines *a_lines;
-};
-
-/*!
- * \brief A collection of SDP Media Streams
- */
-AST_VECTOR(ast_sdp_m_lines, struct ast_sdp_m_line *);
-
-/*!
- * \brief Structure representing an SDP Origin
- */
-struct ast_sdp_o_line {
-       /*! Origin user name */
-       char *username;
-       /*! Origin id */
-       uint64_t session_id;
-       /*! Origin version */
-       uint64_t session_version;
-       /*! Origin IP address type (e.g. "IP4" or "IP6") */
-       char *address_type;
-       /*! Origin address. Can be an IP address or FQDN */
-       char *address;
-};
-
-/*!
- * \brief Structure representing an SDP Session Name
- */
-struct ast_sdp_s_line {
-       /* Session Name */
-       char *session_name;
-};
-
-/*!
- * \brief Structure representing SDP Timing
- */
-struct ast_sdp_t_line {
-       /*! Session start time */
-       uint64_t start_time;
-       /*! Session end time */
-       uint64_t stop_time;
-};
-
-/*!
- * \brief An SDP
- */
-struct ast_sdp {
-       /*! SDP Origin line */
-       struct ast_sdp_o_line *o_line;
-       /*! SDP Session name */
-       struct ast_sdp_s_line *s_line;
-       /*! SDP top-level connection information */
-       struct ast_sdp_c_line *c_line;
-       /*! SDP timing information */
-       struct ast_sdp_t_line *t_line;
-       /*! SDP top-level attributes */
-       struct ast_sdp_a_lines *a_lines;
-       /*! SDP media streams */
-       struct ast_sdp_m_lines *m_lines;
-};
-
-/*!
- * \brief A structure representing an SDP rtpmap attribute
- */
-struct ast_sdp_rtpmap {
-       /*! The RTP payload number for the rtpmap */
-       int payload;
-       /*! The Name of the codec */
-       char *encoding_name;
-       /*! The clock rate of the codec */
-       int clock_rate;
-       /*! Optional encoding parameters */
-       char *encoding_parameters;
-       /*! Area where strings are stored */
-       char buf[0];
-};
-
-/*!
- * \brief Free an SDP Attribute
- *
- * \param a_line The attribute to free
- *
- * \since 15
- */
-void ast_sdp_a_free(struct ast_sdp_a_line *a_line);
-
-/*!
- * \brief Free an SDP Attribute collection
- *
- * \param a_lines The attribute collection to free
- *
- * \since 15
- */
-void ast_sdp_a_lines_free(struct ast_sdp_a_lines *a_lines);
-
-/*!
- * \brief Free SDP Connection Data
- *
- * \param c_line The connection data to free
- *
- * \since 15
- */
-void ast_sdp_c_free(struct ast_sdp_c_line *c_line);
-
-/*!
- * \brief Free an SDP Media Description Payload
- *
- * \param payload The payload to free
- *
- * \since 15
- */
-void ast_sdp_payload_free(struct ast_sdp_payload *payload);
-
-/*!
- * \brief Free an SDP Media Description Payload collection
- *
- * \param payloads collection to free
- *
- * \since 15
- */
-void ast_sdp_payloads_free(struct ast_sdp_payloads *payloads);
-
-/*!
- * \brief Free an SDP Media Description
- * Frees the media description and all resources it contains
- *
- * \param m_line The media description to free
- *
- * \since 15
- */
-void ast_sdp_m_free(struct ast_sdp_m_line *m_line);
-
-/*!
- * \brief Free an SDP Media Description collection
- *
- * \param m_lines The collection description to free
- *
- * \since 15
- */
-void ast_sdp_m_lines_free(struct ast_sdp_m_lines *m_lines);
-
-/*!
- * \brief Free an SDP Origin
- *
- * \param o_line The origin description to free
- *
- * \since 15
- */
-void ast_sdp_o_free(struct ast_sdp_o_line *o_line);
-
-/*!
- * \brief Free an SDP Session
- *
- * \param s_line The session to free
- *
- * \since 15
- */
-void ast_sdp_s_free(struct ast_sdp_s_line *s_line);
-
-/*!
- * \brief Free SDP Timing
- *
- * \param t_line The timing description to free
- *
- * \since 15
- */
-void ast_sdp_t_free(struct ast_sdp_t_line *t_line);
-
-/*!
- * \brief Allocate an SDP Attribute
- *
- * \param name Attribute Name
- * \param value Attribute Name
- *
- * \retval non-NULL Success
- * \retval NULL Failure
- *
- * \since 15
- */
-struct ast_sdp_a_line *ast_sdp_a_alloc(const char *name, const char *value);
-
-/*!
- * \brief Allocate an SDP Connection
- *
- * \param family Family ("IN", etc)
- * \param addr Address
- *
- * \retval non-NULL Success
- * \retval NULL Failure
- *
- * \since 15
- */
-struct ast_sdp_c_line *ast_sdp_c_alloc(const char *family, const char *addr);
-
-/*!
- * \brief Allocate an SDP Media Description Payload
- *
- * \param fmt The media format description
- *
- * \retval non-NULL Success
- * \retval NULL Failure
- *
- * \since 15
- */
-struct ast_sdp_payload *ast_sdp_payload_alloc(const char *fmt);
-
-/*!
- * \brief Allocate an SDP Media Description
- *
- * \param type ("audio", "video", etc)
- * \param port Starting port
- * \param port_count Port pairs to allocate
- * \param proto ("RTP/AVP", "RTP/SAVP", "udp")
- * \param c_line Connection to add.  May be NULL
- *
- * \retval non-NULL Success
- * \retval NULL Failure
- *
- * \since 15
- */
-struct ast_sdp_m_line *ast_sdp_m_alloc(const char *type, uint16_t port,
-       uint16_t port_count,    const char *proto, struct ast_sdp_c_line *c_line);
-
-/*!
- * \brief Allocate an SDP Session
- *
- * \param session_name The session name
- *
- * \retval non-NULL Success
- * \retval NULL Failure
- *
- * \since 15
- */
-struct ast_sdp_s_line *ast_sdp_s_alloc(const char *session_name);
-
-/*!
- * \brief Allocate SDP Timing
- *
- * \param start_time (Seconds since 1900)
- * \param end_time (Seconds since 1900)
- *
- * \retval non-NULL Success
- * \retval NULL Failure
- *
- * \since 15
- */
-struct ast_sdp_t_line *ast_sdp_t_alloc(uint64_t start_time, uint64_t stop_time);
-
-/*!
- * \brief Allocate an SDP Origin
- *
- * \param username User name
- * \param sesison_id Session ID
- * \param sesison_version Session Version
- * \param address_type Address type ("IN4", "IN6", etc)
- * \param address Unicast address
- *
- * \retval non-NULL Success
- * \retval NULL Failure
- *
- * \since 15
- */
-struct ast_sdp_o_line *ast_sdp_o_alloc(const char *username, uint64_t session_id,
-       uint64_t session_version, const char *address_type, const char *address);
-
-/*!
- * \brief Add an SDP Attribute to an SDP
- *
- * \param sdp SDP
- * \param a_line Attribute
- *
- * \retval 0 Success
- * \retval non-0 Failure
- *
- * \since 15
- */
-int ast_sdp_add_a(struct ast_sdp *sdp, struct ast_sdp_a_line *a_line);
-
-/*!
- * \brief Get the count of Attributes on an SDP
- *
- * \param sdp SDP
- *
- * \returns Number of Attributes
- *
- * \since 15
- */
-int ast_sdp_get_a_count(const struct ast_sdp *sdp);
-
-/*!
- * \brief Get an Attribute from an SDP
- *
- * \param sdp SDP
- * \param index Attribute index
- *
- * \retval non-NULL Success
- * \retval NULL Failure
- *
- * \since 15
- */
-struct ast_sdp_a_line *ast_sdp_get_a(const struct ast_sdp *sdp, int index);
-
-/*!
- * \brief Add a Media Description to an SDP
- *
- * \param sdp SDP
- * \param m_line Media Description
- *
- * \retval 0 Success
- * \retval non-0 Failure
- *
- * \since 15
- */
-int ast_sdp_add_m(struct ast_sdp *sdp, struct ast_sdp_m_line *m_line);
-
-/*!
- * \brief Add an RTP Media Description to an SDP
- *
- * \param sdp SDP
- * \param sdp_state SDP state information
- * \param options SDP Options
- * \param stream_index stream
- *
- * \retval 0 Success
- * \retval non-0 Failure
- *
- * \since 15
- */
-int ast_sdp_add_m_from_rtp_stream(struct ast_sdp *sdp, const struct ast_sdp_state *sdp_state,
-       const struct ast_sdp_options *options, int stream_index);
-
-/*!
- * \brief Get the count of Media Descriptions on an SDP
- *
- * \param sdp SDP
- *
- * \returns The number of Media Descriptions
- *
- * \since 15
- */
-int ast_sdp_get_m_count(const struct ast_sdp *sdp);
-
-/*!
- * \brief Get a Media Descriptions from an SDP
- *
- * \param sdp SDP
- * \param index Media Description index
- *
- * \retval non-NULL Success
- * \retval NULL Failure
- *
- * \since 15
- */
-struct ast_sdp_m_line *ast_sdp_get_m(const struct ast_sdp *sdp, int index);
-
-/*!
- * \brief Add an SDP Attribute to a Media Description
- *
- * \param m_line Media Description
- * \param a_line Attribute
- *
- * \retval 0 Success
- * \retval non-0 Failure
- *
- * \since 15
- */
-int ast_sdp_m_add_a(struct ast_sdp_m_line *m_line, struct ast_sdp_a_line *a_line);
-
-/*!
- * \brief Get the count of Attributes on a Media Description
- *
- * \param m_line Media Description
- *
- * \returns Number of Attributes
- *
- * \since 15
- */
-int ast_sdp_m_get_a_count(const struct ast_sdp_m_line *m_line);
-
-/*!
- * \brief Get an Attribute from a Media Description
- *
- * \param m_line Media Description
- * \param index Attribute index
- *
- * \retval non-NULL Success
- * \retval NULL Failure
- *
- * \since 15
- */
-struct ast_sdp_a_line *ast_sdp_m_get_a(const struct ast_sdp_m_line *m_line, int index);
-
-/*!
- * \brief Add a Payload to a Media Description
- *
- * \param m_line Media Description
- * \param payload Payload
- *
- * \retval 0 Success
- * \retval non-0 Failure
- *
- * \since 15
- */
-int ast_sdp_m_add_payload(struct ast_sdp_m_line *m_line,
-       struct ast_sdp_payload *payload);
-
-/*!
- * \brief Get the count of Payloads on a Media Description
- *
- * \param m_line Media Description
- *
- * \returns Number of Attributes
- *
- * \since 15
- */
-int ast_sdp_m_get_payload_count(const struct ast_sdp_m_line *m_line);
-
-/*!
- * \brief Get a Payload from a Media Description
- *
- * \param m_line Media Description
- * \param index Payload index
- *
- * \retval non-NULL Success
- * \retval NULL Failure
- *
- * \since 15
- */
-struct ast_sdp_payload *ast_sdp_m_get_payload(const struct ast_sdp_m_line *m_line, int index);
-
-/*!
- * \brief Add a Format to a Media Description
- *
- * \param m_line Media Description
- * \param options SDP Options
- * \param rtp_code rtp_code from ast_rtp_codecs_payload_code
- * \param asterisk_format True if the value in format is to be used.
- * \param format Format
- * \param code from AST_RTP list
- *
- * \retval 0 Success
- * \retval non-0 Failure
- *
- * \since 15
- */
-int ast_sdp_m_add_format(struct ast_sdp_m_line *m_line, const struct ast_sdp_options *options,
-       int rtp_code, int asterisk_format, const struct ast_format *format, int code);
-
-/*!
- * \brief Create an SDP ao2 object
- *
- * \param o_line Origin
- * \param c_line Connection
- * \param s_line Session
- * \param t_line Timing
- *
- * \retval non-NULL Success
- * \retval NULL Failure
- *
- * \since 15
- */
-struct ast_sdp *ast_sdp_alloc(struct ast_sdp_o_line *o_line,
-       struct ast_sdp_c_line *c_line, struct ast_sdp_s_line *s_line,
-       struct ast_sdp_t_line *t_line);
-
-/*!
- * \brief Find the first attribute match index in the top-level SDP
- *
- * \note This will not search within streams for the given attribute.
- *
- * \param sdp The SDP in which to search
- * \param attr_name The name of the attribute to search for
- * \param payload Optional payload number to search for. If irrelevant, set to -1
- *
- * \retval index of attribute line on success.
- * \retval -1 on failure or not found.
- *
- * \since 15.0.0
- */
-int ast_sdp_find_a_first(const struct ast_sdp *sdp, const char *attr_name, int payload);
-
-/*!
- * \brief Find the next attribute match index in the top-level SDP
- *
- * \note This will not search within streams for the given attribute.
- *
- * \param sdp The SDP in which to search
- * \param last The last matching index found
- * \param attr_name The name of the attribute to search for
- * \param payload Optional payload number to search for. If irrelevant, set to -1
- *
- * \retval index of attribute line on success.
- * \retval -1 on failure or not found.
- *
- * \since 15.0.0
- */
-int ast_sdp_find_a_next(const struct ast_sdp *sdp, int last, const char *attr_name, int payload);
-
-/*!
- * \brief Find an attribute in the top-level SDP
- *
- * \note This will not search within streams for the given attribute.
- *
- * \param sdp The SDP in which to search
- * \param attr_name The name of the attribute to search for
- * \param payload Optional payload number to search for. If irrelevant, set to -1
- *
- * \retval NULL Could not find the given attribute
- * \retval Non-NULL The attribute to find
- *
- * \since 15.0.0
- */
-struct ast_sdp_a_line *ast_sdp_find_attribute(const struct ast_sdp *sdp,
-       const char *attr_name, int payload);
-
-/*!
- * \brief Find the first attribute match index in an SDP stream (m-line)
- *
- * \param m_line The SDP m-line in which to search
- * \param attr_name The name of the attribute to search for
- * \param payload Optional payload number to search for. If irrelevant, set to -1
- *
- * \retval index of attribute line on success.
- * \retval -1 on failure or not found.
- *
- * \since 15.0.0
- */
-int ast_sdp_m_find_a_first(const struct ast_sdp_m_line *m_line, const char *attr_name,
-       int payload);
-
-/*!
- * \brief Find the next attribute match index in an SDP stream (m-line)
- *
- * \param m_line The SDP m-line in which to search
- * \param last The last matching index found
- * \param attr_name The name of the attribute to search for
- * \param payload Optional payload number to search for. If irrelevant, set to -1
- *
- * \retval index of attribute line on success.
- * \retval -1 on failure or not found.
- *
- * \since 15.0.0
- */
-int ast_sdp_m_find_a_next(const struct ast_sdp_m_line *m_line, int last,
-       const char *attr_name, int payload);
-
-/*!
- * \brief Find an attribute in an SDP stream (m-line)
- *
- * \param m_line The SDP m-line in which to search
- * \param attr_name The name of the attribute to search for
- * \param payload Optional payload number to search for. If irrelevant, set to -1
- *
- * \retval NULL Could not find the given attribute
- * \retval Non-NULL The attribute to find
- *
- * \since 15.0.0
- */
-struct ast_sdp_a_line *ast_sdp_m_find_attribute(const struct ast_sdp_m_line *m_line,
-       const char *attr_name, int payload);
-
-/*!
- * \brief Convert an SDP a_line into an rtpmap
- *
- * The returned value is heap-allocated and must be freed with
- * ast_sdp_rtpmap_free()
- *
- * \param a_line The SDP a_line to convert
- *
- * \retval NULL Fail
- * \retval non-NULL Success
- *
- * \since 15.0.0
- */
-struct ast_sdp_rtpmap *ast_sdp_a_get_rtpmap(const struct ast_sdp_a_line *a_line);
-
-
-/*!
- * \brief Allocate a new SDP rtpmap
- *
- * \param payload The RTP payload number
- * \param encoding_name The human-readable name for the codec
- * \param clock_rate The rate of the codec, in cycles per second
- * \param encoding_parameters Optional codec-specific parameters (such as number of channels)
- *
- * \retval NULL Fail
- * \retval non-NULL Success
- *
- * \since 15.0.0
- */
-struct ast_sdp_rtpmap *ast_sdp_rtpmap_alloc(int payload, const char *encoding_name,
-       int clock_rate, const char *encoding_parameters);
-
-/*!
- * \brief Free an SDP rtpmap
- *
- * \since 15.0.0
- */
-void ast_sdp_rtpmap_free(struct ast_sdp_rtpmap *rtpmap);
-
-/*!
- * \brief Turn an SDP into a stream topology
- *
- * This traverses the m-lines of the SDP and creates a stream topology, with
- * each m-line corresponding to a stream in the created topology.
- *
- * \param sdp The SDP to convert
- * \param g726_non_standard Non-zero if G.726 is non-standard
- *
- * \retval NULL An error occurred when converting
- * \retval non-NULL The generated stream topology
- *
- * \since 15.0.0
- */
-struct ast_stream_topology *ast_get_topology_from_sdp(const struct ast_sdp *sdp, int g726_non_standard);
-#endif /* _SDP_PRIV_H */
diff --git a/include/asterisk/sdp_options.h b/include/asterisk/sdp_options.h
deleted file mode 100644 (file)
index e45ae8c..0000000
+++ /dev/null
@@ -1,774 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2017, Digium, Inc.
- *
- * Mark Michelson <mmichelson@digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-#ifndef _ASTERISK_SDP_OPTIONS_H
-#define _ASTERISK_SDP_OPTIONS_H
-
-#include "asterisk/udptl.h"
-#include "asterisk/format_cap.h"
-
-struct ast_sdp_options;
-
-/*!
- * \brief SDP DTMF mode options
- */
-enum ast_sdp_options_dtmf {
-       /*! No DTMF to be used */
-       AST_SDP_DTMF_NONE,
-       /*! Use RFC 4733 events for DTMF */
-       AST_SDP_DTMF_RFC_4733,
-       /*! Use DTMF in the audio stream */
-       AST_SDP_DTMF_INBAND,
-       /*! Use SIP 4733 if supported by the other side or INBAND if not */
-       AST_SDP_DTMF_AUTO,
-};
-
-/*!
- * \brief ICE options
- *
- * This is an enum because it will support a TRICKLE-ICE option
- * in the future.
- */
-enum ast_sdp_options_ice {
-       /*! ICE is not enabled on this session */
-       AST_SDP_ICE_DISABLED,
-       /*! Standard ICE is enabled on this session */
-       AST_SDP_ICE_ENABLED_STANDARD,
-};
-
-/*!
- * \brief Implementation of the SDP
- *
- * Users of the SDP API set the implementation based on what they
- * natively handle. This indicates the type of SDP that the API expects
- * when being given an SDP, and it indicates the type of SDP that the API
- * returns when asked for one.
- */
-enum ast_sdp_options_impl {
-       /*! SDP is represented as a string */
-       AST_SDP_IMPL_STRING,
-       /*! SDP is represented as a pjmedia_sdp_session */
-       AST_SDP_IMPL_PJMEDIA,
-       /*! End of the list */
-       AST_SDP_IMPL_END,
-};
-
-/*!
- * \brief SDP encryption options
- */
-enum ast_sdp_options_encryption {
-       /*! No encryption */
-       AST_SDP_ENCRYPTION_DISABLED,
-       /*! SRTP SDES encryption */
-       AST_SDP_ENCRYPTION_SRTP_SDES,
-       /*! DTLS encryption */
-       AST_SDP_ENCRYPTION_DTLS,
-};
-
-/*!
- * \brief Callback when processing an offer SDP for our answer SDP.
- * \since 15.0.0
- *
- * \details
- * This callback is called after merging our last negotiated topology
- * with the remote's offer topology and before we have sent our answer
- * SDP.  At this point you can alter new_topology streams.  You can
- * decline, remove formats, or rename streams.  Changing anything else
- * on the streams is likely to not end well.
- *
- * * To decline a stream simply set the stream state to
- *   AST_STREAM_STATE_REMOVED.  You could implement a maximum number
- *   of active streams of a given type policy.
- *
- * * To remove formats use the format API to remove any formats from a
- *   stream.  The streams have the current joint negotiated formats.
- *   Most likely you would want to remove all but the first format.
- *
- * * To rename a stream you need to clone the stream and give it a
- *   new name and then set it in new_topology using
- *   ast_stream_topology_set_stream().
- *
- * \note Removing all formats is an error.  You should decline the
- * stream instead.
- *
- * \param context User supplied context data pointer for the SDP
- * state.
- * \param old_topology Active negotiated topology.  NULL if this is
- * the first SDP negotiation.  The old topology is available so you
- * can tell if any streams are new or changing type.
- * \param new_topology New negotiated topology that we intend to
- * generate the answer SDP.
- *
- * \return Nothing
- */
-typedef void (*ast_sdp_answerer_modify_cb)(void *context,
-       const struct ast_stream_topology *old_topology,
-       struct ast_stream_topology *new_topology);
-
-/*!
- * \internal
- * \brief Callback when generating a topology for our SDP offer.
- * \since 15.0.0
- *
- * \details
- * This callback is called after merging any topology updates from the
- * system by ast_sdp_state_update_local_topology() and before we have
- * sent our offer SDP.  At this point you can alter new_topology
- * streams.  You can decline, add/remove/update formats, or rename
- * streams.  Changing anything else on the streams is likely to not
- * end well.
- *
- * * To decline a stream simply set the stream state to
- *   AST_STREAM_STATE_REMOVED.  You could implement a maximum number
- *   of active streams of a given type policy.
- *
- * * To update formats use the format API to change formats of the
- *   streams.  The streams have the current proposed formats.  You
- *   could do whatever you want for formats but you should stay within
- *   the configured formats for the stream type's endpoint.  However,
- *   you should use ast_sdp_state_update_local_topology() instead of
- *   this backdoor method.
- *
- * * To rename a stream you need to clone the stream and give it a
- *   new name and then set it in new_topology using
- *   ast_stream_topology_set_stream().
- *
- * \note Removing all formats is an error.  You should decline the
- * stream instead.
- *
- * \note Declined new streams that are in slots higher than present in
- * old_topology are removed so the SDP can be smaller.  The remote has
- * never seen those slots so we shouldn't bother keeping them.
- *
- * \param context User supplied context data pointer for the SDP
- * state.
- * \param old_topology Active negotiated topology.  NULL if this is
- * the first SDP negotiation.  The old topology is available so you
- * can tell if any streams are new or changing type.
- * \param new_topology Merged topology that we intend to generate the
- * offer SDP.
- *
- * \return Nothing
- */
-typedef void (*ast_sdp_offerer_modify_cb)(void *context,
-       const struct ast_stream_topology *old_topology,
-       struct ast_stream_topology *new_topology);
-
-/*!
- * \brief Callback when generating an offer SDP to configure extra stream data.
- * \since 15.0.0
- *
- * \details
- * This callback is called after any ast_sdp_offerer_modify_cb
- * callback and before we have sent our offer SDP.  The callback can
- * call several SDP API calls to configure the proposed capabilities
- * of streams before we create the SDP offer.  For example, the
- * callback could configure a stream specific connection address, T.38
- * parameters, RTP instance, or UDPTL instance parameters.
- *
- * \param context User supplied context data pointer for the SDP
- * state.
- * \param topology Topology ready to configure extra stream options.
- *
- * \return Nothing
- */
-typedef void (*ast_sdp_offerer_config_cb)(void *context, const struct ast_stream_topology *topology);
-
-/*!
- * \brief Callback before applying a topology.
- * \since 15.0.0
- *
- * \details
- * This callback is called before the topology is applied so the
- * using module can do what is necessary before the topology becomes
- * active.
- *
- * \param context User supplied context data pointer for the SDP
- * state.
- * \param topology Topology ready to be applied.
- *
- * \return Nothing
- */
-typedef void (*ast_sdp_preapply_cb)(void *context, const struct ast_stream_topology *topology);
-
-/*!
- * \brief Callback after applying a topology.
- * \since 15.0.0
- *
- * \details
- * This callback is called after the topology is applied so the
- * using module can do what is necessary after the topology becomes
- * active.
- *
- * \param context User supplied context data pointer for the SDP
- * state.
- * \param topology Topology already applied.
- *
- * \return Nothing
- */
-typedef void (*ast_sdp_postapply_cb)(void *context, const struct ast_stream_topology *topology);
-
-/*!
- * \since 15.0.0
- * \brief Allocate a new SDP options structure.
- *
- * This will heap-allocate an SDP options structure and
- * initialize it to a set of default values.
- *
- * \retval NULL Allocation failure
- * \retval non-NULL Newly allocated SDP options
- */
-struct ast_sdp_options *ast_sdp_options_alloc(void);
-
-/*!
- * \since 15.0.0
- * \brief Free an SDP options structure.
- *
- * \note This only needs to be called if an error occurs between
- *       options allocation and a call to ast_sdp_state_alloc()
- *       Otherwise, the SDP state will take care of freeing the
- *       options for you.
- *
- * \param options The options to free
- */
-void ast_sdp_options_free(struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options media_address
- *
- * \param options SDP Options
- * \param media_address
- */
-void ast_sdp_options_set_media_address(struct ast_sdp_options *options,
-       const char *media_address);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options media_address
- *
- * \param options SDP Options
- *
- * \returns media_address
- */
-const char *ast_sdp_options_get_media_address(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options interface_address
- *
- * \param options SDP Options
- * \param interface_address
- */
-void ast_sdp_options_set_interface_address(struct ast_sdp_options *options,
-       const char *interface_address);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options interface_address
- *
- * \param options SDP Options
- *
- * \returns interface_address
- */
-const char *ast_sdp_options_get_interface_address(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options sdpowner
- *
- * \param options SDP Options
- * \param sdpowner
- */
-void ast_sdp_options_set_sdpowner(struct ast_sdp_options *options,
-       const char *sdpowner);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options sdpowner
- *
- * \param options SDP Options
- *
- * \returns sdpowner
- */
-const char *ast_sdp_options_get_sdpowner(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options sdpsession
- *
- * \param options SDP Options
- * \param sdpsession
- */
-void ast_sdp_options_set_sdpsession(struct ast_sdp_options *options,
-       const char *sdpsession);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options sdpsession
- *
- * \param options SDP Options
- *
- * \returns sdpsession
- */
-const char *ast_sdp_options_get_sdpsession(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options rtp_engine
- *
- * \param options SDP Options
- * \param rtp_engine
- */
-void ast_sdp_options_set_rtp_engine(struct ast_sdp_options *options,
-       const char *rtp_engine);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options rtp_engine
- *
- * \param options SDP Options
- *
- * \returns rtp_engine
- */
-const char *ast_sdp_options_get_rtp_engine(const struct ast_sdp_options *options);
-
-void ast_sdp_options_set_state_context(struct ast_sdp_options *options, void *state_context);
-void *ast_sdp_options_get_state_context(const struct ast_sdp_options *options);
-
-void ast_sdp_options_set_answerer_modify_cb(struct ast_sdp_options *options, ast_sdp_answerer_modify_cb answerer_modify_cb);
-ast_sdp_answerer_modify_cb ast_sdp_options_get_answerer_modify_cb(const struct ast_sdp_options *options);
-
-void ast_sdp_options_set_offerer_modify_cb(struct ast_sdp_options *options, ast_sdp_offerer_modify_cb offerer_modify_cb);
-ast_sdp_offerer_modify_cb ast_sdp_options_get_offerer_modify_cb(const struct ast_sdp_options *options);
-
-void ast_sdp_options_set_offerer_config_cb(struct ast_sdp_options *options, ast_sdp_offerer_config_cb offerer_config_cb);
-ast_sdp_offerer_config_cb ast_sdp_options_get_offerer_config_cb(const struct ast_sdp_options *options);
-
-void ast_sdp_options_set_preapply_cb(struct ast_sdp_options *options, ast_sdp_preapply_cb preapply_cb);
-ast_sdp_preapply_cb ast_sdp_options_get_preapply_cb(const struct ast_sdp_options *options);
-
-void ast_sdp_options_set_postapply_cb(struct ast_sdp_options *options, ast_sdp_postapply_cb postapply_cb);
-ast_sdp_postapply_cb ast_sdp_options_get_postapply_cb(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options rtp_symmetric
- *
- * \param options SDP Options
- * \param rtp_symmetric
- */
-void ast_sdp_options_set_rtp_symmetric(struct ast_sdp_options *options,
-       unsigned int rtp_symmetric);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options rtp_symmetric
- *
- * \param options SDP Options
- *
- * \returns rtp_symmetric
- */
-unsigned int ast_sdp_options_get_rtp_symmetric(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options rtp_ipv6
- *
- * \param options SDP Options
- * \param rtp_ipv6
- */
-void ast_sdp_options_set_rtp_ipv6(struct ast_sdp_options *options,
-       unsigned int rtp_ipv6);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options rtp_ipv6
- *
- * \param options SDP Options
- *
- * \returns rtp_ipv6
- */
-unsigned int ast_sdp_options_get_rtp_ipv6(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options g726_non_standard
- *
- * \param options SDP Options
- * \param g726_non_standard
- */
-void ast_sdp_options_set_g726_non_standard(struct ast_sdp_options *options,
-       unsigned int g726_non_standard);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options g726_non_standard
- *
- * \param options SDP Options
- *
- * \returns g726_non_standard
- */
-unsigned int ast_sdp_options_get_g726_non_standard(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options tos_audio
- *
- * \param options SDP Options
- * \param tos_audio
- */
-void ast_sdp_options_set_tos_audio(struct ast_sdp_options *options,
-       unsigned int tos_audio);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options tos_audio
- *
- * \param options SDP Options
- *
- * \returns tos_audio
- */
-unsigned int ast_sdp_options_get_tos_audio(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options cos_audio
- *
- * \param options SDP Options
- * \param cos_audio
- */
-void ast_sdp_options_set_cos_audio(struct ast_sdp_options *options,
-       unsigned int cos_audio);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options cos_audio
- *
- * \param options SDP Options
- *
- * \returns cos_audio
- */
-unsigned int ast_sdp_options_get_cos_audio(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options tos_video
- *
- * \param options SDP Options
- * \param tos_video
- */
-void ast_sdp_options_set_tos_video(struct ast_sdp_options *options,
-       unsigned int tos_video);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options tos_video
- *
- * \param options SDP Options
- *
- * \returns tos_video
- */
-unsigned int ast_sdp_options_get_tos_video(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options cos_video
- *
- * \param options SDP Options
- * \param cos_video
- */
-void ast_sdp_options_set_cos_video(struct ast_sdp_options *options,
-       unsigned int cos_video);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options cos_video
- *
- * \param options SDP Options
- *
- * \returns cos_video
- */
-unsigned int ast_sdp_options_get_cos_video(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options dtmf
- *
- * \param options SDP Options
- * \param dtmf
- */
-void ast_sdp_options_set_dtmf(struct ast_sdp_options *options,
-       enum ast_sdp_options_dtmf dtmf);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options dtmf
- *
- * \param options SDP Options
- *
- * \returns dtmf
- */
-enum ast_sdp_options_dtmf ast_sdp_options_get_dtmf(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options ice
- *
- * \param options SDP Options
- * \param ice
- */
-void ast_sdp_options_set_ice(struct ast_sdp_options *options,
-       enum ast_sdp_options_ice ice);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options ice
- *
- * \param options SDP Options
- *
- * \returns ice
- */
-enum ast_sdp_options_ice ast_sdp_options_get_ice(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options impl
- *
- * \param options SDP Options
- * \param impl
- */
-void ast_sdp_options_set_impl(struct ast_sdp_options *options,
-       enum ast_sdp_options_impl impl);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options impl
- *
- * \param options SDP Options
- *
- * \returns impl
- */
-enum ast_sdp_options_impl ast_sdp_options_get_impl(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options encryption
- *
- * \param options SDP Options
- * \param encryption
- */
-void ast_sdp_options_set_encryption(struct ast_sdp_options *options,
-       enum ast_sdp_options_encryption encryption);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options encryption
- *
- * \param options SDP Options
- *
- * \returns encryption
- */
-enum ast_sdp_options_encryption ast_sdp_options_get_encryption(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options RTCP MUX
- *
- * \param options SDP Options
- *
- * \returns Boolean indicating if RTCP MUX is enabled.
- */
-unsigned int ast_sdp_options_get_rtcp_mux(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options RTCP MUX
- *
- * \param options SDP Options
- * \param value Boolean that indicates if RTCP MUX should be enabled.
- */
-void ast_sdp_options_set_rtcp_mux(struct ast_sdp_options *options, unsigned int value);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options udptl_symmetric
- *
- * \param options SDP Options
- * \param udptl_symmetric
- */
-void ast_sdp_options_set_udptl_symmetric(struct ast_sdp_options *options,
-       unsigned int udptl_symmetric);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options udptl_symmetric
- *
- * \param options SDP Options
- *
- * \returns udptl_symmetric
- */
-unsigned int ast_sdp_options_get_udptl_symmetric(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options udptl_error_correction
- *
- * \param options SDP Options
- * \param error_correction
- */
-void ast_sdp_options_set_udptl_error_correction(struct ast_sdp_options *options,
-       enum ast_t38_ec_modes error_correction);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options udptl_error_correction
- *
- * \param options SDP Options
- *
- * \returns udptl_error_correction
- */
-enum ast_t38_ec_modes ast_sdp_options_get_udptl_error_correction(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options udptl_far_max_datagram
- *
- * \param options SDP Options
- * \param far_max_datagram
- */
-void ast_sdp_options_set_udptl_far_max_datagram(struct ast_sdp_options *options,
-       unsigned int far_max_datagram);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options udptl_far_max_datagram
- *
- * \param options SDP Options
- *
- * \returns udptl_far_max_datagram
- */
-unsigned int ast_sdp_options_get_udptl_far_max_datagram(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Set SDP Options max_streams
- *
- * \param options SDP Options
- * \param max_streams
- */
-void ast_sdp_options_set_max_streams(struct ast_sdp_options *options,
-       unsigned int max_streams);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options max_streams
- *
- * \param options SDP Options
- *
- * \returns max_streams
- */
-unsigned int ast_sdp_options_get_max_streams(const struct ast_sdp_options *options);
-
-/*!
- * \since 15.0.0
- * \brief Enable setting SSRC level attributes on SDPs
- *
- * \param options SDP Options
- * \param ssrc Boolean indicating if SSRC attributes should be included in generated SDPs
- */
-void ast_sdp_options_set_ssrc(struct ast_sdp_options *options, unsigned int ssrc);
-
-/*!
- * \since 15.0.0
- * \brief Get SDP Options ssrc
- *
- * \param options SDP Options
- *
- * \returns Whether SSRC-level attributes will be added to our SDP.
- */
-unsigned int ast_sdp_options_get_ssrc(const struct ast_sdp_options *options);
-
-/*!
- * \brief Set the SDP options scheduler context used to create new streams of the type.
- * \since 15.0.0
- *
- * \param options SDP Options
- * \param type Media type the scheduler context is for.
- * \param sched Scheduler context to use for the specified media type.
- *
- * \return Nothing
- */
-void ast_sdp_options_set_sched_type(struct ast_sdp_options *options,
-       enum ast_media_type type, struct ast_sched_context *sched);
-
-/*!
- * \brief Get the SDP options scheduler context used to create new streams of the type.
- * \since 15.0.0
- *
- * \param options SDP Options
- * \param type Media type the format cap represents.
- *
- * \return The stored scheduler context to create new streams of the type.
- */
-struct ast_sched_context *ast_sdp_options_get_sched_type(const struct ast_sdp_options *options,
-       enum ast_media_type type);
-
-/*!
- * \brief Set all allowed stream types to create new streams.
- * \since 15.0.0
- *
- * \param options SDP Options
- * \param cap Format capabilities to set all allowed stream types at once.
- *            Could be NULL to disable creating any new streams.
- *
- * \return Nothing
- */
-void ast_sdp_options_set_format_caps(struct ast_sdp_options *options,
-       struct ast_format_cap *cap);
-
-/*!
- * \brief Set the SDP options format cap used to create new streams of the type.
- * \since 15.0.0
- *
- * \param options SDP Options
- * \param type Media type the format cap represents.
- * \param cap Format capabilities to use for the specified media type.
- *            Could be NULL to disable creating new streams of type.
- *
- * \return Nothing
- */
-void ast_sdp_options_set_format_cap_type(struct ast_sdp_options *options,
-       enum ast_media_type type, struct ast_format_cap *cap);
-
-/*!
- * \brief Get the SDP options format cap used to create new streams of the type.
- * \since 15.0.0
- *
- * \param options SDP Options
- * \param type Media type the format cap represents.
- *
- * \retval NULL if stream not allowed to be created.
- * \retval cap to use in negotiating the new stream.
- *
- * \note The returned cap does not have its own ao2 ref.
- */
-struct ast_format_cap *ast_sdp_options_get_format_cap_type(const struct ast_sdp_options *options,
-       enum ast_media_type type);
-
-#endif /* _ASTERISK_SDP_OPTIONS_H */
diff --git a/include/asterisk/sdp_state.h b/include/asterisk/sdp_state.h
deleted file mode 100644 (file)
index ec9d502..0000000
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2017, Digium, Inc.
- *
- * Mark Michelson <mmichelson@digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-#ifndef _ASTERISK_SDP_STATE_H
-#define _ASTERISK_SDP_STATE_H
-
-#include "asterisk/stream.h"
-#include "asterisk/sdp_options.h"
-
-struct ast_sdp_state;
-struct ast_sockaddr;
-struct ast_udptl;
-struct ast_control_t38_parameters;
-
-/*!
- * \brief Allocate a new SDP state
- *
- * \details
- * SDP state keeps tabs on everything SDP-related for a media session.
- * Most SDP operations will require the state to be provided.
- * Ownership of the SDP options is taken on by the SDP state.
- * A good strategy is to call this during session creation.
- *
- * \param topology Initial stream topology to offer.
- *                NULL if we are going to be the answerer.  We can always
- *                update the local topology later if it turns out we need
- *                to be the offerer.
- * \param options SDP options for the duration of the session.
- *
- * \retval SDP state struct
- * \retval NULL on failure
- */
-struct ast_sdp_state *ast_sdp_state_alloc(struct ast_stream_topology *topology,
-       struct ast_sdp_options *options);
-
-/*!
- * \brief Free the SDP state.
- *
- * A good strategy is to call this during session destruction
- */
-void ast_sdp_state_free(struct ast_sdp_state *sdp_state);
-
-/*!
- * \brief Get the associated RTP instance for a particular stream on the SDP state.
- *
- * Stream numbers correspond to the streams in the topology of the associated channel
- */
-struct ast_rtp_instance *ast_sdp_state_get_rtp_instance(const struct ast_sdp_state *sdp_state,
-       int stream_index);
-
-/*!
- * \brief Get the associated UDPTL instance for a particular stream on the SDP state.
- *
- * Stream numbers correspond to the streams in the topology of the associated channel
- */
-struct ast_udptl *ast_sdp_state_get_udptl_instance(const struct ast_sdp_state *sdp_state,
-       int stream_index);
-
-/*!
- * \brief Get the global connection address on the SDP state.
- */
-const struct ast_sockaddr *ast_sdp_state_get_connection_address(const struct ast_sdp_state *sdp_state);
-
-/*!
- * \brief Get the connection address for a particular stream.
- *
- * \param sdp_state
- * \param stream_index The particular stream to get the connection address of
- * \param address[out] A place to store the address in
- *
- * \retval 0 Success
- *
- * \note
- * Stream numbers correspond to the streams in the topology of the associated channel
- */
-int ast_sdp_state_get_stream_connection_address(const struct ast_sdp_state *sdp_state,
-       int stream_index, struct ast_sockaddr *address);
-
-/*!
- * \brief Get the joint negotiated streams based on local and remote capabilities.
- *
- * If this is called prior to receiving a remote SDP, then this will just mirror
- * the local configured endpoint capabilities.
- *
- * \note Cannot return NULL.  It is a BUG if it does.
- */
-const struct ast_stream_topology *ast_sdp_state_get_joint_topology(
-       const struct ast_sdp_state *sdp_state);
-
-/*!
- * \brief Get the local topology
- *
- * \note Cannot return NULL.  It is a BUG if it does.
- */
-const struct ast_stream_topology *ast_sdp_state_get_local_topology(
-       const struct ast_sdp_state *sdp_state);
-
-/*!
- * \brief Get the sdp_state options
- *
- */
-const struct ast_sdp_options *ast_sdp_state_get_options(
-       const struct ast_sdp_state *sdp_state);
-
-
-/*!
- * \brief Get the local SDP.
- *
- * \param sdp_state
- *
- * \retval non-NULL Success
- * \retval NULL Failure
- *
- * \note
- * This function will return the last local SDP created if one were
- * previously requested for the current negotiation.  Otherwise it
- * creates our SDP offer/answer depending on what role we are playing
- * in the current negotiation.
- */
-const struct ast_sdp *ast_sdp_state_get_local_sdp(struct ast_sdp_state *sdp_state);
-
-/*!
- * \brief Get the local SDP Implementation.
- *
- * \param sdp_state
- *
- * \retval non-NULL Success
- * \retval NULL Failure
- *
- * \note
- * This function calls ast_sdp_state_get_local_sdp then translates it into
- * the defined implementation.
- *
- * The return here is const. The use case for this is so that a channel can add
- * the SDP to an outgoing message. The API user should not attempt to modify the SDP.
- * SDP modification should only be done through the API.
- *
- * \since 15
- */
-const void *ast_sdp_state_get_local_sdp_impl(struct ast_sdp_state *sdp_state);
-
-/*!
- * \brief Set the remote SDP
- *
- * \param sdp_state
- * \param sdp
- *
- * \note It is assumed that the passed in SDP has been checked for sanity
- * already.  e.g., There are no syntax errors, a c= line is reachable for
- * each m= line, etc...
- *
- * \retval 0 Success
- * \retval non-0 Failure
- *         Use ast_sdp_state_is_offer_rejected() to see if the SDP offer was rejected.
- *
- * \since 15
- */
-int ast_sdp_state_set_remote_sdp(struct ast_sdp_state *sdp_state, const struct ast_sdp *sdp);
-
-/*!
- * \brief Set the remote SDP from an Implementation
- *
- * \param sdp_state
- * \param remote The implementation's representation of an SDP.
- *
- * \retval 0 Success
- * \retval non-0 Failure
- *         Use ast_sdp_state_is_offer_rejected() to see if the SDP offer was rejected.
- *
- * \since 15
- */
-int ast_sdp_state_set_remote_sdp_from_impl(struct ast_sdp_state *sdp_state, const void *remote);
-
-/*!
- * \brief Was the set remote offer rejected.
- * \since 15.0.0
- *
- * \param sdp_state
- *
- * \retval 0 if not rejected.
- * \retval non-zero if rejected.
- */
-int ast_sdp_state_is_offer_rejected(struct ast_sdp_state *sdp_state);
-
-/*!
- * \brief Are we the SDP offerer.
- * \since 15.0.0
- *
- * \param sdp_state
- *
- * \retval 0 if we are not the offerer.
- * \retval non-zero we are the offerer.
- */
-int ast_sdp_state_is_offerer(struct ast_sdp_state *sdp_state);
-
-/*!
- * \brief Are we the SDP answerer.
- * \since 15.0.0
- *
- * \param sdp_state
- *
- * \retval 0 if we are not the answerer.
- * \retval non-zero we are the answerer.
- */
-int ast_sdp_state_is_answerer(struct ast_sdp_state *sdp_state);
-
-/*!
- * \brief Restart the SDP offer/answer negotiations.
- *
- * \param sdp_state
- *
- * \retval 0 Success
- * \retval non-0 Failure
- */
-int ast_sdp_state_restart_negotiations(struct ast_sdp_state *sdp_state);
-
-/*!
- * \brief Update the local stream topology on the SDP state.
- *
- * \details
- * Basically we are saving off any topology updates until we create the
- * next SDP offer.  Repeated updates merge with the previous updated
- * topology.
- *
- * \param sdp_state
- * \param topology The new stream topology.
- *
- * \retval 0 Success
- * \retval non-0 Failure
- *
- * \since 15
- */
-int ast_sdp_state_update_local_topology(struct ast_sdp_state *sdp_state, struct ast_stream_topology *topology);
-
-/*!
- * \brief Set the local address (IP address) to use for connection addresses
- *
- * \param sdp_state
- * \param address The local address
- *
- * \note
- * Passing NULL as an address will unset the explicit local connection address.
- *
- * \since 15
- */
-void ast_sdp_state_set_local_address(struct ast_sdp_state *sdp_state, struct ast_sockaddr *address);
-
-/*!
- * \brief Set the connection address (IP address and port) to use for a specific stream
- *
- * \param sdp_state
- * \param stream_index The stream to set the connection address for
- * \param address The connection address
- *
- * \retval 0 Success
- *
- * \note
- * Passing NULL as an address will unset the explicit local connection address.
- *
- * \since 15
- */
-int ast_sdp_state_set_connection_address(struct ast_sdp_state *sdp_state, int stream_index,
-       struct ast_sockaddr *address);
-
-/*!
- * \since 15.0.0
- * \brief Set the global locally held state.
- *
- * \param sdp_state
- * \param locally_held
- */
-void ast_sdp_state_set_global_locally_held(struct ast_sdp_state *sdp_state, unsigned int locally_held);
-
-/*!
- * \since 15.0.0
- * \brief Get the global locally held state.
- *
- * \param sdp_state
- *
- * \returns locally_held
- */
-unsigned int ast_sdp_state_get_global_locally_held(const struct ast_sdp_state *sdp_state);
-
-/*!
- * \since 15.0.0
- * \brief Set a stream to be held or unheld locally
- *
- * \param sdp_state
- * \param stream_index The stream to set the held value for
- * \param locally_held
- */
-void ast_sdp_state_set_locally_held(struct ast_sdp_state *sdp_state,
-       int stream_index, unsigned int locally_held);
-
-/*!
- * \since 15.0.0
- * \brief Get whether a stream is locally held or not
- *
- * \param sdp_state
- * \param stream_index The stream to get the held state for
- *
- * \returns locally_held
- */
-unsigned int ast_sdp_state_get_locally_held(const struct ast_sdp_state *sdp_state,
-       int stream_index);
-
-/*!
- * \since 15.0.0
- * \brief Get whether a stream is remotely held or not
- *
- * \param sdp_state
- * \param stream_index The stream to get the held state for
- *
- * \returns remotely_held
- */
-unsigned int ast_sdp_state_get_remotely_held(const struct ast_sdp_state *sdp_state,
-       int stream_index);
-
-/*!
- * \since 15.0.0
- * \brief Set the UDPTL session parameters
- *
- * \param sdp_state
- * \param stream_index The stream to set the UDPTL session parameters for
- * \param params
- */
-void ast_sdp_state_set_t38_parameters(struct ast_sdp_state *sdp_state,
-       int stream_index, struct ast_control_t38_parameters *params);
-
-#endif /* _ASTERISK_SDP_STATE_H */
diff --git a/include/asterisk/sdp_translator.h b/include/asterisk/sdp_translator.h
deleted file mode 100644 (file)
index e1d51f0..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2017, Digium, Inc.
- *
- * Mark Michelson <mmichelson@digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-#ifndef _ASTERISK_SDP_TRANSLATOR_H
-#define _ASTERISK_SDP_TRANSLATOR_H
-
-#include "asterisk/sdp_options.h"
-
-struct sdp;
-
-/*!
- * \brief SDP translator operations
- */
-struct ast_sdp_translator_ops {
-       /*! The SDP representation on which this translator operates */
-       enum ast_sdp_options_impl repr;
-       /*! Allocate new translator private data for a translator */
-       void *(*translator_new)(void);
-       /*! Free translator private data */
-       void (*translator_free)(void *translator_priv);
-       /*! Convert the channel-native SDP into an internal Asterisk SDP */
-       struct ast_sdp *(*to_sdp)(const void *repr_sdp, void *translator_priv);
-       /*! Convert an internal Asterisk SDP into a channel-native SDP */
-       const void *(*from_sdp)(const struct ast_sdp *sdp, void *translator_priv);
-};
-
-/*!
- * \brief An SDP translator
- *
- * An SDP translator is responsible for converting between Asterisk's internal
- * representation of an SDP and the representation that is native to the channel
- * driver. Translators are allocated per-use.
- */
-struct ast_sdp_translator {
-       /*! The operations this translator uses */
-       struct ast_sdp_translator_ops *ops;
-       /*! Private data this translator uses */
-       void *translator_priv;
-};
-
-/*!
- * \brief Register an SDP translator
- * \param ops The SDP operations defined by this translator
- * \retval 0 Success
- * \retval -1 FAIL
- */
-int ast_sdp_register_translator(struct ast_sdp_translator_ops *ops);
-
-/*!
- * \brief Unregister an SDP translator
- */
-void ast_sdp_unregister_translator(struct ast_sdp_translator_ops *ops);
-
-/*!
- * \brief Allocate a new SDP translator
- * \param Representation corresponding to the translator_ops to use
- * \retval NULL FAIL
- * \retval non-NULL New SDP translator
- */
-struct ast_sdp_translator *ast_sdp_translator_new(enum ast_sdp_options_impl repr);
-
-/*!
- * \brief Free an SDP translator
- */
-void ast_sdp_translator_free(struct ast_sdp_translator *translator);
-
-/*!
- * \brief Translate a native SDP to internal Asterisk SDP
- *
- * \param translator The translator to use when translating
- * \param native_sdp The SDP from the channel driver
- * \retval NULL FAIL
- * \retval Non-NULL The translated SDP
- */
-struct ast_sdp *ast_sdp_translator_to_sdp(struct ast_sdp_translator *translator, const void *native_sdp);
-
-/*!
- * \brief Translate an internal Asterisk SDP to a native SDP
- *
- * \param translator The translator to use when translating
- * \param ast_sdp The Asterisk SDP to translate
- * \retval NULL FAIL
- * \retval non-NULL The translated SDP
- */
-const void *ast_sdp_translator_from_sdp(struct ast_sdp_translator *translator,
-       const struct ast_sdp *ast_sdp);
-
-#endif /* _ASTERISK_SDP_TRANSLATOR_H */
diff --git a/main/sdp.c b/main/sdp.c
deleted file mode 100644 (file)
index e5c8803..0000000
+++ /dev/null
@@ -1,950 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2017, Digium, Inc.
- *
- * George Joseph <gjoseph@digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-
-#include "asterisk.h"
-#include "asterisk/utils.h"
-#include "asterisk/netsock2.h"
-#include "asterisk/codec.h"
-#include "asterisk/format.h"
-#include "asterisk/format_cap.h"
-#include "asterisk/format_cache.h"
-#include "asterisk/rtp_engine.h"
-#include "asterisk/sdp_state.h"
-#include "asterisk/sdp_options.h"
-#include "asterisk/sdp_translator.h"
-#include "asterisk/sdp.h"
-#include "asterisk/vector.h"
-#include "asterisk/utils.h"
-#include "asterisk/stream.h"
-#include "sdp_private.h"
-
-void ast_sdp_a_free(struct ast_sdp_a_line *a_line)
-{
-       ast_free(a_line);
-}
-
-void ast_sdp_a_lines_free(struct ast_sdp_a_lines *a_lines)
-{
-       if (!a_lines) {
-               return;
-       }
-
-       AST_VECTOR_CALLBACK_VOID(a_lines, ast_sdp_a_free);
-       AST_VECTOR_FREE(a_lines);
-       ast_free(a_lines);
-}
-
-void ast_sdp_c_free(struct ast_sdp_c_line *c_line)
-{
-       ast_free(c_line);
-}
-
-void ast_sdp_payload_free(struct ast_sdp_payload *payload)
-{
-       ast_free(payload);
-}
-
-void ast_sdp_payloads_free(struct ast_sdp_payloads *payloads)
-{
-       if (!payloads) {
-               return;
-       }
-
-       AST_VECTOR_CALLBACK_VOID(payloads, ast_sdp_payload_free);
-       AST_VECTOR_FREE(payloads);
-       ast_free(payloads);
-}
-
-void ast_sdp_m_free(struct ast_sdp_m_line *m_line)
-{
-       if (!m_line) {
-               return;
-       }
-
-       ast_sdp_a_lines_free(m_line->a_lines);
-       ast_sdp_payloads_free(m_line->payloads);
-       ast_sdp_c_free(m_line->c_line);
-       ast_free(m_line);
-}
-
-void ast_sdp_m_lines_free(struct ast_sdp_m_lines *m_lines)
-{
-       if (!m_lines) {
-               return;
-       }
-
-       AST_VECTOR_CALLBACK_VOID(m_lines, ast_sdp_m_free);
-       AST_VECTOR_FREE(m_lines);
-       ast_free(m_lines);
-}
-
-void ast_sdp_o_free(struct ast_sdp_o_line *o_line)
-{
-       ast_free(o_line);
-}
-
-void ast_sdp_s_free(struct ast_sdp_s_line *s_line)
-{
-       ast_free(s_line);
-}
-
-void ast_sdp_t_free(struct ast_sdp_t_line *t_line)
-{
-       ast_free(t_line);
-}
-
-static void ast_sdp_dtor(void *vdoomed)
-{
-       struct ast_sdp *sdp = vdoomed;
-
-       ast_sdp_o_free(sdp->o_line);
-       ast_sdp_s_free(sdp->s_line);
-       ast_sdp_c_free(sdp->c_line);
-       ast_sdp_t_free(sdp->t_line);
-       ast_sdp_a_lines_free(sdp->a_lines);
-       ast_sdp_m_lines_free(sdp->m_lines);
-}
-
-#define COPY_STR_AND_ADVANCE(p, dest, source) \
-({ \
-       dest = p; \
-       strcpy(dest, source); \
-       p += (strlen(source) + 1); \
-})
-
-struct ast_sdp_a_line *ast_sdp_a_alloc(const char *name, const char *value)
-{
-       struct ast_sdp_a_line *a_line;
-       size_t len;
-       char *p;
-
-       ast_assert(!ast_strlen_zero(name));
-
-       if (ast_strlen_zero(value)) {
-               value = "";
-       }
-
-       len = sizeof(*a_line) + strlen(name) + strlen(value) + 2;
-       a_line = ast_calloc(1, len);
-       if (!a_line) {
-               return NULL;
-       }
-
-       p = ((char *)a_line) + sizeof(*a_line);
-
-       COPY_STR_AND_ADVANCE(p, a_line->name, name);
-       COPY_STR_AND_ADVANCE(p, a_line->value, value);
-
-       return a_line;
-}
-
-struct ast_sdp_c_line *ast_sdp_c_alloc(const char *address_type, const char *address)
-{
-       struct ast_sdp_c_line *c_line;
-       size_t len;
-       char *p;
-
-       ast_assert(!ast_strlen_zero(address_type) && !ast_strlen_zero(address));
-
-       len = sizeof(*c_line) + strlen(address_type) + strlen(address) + 2;
-       c_line = ast_calloc(1, len);
-       if (!c_line) {
-               return NULL;
-       }
-
-       p = ((char *)c_line) + sizeof(*c_line);
-
-       COPY_STR_AND_ADVANCE(p, c_line->address_type, address_type);
-       COPY_STR_AND_ADVANCE(p, c_line->address, address);
-
-       return c_line;
-}
-
-struct ast_sdp_payload *ast_sdp_payload_alloc(const char *fmt)
-{
-       struct ast_sdp_payload *payload;
-       size_t len;
-
-       ast_assert(!ast_strlen_zero(fmt));
-
-       len = sizeof(*payload) + strlen(fmt) + 1;
-       payload = ast_calloc(1, len);
-       if (!payload) {
-               return NULL;
-       }
-
-       payload->fmt = ((char *)payload) + sizeof(*payload);
-       strcpy(payload->fmt, fmt);  /* Safe */
-
-       return payload;
-}
-
-struct ast_sdp_m_line *ast_sdp_m_alloc(const char *type, uint16_t port,
-       uint16_t port_count, const char *proto, struct ast_sdp_c_line *c_line)
-{
-       struct ast_sdp_m_line *m_line;
-       size_t len;
-       char *p;
-
-       ast_assert(!ast_strlen_zero(type) && !ast_strlen_zero(proto));
-
-       len = sizeof(*m_line) + strlen(type) + strlen(proto) + 2;
-       m_line = ast_calloc(1, len);
-       if (!m_line) {
-               return NULL;
-       }
-
-       m_line->a_lines = ast_calloc(1, sizeof(*m_line->a_lines));
-       if (!m_line->a_lines) {
-               ast_sdp_m_free(m_line);
-               return NULL;
-       }
-       if (AST_VECTOR_INIT(m_line->a_lines, 20)) {
-               ast_sdp_m_free(m_line);
-               return NULL;
-       }
-
-       m_line->payloads = ast_calloc(1, sizeof(*m_line->payloads));
-       if (!m_line->payloads) {
-               ast_sdp_m_free(m_line);
-               return NULL;
-       }
-       if (AST_VECTOR_INIT(m_line->payloads, 20)) {
-               ast_sdp_m_free(m_line);
-               return NULL;
-       }
-
-       p = ((char *)m_line) + sizeof(*m_line);
-
-       COPY_STR_AND_ADVANCE(p, m_line->type, type);
-       COPY_STR_AND_ADVANCE(p, m_line->proto, proto);
-       m_line->port = port;
-       m_line->port_count = port_count;
-       m_line->c_line = c_line;
-
-       return m_line;
-}
-
-struct ast_sdp_s_line *ast_sdp_s_alloc(const char *session_name)
-{
-       struct ast_sdp_s_line *s_line;
-       size_t len;
-
-       if (ast_strlen_zero(session_name)) {
-               session_name = " ";
-       }
-
-       len = sizeof(*s_line) + strlen(session_name) + 1;
-       s_line = ast_calloc(1, len);
-       if (!s_line) {
-               return NULL;
-       }
-
-       s_line->session_name = ((char *)s_line) + sizeof(*s_line);
-       strcpy(s_line->session_name, session_name);  /* Safe */
-
-       return s_line;
-}
-
-struct ast_sdp_t_line *ast_sdp_t_alloc(uint64_t start_time, uint64_t stop_time)
-{
-       struct ast_sdp_t_line *t_line;
-
-       t_line = ast_calloc(1, sizeof(*t_line));
-       if (!t_line) {
-               return NULL;
-       }
-
-       t_line->start_time = start_time;
-       t_line->stop_time = stop_time;
-
-       return t_line;
-}
-
-struct ast_sdp_o_line *ast_sdp_o_alloc(const char *username, uint64_t session_id,
-       uint64_t session_version, const char *address_type, const char *address)
-{
-       struct ast_sdp_o_line *o_line;
-       size_t len;
-       char *p;
-
-       ast_assert(!ast_strlen_zero(username) && !ast_strlen_zero(address_type)
-               && !ast_strlen_zero(address));
-
-       len = sizeof(*o_line) + strlen(username) + strlen(address_type) + strlen(address) + 3;
-       o_line = ast_calloc(1, len);
-       if (!o_line) {
-               return NULL;
-       }
-
-       o_line->session_id = session_id;
-       o_line->session_version = session_version;
-
-       p = ((char *)o_line) + sizeof(*o_line);
-
-       COPY_STR_AND_ADVANCE(p, o_line->username, username);
-       COPY_STR_AND_ADVANCE(p, o_line->address_type, address_type);
-       COPY_STR_AND_ADVANCE(p, o_line->address, address);
-
-       return o_line;
-}
-
-struct ast_sdp *ast_sdp_alloc(struct ast_sdp_o_line *o_line,
-       struct ast_sdp_c_line *c_line, struct ast_sdp_s_line *s_line,
-       struct ast_sdp_t_line *t_line)
-{
-       struct ast_sdp *new_sdp;
-
-       new_sdp = ao2_alloc_options(sizeof(*new_sdp), ast_sdp_dtor, AO2_ALLOC_OPT_LOCK_NOLOCK);
-       if (!new_sdp) {
-               return NULL;
-       }
-
-       new_sdp->a_lines = ast_calloc(1, sizeof(*new_sdp->a_lines));
-       if (!new_sdp->a_lines) {
-               ao2_ref(new_sdp, -1);
-               return NULL;
-       }
-       if (AST_VECTOR_INIT(new_sdp->a_lines, 20)) {
-               ao2_ref(new_sdp, -1);
-               return NULL;
-       }
-
-       new_sdp->m_lines = ast_calloc(1, sizeof(*new_sdp->m_lines));
-       if (!new_sdp->m_lines) {
-               ao2_ref(new_sdp, -1);
-               return NULL;
-       }
-       if (AST_VECTOR_INIT(new_sdp->m_lines, 20)) {
-               ao2_ref(new_sdp, -1);
-               return NULL;
-       }
-
-       new_sdp->o_line = o_line;
-       new_sdp->c_line = c_line;
-       new_sdp->s_line = s_line;
-       new_sdp->t_line = t_line;
-
-       return new_sdp;
-}
-
-int ast_sdp_add_a(struct ast_sdp *sdp, struct ast_sdp_a_line *a_line)
-{
-       ast_assert(sdp && a_line);
-
-       return AST_VECTOR_APPEND(sdp->a_lines, a_line);
-}
-
-int ast_sdp_get_a_count(const struct ast_sdp *sdp)
-{
-       ast_assert(sdp != NULL);
-
-       return AST_VECTOR_SIZE(sdp->a_lines);
-}
-
-struct ast_sdp_a_line *ast_sdp_get_a(const struct ast_sdp *sdp, int index)
-{
-       ast_assert(sdp != NULL);
-
-       return AST_VECTOR_GET(sdp->a_lines, index);
-}
-
-int ast_sdp_add_m(struct ast_sdp *sdp, struct ast_sdp_m_line *m_line)
-{
-       ast_assert(sdp && m_line);
-
-       return AST_VECTOR_APPEND(sdp->m_lines, m_line);
-}
-
-int ast_sdp_get_m_count(const struct ast_sdp *sdp)
-{
-       ast_assert(sdp != NULL);
-
-       return AST_VECTOR_SIZE(sdp->m_lines);
-}
-
-struct ast_sdp_m_line *ast_sdp_get_m(const struct ast_sdp *sdp, int index)
-{
-       ast_assert(sdp != NULL);
-
-       return AST_VECTOR_GET(sdp->m_lines, index);
-}
-
-int ast_sdp_m_add_a(struct ast_sdp_m_line *m_line, struct ast_sdp_a_line *a_line)
-{
-       ast_assert(m_line && a_line);
-
-       return AST_VECTOR_APPEND(m_line->a_lines, a_line);
-}
-
-int ast_sdp_m_get_a_count(const struct ast_sdp_m_line *m_line)
-{
-       ast_assert(m_line != NULL);
-
-       return AST_VECTOR_SIZE(m_line->a_lines);
-}
-
-struct ast_sdp_a_line *ast_sdp_m_get_a(const struct ast_sdp_m_line *m_line, int index)
-{
-       ast_assert(m_line != NULL);
-
-       return AST_VECTOR_GET(m_line->a_lines, index);
-}
-
-int ast_sdp_m_add_payload(struct ast_sdp_m_line *m_line, struct ast_sdp_payload *payload)
-{
-       ast_assert(m_line && payload);
-
-       return AST_VECTOR_APPEND(m_line->payloads, payload);
-}
-
-int ast_sdp_m_get_payload_count(const struct ast_sdp_m_line *m_line)
-{
-       ast_assert(m_line != NULL);
-
-       return AST_VECTOR_SIZE(m_line->payloads);
-}
-
-struct ast_sdp_payload *ast_sdp_m_get_payload(const struct ast_sdp_m_line *m_line, int index)
-{
-       ast_assert(m_line != NULL);
-
-       return AST_VECTOR_GET(m_line->payloads, index);
-}
-
-static int sdp_m_add_fmtp(struct ast_sdp_m_line *m_line, const struct ast_format *format,
-       int rtp_code)
-{
-       struct ast_str *fmtp0 = ast_str_alloca(256);
-       struct ast_sdp_a_line *a_line;
-       char *tmp;
-
-       ast_format_generate_sdp_fmtp(format, rtp_code, &fmtp0);
-       if (ast_str_strlen(fmtp0) == 0) {
-               /* Format doesn't have fmtp attributes */
-               return 0;
-       }
-
-       tmp = ast_str_buffer(fmtp0) + ast_str_strlen(fmtp0) - 1;
-       /* remove any carriage return line feeds */
-       while (*tmp == '\r' || *tmp == '\n') --tmp;
-       *++tmp = '\0';
-
-       /*
-        * ast...generate gives us everything, just need value
-        *
-        * It can also give multiple fmtp attribute lines. (silk does)
-        */
-       tmp = strchr(ast_str_buffer(fmtp0), ':');
-       if (tmp && tmp[1] != '\0') {
-               tmp++;
-       } else {
-               tmp = ast_str_buffer(fmtp0);
-       }
-
-       a_line = ast_sdp_a_alloc("fmtp", tmp);
-       if (!a_line || ast_sdp_m_add_a(m_line, a_line)) {
-               return -1;
-       }
-
-       return 0;
-}
-
-static int sdp_m_add_rtpmap(struct ast_sdp_m_line *m_line,
-       const struct ast_sdp_options *options, int rtp_code, int asterisk_format,
-       const struct ast_format *format, int code)
-{
-       char tmp[64];
-       const char *enc_name;
-       struct ast_sdp_payload *payload;
-       struct ast_sdp_a_line *a_line;
-
-       snprintf(tmp, sizeof(tmp), "%d", rtp_code);
-       payload = ast_sdp_payload_alloc(tmp);
-       if (!payload || ast_sdp_m_add_payload(m_line, payload)) {
-               ast_sdp_payload_free(payload);
-               return -1;
-       }
-
-       enc_name = ast_rtp_lookup_mime_subtype2(asterisk_format, format, code,
-               options->g726_non_standard ? AST_RTP_OPT_G726_NONSTANDARD : 0);
-
-       snprintf(tmp, sizeof(tmp), "%d %s/%d%s%s", rtp_code, enc_name,
-               ast_rtp_lookup_sample_rate2(asterisk_format, format, code),
-               strcmp(enc_name, "opus") ? "" : "/", strcmp(enc_name, "opus") ? "" : "2");
-
-       a_line = ast_sdp_a_alloc("rtpmap", tmp);
-       if (!a_line || ast_sdp_m_add_a(m_line, a_line)) {
-               ast_sdp_a_free(a_line);
-               return -1;
-       }
-
-       return 0;
-}
-
-int ast_sdp_m_add_format(struct ast_sdp_m_line *m_line, const struct ast_sdp_options *options,
-       int rtp_code, int asterisk_format, const struct ast_format *format, int code)
-{
-       return sdp_m_add_rtpmap(m_line, options, rtp_code, asterisk_format, format, code)
-               || sdp_m_add_fmtp(m_line, format, rtp_code) ? -1 : 0;
-}
-
-static int sdp_find_a_common(const struct ast_sdp_a_lines *a_lines, int start,
-       const char *attr_name, int payload)
-{
-       struct ast_sdp_a_line *a_line;
-       int idx;
-
-       ast_assert(-1 <= start);
-
-       for (idx = start + 1; idx < AST_VECTOR_SIZE(a_lines); ++idx) {
-               int a_line_payload;
-
-               a_line = AST_VECTOR_GET(a_lines, idx);
-               if (strcmp(a_line->name, attr_name)) {
-                       continue;
-               }
-
-               if (payload >= 0) {
-                       int sscanf_res;
-
-                       sscanf_res = sscanf(a_line->value, "%30d", &a_line_payload);
-                       if (sscanf_res == 1 && payload == a_line_payload) {
-                               return idx;
-                       }
-               } else {
-                       return idx;
-               }
-       }
-
-       return -1;
-}
-
-int ast_sdp_find_a_first(const struct ast_sdp *sdp, const char *attr_name, int payload)
-{
-       return sdp_find_a_common(sdp->a_lines, -1, attr_name, payload);
-}
-
-int ast_sdp_find_a_next(const struct ast_sdp *sdp, int last, const char *attr_name, int payload)
-{
-       return sdp_find_a_common(sdp->a_lines, last, attr_name, payload);
-}
-
-struct ast_sdp_a_line *ast_sdp_find_attribute(const struct ast_sdp *sdp,
-       const char *attr_name, int payload)
-{
-       int idx;
-
-       idx = ast_sdp_find_a_first(sdp, attr_name, payload);
-       if (idx < 0) {
-               return NULL;
-       }
-       return ast_sdp_get_a(sdp, idx);
-}
-
-int ast_sdp_m_find_a_first(const struct ast_sdp_m_line *m_line, const char *attr_name,
-       int payload)
-{
-       return sdp_find_a_common(m_line->a_lines, -1, attr_name, payload);
-}
-
-int ast_sdp_m_find_a_next(const struct ast_sdp_m_line *m_line, int last,
-       const char *attr_name, int payload)
-{
-       return sdp_find_a_common(m_line->a_lines, last, attr_name, payload);
-}
-
-struct ast_sdp_a_line *ast_sdp_m_find_attribute(const struct ast_sdp_m_line *m_line,
-       const char *attr_name, int payload)
-{
-       int idx;
-
-       idx = ast_sdp_m_find_a_first(m_line, attr_name, payload);
-       if (idx < 0) {
-               return NULL;
-       }
-       return ast_sdp_m_get_a(m_line, idx);
-}
-
-struct ast_sdp_rtpmap *ast_sdp_rtpmap_alloc(int payload, const char *encoding_name,
-       int clock_rate, const char *encoding_parameters)
-{
-       struct ast_sdp_rtpmap *rtpmap;
-       char *buf_pos;
-
-       rtpmap = ast_calloc(1, sizeof(*rtpmap) + strlen(encoding_name) + strlen(encoding_parameters) + 2);
-       if (!rtpmap) {
-               return NULL;
-       }
-
-       rtpmap->payload = payload;
-       rtpmap->clock_rate = clock_rate;
-
-       buf_pos = rtpmap->buf;
-       COPY_STR_AND_ADVANCE(buf_pos, rtpmap->encoding_name, encoding_name);
-       COPY_STR_AND_ADVANCE(buf_pos, rtpmap->encoding_parameters, encoding_parameters);
-
-       return rtpmap;
-}
-
-void ast_sdp_rtpmap_free(struct ast_sdp_rtpmap *rtpmap)
-{
-       ast_free(rtpmap);
-}
-
-struct ast_sdp_rtpmap *ast_sdp_a_get_rtpmap(const struct ast_sdp_a_line *a_line)
-{
-       char *value_copy;
-       char *slash;
-       int payload;
-       char encoding_name[64];
-       int clock_rate;
-       char *encoding_parameters;
-       struct ast_sdp_rtpmap *rtpmap;
-       int clock_rate_len;
-
-       value_copy = ast_strip(ast_strdupa(a_line->value));
-
-       if (sscanf(value_copy, "%30d %63s", &payload, encoding_name) != 2) {
-               return NULL;
-       }
-
-       slash = strchr(encoding_name, '/');
-       if (!slash) {
-               return NULL;
-       }
-       *slash++ = '\0';
-       if (ast_strlen_zero(encoding_name)) {
-               return NULL;
-       }
-       if (sscanf(slash, "%30d%n", &clock_rate, &clock_rate_len) < 1) {
-               return NULL;
-       }
-
-       slash += clock_rate_len;
-       if (!ast_strlen_zero(slash)) {
-               if (*slash == '/') {
-                       *slash++ = '\0';
-                       encoding_parameters = slash;
-                       if (ast_strlen_zero(encoding_parameters)) {
-                               return NULL;
-                       }
-               } else {
-                       return NULL;
-               }
-       } else {
-               encoding_parameters = "";
-       }
-
-       rtpmap = ast_sdp_rtpmap_alloc(payload, encoding_name, clock_rate,
-               encoding_parameters);
-
-       return rtpmap;
-}
-
-/*!
- * \brief Turn an SDP attribute into an sdp_rtpmap structure
- *
- * \param m_line The media section where this attribute was found.
- * \param payload The RTP payload to find an rtpmap for
- * \param[out] rtpmap The rtpmap to fill in.
- * \return Zero if successful, otherwise less than zero
- */
-static struct ast_sdp_rtpmap *sdp_payload_get_rtpmap(const struct ast_sdp_m_line *m_line, int payload)
-{
-       struct ast_sdp_a_line *rtpmap_attr;
-
-       rtpmap_attr = ast_sdp_m_find_attribute(m_line, "rtpmap", payload);
-       if (!rtpmap_attr) {
-               return NULL;
-       }
-
-       return ast_sdp_a_get_rtpmap(rtpmap_attr);
-}
-
-static void process_fmtp_value(const char *value, int payload, struct ast_rtp_codecs *codecs)
-{
-       char *param;
-       char *param_start;
-       char *param_end;
-       size_t len;
-       struct ast_format *replace;
-       struct ast_format *format;
-
-       /*
-        * Extract the "a=fmtp:%d %s" attribute parameter string value which
-        * starts after the colon.
-        */
-       param_start = ast_skip_nonblanks(value);/* Skip payload type */
-       param_start = ast_skip_blanks(param_start);
-       param_end = ast_skip_nonblanks(param_start);
-       if (param_end == param_start) {
-               /* There is no parameter string */
-               return;
-       }
-       len = param_end - param_start;
-       param = ast_alloca(len + 1);
-       memcpy(param, param_start, len);
-       param[len] = '\0';
-
-       format = ast_rtp_codecs_get_payload_format(codecs, payload);
-       if (!format) {
-               return;
-       }
-
-       replace = ast_format_parse_sdp_fmtp(format, param);
-       if (replace) {
-               ast_rtp_codecs_payload_replace_format(codecs, payload, replace);
-               ao2_ref(replace, -1);
-       }
-       ao2_ref(format, -1);
-}
-
-/*!
- * \brief Find and process all fmtp attribute lines for a given payload
- *
- * \param m_line The stream on which to search for the fmtp attributes
- * \param payload The specific fmtp attribute to search for
- * \param codecs The current RTP codecs that have been built up
- */
-static void process_fmtp_lines(const struct ast_sdp_m_line *m_line, int payload,
-       struct ast_rtp_codecs *codecs)
-{
-       const struct ast_sdp_a_line *a_line;
-       int idx;
-
-       idx = ast_sdp_m_find_a_first(m_line, "fmtp", payload);
-       for (; 0 <= idx; idx = ast_sdp_m_find_a_next(m_line, idx, "fmtp", payload)) {
-               a_line = ast_sdp_m_get_a(m_line, idx);
-               ast_assert(a_line != NULL);
-
-               process_fmtp_value(a_line->value, payload, codecs);
-       }
-}
-
-/*!
- * \internal
- * \brief Determine the RTP stream direction in the given a lines.
- * \since 15.0.0
- *
- * \param a_lines Attribute lines to search.
- *
- * \retval Stream direction on success.
- * \retval AST_STREAM_STATE_REMOVED on failure.
- *
- * \return Nothing
- */
-static enum ast_stream_state get_a_line_direction(const struct ast_sdp_a_lines *a_lines)
-{
-       if (a_lines) {
-               enum ast_stream_state direction;
-               int idx;
-               const struct ast_sdp_a_line *a_line;
-
-               for (idx = 0; idx < AST_VECTOR_SIZE(a_lines); ++idx) {
-                       a_line = AST_VECTOR_GET(a_lines, idx);
-                       direction = ast_stream_str2state(a_line->name);
-                       if (direction != AST_STREAM_STATE_REMOVED) {
-                               return direction;
-                       }
-               }
-       }
-
-       return AST_STREAM_STATE_REMOVED;
-}
-
-/*!
- * \internal
- * \brief Determine the RTP stream direction.
- * \since 15.0.0
- *
- * \param a_lines The SDP media global attributes
- * \param m_line The SDP media section to convert
- *
- * \return Stream direction
- */
-static enum ast_stream_state get_stream_direction(const struct ast_sdp_a_lines *a_lines, const struct ast_sdp_m_line *m_line)
-{
-       enum ast_stream_state direction;
-
-       direction = get_a_line_direction(m_line->a_lines);
-       if (direction != AST_STREAM_STATE_REMOVED) {
-               return direction;
-       }
-       direction = get_a_line_direction(a_lines);
-       if (direction != AST_STREAM_STATE_REMOVED) {
-               return direction;
-       }
-       return AST_STREAM_STATE_SENDRECV;
-}
-
-/*
- * Needed so we don't have an external function referenced as data.
- * The dynamic linker doesn't handle that very well.
- */
-static void rtp_codecs_free(struct ast_rtp_codecs *codecs)
-{
-       if (codecs) {
-               ast_rtp_codecs_payloads_destroy(codecs);
-       }
-}
-
-/*!
- * \brief Convert an SDP stream into an Asterisk stream
- *
- * Given an m-line from an SDP, convert it into an ast_stream structure.
- * This takes formats, as well as clock-rate and fmtp attributes into account.
- *
- * \param a_lines The SDP media global attributes
- * \param m_line The SDP media section to convert
- * \param g726_non_standard Non-zero if G.726 is non-standard
- *
- * \retval NULL An error occurred
- * \retval non-NULL The converted stream
- */
-static struct ast_stream *get_stream_from_m(const struct ast_sdp_a_lines *a_lines, const struct ast_sdp_m_line *m_line, int g726_non_standard)
-{
-       int i;
-       int non_ast_fmts;
-       struct ast_rtp_codecs *codecs;
-       struct ast_format_cap *caps;
-       struct ast_stream *stream;
-       enum ast_rtp_options options;
-
-       caps = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
-       if (!caps) {
-               return NULL;
-       }
-       stream = ast_stream_alloc(m_line->type, ast_media_type_from_str(m_line->type));
-       if (!stream) {
-               ao2_ref(caps, -1);
-               return NULL;
-       }
-
-       switch (ast_stream_get_type(stream)) {
-       case AST_MEDIA_TYPE_AUDIO:
-       case AST_MEDIA_TYPE_VIDEO:
-               codecs = ast_calloc(1, sizeof(*codecs));
-               if (!codecs || ast_rtp_codecs_payloads_initialize(codecs)) {
-                       rtp_codecs_free(codecs);
-                       ast_stream_free(stream);
-                       ao2_ref(caps, -1);
-                       ast_free(codecs);
-                       return NULL;
-               }
-               ast_stream_set_rtp_codecs(stream, codecs);
-
-               if (!m_line->port) {
-                       /* Stream is declined.  There may not be any attributes. */
-                       ast_stream_set_state(stream, AST_STREAM_STATE_REMOVED);
-                       break;
-               }
-
-               options = g726_non_standard ? AST_RTP_OPT_G726_NONSTANDARD : 0;
-               for (i = 0; i < ast_sdp_m_get_payload_count(m_line); ++i) {
-                       struct ast_sdp_payload *payload_s;
-                       struct ast_sdp_rtpmap *rtpmap;
-                       int payload;
-
-                       payload_s = ast_sdp_m_get_payload(m_line, i);
-                       sscanf(payload_s->fmt, "%30d", &payload);
-
-                       rtpmap = sdp_payload_get_rtpmap(m_line, payload);
-                       if (!rtpmap) {
-                               /* No rtpmap attribute.  Try static payload type format assignment */
-                               ast_rtp_codecs_payloads_set_m_type(codecs, NULL, payload);
-                               continue;
-                       }
-
-                       if (!ast_rtp_codecs_payloads_set_rtpmap_type_rate(codecs, NULL, payload,
-                               m_line->type, rtpmap->encoding_name, options, rtpmap->clock_rate)) {
-                               /* Successfully mapped the payload type to format */
-                               process_fmtp_lines(m_line, payload, codecs);
-                       }
-                       ast_sdp_rtpmap_free(rtpmap);
-               }
-
-               ast_rtp_codecs_payload_formats(codecs, caps, &non_ast_fmts);
-
-               ast_stream_set_state(stream, get_stream_direction(a_lines, m_line));
-               break;
-       case AST_MEDIA_TYPE_IMAGE:
-               if (!m_line->port) {
-                       /* Stream is declined.  There may not be any attributes. */
-                       ast_stream_set_state(stream, AST_STREAM_STATE_REMOVED);
-                       break;
-               }
-
-               for (i = 0; i < ast_sdp_m_get_payload_count(m_line); ++i) {
-                       struct ast_sdp_payload *payload;
-
-                       /* As we don't carry T.38 over RTP we do our own format check */
-                       payload = ast_sdp_m_get_payload(m_line, i);
-                       if (!strcasecmp(payload->fmt, "t38")) {
-                               ast_format_cap_append(caps, ast_format_t38, 0);
-                               ast_stream_set_state(stream, AST_STREAM_STATE_SENDRECV);
-                       }
-               }
-               break;
-       case AST_MEDIA_TYPE_UNKNOWN:
-       case AST_MEDIA_TYPE_TEXT:
-       case AST_MEDIA_TYPE_END:
-               /* Consider these unsupported streams as declined */
-               ast_stream_set_state(stream, AST_STREAM_STATE_REMOVED);
-               break;
-       }
-
-       ast_stream_set_formats(stream, caps);
-       ao2_ref(caps, -1);
-
-       return stream;
-}
-
-struct ast_stream_topology *ast_get_topology_from_sdp(const struct ast_sdp *sdp, int g726_non_standard)
-{
-       struct ast_stream_topology *topology;
-       int i;
-
-       topology = ast_stream_topology_alloc();
-       if (!topology) {
-               return NULL;
-       }
-
-       for (i = 0; i < ast_sdp_get_m_count(sdp); ++i) {
-               struct ast_stream *stream;
-
-               stream = get_stream_from_m(sdp->a_lines, ast_sdp_get_m(sdp, i), g726_non_standard);
-               if (!stream) {
-                       /*
-                        * The topology cannot match the SDP because
-                        * we failed to create a corresponding stream.
-                        */
-                       ast_stream_topology_free(topology);
-                       return NULL;
-               }
-               if (ast_stream_topology_append_stream(topology, stream) < 0) {
-                       /* Failed to add stream to topology */
-                       ast_stream_free(stream);
-                       ast_stream_topology_free(topology);
-                       return NULL;
-               }
-       }
-
-       return topology;
-}
diff --git a/main/sdp_options.c b/main/sdp_options.c
deleted file mode 100644 (file)
index 79efbaf..0000000
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2017, Digium, Inc.
- *
- * Mark Michelson <mmichelson@digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-#include "asterisk.h"
-
-#include "asterisk/utils.h"
-#include "asterisk/sdp_options.h"
-
-#include "sdp_private.h"
-
-#define DEFAULT_DTMF AST_SDP_DTMF_NONE
-#define DEFAULT_ICE AST_SDP_ICE_DISABLED
-#define DEFAULT_IMPL AST_SDP_IMPL_STRING
-#define DEFAULT_ENCRYPTION AST_SDP_ENCRYPTION_DISABLED
-#define DEFAULT_MAX_STREAMS 16 /* Set to match our PJPROJECT PJMEDIA_MAX_SDP_MEDIA. */
-
-#define DEFINE_STRINGFIELD_GETTERS_SETTERS_FOR(field, assert_on_null) \
-void ast_sdp_options_set_##field(struct ast_sdp_options *options, const char *value) \
-{ \
-       ast_assert(options != NULL); \
-       if ((assert_on_null)) ast_assert(!ast_strlen_zero(value)); \
-       if (!strcmp(value, options->field)) return; \
-       ast_string_field_set(options, field, value); \
-} \
-const char *ast_sdp_options_get_##field(const struct ast_sdp_options *options) \
-{ \
-       ast_assert(options != NULL); \
-       return options->field; \
-} \
-
-#define DEFINE_GETTERS_SETTERS_FOR(type, field) \
-void ast_sdp_options_set_##field(struct ast_sdp_options *options, type value) \
-{ \
-       ast_assert(options != NULL); \
-       options->field = value; \
-} \
-type ast_sdp_options_get_##field(const struct ast_sdp_options *options) \
-{ \
-       ast_assert(options != NULL); \
-       return options->field; \
-} \
-
-DEFINE_STRINGFIELD_GETTERS_SETTERS_FOR(media_address, 0);
-DEFINE_STRINGFIELD_GETTERS_SETTERS_FOR(interface_address, 0);
-DEFINE_STRINGFIELD_GETTERS_SETTERS_FOR(sdpowner, 0);
-DEFINE_STRINGFIELD_GETTERS_SETTERS_FOR(sdpsession, 0);
-DEFINE_STRINGFIELD_GETTERS_SETTERS_FOR(rtp_engine, 0);
-
-DEFINE_GETTERS_SETTERS_FOR(void *, state_context);
-DEFINE_GETTERS_SETTERS_FOR(ast_sdp_answerer_modify_cb, answerer_modify_cb);
-DEFINE_GETTERS_SETTERS_FOR(ast_sdp_offerer_modify_cb, offerer_modify_cb);
-DEFINE_GETTERS_SETTERS_FOR(ast_sdp_offerer_config_cb, offerer_config_cb);
-DEFINE_GETTERS_SETTERS_FOR(ast_sdp_preapply_cb, preapply_cb);
-DEFINE_GETTERS_SETTERS_FOR(ast_sdp_postapply_cb, postapply_cb);
-DEFINE_GETTERS_SETTERS_FOR(unsigned int, rtp_symmetric);
-DEFINE_GETTERS_SETTERS_FOR(unsigned int, udptl_symmetric);
-DEFINE_GETTERS_SETTERS_FOR(enum ast_t38_ec_modes, udptl_error_correction);
-DEFINE_GETTERS_SETTERS_FOR(unsigned int, udptl_far_max_datagram);
-DEFINE_GETTERS_SETTERS_FOR(unsigned int, rtp_ipv6);
-DEFINE_GETTERS_SETTERS_FOR(unsigned int, g726_non_standard);
-DEFINE_GETTERS_SETTERS_FOR(unsigned int, rtcp_mux);
-DEFINE_GETTERS_SETTERS_FOR(unsigned int, tos_audio);
-DEFINE_GETTERS_SETTERS_FOR(unsigned int, cos_audio);
-DEFINE_GETTERS_SETTERS_FOR(unsigned int, tos_video);
-DEFINE_GETTERS_SETTERS_FOR(unsigned int, cos_video);
-DEFINE_GETTERS_SETTERS_FOR(unsigned int, max_streams);
-DEFINE_GETTERS_SETTERS_FOR(enum ast_sdp_options_dtmf, dtmf);
-DEFINE_GETTERS_SETTERS_FOR(enum ast_sdp_options_ice, ice);
-DEFINE_GETTERS_SETTERS_FOR(enum ast_sdp_options_impl, impl);
-DEFINE_GETTERS_SETTERS_FOR(enum ast_sdp_options_encryption, encryption);
-DEFINE_GETTERS_SETTERS_FOR(unsigned int, ssrc);
-
-struct ast_sched_context *ast_sdp_options_get_sched_type(const struct ast_sdp_options *options, enum ast_media_type type)
-{
-       struct ast_sched_context *sched = NULL;
-
-       switch (type) {
-       case AST_MEDIA_TYPE_AUDIO:
-       case AST_MEDIA_TYPE_VIDEO:
-       case AST_MEDIA_TYPE_IMAGE:
-       case AST_MEDIA_TYPE_TEXT:
-               sched = options->sched[type];
-               break;
-       case AST_MEDIA_TYPE_UNKNOWN:
-       case AST_MEDIA_TYPE_END:
-               break;
-       }
-       return sched;
-}
-
-void ast_sdp_options_set_sched_type(struct ast_sdp_options *options, enum ast_media_type type, struct ast_sched_context *sched)
-{
-       switch (type) {
-       case AST_MEDIA_TYPE_AUDIO:
-       case AST_MEDIA_TYPE_VIDEO:
-       case AST_MEDIA_TYPE_IMAGE:
-       case AST_MEDIA_TYPE_TEXT:
-               options->sched[type] = sched;
-               break;
-       case AST_MEDIA_TYPE_UNKNOWN:
-       case AST_MEDIA_TYPE_END:
-               break;
-       }
-}
-
-struct ast_format_cap *ast_sdp_options_get_format_cap_type(const struct ast_sdp_options *options,
-       enum ast_media_type type)
-{
-       struct ast_format_cap *cap = NULL;
-
-       switch (type) {
-       case AST_MEDIA_TYPE_AUDIO:
-       case AST_MEDIA_TYPE_VIDEO:
-       case AST_MEDIA_TYPE_IMAGE:
-       case AST_MEDIA_TYPE_TEXT:
-               cap = options->caps[type];
-               break;
-       case AST_MEDIA_TYPE_UNKNOWN:
-       case AST_MEDIA_TYPE_END:
-               break;
-       }
-       return cap;
-}
-
-void ast_sdp_options_set_format_cap_type(struct ast_sdp_options *options,
-       enum ast_media_type type, struct ast_format_cap *cap)
-{
-       switch (type) {
-       case AST_MEDIA_TYPE_AUDIO:
-       case AST_MEDIA_TYPE_VIDEO:
-       case AST_MEDIA_TYPE_IMAGE:
-       case AST_MEDIA_TYPE_TEXT:
-               ao2_cleanup(options->caps[type]);
-               options->caps[type] = NULL;
-               if (cap && !ast_format_cap_empty(cap)) {
-                       ao2_ref(cap, +1);
-                       options->caps[type] = cap;
-               }
-               break;
-       case AST_MEDIA_TYPE_UNKNOWN:
-       case AST_MEDIA_TYPE_END:
-               break;
-       }
-}
-
-void ast_sdp_options_set_format_caps(struct ast_sdp_options *options,
-       struct ast_format_cap *cap)
-{
-       enum ast_media_type type;
-
-       for (type = AST_MEDIA_TYPE_UNKNOWN; type < AST_MEDIA_TYPE_END; ++type) {
-               ao2_cleanup(options->caps[type]);
-               options->caps[type] = NULL;
-       }
-
-       if (!cap || ast_format_cap_empty(cap)) {
-               return;
-       }
-
-       for (type = AST_MEDIA_TYPE_UNKNOWN + 1; type < AST_MEDIA_TYPE_END; ++type) {
-               struct ast_format_cap *type_cap;
-
-               type_cap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
-               if (!type_cap) {
-                       continue;
-               }
-
-               ast_format_cap_set_framing(type_cap, ast_format_cap_get_framing(cap));
-               if (ast_format_cap_append_from_cap(type_cap, cap, type)
-                       || ast_format_cap_empty(type_cap)) {
-                       ao2_ref(type_cap, -1);
-                       continue;
-               }
-
-               /* This takes the allocation reference */
-               options->caps[type] = type_cap;
-       }
-}
-
-static void set_defaults(struct ast_sdp_options *options)
-{
-       options->dtmf = DEFAULT_DTMF;
-       options->ice = DEFAULT_ICE;
-       options->impl = DEFAULT_IMPL;
-       options->encryption = DEFAULT_ENCRYPTION;
-       options->max_streams = DEFAULT_MAX_STREAMS;
-}
-
-struct ast_sdp_options *ast_sdp_options_alloc(void)
-{
-       struct ast_sdp_options *options;
-
-       options = ast_calloc(1, sizeof(*options));
-       if (!options) {
-               return NULL;
-       }
-
-       if (ast_string_field_init(options, 256)) {
-               ast_free(options);
-               return NULL;
-       }
-
-       set_defaults(options);
-       return options;
-}
-
-void ast_sdp_options_free(struct ast_sdp_options *options)
-{
-       enum ast_media_type type;
-
-       if (!options) {
-               return;
-       }
-
-       for (type = AST_MEDIA_TYPE_UNKNOWN; type < AST_MEDIA_TYPE_END; ++type) {
-               ao2_cleanup(options->caps[type]);
-       }
-       ast_string_field_free_memory(options);
-       ast_free(options);
-}
diff --git a/main/sdp_private.h b/main/sdp_private.h
deleted file mode 100644 (file)
index 48bedc8..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2017, Digium, Inc.
- *
- * Mark Michelson <mmichelson@digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-#ifndef _MAIN_SDP_PRIVATE_H
-#define _MAIN_SDP_PRIVATE_H
-
-#include "asterisk/stringfields.h"
-#include "asterisk/sdp_options.h"
-
-struct ast_sdp_options {
-       AST_DECLARE_STRING_FIELDS(
-               /*! Media address to advertise in SDP session c= line */
-               AST_STRING_FIELD(media_address);
-               /*! Optional address of the interface media should use. */
-               AST_STRING_FIELD(interface_address);
-               /*! SDP origin username */
-               AST_STRING_FIELD(sdpowner);
-               /*! SDP session name */
-               AST_STRING_FIELD(sdpsession);
-               /*! RTP Engine Name */
-               AST_STRING_FIELD(rtp_engine);
-       );
-       /*! Scheduler context for the media stream types (Mainly for RTP) */
-       struct ast_sched_context *sched[AST_MEDIA_TYPE_END];
-       /*! Capabilities to create new streams of the indexed media type. */
-       struct ast_format_cap *caps[AST_MEDIA_TYPE_END];
-       /*! User supplied context data pointer for the SDP state. */
-       void *state_context;
-       /*! Modify negotiated topology before create answer SDP callback. */
-       ast_sdp_answerer_modify_cb answerer_modify_cb;
-       /*! Modify proposed topology before create offer SDP callback. */
-       ast_sdp_offerer_modify_cb offerer_modify_cb;
-       /*! Configure proposed topology extra stream options before create offer SDP callback. */
-       ast_sdp_offerer_config_cb offerer_config_cb;
-       /*! Negotiated topology is about to be applied callback. */
-       ast_sdp_preapply_cb preapply_cb;
-       /*! Negotiated topology was just applied callback. */
-       ast_sdp_postapply_cb postapply_cb;
-       struct {
-               unsigned int rtp_symmetric:1;
-               unsigned int udptl_symmetric:1;
-               unsigned int rtp_ipv6:1;
-               unsigned int g726_non_standard:1;
-               unsigned int rtcp_mux:1;
-               unsigned int ssrc:1;
-       };
-       struct {
-               unsigned int tos_audio;
-               unsigned int cos_audio;
-               unsigned int tos_video;
-               unsigned int cos_video;
-               unsigned int udptl_far_max_datagram;
-               /*! Maximum number of streams to allow. */
-               unsigned int max_streams;
-       };
-       enum ast_sdp_options_dtmf dtmf;
-       enum ast_sdp_options_ice ice;
-       enum ast_sdp_options_impl impl;
-       enum ast_sdp_options_encryption encryption;
-       enum ast_t38_ec_modes udptl_error_correction;
-};
-
-#endif /* _MAIN_SDP_PRIVATE_H */
diff --git a/main/sdp_state.c b/main/sdp_state.c
deleted file mode 100644 (file)
index e022277..0000000
+++ /dev/null
@@ -1,3411 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2017, Digium, Inc.
- *
- * Mark Michelson <mmichelson@digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-#include "asterisk.h"
-#include "asterisk/sdp_state.h"
-#include "asterisk/sdp_options.h"
-#include "asterisk/sdp_translator.h"
-#include "asterisk/vector.h"
-#include "asterisk/utils.h"
-#include "asterisk/netsock2.h"
-#include "asterisk/rtp_engine.h"
-#include "asterisk/format.h"
-#include "asterisk/format_cap.h"
-#include "asterisk/config.h"
-#include "asterisk/codec.h"
-#include "asterisk/udptl.h"
-
-#include "asterisk/sdp.h"
-#include "asterisk/stream.h"
-
-#include "sdp_private.h"
-
-enum ast_sdp_role {
-       /*!
-        * \brief The role has not yet been determined.
-        *
-        * When the SDP state is allocated, this is the starting role.
-        * Similarly, when the SDP state is reset, the role is reverted
-        * to this.
-        */
-       SDP_ROLE_NOT_SET,
-       /*!
-        * \brief We are the offerer.
-        *
-        * If a local SDP is requested before a remote SDP has been set, then
-        * we assume the role of offerer. This means that we will generate an
-        * SDP from the local capabilities and configured options.
-        */
-       SDP_ROLE_OFFERER,
-       /*!
-        * \brief We are the answerer.
-        *
-        * If a remote SDP is set before a local SDP is requested, then we
-        * assume the role of answerer. This means that we will generate an
-        * SDP based on a merge of the remote capabilities and our local capabilities.
-        */
-       SDP_ROLE_ANSWERER,
-};
-
-typedef int (*state_fn)(struct ast_sdp_state *state);
-
-struct sdp_state_rtp {
-       /*! The underlying RTP instance */
-       struct ast_rtp_instance *instance;
-};
-
-struct sdp_state_udptl {
-       /*! The underlying UDPTL instance */
-       struct ast_udptl *instance;
-};
-
-struct sdp_state_stream {
-       /*! Type of the stream */
-       enum ast_media_type type;
-       union {
-               /*! The underlying RTP instance */
-               struct sdp_state_rtp *rtp;
-               /*! The underlying UDPTL instance */
-               struct sdp_state_udptl *udptl;
-       };
-       /*! An explicit connection address for this stream */
-       struct ast_sockaddr connection_address;
-       /*!
-        * \brief Stream is on hold by remote side
-        *
-        * \note This flag is never set on the
-        * sdp_state->proposed_capabilities->streams states.  This is useful
-        * when the remote sends us a reINVITE with a deferred SDP to place
-        * us on and off of hold.
-        */
-       unsigned int remotely_held:1;
-       /*! Stream is on hold by local side */
-       unsigned int locally_held:1;
-       /*! UDPTL session parameters */
-       struct ast_control_t38_parameters t38_local_params;
-};
-
-static int sdp_is_stream_type_supported(enum ast_media_type type)
-{
-       int is_supported = 0;
-
-       switch (type) {
-       case AST_MEDIA_TYPE_AUDIO:
-       case AST_MEDIA_TYPE_VIDEO:
-       case AST_MEDIA_TYPE_IMAGE:
-               is_supported = 1;
-               break;
-       case AST_MEDIA_TYPE_UNKNOWN:
-       case AST_MEDIA_TYPE_TEXT:
-       case AST_MEDIA_TYPE_END:
-               break;
-       }
-       return is_supported;
-}
-
-static void sdp_state_rtp_destroy(void *obj)
-{
-       struct sdp_state_rtp *rtp = obj;
-
-       if (rtp->instance) {
-               ast_rtp_instance_stop(rtp->instance);
-               ast_rtp_instance_destroy(rtp->instance);
-       }
-}
-
-static void sdp_state_udptl_destroy(void *obj)
-{
-       struct sdp_state_udptl *udptl = obj;
-
-       if (udptl->instance) {
-               ast_udptl_destroy(udptl->instance);
-       }
-}
-
-static void sdp_state_stream_free(struct sdp_state_stream *state_stream)
-{
-       switch (state_stream->type) {
-       case AST_MEDIA_TYPE_AUDIO:
-       case AST_MEDIA_TYPE_VIDEO:
-               ao2_cleanup(state_stream->rtp);
-               break;
-       case AST_MEDIA_TYPE_IMAGE:
-               ao2_cleanup(state_stream->udptl);
-               break;
-       case AST_MEDIA_TYPE_UNKNOWN:
-       case AST_MEDIA_TYPE_TEXT:
-       case AST_MEDIA_TYPE_END:
-               break;
-       }
-       ast_free(state_stream);
-}
-
-AST_VECTOR(sdp_state_streams, struct sdp_state_stream *);
-
-struct sdp_state_capabilities {
-       /*! Stream topology */
-       struct ast_stream_topology *topology;
-       /*! Additional information about the streams */
-       struct sdp_state_streams streams;
-};
-
-static void sdp_state_capabilities_free(struct sdp_state_capabilities *capabilities)
-{
-       if (!capabilities) {
-               return;
-       }
-
-       ast_stream_topology_free(capabilities->topology);
-       AST_VECTOR_CALLBACK_VOID(&capabilities->streams, sdp_state_stream_free);
-       AST_VECTOR_FREE(&capabilities->streams);
-       ast_free(capabilities);
-}
-
-/*! \brief Internal function which creates an RTP instance */
-static struct sdp_state_rtp *create_rtp(const struct ast_sdp_options *options,
-       enum ast_media_type media_type)
-{
-       struct sdp_state_rtp *rtp;
-       struct ast_rtp_engine_ice *ice;
-       static struct ast_sockaddr address_rtp;
-       struct ast_sockaddr *media_address = &address_rtp;
-
-       if (!ast_strlen_zero(options->interface_address)) {
-               if (!ast_sockaddr_parse(&address_rtp, options->interface_address, 0)) {
-                       ast_log(LOG_ERROR, "Attempted to bind RTP to invalid media address: %s\n",
-                               options->interface_address);
-                       return NULL;
-               }
-       } else {
-               if (ast_check_ipv6()) {
-                       ast_sockaddr_parse(&address_rtp, "::", 0);
-               } else {
-                       ast_sockaddr_parse(&address_rtp, "0.0.0.0", 0);
-               }
-       }
-
-       rtp = ao2_alloc_options(sizeof(*rtp), sdp_state_rtp_destroy, AO2_ALLOC_OPT_LOCK_NOLOCK);
-       if (!rtp) {
-               return NULL;
-       }
-
-       rtp->instance = ast_rtp_instance_new(options->rtp_engine,
-               ast_sdp_options_get_sched_type(options, media_type), media_address, NULL);
-       if (!rtp->instance) {
-               ast_log(LOG_ERROR, "Unable to create RTP instance using RTP engine '%s'\n",
-                       options->rtp_engine);
-               ao2_ref(rtp, -1);
-               return NULL;
-       }
-
-       ast_rtp_instance_set_prop(rtp->instance, AST_RTP_PROPERTY_RTCP,
-               AST_RTP_INSTANCE_RTCP_STANDARD);
-       ast_rtp_instance_set_prop(rtp->instance, AST_RTP_PROPERTY_NAT,
-               options->rtp_symmetric);
-
-       if (options->ice == AST_SDP_ICE_DISABLED
-               && (ice = ast_rtp_instance_get_ice(rtp->instance))) {
-               ice->stop(rtp->instance);
-       }
-
-       if (options->dtmf == AST_SDP_DTMF_RFC_4733 || options->dtmf == AST_SDP_DTMF_AUTO) {
-               ast_rtp_instance_dtmf_mode_set(rtp->instance, AST_RTP_DTMF_MODE_RFC2833);
-               ast_rtp_instance_set_prop(rtp->instance, AST_RTP_PROPERTY_DTMF, 1);
-       } else if (options->dtmf == AST_SDP_DTMF_INBAND) {
-               ast_rtp_instance_dtmf_mode_set(rtp->instance, AST_RTP_DTMF_MODE_INBAND);
-       }
-
-       switch (media_type) {
-       case AST_MEDIA_TYPE_AUDIO:
-               if (options->tos_audio || options->cos_audio) {
-                       ast_rtp_instance_set_qos(rtp->instance, options->tos_audio,
-                               options->cos_audio, "SIP RTP Audio");
-               }
-               break;
-       case AST_MEDIA_TYPE_VIDEO:
-               if (options->tos_video || options->cos_video) {
-                       ast_rtp_instance_set_qos(rtp->instance, options->tos_video,
-                               options->cos_video, "SIP RTP Video");
-               }
-               break;
-       case AST_MEDIA_TYPE_IMAGE:
-       case AST_MEDIA_TYPE_TEXT:
-       case AST_MEDIA_TYPE_UNKNOWN:
-       case AST_MEDIA_TYPE_END:
-               break;
-       }
-
-       ast_rtp_instance_set_last_rx(rtp->instance, time(NULL));
-
-       return rtp;
-}
-
-/*! \brief Internal function which creates a UDPTL instance */
-static struct sdp_state_udptl *create_udptl(const struct ast_sdp_options *options)
-{
-       struct sdp_state_udptl *udptl;
-       static struct ast_sockaddr address_udptl;
-       struct ast_sockaddr *media_address = &address_udptl;
-
-       if (!ast_strlen_zero(options->interface_address)) {
-               if (!ast_sockaddr_parse(&address_udptl, options->interface_address, 0)) {
-                       ast_log(LOG_ERROR, "Attempted to bind UDPTL to invalid media address: %s\n",
-                               options->interface_address);
-                       return NULL;
-               }
-       } else {
-               if (ast_check_ipv6()) {
-                       ast_sockaddr_parse(&address_udptl, "::", 0);
-               } else {
-                       ast_sockaddr_parse(&address_udptl, "0.0.0.0", 0);
-               }
-       }
-
-       udptl = ao2_alloc_options(sizeof(*udptl), sdp_state_udptl_destroy, AO2_ALLOC_OPT_LOCK_NOLOCK);
-       if (!udptl) {
-               return NULL;
-       }
-
-       udptl->instance = ast_udptl_new_with_bindaddr(NULL, NULL, 0, media_address);
-       if (!udptl->instance) {
-               ao2_ref(udptl, -1);
-               return NULL;
-       }
-
-       ast_udptl_set_error_correction_scheme(udptl->instance, ast_sdp_options_get_udptl_error_correction(options));
-       ast_udptl_setnat(udptl->instance, ast_sdp_options_get_udptl_symmetric(options));
-       ast_udptl_set_far_max_datagram(udptl->instance, ast_sdp_options_get_udptl_far_max_datagram(options));
-
-       return udptl;
-}
-
-static struct ast_stream *merge_local_stream(const struct ast_sdp_options *options,
-       const struct ast_stream *update);
-
-static struct sdp_state_capabilities *sdp_initialize_state_capabilities(const struct ast_stream_topology *topology,
-       const struct ast_sdp_options *options)
-{
-       struct sdp_state_capabilities *capabilities;
-       struct ast_stream *stream;
-       unsigned int topology_count;
-       unsigned int max_streams;
-       unsigned int idx;
-
-       capabilities = ast_calloc(1, sizeof(*capabilities));
-       if (!capabilities) {
-               return NULL;
-       }
-
-       capabilities->topology = ast_stream_topology_alloc();
-       if (!capabilities->topology) {
-               sdp_state_capabilities_free(capabilities);
-               return NULL;
-       }
-
-       max_streams = ast_sdp_options_get_max_streams(options);
-       if (topology) {
-               topology_count = ast_stream_topology_get_count(topology);
-       } else {
-               topology_count = 0;
-       }
-
-       /* Gather acceptable streams from the initial topology */
-       for (idx = 0; idx < topology_count; ++idx) {
-               stream = ast_stream_topology_get_stream(topology, idx);
-               if (!sdp_is_stream_type_supported(ast_stream_get_type(stream))) {
-                       /* Delete the unsupported stream from the initial topology */
-                       continue;
-               }
-               if (max_streams <= ast_stream_topology_get_count(capabilities->topology)) {
-                       /* Cannot support any more streams */
-                       break;
-               }
-
-               stream = merge_local_stream(options, stream);
-               if (!stream) {
-                       sdp_state_capabilities_free(capabilities);
-                       return NULL;
-               }
-
-               if (ast_stream_topology_append_stream(capabilities->topology, stream) < 0) {
-                       ast_stream_free(stream);
-                       sdp_state_capabilities_free(capabilities);
-                       return NULL;
-               }
-       }
-
-       /*
-        * Remove trailing declined streams from the initial built topology.
-        * No need to waste space in the SDP with these unused slots.
-        */
-       for (idx = ast_stream_topology_get_count(capabilities->topology); idx--;) {
-               stream = ast_stream_topology_get_stream(capabilities->topology, idx);
-               if (ast_stream_get_state(stream) != AST_STREAM_STATE_REMOVED) {
-                       break;
-               }
-               ast_stream_topology_del_stream(capabilities->topology, idx);
-       }
-
-       topology_count = ast_stream_topology_get_count(capabilities->topology);
-       if (AST_VECTOR_INIT(&capabilities->streams, topology_count)) {
-               sdp_state_capabilities_free(capabilities);
-               return NULL;
-       }
-
-       for (idx = 0; idx < topology_count; ++idx) {
-               struct sdp_state_stream *state_stream;
-
-               state_stream = ast_calloc(1, sizeof(*state_stream));
-               if (!state_stream) {
-                       sdp_state_capabilities_free(capabilities);
-                       return NULL;
-               }
-
-               stream = ast_stream_topology_get_stream(capabilities->topology, idx);
-               state_stream->type = ast_stream_get_type(stream);
-               if (ast_stream_get_state(stream) != AST_STREAM_STATE_REMOVED) {
-                       switch (state_stream->type) {
-                       case AST_MEDIA_TYPE_AUDIO:
-                       case AST_MEDIA_TYPE_VIDEO:
-                               state_stream->rtp = create_rtp(options, state_stream->type);
-                               if (!state_stream->rtp) {
-                                       sdp_state_stream_free(state_stream);
-                                       sdp_state_capabilities_free(capabilities);
-                                       return NULL;
-                               }
-                               break;
-                       case AST_MEDIA_TYPE_IMAGE:
-                               state_stream->udptl = create_udptl(options);
-                               if (!state_stream->udptl) {
-                                       sdp_state_stream_free(state_stream);
-                                       sdp_state_capabilities_free(capabilities);
-                                       return NULL;
-                               }
-                               break;
-                       case AST_MEDIA_TYPE_UNKNOWN:
-                       case AST_MEDIA_TYPE_TEXT:
-                       case AST_MEDIA_TYPE_END:
-                               /* Unsupported stream type already handled earlier */
-                               ast_assert(0);
-                               break;
-                       }
-               }
-
-               if (AST_VECTOR_APPEND(&capabilities->streams, state_stream)) {
-                       sdp_state_stream_free(state_stream);
-                       sdp_state_capabilities_free(capabilities);
-                       return NULL;
-               }
-       }
-
-       return capabilities;
-}
-
-/*!
- * \brief SDP state, the main structure used to keep track of SDP negotiation
- * and settings.
- *
- * Most fields are pretty self-explanatory, but negotiated_capabilities and
- * proposed_capabilities could use some further explanation. When an SDP
- * state is allocated, a stream topology is provided that dictates the
- * types of streams to offer in the resultant SDP. At the time the SDP
- * is allocated, this topology is used to create the proposed_capabilities.
- *
- * If we are the SDP offerer, then the proposed_capabilities are what are used
- * to generate the offer SDP. When the answer SDP arrives, the proposed capabilities
- * are merged with the answer SDP to create the negotiated capabilities.
- *
- * If we are the SDP answerer, then the incoming offer SDP is merged with our
- * proposed capabilities to create the negotiated capabilities. These negotiated
- * capabilities are what we send in our answer SDP.
- *
- * Any changes that a user of the API performs will occur on the proposed capabilities.
- * The negotiated capabilities are only altered based on actual SDP negotiation. This is
- * done so that the negotiated capabilities can be fallen back on if the proposed
- * capabilities run into some sort of issue.
- */
-struct ast_sdp_state {
-       /*! Current capabilities */
-       struct sdp_state_capabilities *negotiated_capabilities;
-       /*! Proposed capabilities */
-       struct sdp_state_capabilities *proposed_capabilities;
-       /*!
-        * \brief New topology waiting to be merged.
-        *
-        * \details
-        * Repeated topology updates are merged into each other here until
-        * negotiations are restarted and we create an offer.
-        */
-       struct ast_stream_topology *pending_topology_update;
-       /*! Local SDP. Generated via the options and negotiated/proposed capabilities. */
-       struct ast_sdp *local_sdp;
-       /*! Saved remote SDP */
-       struct ast_sdp *remote_sdp;
-       /*! SDP options. Configured options beyond media capabilities. */
-       struct ast_sdp_options *options;
-       /*! Translator that puts SDPs into the expected representation */
-       struct ast_sdp_translator *translator;
-       /*! An explicit global connection address */
-       struct ast_sockaddr connection_address;
-       /*! The role that we occupy in SDP negotiation */
-       enum ast_sdp_role role;
-       /*! TRUE if all streams on hold by local side */
-       unsigned int locally_held:1;
-       /*! TRUE if the remote offer resulted in all streams being declined. */
-       unsigned int remote_offer_rejected:1;
-};
-
-struct ast_sdp_state *ast_sdp_state_alloc(struct ast_stream_topology *topology,
-       struct ast_sdp_options *options)
-{
-       struct ast_sdp_state *sdp_state;
-
-       sdp_state = ast_calloc(1, sizeof(*sdp_state));
-       if (!sdp_state) {
-               return NULL;
-       }
-
-       sdp_state->options = options;
-
-       sdp_state->translator = ast_sdp_translator_new(ast_sdp_options_get_impl(sdp_state->options));
-       if (!sdp_state->translator) {
-               ast_sdp_state_free(sdp_state);
-               return NULL;
-       }
-
-       sdp_state->proposed_capabilities = sdp_initialize_state_capabilities(topology, options);
-       if (!sdp_state->proposed_capabilities) {
-               ast_sdp_state_free(sdp_state);
-               return NULL;
-       }
-
-       sdp_state->role = SDP_ROLE_NOT_SET;
-
-       return sdp_state;
-}
-
-void ast_sdp_state_free(struct ast_sdp_state *sdp_state)
-{
-       if (!sdp_state) {
-               return;
-       }
-
-       sdp_state_capabilities_free(sdp_state->negotiated_capabilities);
-       sdp_state_capabilities_free(sdp_state->proposed_capabilities);
-       ao2_cleanup(sdp_state->local_sdp);
-       ao2_cleanup(sdp_state->remote_sdp);
-       ast_sdp_options_free(sdp_state->options);
-       ast_sdp_translator_free(sdp_state->translator);
-       ast_free(sdp_state);
-}
-
-/*!
- * \internal
- * \brief Allow a configured callback to alter the new negotiated joint topology.
- * \since 15.0.0
- *
- * \details
- * The callback can alter topology stream names, formats, or decline streams.
- *
- * \param sdp_state
- * \param topology Joint topology that we intend to generate the answer SDP.
- *
- * \return Nothing
- */
-static void sdp_state_cb_answerer_modify_topology(const struct ast_sdp_state *sdp_state,
-       struct ast_stream_topology *topology)
-{
-       ast_sdp_answerer_modify_cb cb;
-
-       cb = ast_sdp_options_get_answerer_modify_cb(sdp_state->options);
-       if (cb) {
-               void *context;
-               const struct ast_stream_topology *neg_topology;/*!< Last negotiated topology */
-#ifdef AST_DEVMODE
-               struct ast_stream *stream;
-               int idx;
-               enum ast_media_type type[ast_stream_topology_get_count(topology)];
-               enum ast_stream_state state[ast_stream_topology_get_count(topology)];
-
-               /*
-                * Save stream types and states to validate that they don't
-                * get changed unexpectedly.
-                */
-               for (idx = 0; idx < ast_stream_topology_get_count(topology); ++idx) {
-                       stream = ast_stream_topology_get_stream(topology, idx);
-                       type[idx] = ast_stream_get_type(stream);
-                       state[idx] = ast_stream_get_state(stream);
-               }
-#endif
-
-               context = ast_sdp_options_get_state_context(sdp_state->options);
-               neg_topology = sdp_state->negotiated_capabilities
-                       ? sdp_state->negotiated_capabilities->topology : NULL;
-               cb(context, neg_topology, topology);
-
-#ifdef AST_DEVMODE
-               for (idx = 0; idx < ast_stream_topology_get_count(topology); ++idx) {
-                       stream = ast_stream_topology_get_stream(topology, idx);
-
-                       /* Check that active streams have at least one format */
-                       ast_assert(ast_stream_get_state(stream) == AST_STREAM_STATE_REMOVED
-                               || (ast_stream_get_formats(stream)
-                                       && ast_format_cap_count(ast_stream_get_formats(stream))));
-
-                       /* Check that stream types didn't change. */
-                       ast_assert(type[idx] == ast_stream_get_type(stream));
-
-                       /* Check that streams didn't get resurected. */
-                       ast_assert(state[idx] != AST_STREAM_STATE_REMOVED
-                               || ast_stream_get_state(stream) == AST_STREAM_STATE_REMOVED);
-               }
-#endif
-       }
-}
-
-/*!
- * \internal
- * \brief Allow a configured callback to alter the merged local topology.
- * \since 15.0.0
- *
- * \details
- * The callback can modify streams in the merged topology.  The
- * callback can decline, add/remove/update formats, or rename
- * streams.  Changing anything else on the streams is likely to not
- * end well.
- *
- * \param sdp_state
- * \param topology Merged topology that we intend to generate the offer SDP.
- *
- * \return Nothing
- */
-static void sdp_state_cb_offerer_modify_topology(const struct ast_sdp_state *sdp_state,
-       struct ast_stream_topology *topology)
-{
-       ast_sdp_offerer_modify_cb cb;
-
-       cb = ast_sdp_options_get_offerer_modify_cb(sdp_state->options);
-       if (cb) {
-               void *context;
-               const struct ast_stream_topology *neg_topology;/*!< Last negotiated topology */
-
-               context = ast_sdp_options_get_state_context(sdp_state->options);
-               neg_topology = sdp_state->negotiated_capabilities
-                       ? sdp_state->negotiated_capabilities->topology : NULL;
-               cb(context, neg_topology, topology);
-
-#ifdef AST_DEVMODE
-               {
-                       struct ast_stream *stream;
-                       int idx;
-
-                       /* Check that active streams have at least one format */
-                       for (idx = 0; idx < ast_stream_topology_get_count(topology); ++idx) {
-                               stream = ast_stream_topology_get_stream(topology, idx);
-                               ast_assert(ast_stream_get_state(stream) == AST_STREAM_STATE_REMOVED
-                                       || (ast_stream_get_formats(stream)
-                                               && ast_format_cap_count(ast_stream_get_formats(stream))));
-                       }
-               }
-#endif
-       }
-}
-
-/*!
- * \internal
- * \brief Allow a configured callback to configure the merged local topology.
- * \since 15.0.0
- *
- * \details
- * The callback can configure other parameters associated with each
- * active stream on the topology.  The callback can call several SDP
- * API calls to configure the proposed capabilities of the streams
- * before we create the offer SDP.  For example, the callback could
- * configure a stream specific connection address, T.38 parameters,
- * RTP instance, or UDPTL instance parameters.
- *
- * \param sdp_state
- * \param topology Merged topology that we intend to generate the offer SDP.
- *
- * \return Nothing
- */
-static void sdp_state_cb_offerer_config_topology(const struct ast_sdp_state *sdp_state,
-       const struct ast_stream_topology *topology)
-{
-       ast_sdp_offerer_config_cb cb;
-
-       cb = ast_sdp_options_get_offerer_config_cb(sdp_state->options);
-       if (cb) {
-               void *context;
-
-               context = ast_sdp_options_get_state_context(sdp_state->options);
-               cb(context, topology);
-       }
-}
-
-/*!
- * \internal
- * \brief Call any registered pre-apply topology callback.
- * \since 15.0.0
- *
- * \param sdp_state
- * \param topology
- *
- * \return Nothing
- */
-static void sdp_state_cb_preapply_topology(const struct ast_sdp_state *sdp_state,
-       const struct ast_stream_topology *topology)
-{
-       ast_sdp_preapply_cb cb;
-
-       cb = ast_sdp_options_get_preapply_cb(sdp_state->options);
-       if (cb) {
-               void *context;
-
-               context = ast_sdp_options_get_state_context(sdp_state->options);
-               cb(context, topology);
-       }
-}
-
-/*!
- * \internal
- * \brief Call any registered post-apply topology callback.
- * \since 15.0.0
- *
- * \param sdp_state
- * \param topology
- *
- * \return Nothing
- */
-static void sdp_state_cb_postapply_topology(const struct ast_sdp_state *sdp_state,
-       const struct ast_stream_topology *topology)
-{
-       ast_sdp_postapply_cb cb;
-
-       cb = ast_sdp_options_get_postapply_cb(sdp_state->options);
-       if (cb) {
-               void *context;
-
-               context = ast_sdp_options_get_state_context(sdp_state->options);
-               cb(context, topology);
-       }
-}
-
-static const struct sdp_state_capabilities *sdp_state_get_joint_capabilities(
-       const struct ast_sdp_state *sdp_state)
-{
-       ast_assert(sdp_state != NULL);
-
-       if (sdp_state->negotiated_capabilities) {
-               return sdp_state->negotiated_capabilities;
-       }
-
-       return sdp_state->proposed_capabilities;
-}
-
-static struct sdp_state_stream *sdp_state_get_stream(const struct ast_sdp_state *sdp_state, int stream_index)
-{
-       if (stream_index >= AST_VECTOR_SIZE(&sdp_state->proposed_capabilities->streams)) {
-               return NULL;
-       }
-
-       return AST_VECTOR_GET(&sdp_state->proposed_capabilities->streams, stream_index);
-}
-
-static struct sdp_state_stream *sdp_state_get_joint_stream(const struct ast_sdp_state *sdp_state, int stream_index)
-{
-       const struct sdp_state_capabilities *capabilities;
-
-       capabilities = sdp_state_get_joint_capabilities(sdp_state);
-       if (AST_VECTOR_SIZE(&capabilities->streams) <= stream_index) {
-               return NULL;
-       }
-
-       return AST_VECTOR_GET(&capabilities->streams, stream_index);
-}
-
-struct ast_rtp_instance *ast_sdp_state_get_rtp_instance(
-       const struct ast_sdp_state *sdp_state, int stream_index)
-{
-       struct sdp_state_stream *stream_state;
-
-       ast_assert(sdp_state != NULL);
-       ast_assert(ast_stream_get_type(ast_stream_topology_get_stream(sdp_state->proposed_capabilities->topology,
-               stream_index)) == AST_MEDIA_TYPE_AUDIO || ast_stream_get_type(ast_stream_topology_get_stream(
-                       sdp_state->proposed_capabilities->topology, stream_index)) == AST_MEDIA_TYPE_VIDEO);
-
-       stream_state = sdp_state_get_stream(sdp_state, stream_index);
-       if (!stream_state || !stream_state->rtp) {
-               return NULL;
-       }
-
-       return stream_state->rtp->instance;
-}
-
-struct ast_udptl *ast_sdp_state_get_udptl_instance(
-       const struct ast_sdp_state *sdp_state, int stream_index)
-{
-       struct sdp_state_stream *stream_state;
-
-       ast_assert(sdp_state != NULL);
-       ast_assert(ast_stream_get_type(ast_stream_topology_get_stream(sdp_state->proposed_capabilities->topology,
-               stream_index)) == AST_MEDIA_TYPE_IMAGE);
-
-       stream_state = sdp_state_get_stream(sdp_state, stream_index);
-       if (!stream_state || !stream_state->udptl) {
-               return NULL;
-       }
-
-       return stream_state->udptl->instance;
-}
-
-const struct ast_sockaddr *ast_sdp_state_get_connection_address(const struct ast_sdp_state *sdp_state)
-{
-       ast_assert(sdp_state != NULL);
-
-       return &sdp_state->connection_address;
-}
-
-static int sdp_state_stream_get_connection_address(const struct ast_sdp_state *sdp_state,
-       struct sdp_state_stream *stream_state, struct ast_sockaddr *address)
-{
-       ast_assert(sdp_state != NULL);
-       ast_assert(stream_state != NULL);
-       ast_assert(address != NULL);
-
-       /* If an explicit connection address has been provided for the stream return it */
-       if (!ast_sockaddr_isnull(&stream_state->connection_address)) {
-               ast_sockaddr_copy(address, &stream_state->connection_address);
-               return 0;
-       }
-
-       switch (stream_state->type) {
-       case AST_MEDIA_TYPE_AUDIO:
-       case AST_MEDIA_TYPE_VIDEO:
-               if (!stream_state->rtp->instance) {
-                       return -1;
-               }
-               ast_rtp_instance_get_local_address(stream_state->rtp->instance, address);
-               break;
-       case AST_MEDIA_TYPE_IMAGE:
-               if (!stream_state->udptl->instance) {
-                       return -1;
-               }
-               ast_udptl_get_us(stream_state->udptl->instance, address);
-               break;
-       case AST_MEDIA_TYPE_UNKNOWN:
-       case AST_MEDIA_TYPE_TEXT:
-       case AST_MEDIA_TYPE_END:
-               return -1;
-       }
-
-       if (ast_sockaddr_isnull(address)) {
-               /* No address is set on the stream state. */
-               return -1;
-       }
-
-       /* If an explicit global connection address is set use it here for the IP part */
-       if (!ast_sockaddr_isnull(&sdp_state->connection_address)) {
-               int port = ast_sockaddr_port(address);
-
-               ast_sockaddr_copy(address, &sdp_state->connection_address);
-               ast_sockaddr_set_port(address, port);
-       }
-
-       return 0;
-}
-
-int ast_sdp_state_get_stream_connection_address(const struct ast_sdp_state *sdp_state,
-       int stream_index, struct ast_sockaddr *address)
-{
-       struct sdp_state_stream *stream_state;
-
-       ast_assert(sdp_state != NULL);
-       ast_assert(address != NULL);
-
-       stream_state = sdp_state_get_stream(sdp_state, stream_index);
-       if (!stream_state) {
-               return -1;
-       }
-
-       return sdp_state_stream_get_connection_address(sdp_state, stream_state, address);
-}
-
-const struct ast_stream_topology *ast_sdp_state_get_joint_topology(
-       const struct ast_sdp_state *sdp_state)
-{
-       const struct sdp_state_capabilities *capabilities;
-
-       capabilities = sdp_state_get_joint_capabilities(sdp_state);
-       return capabilities->topology;
-}
-
-const struct ast_stream_topology *ast_sdp_state_get_local_topology(
-       const struct ast_sdp_state *sdp_state)
-{
-       ast_assert(sdp_state != NULL);
-
-       return sdp_state->proposed_capabilities->topology;
-}
-
-const struct ast_sdp_options *ast_sdp_state_get_options(
-       const struct ast_sdp_state *sdp_state)
-{
-       ast_assert(sdp_state != NULL);
-
-       return sdp_state->options;
-}
-
-static struct ast_stream *decline_stream(enum ast_media_type type, const char *name)
-{
-       struct ast_stream *stream;
-
-       if (!name) {
-               name = ast_codec_media_type2str(type);
-       }
-       stream = ast_stream_alloc(name, type);
-       if (!stream) {
-               return NULL;
-       }
-       ast_stream_set_state(stream, AST_STREAM_STATE_REMOVED);
-       return stream;
-}
-
-/*!
- * \brief Merge an update stream into a local stream.
- *
- * \param options SDP Options
- * \param update An updated stream
- *
- * \retval NULL An error occurred
- * \retval non-NULL The joint stream created
- */
-static struct ast_stream *merge_local_stream(const struct ast_sdp_options *options,
-       const struct ast_stream *update)
-{
-       struct ast_stream *joint_stream;
-       struct ast_format_cap *joint_cap;
-       struct ast_format_cap *allowed_cap;
-       struct ast_format_cap *update_cap;
-       enum ast_stream_state joint_state;
-
-       joint_cap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
-       if (!joint_cap) {
-               return NULL;
-       }
-
-       update_cap = ast_stream_get_formats(update);
-       allowed_cap = ast_sdp_options_get_format_cap_type(options,
-               ast_stream_get_type(update));
-       if (allowed_cap && update_cap) {
-               struct ast_str *allowed_buf = ast_str_alloca(128);
-               struct ast_str *update_buf = ast_str_alloca(128);
-               struct ast_str *joint_buf = ast_str_alloca(128);
-
-               ast_format_cap_get_compatible(allowed_cap, update_cap, joint_cap);
-               ast_debug(3,
-                       "Filtered update '%s' with allowed '%s' to get joint '%s'. Joint has %zu formats\n",
-                       ast_format_cap_get_names(update_cap, &update_buf),
-                       ast_format_cap_get_names(allowed_cap, &allowed_buf),
-                       ast_format_cap_get_names(joint_cap, &joint_buf),
-                       ast_format_cap_count(joint_cap));
-       }
-
-       /* Determine the joint stream state */
-       joint_state = AST_STREAM_STATE_REMOVED;
-       if (ast_stream_get_state(update) != AST_STREAM_STATE_REMOVED
-               && ast_format_cap_count(joint_cap)) {
-               joint_state = AST_STREAM_STATE_SENDRECV;
-       }
-
-       joint_stream = ast_stream_alloc(ast_stream_get_name(update),
-               ast_stream_get_type(update));
-       if (joint_stream) {
-               ast_stream_set_state(joint_stream, joint_state);
-               if (joint_state != AST_STREAM_STATE_REMOVED) {
-                       ast_stream_set_formats(joint_stream, joint_cap);
-               }
-       }
-
-       ao2_ref(joint_cap, -1);
-
-       return joint_stream;
-}
-
-/*!
- * \brief Merge a remote stream into a local stream.
- *
- * \param sdp_state
- * \param local Our local stream (NULL if creating new stream)
- * \param locally_held Nonzero if the local stream is held
- * \param remote A remote stream
- *
- * \retval NULL An error occurred
- * \retval non-NULL The joint stream created
- */
-static struct ast_stream *merge_remote_stream(const struct ast_sdp_state *sdp_state,
-       const struct ast_stream *local, unsigned int locally_held,
-       const struct ast_stream *remote)
-{
-       struct ast_stream *joint_stream;
-       struct ast_format_cap *joint_cap;
-       struct ast_format_cap *local_cap;
-       struct ast_format_cap *remote_cap;
-       const char *joint_name;
-       enum ast_stream_state joint_state;
-       enum ast_stream_state remote_state;
-
-       joint_cap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
-       if (!joint_cap) {
-               return NULL;
-       }
-
-       remote_cap = ast_stream_get_formats(remote);
-       if (local) {
-               local_cap = ast_stream_get_formats(local);
-       } else {
-               local_cap = ast_sdp_options_get_format_cap_type(sdp_state->options,
-                       ast_stream_get_type(remote));
-       }
-       if (local_cap && remote_cap) {
-               struct ast_str *local_buf = ast_str_alloca(128);
-               struct ast_str *remote_buf = ast_str_alloca(128);
-               struct ast_str *joint_buf = ast_str_alloca(128);
-
-               ast_format_cap_get_compatible(local_cap, remote_cap, joint_cap);
-               ast_debug(3,
-                       "Combined local '%s' with remote '%s' to get joint '%s'. Joint has %zu formats\n",
-                       ast_format_cap_get_names(local_cap, &local_buf),
-                       ast_format_cap_get_names(remote_cap, &remote_buf),
-                       ast_format_cap_get_names(joint_cap, &joint_buf),
-                       ast_format_cap_count(joint_cap));
-       }
-
-       /* Determine the joint stream state */
-       remote_state = ast_stream_get_state(remote);
-       joint_state = AST_STREAM_STATE_REMOVED;
-       if ((!local || ast_stream_get_state(local) != AST_STREAM_STATE_REMOVED)
-               && ast_format_cap_count(joint_cap)) {
-               if (sdp_state->locally_held || locally_held) {
-                       switch (remote_state) {
-                       case AST_STREAM_STATE_REMOVED:
-                               break;
-                       case AST_STREAM_STATE_INACTIVE:
-                               joint_state = AST_STREAM_STATE_INACTIVE;
-                               break;
-                       case AST_STREAM_STATE_SENDRECV:
-                               joint_state = AST_STREAM_STATE_SENDONLY;
-                               break;
-                       case AST_STREAM_STATE_SENDONLY:
-                               joint_state = AST_STREAM_STATE_INACTIVE;
-                               break;
-                       case AST_STREAM_STATE_RECVONLY:
-                               joint_state = AST_STREAM_STATE_SENDONLY;
-                               break;
-                       }
-               } else {
-                       switch (remote_state) {
-                       case AST_STREAM_STATE_REMOVED:
-                               break;
-                       case AST_STREAM_STATE_INACTIVE:
-                               joint_state = AST_STREAM_STATE_RECVONLY;
-                               break;
-                       case AST_STREAM_STATE_SENDRECV:
-                               joint_state = AST_STREAM_STATE_SENDRECV;
-                               break;
-                       case AST_STREAM_STATE_SENDONLY:
-                               joint_state = AST_STREAM_STATE_RECVONLY;
-                               break;
-                       case AST_STREAM_STATE_RECVONLY:
-                               joint_state = AST_STREAM_STATE_SENDRECV;
-                               break;
-                       }
-               }
-       }
-
-       if (local) {
-               joint_name = ast_stream_get_name(local);
-       } else {
-               joint_name = ast_codec_media_type2str(ast_stream_get_type(remote));
-       }
-       joint_stream = ast_stream_alloc(joint_name, ast_stream_get_type(remote));
-       if (joint_stream) {
-               ast_stream_set_state(joint_stream, joint_state);
-               if (joint_state != AST_STREAM_STATE_REMOVED) {
-                       ast_stream_set_formats(joint_stream, joint_cap);
-               }
-       }
-
-       ao2_ref(joint_cap, -1);
-
-       return joint_stream;
-}
-
-/*!
- * \internal
- * \brief Determine if a merged topology should be rejected.
- * \since 15.0.0
- *
- * \param topology What topology to determine if we reject
- *
- * \retval 0 if not rejected.
- * \retval non-zero if rejected.
- */
-static int sdp_topology_is_rejected(struct ast_stream_topology *topology)
-{
-       int idx;
-       struct ast_stream *stream;
-
-       for (idx = ast_stream_topology_get_count(topology); idx--;) {
-               stream = ast_stream_topology_get_stream(topology, idx);
-               if (ast_stream_get_state(stream) != AST_STREAM_STATE_REMOVED) {
-                       /* At least one stream is not declined */
-                       return 0;
-               }
-       }
-
-       /* All streams are declined */
-       return 1;
-}
-
-static void sdp_state_stream_copy_common(struct sdp_state_stream *dst, const struct sdp_state_stream *src)
-{
-       ast_sockaddr_copy(&dst->connection_address,
-               &src->connection_address);
-       /* Explicitly does not copy the local or remote hold states. */
-       dst->t38_local_params = src->t38_local_params;
-}
-
-static void sdp_state_stream_copy(struct sdp_state_stream *dst, const struct sdp_state_stream *src)
-{
-       *dst = *src;
-
-       switch (dst->type) {
-       case AST_MEDIA_TYPE_AUDIO:
-       case AST_MEDIA_TYPE_VIDEO:
-               ao2_bump(dst->rtp);
-               break;
-       case AST_MEDIA_TYPE_IMAGE:
-               ao2_bump(dst->udptl);
-               break;
-       case AST_MEDIA_TYPE_UNKNOWN:
-       case AST_MEDIA_TYPE_TEXT:
-       case AST_MEDIA_TYPE_END:
-               break;
-       }
-}
-
-/*!
- * \internal
- * \brief Initialize an int vector and default the contents to the member index.
- * \since 15.0.0
- *
- * \param vect Vetctor to initialize and set to default values.
- * \param size Size of the vector to setup.
- *
- * \retval 0 on success.
- * \retval -1 on failure.
- */
-static int sdp_vect_idx_init(struct ast_vector_int *vect, size_t size)
-{
-       int idx;
-
-       if (AST_VECTOR_INIT(vect, size)) {
-               return -1;
-       }
-       for (idx = 0; idx < size; ++idx) {
-               AST_VECTOR_APPEND(vect, idx);
-       }
-       return 0;
-}
-
-/*!
- * \internal
- * \brief Compare stream types for sort order.
- * \since 15.0.0
- *
- * \param left Stream parameter on left
- * \param right Stream parameter on right
- *
- * \retval <0 left stream sorts first.
- * \retval =0 streams match.
- * \retval >0 right stream sorts first.
- */
-static int sdp_stream_cmp_by_type(const struct ast_stream *left, const struct ast_stream *right)
-{
-       enum ast_media_type left_type = ast_stream_get_type(left);
-       enum ast_media_type right_type = ast_stream_get_type(right);
-
-       /* Treat audio and image as the same for T.38 support */
-       if (left_type == AST_MEDIA_TYPE_IMAGE) {
-               left_type = AST_MEDIA_TYPE_AUDIO;
-       }
-       if (right_type == AST_MEDIA_TYPE_IMAGE) {
-               right_type = AST_MEDIA_TYPE_AUDIO;
-       }
-
-       return left_type - right_type;
-}
-
-/*!
- * \internal
- * \brief Compare stream names and types for sort order.
- * \since 15.0.0
- *
- * \param left Stream parameter on left
- * \param right Stream parameter on right
- *
- * \retval <0 left stream sorts first.
- * \retval =0 streams match.
- * \retval >0 right stream sorts first.
- */
-static int sdp_stream_cmp_by_name(const struct ast_stream *left, const struct ast_stream *right)
-{
-       int cmp;
-       const char *left_name;
-
-       left_name = ast_stream_get_name(left);
-       cmp = strcmp(left_name, ast_stream_get_name(right));
-       if (!cmp) {
-               cmp = sdp_stream_cmp_by_type(left, right);
-               if (!cmp) {
-                       /* Are the stream names real or type names which aren't matchable? */
-                       if (ast_strlen_zero(left_name)
-                               || !strcmp(left_name, ast_codec_media_type2str(ast_stream_get_type(left)))
-                               || !strcmp(left_name, ast_codec_media_type2str(ast_stream_get_type(right)))) {
-                               /* The streams don't actually have real names */
-                               cmp = -1;
-                       }
-               }
-       }
-       return cmp;
-}
-
-/*!
- * \internal
- * \brief Merge topology streams by the match function.
- * \since 15.0.0
- *
- * \param sdp_state
- * \param current_topology Topology to update with state.
- * \param update_topology Topology to merge into the current topology.
- * \param current_vect Stream index vector of remaining current_topology streams.
- * \param update_vect Stream index vector of remaining update_topology streams.
- * \param backfill_candidate Array of flags marking current_topology streams
- *            that can be reused for a different stream.
- * \param match Stream comparison function to identify corresponding streams
- *            between the current_topology and update_topology.
- * \param merged_topology Output topology of merged streams.
- * \param compact_streams TRUE if backfill and limit number of streams.
- *
- * \retval 0 on success.
- * \retval -1 on failure.
- */
-static int sdp_merge_streams_match(
-       const struct ast_sdp_state *sdp_state,
-       const struct ast_stream_topology *current_topology,
-       const struct ast_stream_topology *update_topology,
-       struct ast_vector_int *current_vect,
-       struct ast_vector_int *update_vect,
-       char backfill_candidate[],
-       int (*match)(const struct ast_stream *left, const struct ast_stream *right),
-       struct ast_stream_topology *merged_topology,
-       int compact_streams)
-{
-       struct ast_stream *current_stream;
-       struct ast_stream *update_stream;
-       int current_idx;
-       int update_idx;
-       int idx;
-
-       for (current_idx = 0; current_idx < AST_VECTOR_SIZE(current_vect);) {
-               idx = AST_VECTOR_GET(current_vect, current_idx);
-               current_stream = ast_stream_topology_get_stream(current_topology, idx);
-
-               for (update_idx = 0; update_idx < AST_VECTOR_SIZE(update_vect); ++update_idx) {
-                       idx = AST_VECTOR_GET(update_vect, update_idx);
-                       update_stream = ast_stream_topology_get_stream(update_topology, idx);
-
-                       if (match(current_stream, update_stream)) {
-                               continue;
-                       }
-
-                       if (!compact_streams
-                               || ast_stream_get_state(current_stream) != AST_STREAM_STATE_REMOVED
-                               || ast_stream_get_state(update_stream) != AST_STREAM_STATE_REMOVED) {
-                               struct ast_stream *merged_stream;
-
-                               merged_stream = merge_local_stream(sdp_state->options, update_stream);
-                               if (!merged_stream) {
-                                       return -1;
-                               }
-                               idx = AST_VECTOR_GET(current_vect, current_idx);
-                               if (ast_stream_topology_set_stream(merged_topology, idx, merged_stream)) {
-                                       ast_stream_free(merged_stream);
-                                       return -1;
-                               }
-
-                               /*
-                                * The current_stream cannot be considered a backfill_candidate
-                                * anymore since it got updated.
-                                *
-                                * XXX It could be argued that if the declined status didn't
-                                * change because the merged_stream became declined then we
-                                * shouldn't remove the stream slot as a backfill_candidate
-                                * and we shouldn't update the merged_topology stream.  If we
-                                * then backfilled the stream we would likely mess up the core
-                                * if it is matching streams by type since the core attempted
-                                * to update the stream with an incompatible stream.  Any
-                                * backfilled streams could cause a stream type ordering
-                                * problem.  However, we do need to reclaim declined stream
-                                * slots sometime.
-                                */
-                               backfill_candidate[idx] = 0;
-                       }
-
-                       AST_VECTOR_REMOVE_ORDERED(current_vect, current_idx);
-                       AST_VECTOR_REMOVE_ORDERED(update_vect, update_idx);
-                       goto matched_next;
-               }
-
-               ++current_idx;
-matched_next:;
-       }
-       return 0;
-}
-
-/*!
- * \internal
- * \brief Merge the current local topology with an updated topology.
- * \since 15.0.0
- *
- * \param sdp_state
- * \param current_topology Topology to update with state.
- * \param update_topology Topology to merge into the current topology.
- * \param compact_streams TRUE if backfill and limit number of streams.
- *
- * \retval merged topology on success.
- * \retval NULL on failure.
- */
-static struct ast_stream_topology *merge_local_topologies(
-       const struct ast_sdp_state *sdp_state,
-       const struct ast_stream_topology *current_topology,
-       const struct ast_stream_topology *update_topology,
-       int compact_streams)
-{
-       struct ast_stream_topology *merged_topology;
-       struct ast_stream *current_stream;
-       struct ast_stream *update_stream;
-       struct ast_stream *merged_stream;
-       struct ast_vector_int current_vect;
-       struct ast_vector_int update_vect;
-       int current_idx = ast_stream_topology_get_count(current_topology);
-       int update_idx;
-       int idx;
-       char backfill_candidate[current_idx];
-
-       memset(backfill_candidate, 0, current_idx);
-
-       if (compact_streams) {
-               /* Limit matching consideration to the maximum allowed live streams. */
-               idx = ast_sdp_options_get_max_streams(sdp_state->options);
-               if (idx < current_idx) {
-                       current_idx = idx;
-               }
-       }
-       if (sdp_vect_idx_init(&current_vect, current_idx)) {
-               return NULL;
-       }
-
-       if (sdp_vect_idx_init(&update_vect, ast_stream_topology_get_count(update_topology))) {
-               AST_VECTOR_FREE(&current_vect);
-               return NULL;
-       }
-
-       merged_topology = ast_stream_topology_clone(current_topology);
-       if (!merged_topology) {
-               goto fail;
-       }
-
-       /*
-        * Remove any unsupported current streams from match consideration
-        * and mark potential backfill candidates.
-        */
-       for (current_idx = AST_VECTOR_SIZE(&current_vect); current_idx--;) {
-               idx = AST_VECTOR_GET(&current_vect, current_idx);
-               current_stream = ast_stream_topology_get_stream(current_topology, idx);
-               if (ast_stream_get_state(current_stream) == AST_STREAM_STATE_REMOVED
-                       && compact_streams) {
-                       /* The declined stream is a potential backfill candidate */
-                       backfill_candidate[idx] = 1;
-               }
-               if (sdp_is_stream_type_supported(ast_stream_get_type(current_stream))) {
-                       continue;
-               }
-               /* Unsupported current streams should always be declined */
-               ast_assert(ast_stream_get_state(current_stream) == AST_STREAM_STATE_REMOVED);
-
-               AST_VECTOR_REMOVE_ORDERED(&current_vect, current_idx);
-       }
-
-       /* Remove any unsupported update streams from match consideration. */
-       for (update_idx = AST_VECTOR_SIZE(&update_vect); update_idx--;) {
-               idx = AST_VECTOR_GET(&update_vect, update_idx);
-               update_stream = ast_stream_topology_get_stream(update_topology, idx);
-               if (sdp_is_stream_type_supported(ast_stream_get_type(update_stream))) {
-                       continue;
-               }
-
-               AST_VECTOR_REMOVE_ORDERED(&update_vect, update_idx);
-       }
-
-       /* Match by stream name and type */
-       if (sdp_merge_streams_match(sdp_state, current_topology, update_topology,
-               &current_vect, &update_vect, backfill_candidate, sdp_stream_cmp_by_name,
-               merged_topology, compact_streams)) {
-               goto fail;
-       }
-
-       /* Match by stream type */
-       if (sdp_merge_streams_match(sdp_state, current_topology, update_topology,
-               &current_vect, &update_vect, backfill_candidate, sdp_stream_cmp_by_type,
-               merged_topology, compact_streams)) {
-               goto fail;
-       }
-
-       /* Decline unmatched current stream slots */
-       for (current_idx = AST_VECTOR_SIZE(&current_vect); current_idx--;) {
-               idx = AST_VECTOR_GET(&current_vect, current_idx);
-               current_stream = ast_stream_topology_get_stream(current_topology, idx);
-
-               if (ast_stream_get_state(current_stream) == AST_STREAM_STATE_REMOVED) {
-                       /* Stream is already declined. */
-                       continue;
-               }
-
-               merged_stream = decline_stream(ast_stream_get_type(current_stream),
-                       ast_stream_get_name(current_stream));
-               if (!merged_stream) {
-                       goto fail;
-               }
-               if (ast_stream_topology_set_stream(merged_topology, idx, merged_stream)) {
-                       ast_stream_free(merged_stream);
-                       goto fail;
-               }
-       }
-
-       /* Backfill new update stream slots into pre-existing declined current stream slots */
-       while (AST_VECTOR_SIZE(&update_vect)) {
-               idx = ast_stream_topology_get_count(current_topology);
-               for (current_idx = 0; current_idx < idx; ++current_idx) {
-                       if (backfill_candidate[current_idx]) {
-                               break;
-                       }
-               }
-               if (idx <= current_idx) {
-                       /* No more backfill candidates remain. */
-                       break;
-               }
-               /* There should only be backfill stream slots when we are compact_streams */
-               ast_assert(compact_streams);
-
-               idx = AST_VECTOR_GET(&update_vect, 0);
-               update_stream = ast_stream_topology_get_stream(update_topology, idx);
-               AST_VECTOR_REMOVE_ORDERED(&update_vect, 0);
-
-               if (ast_stream_get_state(update_stream) == AST_STREAM_STATE_REMOVED) {
-                       /* New stream is already declined so don't bother adding it. */
-                       continue;
-               }
-
-               merged_stream = merge_local_stream(sdp_state->options, update_stream);
-               if (!merged_stream) {
-                       goto fail;
-               }
-               if (ast_stream_get_state(merged_stream) == AST_STREAM_STATE_REMOVED) {
-                       /* New stream not compatible so don't bother adding it. */
-                       ast_stream_free(merged_stream);
-                       continue;
-               }
-
-               /* Add the new stream into the backfill stream slot. */
-               if (ast_stream_topology_set_stream(merged_topology, current_idx, merged_stream)) {
-                       ast_stream_free(merged_stream);
-                       goto fail;
-               }
-               backfill_candidate[current_idx] = 0;
-       }
-
-       /* Append any remaining new update stream slots that can fit. */
-       while (AST_VECTOR_SIZE(&update_vect)
-               && (!compact_streams
-                       || ast_stream_topology_get_count(merged_topology)
-                               < ast_sdp_options_get_max_streams(sdp_state->options))) {
-               idx = AST_VECTOR_GET(&update_vect, 0);
-               update_stream = ast_stream_topology_get_stream(update_topology, idx);
-               AST_VECTOR_REMOVE_ORDERED(&update_vect, 0);
-
-               if (ast_stream_get_state(update_stream) == AST_STREAM_STATE_REMOVED) {
-                       /* New stream is already declined so don't bother adding it. */
-                       continue;
-               }
-
-               merged_stream = merge_local_stream(sdp_state->options, update_stream);
-               if (!merged_stream) {
-                       goto fail;
-               }
-               if (ast_stream_get_state(merged_stream) == AST_STREAM_STATE_REMOVED) {
-                       /* New stream not compatible so don't bother adding it. */
-                       ast_stream_free(merged_stream);
-                       continue;
-               }
-
-               /* Append the new update stream. */
-               if (ast_stream_topology_append_stream(merged_topology, merged_stream) < 0) {
-                       ast_stream_free(merged_stream);
-                       goto fail;
-               }
-       }
-
-       AST_VECTOR_FREE(&current_vect);
-       AST_VECTOR_FREE(&update_vect);
-       return merged_topology;
-
-fail:
-       ast_stream_topology_free(merged_topology);
-       AST_VECTOR_FREE(&current_vect);
-       AST_VECTOR_FREE(&update_vect);
-       return NULL;
-}
-
-/*!
- * \internal
- * \brief Remove declined streams appended beyond orig_topology.
- * \since 15.0.0
- *
- * \param sdp_state
- * \param orig_topology Negotiated or initial topology.
- * \param new_topology New proposed topology.
- *
- * \return Nothing
- */
-static void remove_appended_declined_streams(const struct ast_sdp_state *sdp_state,
-       const struct ast_stream_topology *orig_topology,
-       struct ast_stream_topology *new_topology)
-{
-       struct ast_stream *stream;
-       int orig_count;
-       int idx;
-
-       orig_count = ast_stream_topology_get_count(orig_topology);
-       for (idx = ast_stream_topology_get_count(new_topology); orig_count < idx;) {
-               --idx;
-               stream = ast_stream_topology_get_stream(new_topology, idx);
-               if (ast_stream_get_state(stream) != AST_STREAM_STATE_REMOVED) {
-                       continue;
-               }
-               ast_stream_topology_del_stream(new_topology, idx);
-       }
-}
-
-/*!
- * \internal
- * \brief Setup a new state stream from a possibly existing state stream.
- * \since 15.0.0
- *
- * \param sdp_state
- * \param new_state_stream What state stream to setup
- * \param old_state_stream Source of previous state stream information.
- *            May be NULL.
- * \param new_type Type of the new state stream.
- *
- * \retval 0 on success.
- * \retval -1 on failure.
- */
-static int setup_new_stream_capabilities(
-       const struct ast_sdp_state *sdp_state,
-       struct sdp_state_stream *new_state_stream,
-       struct sdp_state_stream *old_state_stream,
-       enum ast_media_type new_type)
-{
-       if (old_state_stream) {
-               /*
-                * Copy everything potentially useful for a new stream state type
-                * from the old stream of a possible different type.
-                */
-               sdp_state_stream_copy_common(new_state_stream, old_state_stream);
-               /* We also need to preserve the locally_held state for the new stream. */
-               new_state_stream->locally_held = old_state_stream->locally_held;
-       }
-       new_state_stream->type = new_type;
-
-       switch (new_type) {
-       case AST_MEDIA_TYPE_AUDIO:
-       case AST_MEDIA_TYPE_VIDEO:
-               new_state_stream->rtp = create_rtp(sdp_state->options, new_type);
-               if (!new_state_stream->rtp) {
-                       return -1;
-               }
-               break;
-       case AST_MEDIA_TYPE_IMAGE:
-               new_state_stream->udptl = create_udptl(sdp_state->options);
-               if (!new_state_stream->udptl) {
-                       return -1;
-               }
-               break;
-       case AST_MEDIA_TYPE_UNKNOWN:
-       case AST_MEDIA_TYPE_TEXT:
-       case AST_MEDIA_TYPE_END:
-               break;
-       }
-       return 0;
-}
-
-/*!
- * \brief Merge existing stream capabilities and a new topology.
- *
- * \param sdp_state The state needing capabilities merged
- * \param new_topology The topology to merge with our proposed capabilities
- *
- * \details
- *
- * This is a bit complicated. The idea is that we already have some
- * capabilities set, and we've now been confronted with a new stream
- * topology from the system.  We want to take what we had before and
- * merge them with the new topology from the system.
- *
- * According to the RFC, stream slots can change their types only if
- * they are carrying the same logical information or an offer is
- * reusing a declined slot or new stream slots are added to the end
- * of the list.  Switching a stream from audio to T.38 makes sense
- * because the stream slot is carrying the same information just in a
- * different format.
- *
- * We can setup new streams offered by the system up to our
- * configured maximum stream slots.  New stream slots requested over
- * the maximum are discarded.
- *
- * \retval NULL An error occurred
- * \retval non-NULL The merged capabilities
- */
-static struct sdp_state_capabilities *merge_local_capabilities(
-       const struct ast_sdp_state *sdp_state,
-       const struct ast_stream_topology *new_topology)
-{
-       const struct sdp_state_capabilities *current = sdp_state->proposed_capabilities;
-       struct sdp_state_capabilities *merged_capabilities;
-       int idx;
-
-       ast_assert(current != NULL);
-
-       merged_capabilities = ast_calloc(1, sizeof(*merged_capabilities));
-       if (!merged_capabilities) {
-               return NULL;
-       }
-
-       merged_capabilities->topology = merge_local_topologies(sdp_state, current->topology,
-               new_topology, 1);
-       if (!merged_capabilities->topology) {
-               goto fail;
-       }
-       sdp_state_cb_offerer_modify_topology(sdp_state, merged_capabilities->topology);
-       remove_appended_declined_streams(sdp_state, current->topology,
-               merged_capabilities->topology);
-
-       if (AST_VECTOR_INIT(&merged_capabilities->streams,
-               ast_stream_topology_get_count(merged_capabilities->topology))) {
-               goto fail;
-       }
-
-       for (idx = 0; idx < ast_stream_topology_get_count(merged_capabilities->topology); ++idx) {
-               struct sdp_state_stream *merged_state_stream;
-               struct sdp_state_stream *current_state_stream;
-               struct ast_stream *merged_stream;
-               struct ast_stream *current_stream;
-               enum ast_media_type merged_stream_type;
-               enum ast_media_type current_stream_type;
-
-               merged_state_stream = ast_calloc(1, sizeof(*merged_state_stream));
-               if (!merged_state_stream) {
-                       goto fail;
-               }
-
-               merged_stream = ast_stream_topology_get_stream(merged_capabilities->topology, idx);
-               merged_stream_type = ast_stream_get_type(merged_stream);
-
-               if (idx < ast_stream_topology_get_count(current->topology)) {
-                       current_state_stream = AST_VECTOR_GET(&current->streams, idx);
-                       current_stream = ast_stream_topology_get_stream(current->topology, idx);
-                       current_stream_type = ast_stream_get_type(current_stream);
-               } else {
-                       /* The merged topology is adding a stream */
-                       current_state_stream = NULL;
-                       current_stream = NULL;
-                       current_stream_type = AST_MEDIA_TYPE_UNKNOWN;
-               }
-
-               if (ast_stream_get_state(merged_stream) == AST_STREAM_STATE_REMOVED) {
-                       if (current_state_stream) {
-                               /* Copy everything potentially useful to a declined stream state. */
-                               sdp_state_stream_copy_common(merged_state_stream, current_state_stream);
-                       }
-                       merged_state_stream->type = merged_stream_type;
-               } else if (!current_stream
-                       || ast_stream_get_state(current_stream) == AST_STREAM_STATE_REMOVED) {
-                       /* This is a new stream */
-                       if (setup_new_stream_capabilities(sdp_state, merged_state_stream,
-                               current_state_stream, merged_stream_type)) {
-                               sdp_state_stream_free(merged_state_stream);
-                               goto fail;
-                       }
-               } else if (merged_stream_type == current_stream_type) {
-                       /* Stream type is not changing. */
-                       sdp_state_stream_copy(merged_state_stream, current_state_stream);
-               } else {
-                       /*
-                        * Stream type is changing.  Need to replace the stream.
-                        *
-                        * Unsupported streams should already be handled earlier because
-                        * they are always declined.
-                        */
-                       ast_assert(sdp_is_stream_type_supported(merged_stream_type));
-
-                       /*
-                        * XXX We might need to keep the old RTP instance if the new
-                        * stream type is also RTP.  We would just be changing between
-                        * audio and video in that case.  However we will create a new
-                        * RTP instance anyway since its purpose has to be changing.
-                        * Any RTP packets in flight from the old stream type might
-                        * cause mischief.
-                        */
-                       if (setup_new_stream_capabilities(sdp_state, merged_state_stream,
-                               current_state_stream, merged_stream_type)) {
-                               sdp_state_stream_free(merged_state_stream);
-                               goto fail;
-                       }
-               }
-
-               if (AST_VECTOR_APPEND(&merged_capabilities->streams, merged_state_stream)) {
-                       sdp_state_stream_free(merged_state_stream);
-                       goto fail;
-               }
-       }
-
-       return merged_capabilities;
-
-fail:
-       sdp_state_capabilities_free(merged_capabilities);
-       return NULL;
-}
-
-static void merge_remote_stream_capabilities(
-       const struct ast_sdp_state *sdp_state,
-       struct sdp_state_stream *joint_state_stream,
-       struct sdp_state_stream *local_state_stream,
-       struct ast_stream *remote_stream)
-{
-       struct ast_rtp_codecs *codecs;
-
-       *joint_state_stream = *local_state_stream;
-       /*
-        * Need to explicitly set the type to the remote because we could
-        * be changing the type between audio and video.
-        */
-       joint_state_stream->type = ast_stream_get_type(remote_stream);
-
-       switch (joint_state_stream->type) {
-       case AST_MEDIA_TYPE_AUDIO:
-       case AST_MEDIA_TYPE_VIDEO:
-               ao2_bump(joint_state_stream->rtp);
-               codecs = ast_stream_get_rtp_codecs(remote_stream);
-               ast_assert(codecs != NULL);
-               if (sdp_state->role == SDP_ROLE_ANSWERER) {
-                       /*
-                        * Setup rx payload type mapping to prefer the mapping
-                        * from the peer that the RFC says we SHOULD use.
-                        */
-                       ast_rtp_codecs_payloads_xover(codecs, codecs, NULL);
-               }
-               ast_rtp_codecs_payloads_copy(codecs,
-                       ast_rtp_instance_get_codecs(joint_state_stream->rtp->instance),
-                       joint_state_stream->rtp->instance);
-               break;
-       case AST_MEDIA_TYPE_IMAGE:
-               joint_state_stream->udptl = ao2_bump(joint_state_stream->udptl);
-               break;
-       case AST_MEDIA_TYPE_UNKNOWN:
-       case AST_MEDIA_TYPE_TEXT:
-       case AST_MEDIA_TYPE_END:
-               break;
-       }
-}
-
-static int create_remote_stream_capabilities(
-       const struct ast_sdp_state *sdp_state,
-       struct sdp_state_stream *joint_state_stream,
-       struct sdp_state_stream *local_state_stream,
-       struct ast_stream *remote_stream)
-{
-       struct ast_rtp_codecs *codecs;
-
-       /* We can only create streams if we are the answerer */
-       ast_assert(sdp_state->role == SDP_ROLE_ANSWERER);
-
-       if (local_state_stream) {
-               /*
-                * Copy everything potentially useful for a new stream state type
-                * from the old stream of a possible different type.
-                */
-               sdp_state_stream_copy_common(joint_state_stream, local_state_stream);
-               /* We also need to preserve the locally_held state for the new stream. */
-               joint_state_stream->locally_held = local_state_stream->locally_held;
-       }
-       joint_state_stream->type = ast_stream_get_type(remote_stream);
-
-       switch (joint_state_stream->type) {
-       case AST_MEDIA_TYPE_AUDIO:
-       case AST_MEDIA_TYPE_VIDEO:
-               joint_state_stream->rtp = create_rtp(sdp_state->options, joint_state_stream->type);
-               if (!joint_state_stream->rtp) {
-                       return -1;
-               }
-
-               /*
-                * Setup rx payload type mapping to prefer the mapping
-                * from the peer that the RFC says we SHOULD use.
-                */
-               codecs = ast_stream_get_rtp_codecs(remote_stream);
-               ast_assert(codecs != NULL);
-               ast_rtp_codecs_payloads_xover(codecs, codecs, NULL);
-               ast_rtp_codecs_payloads_copy(codecs,
-                       ast_rtp_instance_get_codecs(joint_state_stream->rtp->instance),
-                       joint_state_stream->rtp->instance);
-               break;
-       case AST_MEDIA_TYPE_IMAGE:
-               joint_state_stream->udptl = create_udptl(sdp_state->options);
-               if (!joint_state_stream->udptl) {
-                       return -1;
-               }
-               break;
-       case AST_MEDIA_TYPE_UNKNOWN:
-       case AST_MEDIA_TYPE_TEXT:
-       case AST_MEDIA_TYPE_END:
-               break;
-       }
-       return 0;
-}
-
-/*!
- * \internal
- * \brief Create a joint topology from the remote topology.
- * \since 15.0.0
- *
- * \param sdp_state The state needing capabilities merged.
- * \param local Capabilities to merge the remote topology into.
- * \param remote_topology The topology to merge with our local capabilities.
- *
- * \retval joint topology on success.
- * \retval NULL on failure.
- */
-static struct ast_stream_topology *merge_remote_topology(
-       const struct ast_sdp_state *sdp_state,
-       const struct sdp_state_capabilities *local,
-       const struct ast_stream_topology *remote_topology)
-{
-       struct ast_stream_topology *joint_topology;
-       int idx;
-
-       joint_topology = ast_stream_topology_alloc();
-       if (!joint_topology) {
-               return NULL;
-       }
-
-       for (idx = 0; idx < ast_stream_topology_get_count(remote_topology); ++idx) {
-               enum ast_media_type local_stream_type;
-               enum ast_media_type remote_stream_type;
-               struct ast_stream *remote_stream;
-               struct ast_stream *local_stream;
-               struct ast_stream *joint_stream;
-               struct sdp_state_stream *local_state_stream;
-
-               remote_stream = ast_stream_topology_get_stream(remote_topology, idx);
-               remote_stream_type = ast_stream_get_type(remote_stream);
-
-               if (idx < ast_stream_topology_get_count(local->topology)) {
-                       local_state_stream = AST_VECTOR_GET(&local->streams, idx);
-                       local_stream = ast_stream_topology_get_stream(local->topology, idx);
-                       local_stream_type = ast_stream_get_type(local_stream);
-               } else {
-                       /* The remote is adding a stream slot */
-                       local_state_stream = NULL;
-                       local_stream = NULL;
-                       local_stream_type = AST_MEDIA_TYPE_UNKNOWN;
-
-                       if (sdp_state->role != SDP_ROLE_ANSWERER) {
-                               /* Remote cannot add a new stream slot in an answer SDP */
-                               ast_debug(1,
-                                       "Bad.  Ignoring new %s stream slot remote answer SDP trying to add.\n",
-                                       ast_codec_media_type2str(remote_stream_type));
-                               continue;
-                       }
-               }
-
-               if (local_stream
-                       && ast_stream_get_state(local_stream) != AST_STREAM_STATE_REMOVED) {
-                       if (remote_stream_type == local_stream_type) {
-                               /* Stream type is not changing. */
-                               joint_stream = merge_remote_stream(sdp_state, local_stream,
-                                       local_state_stream->locally_held, remote_stream);
-                       } else if (sdp_state->role == SDP_ROLE_ANSWERER) {
-                               /* Stream type is changing. */
-                               joint_stream = merge_remote_stream(sdp_state, NULL,
-                                       local_state_stream->locally_held, remote_stream);
-                       } else {
-                               /*
-                                * Remote cannot change the stream type we offered.
-                                * Mark as declined.
-                                */
-                               ast_debug(1,
-                                       "Bad.  Remote answer SDP trying to change the stream type from %s to %s.\n",
-                                       ast_codec_media_type2str(local_stream_type),
-                                       ast_codec_media_type2str(remote_stream_type));
-                               joint_stream = decline_stream(local_stream_type,
-                                       ast_stream_get_name(local_stream));
-                       }
-               } else {
-                       /* Local stream is either dead/declined or nonexistent. */
-                       if (sdp_state->role == SDP_ROLE_ANSWERER) {
-                               if (sdp_is_stream_type_supported(remote_stream_type)
-                                       && ast_stream_get_state(remote_stream) != AST_STREAM_STATE_REMOVED
-                                       && idx < ast_sdp_options_get_max_streams(sdp_state->options)) {
-                                       /* Try to create the new stream */
-                                       joint_stream = merge_remote_stream(sdp_state, NULL,
-                                               local_state_stream ? local_state_stream->locally_held : 0,
-                                               remote_stream);
-                               } else {
-                                       const char *stream_name;
-
-                                       /* Decline the remote stream. */
-                                       if (local_stream
-                                               && local_stream_type == remote_stream_type) {
-                                               /* Preserve the previous stream name */
-                                               stream_name = ast_stream_get_name(local_stream);
-                                       } else {
-                                               stream_name = NULL;
-                                       }
-                                       joint_stream = decline_stream(remote_stream_type, stream_name);
-                               }
-                       } else {
-                               /* Decline the stream. */
-                               if (DEBUG_ATLEAST(1)
-                                       && ast_stream_get_state(remote_stream) != AST_STREAM_STATE_REMOVED) {
-                                       /*
-                                        * Remote cannot request a new stream in place of a declined
-                                        * stream in an answer SDP.
-                                        */
-                                       ast_log(LOG_DEBUG,
-                                               "Bad.  Remote answer SDP trying to use a declined stream slot for %s.\n",
-                                               ast_codec_media_type2str(remote_stream_type));
-                               }
-                               joint_stream = decline_stream(local_stream_type,
-                                       ast_stream_get_name(local_stream));
-                       }
-               }
-
-               if (!joint_stream) {
-                       goto fail;
-               }
-               if (ast_stream_topology_append_stream(joint_topology, joint_stream) < 0) {
-                       ast_stream_free(joint_stream);
-                       goto fail;
-               }
-       }
-
-       return joint_topology;
-
-fail:
-       ast_stream_topology_free(joint_topology);
-       return NULL;
-}
-
-/*!
- * \brief Merge our stream capabilities and a remote topology into joint capabilities.
- *
- * \param sdp_state The state needing capabilities merged
- * \param remote_topology The topology to merge with our proposed capabilities
- *
- * \details
- * This is a bit complicated. The idea is that we already have some
- * capabilities set, and we've now been confronted with a stream
- * topology from the remote end.  We want to take what's been
- * presented to us and merge those new capabilities with our own.
- *
- * According to the RFC, stream slots can change their types only if
- * they are carrying the same logical information or an offer is
- * reusing a declined slot or new stream slots are added to the end
- * of the list.  Switching a stream from audio to T.38 makes sense
- * because the stream slot is carrying the same information just in a
- * different format.
- *
- * When we are the answerer we can setup new streams offered by the
- * remote up to our configured maximum stream slots.  New stream
- * slots offered over the maximum are unconditionally declined.
- *
- * \retval NULL An error occurred
- * \retval non-NULL The merged capabilities
- */
-static struct sdp_state_capabilities *merge_remote_capabilities(
-       const struct ast_sdp_state *sdp_state,
-       const struct ast_stream_topology *remote_topology)
-{
-       const struct sdp_state_capabilities *local = sdp_state->proposed_capabilities;
-       struct sdp_state_capabilities *joint_capabilities;
-       int idx;
-
-       ast_assert(local != NULL);
-
-       joint_capabilities = ast_calloc(1, sizeof(*joint_capabilities));
-       if (!joint_capabilities) {
-               return NULL;
-       }
-
-       joint_capabilities->topology = merge_remote_topology(sdp_state, local, remote_topology);
-       if (!joint_capabilities->topology) {
-               goto fail;
-       }
-
-       if (sdp_state->role == SDP_ROLE_ANSWERER) {
-               sdp_state_cb_answerer_modify_topology(sdp_state, joint_capabilities->topology);
-       }
-       idx = ast_stream_topology_get_count(joint_capabilities->topology);
-       if (AST_VECTOR_INIT(&joint_capabilities->streams, idx)) {
-               goto fail;
-       }
-
-       for (idx = 0; idx < ast_stream_topology_get_count(remote_topology); ++idx) {
-               enum ast_media_type local_stream_type;
-               enum ast_media_type remote_stream_type;
-               struct ast_stream *remote_stream;
-               struct ast_stream *local_stream;
-               struct ast_stream *joint_stream;
-               struct sdp_state_stream *local_state_stream;
-               struct sdp_state_stream *joint_state_stream;
-
-               joint_state_stream = ast_calloc(1, sizeof(*joint_state_stream));
-               if (!joint_state_stream) {
-                       goto fail;
-               }
-
-               remote_stream = ast_stream_topology_get_stream(remote_topology, idx);
-               remote_stream_type = ast_stream_get_type(remote_stream);
-
-               if (idx < ast_stream_topology_get_count(local->topology)) {
-                       local_state_stream = AST_VECTOR_GET(&local->streams, idx);
-                       local_stream = ast_stream_topology_get_stream(local->topology, idx);
-                       local_stream_type = ast_stream_get_type(local_stream);
-               } else {
-                       /* The remote is adding a stream slot */
-                       local_state_stream = NULL;
-                       local_stream = NULL;
-                       local_stream_type = AST_MEDIA_TYPE_UNKNOWN;
-
-                       if (sdp_state->role != SDP_ROLE_ANSWERER) {
-                               /* Remote cannot add a new stream slot in an answer SDP */
-                               sdp_state_stream_free(joint_state_stream);
-                               break;
-                       }
-               }
-
-               joint_stream = ast_stream_topology_get_stream(joint_capabilities->topology,
-                       idx);
-
-               if (local_stream
-                       && ast_stream_get_state(local_stream) != AST_STREAM_STATE_REMOVED) {
-                       if (ast_stream_get_state(joint_stream) == AST_STREAM_STATE_REMOVED) {
-                               /* Copy everything potentially useful to a declined stream state. */
-                               sdp_state_stream_copy_common(joint_state_stream, local_state_stream);
-
-                               joint_state_stream->type = ast_stream_get_type(joint_stream);
-                       } else if (remote_stream_type == local_stream_type) {
-                               /* Stream type is not changing. */
-                               merge_remote_stream_capabilities(sdp_state, joint_state_stream,
-                                       local_state_stream, remote_stream);
-                               ast_assert(joint_state_stream->type == ast_stream_get_type(joint_stream));
-                       } else {
-                               /*
-                                * Stream type is changing.  Need to replace the stream.
-                                *
-                                * XXX We might need to keep the old RTP instance if the new
-                                * stream type is also RTP.  We would just be changing between
-                                * audio and video in that case.  However we will create a new
-                                * RTP instance anyway since its purpose has to be changing.
-                                * Any RTP packets in flight from the old stream type might
-                                * cause mischief.
-                                */
-                               if (create_remote_stream_capabilities(sdp_state, joint_state_stream,
-                                       local_state_stream, remote_stream)) {
-                                       sdp_state_stream_free(joint_state_stream);
-                                       goto fail;
-                               }
-                               ast_assert(joint_state_stream->type == ast_stream_get_type(joint_stream));
-                       }
-               } else {
-                       /* Local stream is either dead/declined or nonexistent. */
-                       if (sdp_state->role == SDP_ROLE_ANSWERER) {
-                               if (ast_stream_get_state(joint_stream) == AST_STREAM_STATE_REMOVED) {
-                                       if (local_state_stream) {
-                                               /* Copy everything potentially useful to a declined stream state. */
-                                               sdp_state_stream_copy_common(joint_state_stream, local_state_stream);
-                                       }
-                                       joint_state_stream->type = ast_stream_get_type(joint_stream);
-                               } else {
-                                       /* Try to create the new stream */
-                                       if (create_remote_stream_capabilities(sdp_state, joint_state_stream,
-                                               local_state_stream, remote_stream)) {
-                                               sdp_state_stream_free(joint_state_stream);
-                                               goto fail;
-                                       }
-                                       ast_assert(joint_state_stream->type == ast_stream_get_type(joint_stream));
-                               }
-                       } else {
-                               /* Decline the stream. */
-                               ast_assert(ast_stream_get_state(joint_stream) == AST_STREAM_STATE_REMOVED);
-                               if (local_state_stream) {
-                                       /* Copy everything potentially useful to a declined stream state. */
-                                       sdp_state_stream_copy_common(joint_state_stream, local_state_stream);
-                               }
-                               joint_state_stream->type = ast_stream_get_type(joint_stream);
-                       }
-               }
-
-               /* Determine if the remote placed the stream on hold. */
-               joint_state_stream->remotely_held = 0;
-               if (ast_stream_get_state(joint_stream) != AST_STREAM_STATE_REMOVED) {
-                       enum ast_stream_state remote_state;
-
-                       remote_state = ast_stream_get_state(remote_stream);
-                       switch (remote_state) {
-                       case AST_STREAM_STATE_INACTIVE:
-                       case AST_STREAM_STATE_SENDONLY:
-                               joint_state_stream->remotely_held = 1;
-                               break;
-                       default:
-                               break;
-                       }
-               }
-
-               if (AST_VECTOR_APPEND(&joint_capabilities->streams, joint_state_stream)) {
-                       sdp_state_stream_free(joint_state_stream);
-                       goto fail;
-               }
-       }
-
-       return joint_capabilities;
-
-fail:
-       sdp_state_capabilities_free(joint_capabilities);
-       return NULL;
-}
-
-/*!
- * \brief Apply remote SDP's ICE information to our RTP session
- *
- * \param state The SDP state on which negotiation has taken place
- * \param options The SDP options we support
- * \param remote_sdp The SDP we most recently received
- * \param remote_m_line The stream on which we are examining ICE candidates
- */
-static void update_ice(const struct ast_sdp_state *state, struct ast_rtp_instance *rtp, const struct ast_sdp_options *options,
-       const struct ast_sdp *remote_sdp, const struct ast_sdp_m_line *remote_m_line)
-{
-       struct ast_rtp_engine_ice *ice;
-       const struct ast_sdp_a_line *attr;
-       const struct ast_sdp_a_line *attr_rtcp_mux;
-       unsigned int attr_i;
-
-       /* If ICE support is not enabled or available exit early */
-       if (ast_sdp_options_get_ice(options) != AST_SDP_ICE_ENABLED_STANDARD || !(ice = ast_rtp_instance_get_ice(rtp))) {
-               return;
-       }
-
-       attr = ast_sdp_m_find_attribute(remote_m_line, "ice-ufrag", -1);
-       if (!attr) {
-               attr = ast_sdp_find_attribute(remote_sdp, "ice-ufrag", -1);
-       }
-       if (attr) {
-               ice->set_authentication(rtp, attr->value, NULL);
-       } else {
-               return;
-       }
-
-       attr = ast_sdp_m_find_attribute(remote_m_line, "ice-pwd", -1);
-       if (!attr) {
-               attr = ast_sdp_find_attribute(remote_sdp, "ice-pwd", -1);
-       }
-       if (attr) {
-               ice->set_authentication(rtp, NULL, attr->value);
-       } else {
-               return;
-       }
-
-       if (ast_sdp_find_attribute(remote_sdp, "ice-lite", -1)) {
-               ice->ice_lite(rtp);
-       }
-
-       attr_rtcp_mux = ast_sdp_m_find_attribute(remote_m_line, "rtcp-mux", -1);
-
-       /* Find all of the candidates */
-       for (attr_i = 0; attr_i < ast_sdp_m_get_a_count(remote_m_line); ++attr_i) {
-               char foundation[33];
-               char transport[32];
-               char address[INET6_ADDRSTRLEN + 1];
-               char cand_type[6];
-               char relay_address[INET6_ADDRSTRLEN + 1] = "";
-               unsigned int port;
-               unsigned int relay_port = 0;
-               struct ast_rtp_engine_ice_candidate candidate = { 0, };
-
-               attr = ast_sdp_m_get_a(remote_m_line, attr_i);
-
-               /* If this is not a candidate line skip it */
-               if (strcmp(attr->name, "candidate")) {
-                       continue;
-               }
-
-               if (sscanf(attr->value, "%32s %30u %31s %30u %46s %30u typ %5s %*s %23s %*s %30u",
-                       foundation, &candidate.id, transport, (unsigned *)&candidate.priority, address,
-                       &port, cand_type, relay_address, &relay_port) < 7) {
-                       /* Candidate did not parse properly */
-                       continue;
-               }
-
-               if (candidate.id > 1
-                       && attr_rtcp_mux
-                       && ast_sdp_options_get_rtcp_mux(options)) {
-                       /* Remote side may have offered RTP and RTCP candidates. However, if we're using RTCP MUX,
-                        * then we should ignore RTCP candidates.
-                        */
-                       continue;
-               }
-
-               candidate.foundation = foundation;
-               candidate.transport = transport;
-
-               ast_sockaddr_parse(&candidate.address, address, PARSE_PORT_FORBID);
-               ast_sockaddr_set_port(&candidate.address, port);
-
-               if (!strcasecmp(cand_type, "host")) {
-                       candidate.type = AST_RTP_ICE_CANDIDATE_TYPE_HOST;
-               } else if (!strcasecmp(cand_type, "srflx")) {
-                       candidate.type = AST_RTP_ICE_CANDIDATE_TYPE_SRFLX;
-               } else if (!strcasecmp(cand_type, "relay")) {
-                       candidate.type = AST_RTP_ICE_CANDIDATE_TYPE_RELAYED;
-               } else {
-                       continue;
-               }
-
-               if (!ast_strlen_zero(relay_address)) {
-                       ast_sockaddr_parse(&candidate.relay_address, relay_address, PARSE_PORT_FORBID);
-               }
-
-               if (relay_port) {
-                       ast_sockaddr_set_port(&candidate.relay_address, relay_port);
-               }
-
-               ice->add_remote_candidate(rtp, &candidate);
-       }
-
-       if (state->role == SDP_ROLE_OFFERER) {
-               ice->set_role(rtp, AST_RTP_ICE_ROLE_CONTROLLING);
-       } else {
-               ice->set_role(rtp, AST_RTP_ICE_ROLE_CONTROLLED);
-       }
-
-       ice->start(rtp);
-}
-
-/*!
- * \brief Update RTP instances based on merged SDPs
- *
- * RTP instances, when first allocated, cannot make assumptions about what the other
- * side supports and thus has to go with some default behaviors. This function gets
- * called after we know both what we support and what the remote endpoint supports.
- * This way, we can update the RTP instance to reflect what is supported by both
- * sides.
- *
- * \param state The SDP state in which SDPs have been negotiated
- * \param rtp The RTP wrapper that is being updated
- * \param options Our locally-supported SDP options
- * \param remote_sdp The SDP we most recently received
- * \param remote_m_line The remote SDP stream that corresponds to the RTP instance we are modifying
- */
-static void update_rtp_after_merge(const struct ast_sdp_state *state,
-       struct sdp_state_rtp *rtp,
-    const struct ast_sdp_options *options,
-       const struct ast_sdp *remote_sdp,
-       const struct ast_sdp_m_line *remote_m_line)
-{
-       struct ast_sdp_c_line *c_line;
-       struct ast_sockaddr *addrs;
-
-       c_line = remote_m_line->c_line;
-       if (!c_line) {
-               c_line = remote_sdp->c_line;
-       }
-       /*
-        * There must be a c= line somewhere but that would be an error by
-        * the far end that should have been caught by a validation check
-        * before we processed the SDP.
-        */
-       ast_assert(c_line != NULL);
-
-       if (ast_sockaddr_resolve(&addrs, c_line->address, PARSE_PORT_FORBID, AST_AF_UNSPEC) > 0) {
-               /* Apply connection information to the RTP instance */
-               ast_sockaddr_set_port(addrs, remote_m_line->port);
-               ast_rtp_instance_set_remote_address(rtp->instance, addrs);
-               ast_free(addrs);
-       }
-
-       if (ast_sdp_options_get_rtcp_mux(options)
-               && ast_sdp_m_find_attribute(remote_m_line, "rtcp-mux", -1)) {
-               ast_rtp_instance_set_prop(rtp->instance, AST_RTP_PROPERTY_RTCP,
-                       AST_RTP_INSTANCE_RTCP_MUX);
-       } else {
-               ast_rtp_instance_set_prop(rtp->instance, AST_RTP_PROPERTY_RTCP,
-                       AST_RTP_INSTANCE_RTCP_STANDARD);
-       }
-
-       update_ice(state, rtp->instance, options, remote_sdp, remote_m_line);
-}
-
-/*!
- * \brief Update UDPTL instances based on merged SDPs
- *
- * UDPTL instances, when first allocated, cannot make assumptions about what the other
- * side supports and thus has to go with some default behaviors. This function gets
- * called after we know both what we support and what the remote endpoint supports.
- * This way, we can update the UDPTL instance to reflect what is supported by both
- * sides.
- *
- * \param state The SDP state in which SDPs have been negotiated
- * \param udptl The UDPTL instance that is being updated
- * \param options Our locally-supported SDP options
- * \param remote_sdp The SDP we most recently received
- * \param remote_m_line The remote SDP stream that corresponds to the RTP instance we are modifying
- */
-static void update_udptl_after_merge(const struct ast_sdp_state *state, struct sdp_state_udptl *udptl,
-    const struct ast_sdp_options *options,
-       const struct ast_sdp *remote_sdp,
-       const struct ast_sdp_m_line *remote_m_line)
-{
-       struct ast_sdp_a_line *a_line;
-       struct ast_sdp_c_line *c_line;
-       unsigned int fax_max_datagram;
-       struct ast_sockaddr *addrs;
-
-       a_line = ast_sdp_m_find_attribute(remote_m_line, "t38faxmaxdatagram", -1);
-       if (!a_line) {
-               a_line = ast_sdp_m_find_attribute(remote_m_line, "t38maxdatagram", -1);
-       }
-       if (a_line && !ast_sdp_options_get_udptl_far_max_datagram(options) &&
-               (sscanf(a_line->value, "%30u", &fax_max_datagram) == 1)) {
-               ast_udptl_set_far_max_datagram(udptl->instance, fax_max_datagram);
-       }
-
-       a_line = ast_sdp_m_find_attribute(remote_m_line, "t38faxudpec", -1);
-       if (a_line) {
-               if (!strcasecmp(a_line->value, "t38UDPRedundancy")) {
-                       ast_udptl_set_error_correction_scheme(udptl->instance, UDPTL_ERROR_CORRECTION_REDUNDANCY);
-               } else if (!strcasecmp(a_line->value, "t38UDPFEC")) {
-                       ast_udptl_set_error_correction_scheme(udptl->instance, UDPTL_ERROR_CORRECTION_FEC);
-               } else {
-                       ast_udptl_set_error_correction_scheme(udptl->instance, UDPTL_ERROR_CORRECTION_NONE);
-               }
-       }
-
-       c_line = remote_m_line->c_line;
-       if (!c_line) {
-               c_line = remote_sdp->c_line;
-       }
-       /*
-        * There must be a c= line somewhere but that would be an error by
-        * the far end that should have been caught by a validation check
-        * before we processed the SDP.
-        */
-       ast_assert(c_line != NULL);
-
-       if (ast_sockaddr_resolve(&addrs, c_line->address, PARSE_PORT_FORBID, AST_AF_UNSPEC) > 0) {
-               /* Apply connection information to the UDPTL instance */
-               ast_sockaddr_set_port(addrs, remote_m_line->port);
-               ast_udptl_set_peer(udptl->instance, addrs);
-               ast_free(addrs);
-       }
-}
-
-static void sdp_apply_negotiated_state(struct ast_sdp_state *sdp_state)
-{
-       struct sdp_state_capabilities *capabilities = sdp_state->negotiated_capabilities;
-       int idx;
-
-       if (!capabilities) {
-               /* Nothing to apply */
-               return;
-       }
-
-       sdp_state_cb_preapply_topology(sdp_state, capabilities->topology);
-       for (idx = 0; idx < AST_VECTOR_SIZE(&capabilities->streams); ++idx) {
-               struct sdp_state_stream *state_stream;
-               struct ast_stream *stream;
-
-               stream = ast_stream_topology_get_stream(capabilities->topology, idx);
-               if (ast_stream_get_state(stream) == AST_STREAM_STATE_REMOVED) {
-                       /* Stream is declined */
-                       continue;
-               }
-
-               state_stream = AST_VECTOR_GET(&capabilities->streams, idx);
-               switch (ast_stream_get_type(stream)) {
-               case AST_MEDIA_TYPE_AUDIO:
-               case AST_MEDIA_TYPE_VIDEO:
-                       update_rtp_after_merge(sdp_state, state_stream->rtp, sdp_state->options,
-                               sdp_state->remote_sdp, ast_sdp_get_m(sdp_state->remote_sdp, idx));
-                       break;
-               case AST_MEDIA_TYPE_IMAGE:
-                       update_udptl_after_merge(sdp_state, state_stream->udptl, sdp_state->options,
-                               sdp_state->remote_sdp, ast_sdp_get_m(sdp_state->remote_sdp, idx));
-                       break;
-               case AST_MEDIA_TYPE_UNKNOWN:
-               case AST_MEDIA_TYPE_TEXT:
-               case AST_MEDIA_TYPE_END:
-                       /* All unsupported streams are declined */
-                       ast_assert(0);
-                       break;
-               }
-       }
-       sdp_state_cb_postapply_topology(sdp_state, capabilities->topology);
-}
-
-static void set_negotiated_capabilities(struct ast_sdp_state *sdp_state,
-       struct sdp_state_capabilities *new_capabilities)
-{
-       struct sdp_state_capabilities *old_capabilities = sdp_state->negotiated_capabilities;
-
-       sdp_state->negotiated_capabilities = new_capabilities;
-       sdp_state_capabilities_free(old_capabilities);
-}
-
-static void set_proposed_capabilities(struct ast_sdp_state *sdp_state,
-       struct sdp_state_capabilities *new_capabilities)
-{
-       struct sdp_state_capabilities *old_capabilities = sdp_state->proposed_capabilities;
-
-       sdp_state->proposed_capabilities = new_capabilities;
-       sdp_state_capabilities_free(old_capabilities);
-}
-
-/*!
- * \internal
- * \brief Copy the new capabilities into the proposed capabilities.
- * \since 15.0.0
- *
- * \param sdp_state The current SDP state
- * \param new_capabilities Capabilities to copy
- *
- * \retval 0 on success.
- * \retval -1 on failure.
- */
-static int update_proposed_capabilities(struct ast_sdp_state *sdp_state,
-       struct sdp_state_capabilities *new_capabilities)
-{
-       struct sdp_state_capabilities *proposed_capabilities;
-       int idx;
-
-       proposed_capabilities = ast_calloc(1, sizeof(*proposed_capabilities));
-       if (!proposed_capabilities) {
-               return -1;
-       }
-
-       proposed_capabilities->topology = ast_stream_topology_clone(new_capabilities->topology);
-       if (!proposed_capabilities->topology) {
-               goto fail;
-       }
-
-       if (AST_VECTOR_INIT(&proposed_capabilities->streams,
-               AST_VECTOR_SIZE(&new_capabilities->streams))) {
-               goto fail;
-       }
-
-       for (idx = 0; idx < AST_VECTOR_SIZE(&new_capabilities->streams); ++idx) {
-               struct sdp_state_stream *proposed_state_stream;
-               struct sdp_state_stream *new_state_stream;
-
-               proposed_state_stream = ast_calloc(1, sizeof(*proposed_state_stream));
-               if (!proposed_state_stream) {
-                       goto fail;
-               }
-
-               new_state_stream = AST_VECTOR_GET(&new_capabilities->streams, idx);
-               *proposed_state_stream = *new_state_stream;
-
-               switch (proposed_state_stream->type) {
-               case AST_MEDIA_TYPE_AUDIO:
-               case AST_MEDIA_TYPE_VIDEO:
-                       ao2_bump(proposed_state_stream->rtp);
-                       break;
-               case AST_MEDIA_TYPE_IMAGE:
-                       ao2_bump(proposed_state_stream->udptl);
-                       break;
-               case AST_MEDIA_TYPE_UNKNOWN:
-               case AST_MEDIA_TYPE_TEXT:
-               case AST_MEDIA_TYPE_END:
-                       break;
-               }
-
-               /* This is explicitly never set on the proposed capabilities struct */
-               proposed_state_stream->remotely_held = 0;
-
-               if (AST_VECTOR_APPEND(&proposed_capabilities->streams, proposed_state_stream)) {
-                       sdp_state_stream_free(proposed_state_stream);
-                       goto fail;
-               }
-       }
-
-       set_proposed_capabilities(sdp_state, proposed_capabilities);
-       return 0;
-
-fail:
-       sdp_state_capabilities_free(proposed_capabilities);
-       return -1;
-}
-
-static struct ast_sdp *sdp_create_from_state(const struct ast_sdp_state *sdp_state,
-       const struct sdp_state_capabilities *capabilities);
-
-/*!
- * \brief Merge SDPs into a joint SDP.
- *
- * This function is used to take a remote SDP and merge it with our local
- * capabilities to produce a new local SDP.  After creating the new local SDP,
- * it then iterates through media instances and updates them as necessary.  For
- * instance, if a specific RTP feature is supported by both us and the far end,
- * then we can ensure that the feature is enabled.
- *
- * \param sdp_state The current SDP state
- *
- * \retval 0 Success
- * \retval -1 Failure
- *         Use ast_sdp_state_is_offer_rejected() to see if the offer SDP was rejected.
- */
-static int merge_sdps(struct ast_sdp_state *sdp_state, const struct ast_sdp *remote_sdp)
-{
-       struct sdp_state_capabilities *joint_capabilities;
-       struct ast_stream_topology *remote_capabilities;
-
-       remote_capabilities = ast_get_topology_from_sdp(remote_sdp,
-               ast_sdp_options_get_g726_non_standard(sdp_state->options));
-       if (!remote_capabilities) {
-               return -1;
-       }
-
-       joint_capabilities = merge_remote_capabilities(sdp_state, remote_capabilities);
-       ast_stream_topology_free(remote_capabilities);
-       if (!joint_capabilities) {
-               return -1;
-       }
-       if (sdp_state->role == SDP_ROLE_ANSWERER) {
-               sdp_state->remote_offer_rejected =
-                       sdp_topology_is_rejected(joint_capabilities->topology) ? 1 : 0;
-               if (sdp_state->remote_offer_rejected) {
-                       sdp_state_capabilities_free(joint_capabilities);
-                       return -1;
-               }
-       }
-       set_negotiated_capabilities(sdp_state, joint_capabilities);
-
-       ao2_cleanup(sdp_state->remote_sdp);
-       sdp_state->remote_sdp = ao2_bump((struct ast_sdp *) remote_sdp);
-
-       sdp_apply_negotiated_state(sdp_state);
-
-       return 0;
-}
-
-const struct ast_sdp *ast_sdp_state_get_local_sdp(struct ast_sdp_state *sdp_state)
-{
-       ast_assert(sdp_state != NULL);
-
-       switch (sdp_state->role) {
-       case SDP_ROLE_NOT_SET:
-               ast_assert(sdp_state->local_sdp == NULL);
-               sdp_state->role = SDP_ROLE_OFFERER;
-
-               if (sdp_state->pending_topology_update) {
-                       struct sdp_state_capabilities *capabilities;
-
-                       /* We have a topology update to perform before generating the offer */
-                       capabilities = merge_local_capabilities(sdp_state,
-                               sdp_state->pending_topology_update);
-                       if (!capabilities) {
-                               break;
-                       }
-                       ast_stream_topology_free(sdp_state->pending_topology_update);
-                       sdp_state->pending_topology_update = NULL;
-                       set_proposed_capabilities(sdp_state, capabilities);
-               }
-
-               /*
-                * Allow the system to configure the topology streams
-                * before we create the offer SDP.
-                */
-               sdp_state_cb_offerer_config_topology(sdp_state,
-                       sdp_state->proposed_capabilities->topology);
-
-               sdp_state->local_sdp = sdp_create_from_state(sdp_state, sdp_state->proposed_capabilities);
-               break;
-       case SDP_ROLE_OFFERER:
-               break;
-       case SDP_ROLE_ANSWERER:
-               if (!sdp_state->local_sdp
-                       && sdp_state->negotiated_capabilities
-                       && !sdp_state->remote_offer_rejected) {
-                       sdp_state->local_sdp = sdp_create_from_state(sdp_state, sdp_state->negotiated_capabilities);
-               }
-               break;
-       }
-
-       return sdp_state->local_sdp;
-}
-
-const void *ast_sdp_state_get_local_sdp_impl(struct ast_sdp_state *sdp_state)
-{
-       const struct ast_sdp *sdp = ast_sdp_state_get_local_sdp(sdp_state);
-
-       if (!sdp) {
-               return NULL;
-       }
-
-       return ast_sdp_translator_from_sdp(sdp_state->translator, sdp);
-}
-
-int ast_sdp_state_set_remote_sdp(struct ast_sdp_state *sdp_state, const struct ast_sdp *sdp)
-{
-       ast_assert(sdp_state != NULL);
-
-       if (sdp_state->role == SDP_ROLE_NOT_SET) {
-               sdp_state->role = SDP_ROLE_ANSWERER;
-       }
-
-       return merge_sdps(sdp_state, sdp);
-}
-
-int ast_sdp_state_set_remote_sdp_from_impl(struct ast_sdp_state *sdp_state, const void *remote)
-{
-       struct ast_sdp *sdp;
-       int ret;
-
-       ast_assert(sdp_state != NULL);
-
-       sdp = ast_sdp_translator_to_sdp(sdp_state->translator, remote);
-       if (!sdp) {
-               return -1;
-       }
-       ret = ast_sdp_state_set_remote_sdp(sdp_state, sdp);
-       ao2_ref(sdp, -1);
-       return ret;
-}
-
-int ast_sdp_state_is_offer_rejected(struct ast_sdp_state *sdp_state)
-{
-       return sdp_state->remote_offer_rejected;
-}
-
-int ast_sdp_state_is_offerer(struct ast_sdp_state *sdp_state)
-{
-       return sdp_state->role == SDP_ROLE_OFFERER;
-}
-
-int ast_sdp_state_is_answerer(struct ast_sdp_state *sdp_state)
-{
-       return sdp_state->role == SDP_ROLE_ANSWERER;
-}
-
-int ast_sdp_state_restart_negotiations(struct ast_sdp_state *sdp_state)
-{
-       ast_assert(sdp_state != NULL);
-
-       ao2_cleanup(sdp_state->local_sdp);
-       sdp_state->local_sdp = NULL;
-
-       sdp_state->role = SDP_ROLE_NOT_SET;
-       sdp_state->remote_offer_rejected = 0;
-
-       if (sdp_state->negotiated_capabilities) {
-               update_proposed_capabilities(sdp_state, sdp_state->negotiated_capabilities);
-       }
-
-       return 0;
-}
-
-int ast_sdp_state_update_local_topology(struct ast_sdp_state *sdp_state, struct ast_stream_topology *topology)
-{
-       struct ast_stream_topology *merged_topology;
-
-       ast_assert(sdp_state != NULL);
-       ast_assert(topology != NULL);
-
-       if (sdp_state->pending_topology_update) {
-               merged_topology = merge_local_topologies(sdp_state,
-                       sdp_state->pending_topology_update, topology, 0);
-               if (!merged_topology) {
-                       return -1;
-               }
-               ast_stream_topology_free(sdp_state->pending_topology_update);
-               sdp_state->pending_topology_update = merged_topology;
-       } else {
-               sdp_state->pending_topology_update = ast_stream_topology_clone(topology);
-               if (!sdp_state->pending_topology_update) {
-                       return -1;
-               }
-       }
-
-       return 0;
-}
-
-void ast_sdp_state_set_local_address(struct ast_sdp_state *sdp_state, struct ast_sockaddr *address)
-{
-       ast_assert(sdp_state != NULL);
-
-       if (!address) {
-               ast_sockaddr_setnull(&sdp_state->connection_address);
-       } else {
-               ast_sockaddr_copy(&sdp_state->connection_address, address);
-       }
-}
-
-int ast_sdp_state_set_connection_address(struct ast_sdp_state *sdp_state, int stream_index,
-       struct ast_sockaddr *address)
-{
-       struct sdp_state_stream *stream_state;
-       ast_assert(sdp_state != NULL);
-
-       stream_state = sdp_state_get_stream(sdp_state, stream_index);
-       if (!stream_state) {
-               return -1;
-       }
-
-       if (!address) {
-               ast_sockaddr_setnull(&stream_state->connection_address);
-       } else {
-               ast_sockaddr_copy(&stream_state->connection_address, address);
-       }
-
-       return 0;
-}
-
-void ast_sdp_state_set_global_locally_held(struct ast_sdp_state *sdp_state, unsigned int locally_held)
-{
-       ast_assert(sdp_state != NULL);
-
-       sdp_state->locally_held = locally_held ? 1 : 0;
-}
-
-unsigned int ast_sdp_state_get_global_locally_held(const struct ast_sdp_state *sdp_state)
-{
-       ast_assert(sdp_state != NULL);
-
-       return sdp_state->locally_held;
-}
-
-void ast_sdp_state_set_locally_held(struct ast_sdp_state *sdp_state,
-       int stream_index, unsigned int locally_held)
-{
-       struct sdp_state_stream *stream_state;
-       ast_assert(sdp_state != NULL);
-
-       locally_held = locally_held ? 1 : 0;
-
-       stream_state = sdp_state_get_joint_stream(sdp_state, stream_index);
-       if (stream_state) {
-               stream_state->locally_held = locally_held;
-       }
-
-       stream_state = sdp_state_get_stream(sdp_state, stream_index);
-       if (stream_state) {
-               stream_state->locally_held = locally_held;
-       }
-}
-
-unsigned int ast_sdp_state_get_locally_held(const struct ast_sdp_state *sdp_state,
-       int stream_index)
-{
-       struct sdp_state_stream *stream_state;
-       ast_assert(sdp_state != NULL);
-
-       stream_state = sdp_state_get_joint_stream(sdp_state, stream_index);
-       if (!stream_state) {
-               return 0;
-       }
-
-       return stream_state->locally_held;
-}
-
-unsigned int ast_sdp_state_get_remotely_held(const struct ast_sdp_state *sdp_state,
-       int stream_index)
-{
-       struct sdp_state_stream *stream_state;
-
-       ast_assert(sdp_state != NULL);
-
-       stream_state = sdp_state_get_joint_stream(sdp_state, stream_index);
-       if (!stream_state) {
-               return 0;
-       }
-
-       return stream_state->remotely_held;
-}
-
-void ast_sdp_state_set_t38_parameters(struct ast_sdp_state *sdp_state,
-       int stream_index, struct ast_control_t38_parameters *params)
-{
-       struct sdp_state_stream *stream_state;
-       ast_assert(sdp_state != NULL && params != NULL);
-
-       stream_state = sdp_state_get_stream(sdp_state, stream_index);
-       if (stream_state) {
-               stream_state->t38_local_params = *params;
-       }
-}
-
-/*!
- * \brief Add SSRC-level attributes if appropriate.
- *
- * This function does nothing if the SDP options indicate not to add SSRC-level attributes.
- *
- * Currently, the only attribute added is cname, which is retrieved from the RTP instance.
- *
- * \param m_line The m_line on which to add the SSRC attributes
- * \param options Options that indicate what, if any, SSRC attributes to add
- * \param rtp RTP instance from which we get SSRC-level information
- */
-static void add_ssrc_attributes(struct ast_sdp_m_line *m_line, const struct ast_sdp_options *options,
-       struct ast_rtp_instance *rtp)
-{
-       struct ast_sdp_a_line *a_line;
-       char attr_buffer[128];
-
-       if (!ast_sdp_options_get_ssrc(options)) {
-               return;
-       }
-
-       snprintf(attr_buffer, sizeof(attr_buffer), "%u cname:%s", ast_rtp_instance_get_ssrc(rtp),
-               ast_rtp_instance_get_cname(rtp));
-
-       a_line = ast_sdp_a_alloc("ssrc", attr_buffer);
-       if (!a_line) {
-               return;
-       }
-       ast_sdp_m_add_a(m_line, a_line);
-}
-
-/*!
- * \internal
- * \brief Create a declined m-line from a remote requested stream.
- * \since 15.0.0
- *
- * \details
- * Using the last received remote SDP create a declined stream
- * m-line for the requested stream.  The stream may be unsupported.
- *
- * \param sdp Our SDP under construction to append the declined stream.
- * \param sdp_state
- * \param stream_index Which remote SDP stream we are declining.
- *
- * \retval 0 on success.
- * \retval -1 on failure.
- */
-static int sdp_add_m_from_declined_remote_stream(struct ast_sdp *sdp,
-       const struct ast_sdp_state *sdp_state, int stream_index)
-{
-       const struct ast_sdp_m_line *m_line_remote;
-       struct ast_sdp_m_line *m_line;
-       int idx;
-
-       ast_assert(sdp && sdp_state && sdp_state->remote_sdp);
-       ast_assert(stream_index < ast_sdp_get_m_count(sdp_state->remote_sdp));
-
-       /*
-        * The only way we can generate a declined unsupported stream
-        * m-line is if the remote offered it to us.
-        */
-       m_line_remote = ast_sdp_get_m(sdp_state->remote_sdp, stream_index);
-
-       /* Copy remote SDP stream m-line except for port number. */
-       m_line = ast_sdp_m_alloc(m_line_remote->type, 0, m_line_remote->port_count,
-               m_line_remote->proto, NULL);
-       if (!m_line) {
-               return -1;
-       }
-
-       /* Copy any m-line payload strings from the remote SDP */
-       for (idx = 0; idx < ast_sdp_m_get_payload_count(m_line_remote); ++idx) {
-               const struct ast_sdp_payload *payload_remote;
-               struct ast_sdp_payload *payload;
-
-               payload_remote = ast_sdp_m_get_payload(m_line_remote, idx);
-               payload = ast_sdp_payload_alloc(payload_remote->fmt);
-               if (!payload) {
-                       ast_sdp_m_free(m_line);
-                       return -1;
-               }
-               if (ast_sdp_m_add_payload(m_line, payload)) {
-                       ast_sdp_payload_free(payload);
-                       ast_sdp_m_free(m_line);
-                       return -1;
-               }
-       }
-
-       if (ast_sdp_add_m(sdp, m_line)) {
-               ast_sdp_m_free(m_line);
-               return -1;
-       }
-
-       return 0;
-}
-
-/*!
- * \internal
- * \brief Create a declined m-line for our SDP stream.
- * \since 15.0.0
- *
- * \param sdp Our SDP under construction to append the declined stream.
- * \param sdp_state
- * \param type Stream type we are declining.
- * \param stream_index Which remote SDP stream we are declining.
- *
- * \retval 0 on success.
- * \retval -1 on failure.
- */
-static int sdp_add_m_from_declined_stream(struct ast_sdp *sdp,
-       const struct ast_sdp_state *sdp_state, enum ast_media_type type, int stream_index)
-{
-       struct ast_sdp_m_line *m_line;
-       const char *proto;
-       const char *fmt;
-       struct ast_sdp_payload *payload;
-
-       if (sdp_state->role == SDP_ROLE_ANSWERER) {
-               /* We are declining the remote stream or it is still declined. */
-               return sdp_add_m_from_declined_remote_stream(sdp, sdp_state, stream_index);
-       }
-
-       /* Send declined remote stream in our offer if the type matches. */
-       if (sdp_state->remote_sdp
-               && stream_index < ast_sdp_get_m_count(sdp_state->remote_sdp)) {
-               if (!sdp_is_stream_type_supported(type)
-                       || !strcasecmp(ast_sdp_get_m(sdp_state->remote_sdp, stream_index)->type,
-                               ast_codec_media_type2str(type))) {
-                       /* Stream is still declined */
-                       return sdp_add_m_from_declined_remote_stream(sdp, sdp_state, stream_index);
-               }
-       }
-
-       /* Build a new declined stream in our offer. */
-       switch (type) {
-       case AST_MEDIA_TYPE_AUDIO:
-       case AST_MEDIA_TYPE_VIDEO:
-               proto = "RTP/AVP";
-               break;
-       case AST_MEDIA_TYPE_IMAGE:
-               proto = "udptl";
-               break;
-       default:
-               /* Stream type not supported */
-               ast_assert(0);
-               return -1;
-       }
-       m_line = ast_sdp_m_alloc(ast_codec_media_type2str(type), 0, 1, proto, NULL);
-       if (!m_line) {
-               return -1;
-       }
-
-       /* Add a dummy static payload type */
-       switch (type) {
-       case AST_MEDIA_TYPE_AUDIO:
-               fmt = "0"; /* ulaw */
-               break;
-       case AST_MEDIA_TYPE_VIDEO:
-               fmt = "31"; /* H.261 */
-               break;
-       case AST_MEDIA_TYPE_IMAGE:
-               fmt = "t38"; /* T.38 */
-               break;
-       default:
-               /* Stream type not supported */
-               ast_assert(0);
-               ast_sdp_m_free(m_line);
-               return -1;
-       }
-       payload = ast_sdp_payload_alloc(fmt);
-       if (!payload || ast_sdp_m_add_payload(m_line, payload)) {
-               ast_sdp_payload_free(payload);
-               ast_sdp_m_free(m_line);
-               return -1;
-       }
-
-       if (ast_sdp_add_m(sdp, m_line)) {
-               ast_sdp_m_free(m_line);
-               return -1;
-       }
-
-       return 0;
-}
-
-static int sdp_add_m_from_rtp_stream(struct ast_sdp *sdp, const struct ast_sdp_state *sdp_state,
-       const struct sdp_state_capabilities *capabilities, int stream_index)
-{
-       struct ast_stream *stream;
-       struct ast_sdp_m_line *m_line;
-       struct ast_format_cap *caps;
-       int i;
-       int rtp_code;
-       int rtp_port;
-       int min_packet_size = 0;
-       int max_packet_size = 0;
-       enum ast_media_type media_type;
-       char tmp[64];
-       struct sdp_state_stream *stream_state;
-       struct ast_rtp_instance *rtp;
-       struct ast_sdp_a_line *a_line;
-       const struct ast_sdp_options *options;
-       const char *direction;
-
-       stream = ast_stream_topology_get_stream(capabilities->topology, stream_index);
-
-       ast_assert(sdp && sdp_state && stream);
-
-       options = sdp_state->options;
-       caps = ast_stream_get_formats(stream);
-
-       stream_state = AST_VECTOR_GET(&capabilities->streams, stream_index);
-       if (stream_state->rtp && caps && ast_format_cap_count(caps)
-               && AST_STREAM_STATE_REMOVED != ast_stream_get_state(stream)) {
-               rtp = stream_state->rtp->instance;
-       } else {
-               /* This is a disabled stream */
-               rtp = NULL;
-       }
-
-       if (rtp) {
-               struct ast_sockaddr address_rtp;
-
-               if (sdp_state_stream_get_connection_address(sdp_state, stream_state, &address_rtp)) {
-                       return -1;
-               }
-               rtp_port = ast_sockaddr_port(&address_rtp);
-       } else {
-               rtp_port = 0;
-       }
-
-       media_type = ast_stream_get_type(stream);
-       if (!rtp_port) {
-               /* Declined/disabled stream */
-               return sdp_add_m_from_declined_stream(sdp, sdp_state, media_type, stream_index);
-       }
-
-       /* Stream is not declined/disabled */
-       m_line = ast_sdp_m_alloc(ast_codec_media_type2str(media_type), rtp_port, 1,
-               options->encryption != AST_SDP_ENCRYPTION_DISABLED ? "RTP/SAVP" : "RTP/AVP",
-               NULL);
-       if (!m_line) {
-               return -1;
-       }
-
-       for (i = 0; i < ast_format_cap_count(caps); i++) {
-               struct ast_format *format = ast_format_cap_get_format(caps, i);
-
-               rtp_code = ast_rtp_codecs_payload_code(ast_rtp_instance_get_codecs(rtp), 1,
-                       format, 0);
-               if (rtp_code == -1) {
-                       ast_log(LOG_WARNING,"Unable to get rtp codec payload code for %s\n",
-                               ast_format_get_name(format));
-                       ao2_ref(format, -1);
-                       continue;
-               }
-
-               if (ast_sdp_m_add_format(m_line, options, rtp_code, 1, format, 0)) {
-                       ast_sdp_m_free(m_line);
-                       ao2_ref(format, -1);
-                       return -1;
-               }
-
-               if (ast_format_get_maximum_ms(format)
-                       && ((ast_format_get_maximum_ms(format) < max_packet_size)
-                               || !max_packet_size)) {
-                       max_packet_size = ast_format_get_maximum_ms(format);
-               }
-
-               ao2_ref(format, -1);
-       }
-
-       if (media_type != AST_MEDIA_TYPE_VIDEO
-               && (options->dtmf == AST_SDP_DTMF_RFC_4733 || options->dtmf == AST_SDP_DTMF_AUTO)) {
-               i = AST_RTP_DTMF;
-               rtp_code = ast_rtp_codecs_payload_code(
-                       ast_rtp_instance_get_codecs(rtp), 0, NULL, i);
-               if (-1 < rtp_code) {
-                       if (ast_sdp_m_add_format(m_line, options, rtp_code, 0, NULL, i)) {
-                               ast_sdp_m_free(m_line);
-                               return -1;
-                       }
-
-                       snprintf(tmp, sizeof(tmp), "%d 0-16", rtp_code);
-                       a_line = ast_sdp_a_alloc("fmtp", tmp);
-                       if (!a_line || ast_sdp_m_add_a(m_line, a_line)) {
-                               ast_sdp_a_free(a_line);
-                               ast_sdp_m_free(m_line);
-                               return -1;
-                       }
-               }
-       }
-
-       /* If ptime is set add it as an attribute */
-       min_packet_size = ast_rtp_codecs_get_framing(ast_rtp_instance_get_codecs(rtp));
-       if (!min_packet_size) {
-               min_packet_size = ast_format_cap_get_framing(caps);
-       }
-       if (min_packet_size) {
-               snprintf(tmp, sizeof(tmp), "%d", min_packet_size);
-
-               a_line = ast_sdp_a_alloc("ptime", tmp);
-               if (!a_line || ast_sdp_m_add_a(m_line, a_line)) {
-                       ast_sdp_a_free(a_line);
-                       ast_sdp_m_free(m_line);
-                       return -1;
-               }
-       }
-
-       if (max_packet_size) {
-               snprintf(tmp, sizeof(tmp), "%d", max_packet_size);
-               a_line = ast_sdp_a_alloc("maxptime", tmp);
-               if (!a_line || ast_sdp_m_add_a(m_line, a_line)) {
-                       ast_sdp_a_free(a_line);
-                       ast_sdp_m_free(m_line);
-                       return -1;
-               }
-       }
-
-       if (sdp_state->locally_held || stream_state->locally_held) {
-               if (stream_state->remotely_held) {
-                       direction = "inactive";
-               } else {
-                       direction = "sendonly";
-               }
-       } else {
-               if (stream_state->remotely_held) {
-                       direction = "recvonly";
-               } else {
-                       /* Default is "sendrecv" */
-                       direction = NULL;
-               }
-       }
-       if (direction) {
-               a_line = ast_sdp_a_alloc(direction, "");
-               if (!a_line || ast_sdp_m_add_a(m_line, a_line)) {
-                       ast_sdp_a_free(a_line);
-                       ast_sdp_m_free(m_line);
-                       return -1;
-               }
-       }
-
-       add_ssrc_attributes(m_line, options, rtp);
-
-       if (ast_sdp_add_m(sdp, m_line)) {
-               ast_sdp_m_free(m_line);
-               return -1;
-       }
-
-       return 0;
-}
-
-/*! \brief Get Max T.38 Transmission rate from T38 capabilities */
-static unsigned int t38_get_rate(enum ast_control_t38_rate rate)
-{
-       switch (rate) {
-       case AST_T38_RATE_2400:
-               return 2400;
-       case AST_T38_RATE_4800:
-               return 4800;
-       case AST_T38_RATE_7200:
-               return 7200;
-       case AST_T38_RATE_9600:
-               return 9600;
-       case AST_T38_RATE_12000:
-               return 12000;
-       case AST_T38_RATE_14400:
-               return 14400;
-       default:
-               return 0;
-       }
-}
-
-static int sdp_add_m_from_udptl_stream(struct ast_sdp *sdp, const struct ast_sdp_state *sdp_state,
-       const struct sdp_state_capabilities *capabilities, int stream_index)
-{
-       struct ast_stream *stream;
-       struct ast_sdp_m_line *m_line;
-       struct ast_sdp_payload *payload;
-       enum ast_media_type media_type;
-       char tmp[64];
-       struct sdp_state_udptl *udptl;
-       struct ast_sdp_a_line *a_line;
-       struct sdp_state_stream *stream_state;
-       int udptl_port;
-
-       stream = ast_stream_topology_get_stream(capabilities->topology, stream_index);
-
-       ast_assert(sdp && sdp_state && stream);
-
-       stream_state = AST_VECTOR_GET(&capabilities->streams, stream_index);
-       if (stream_state->udptl
-               && AST_STREAM_STATE_REMOVED != ast_stream_get_state(stream)) {
-               udptl = stream_state->udptl;
-       } else {
-               /* This is a disabled stream */
-               udptl = NULL;
-       }
-
-       if (udptl) {
-               struct ast_sockaddr address_udptl;
-
-               if (sdp_state_stream_get_connection_address(sdp_state, stream_state, &address_udptl)) {
-                       return -1;
-               }
-               udptl_port = ast_sockaddr_port(&address_udptl);
-       } else {
-               udptl_port = 0;
-       }
-
-       media_type = ast_stream_get_type(stream);
-       if (!udptl_port) {
-               /* Declined/disabled stream */
-               return sdp_add_m_from_declined_stream(sdp, sdp_state, media_type, stream_index);
-       }
-
-       /* Stream is not declined/disabled */
-       m_line = ast_sdp_m_alloc(ast_codec_media_type2str(media_type), udptl_port, 1,
-               "udptl", NULL);
-       if (!m_line) {
-               return -1;
-       }
-
-       payload = ast_sdp_payload_alloc("t38");
-       if (!payload || ast_sdp_m_add_payload(m_line, payload)) {
-               ast_sdp_payload_free(payload);
-               ast_sdp_m_free(m_line);
-               return -1;
-       }
-
-       snprintf(tmp, sizeof(tmp), "%u", stream_state->t38_local_params.version);
-       a_line = ast_sdp_a_alloc("T38FaxVersion", tmp);
-       if (!a_line || ast_sdp_m_add_a(m_line, a_line)) {
-               ast_sdp_a_free(a_line);
-               ast_sdp_m_free(m_line);
-               return -1;
-       }
-
-       snprintf(tmp, sizeof(tmp), "%u", t38_get_rate(stream_state->t38_local_params.rate));
-       a_line = ast_sdp_a_alloc("T38FaxMaxBitRate", tmp);
-       if (!a_line || ast_sdp_m_add_a(m_line, a_line)) {
-               ast_sdp_a_free(a_line);
-               ast_sdp_m_free(m_line);
-               return -1;
-       }
-
-       if (stream_state->t38_local_params.fill_bit_removal) {
-               a_line = ast_sdp_a_alloc("T38FaxFillBitRemoval", "");
-               if (!a_line || ast_sdp_m_add_a(m_line, a_line)) {
-                       ast_sdp_a_free(a_line);
-                       ast_sdp_m_free(m_line);
-                       return -1;
-               }
-       }
-
-       if (stream_state->t38_local_params.transcoding_mmr) {
-               a_line = ast_sdp_a_alloc("T38FaxTranscodingMMR", "");
-               if (!a_line || ast_sdp_m_add_a(m_line, a_line)) {
-                       ast_sdp_a_free(a_line);
-                       ast_sdp_m_free(m_line);
-                       return -1;
-               }
-       }
-
-       if (stream_state->t38_local_params.transcoding_jbig) {
-               a_line = ast_sdp_a_alloc("T38FaxTranscodingJBIG", "");
-               if (!a_line || ast_sdp_m_add_a(m_line, a_line)) {
-                       ast_sdp_a_free(a_line);
-                       ast_sdp_m_free(m_line);
-                       return -1;
-               }
-       }
-
-       switch (stream_state->t38_local_params.rate_management) {
-       case AST_T38_RATE_MANAGEMENT_TRANSFERRED_TCF:
-               a_line = ast_sdp_a_alloc("T38FaxRateManagement", "transferredTCF");
-               if (!a_line || ast_sdp_m_add_a(m_line, a_line)) {
-                       ast_sdp_a_free(a_line);
-                       ast_sdp_m_free(m_line);
-                       return -1;
-               }
-               break;
-       case AST_T38_RATE_MANAGEMENT_LOCAL_TCF:
-               a_line = ast_sdp_a_alloc("T38FaxRateManagement", "localTCF");
-               if (!a_line || ast_sdp_m_add_a(m_line, a_line)) {
-                       ast_sdp_a_free(a_line);
-                       ast_sdp_m_free(m_line);
-                       return -1;
-               }
-               break;
-       }
-
-       snprintf(tmp, sizeof(tmp), "%u", ast_udptl_get_local_max_datagram(udptl->instance));
-       a_line = ast_sdp_a_alloc("T38FaxMaxDatagram", tmp);
-       if (!a_line || ast_sdp_m_add_a(m_line, a_line)) {
-               ast_sdp_a_free(a_line);
-               ast_sdp_m_free(m_line);
-               return -1;
-       }
-
-       switch (ast_udptl_get_error_correction_scheme(udptl->instance)) {
-       case UDPTL_ERROR_CORRECTION_NONE:
-               break;
-       case UDPTL_ERROR_CORRECTION_FEC:
-               a_line = ast_sdp_a_alloc("T38FaxUdpEC", "t38UDPFEC");
-               if (!a_line || ast_sdp_m_add_a(m_line, a_line)) {
-                       ast_sdp_a_free(a_line);
-                       ast_sdp_m_free(m_line);
-                       return -1;
-               }
-               break;
-       case UDPTL_ERROR_CORRECTION_REDUNDANCY:
-               a_line = ast_sdp_a_alloc("T38FaxUdpEC", "t38UDPRedundancy");
-               if (!a_line || ast_sdp_m_add_a(m_line, a_line)) {
-                       ast_sdp_a_free(a_line);
-                       ast_sdp_m_free(m_line);
-                       return -1;
-               }
-               break;
-       }
-
-       if (ast_sdp_add_m(sdp, m_line)) {
-               ast_sdp_m_free(m_line);
-               return -1;
-       }
-
-       return 0;
-}
-
-/*!
- * \brief Create an SDP based on current SDP state
- *
- * \param sdp_state The current SDP state
- * \retval NULL Failed to create SDP
- * \retval non-NULL Newly-created SDP
- */
-static struct ast_sdp *sdp_create_from_state(const struct ast_sdp_state *sdp_state,
-       const struct sdp_state_capabilities *capabilities)
-{
-       struct ast_sdp *sdp = NULL;
-       struct ast_stream_topology *topology;
-       const struct ast_sdp_options *options;
-       int stream_num;
-       struct ast_sdp_o_line *o_line = NULL;
-       struct ast_sdp_c_line *c_line = NULL;
-       struct ast_sdp_s_line *s_line = NULL;
-       struct ast_sdp_t_line *t_line = NULL;
-       char *address_type;
-       struct timeval tv = ast_tvnow();
-       uint32_t t;
-       int stream_count;
-
-       options = sdp_state->options;
-       topology = capabilities->topology;
-
-       t = tv.tv_sec + 2208988800UL;
-       address_type = (strchr(options->media_address, ':') ? "IP6" : "IP4");
-
-       o_line = ast_sdp_o_alloc(options->sdpowner, t, t, address_type, options->media_address);
-       if (!o_line) {
-               goto error;
-       }
-       c_line = ast_sdp_c_alloc(address_type, options->media_address);
-       if (!c_line) {
-               goto error;
-       }
-       s_line = ast_sdp_s_alloc(options->sdpsession);
-       if (!s_line) {
-               goto error;
-       }
-       t_line = ast_sdp_t_alloc(0, 0);
-       if (!t_line) {
-               goto error;
-       }
-
-       sdp = ast_sdp_alloc(o_line, c_line, s_line, t_line);
-       if (!sdp) {
-               goto error;
-       }
-
-       stream_count = ast_stream_topology_get_count(topology);
-       for (stream_num = 0; stream_num < stream_count; stream_num++) {
-               switch (ast_stream_get_type(ast_stream_topology_get_stream(topology, stream_num))) {
-               case AST_MEDIA_TYPE_AUDIO:
-               case AST_MEDIA_TYPE_VIDEO:
-                       if (sdp_add_m_from_rtp_stream(sdp, sdp_state, capabilities, stream_num)) {
-                               goto error;
-                       }
-                       break;
-               case AST_MEDIA_TYPE_IMAGE:
-                       if (sdp_add_m_from_udptl_stream(sdp, sdp_state, capabilities, stream_num)) {
-                               goto error;
-                       }
-                       break;
-               case AST_MEDIA_TYPE_UNKNOWN:
-               case AST_MEDIA_TYPE_TEXT:
-               case AST_MEDIA_TYPE_END:
-                       /* Decline any of these streams from the remote. */
-                       if (sdp_add_m_from_declined_remote_stream(sdp, sdp_state, stream_num)) {
-                               goto error;
-                       }
-                       break;
-               }
-       }
-
-       return sdp;
-
-error:
-       if (sdp) {
-               ao2_ref(sdp, -1);
-       } else {
-               ast_sdp_t_free(t_line);
-               ast_sdp_s_free(s_line);
-               ast_sdp_c_free(c_line);
-               ast_sdp_o_free(o_line);
-       }
-
-       return NULL;
-}
diff --git a/main/sdp_translator.c b/main/sdp_translator.c
deleted file mode 100644 (file)
index 6fe330a..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2017, Digium, Inc.
- *
- * Mark Michelson <mmichelson@digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-#include "asterisk.h"
-#include "asterisk/sdp_options.h"
-#include "asterisk/sdp_translator.h"
-#include "asterisk/logger.h"
-#include "asterisk/utils.h"
-#include "asterisk/lock.h"
-
-AST_RWLOCK_DEFINE_STATIC(registered_ops_lock);
-static struct ast_sdp_translator_ops *registered_ops[AST_SDP_IMPL_END];
-
-int ast_sdp_register_translator(struct ast_sdp_translator_ops *ops)
-{
-       SCOPED_WRLOCK(lock, &registered_ops_lock);
-
-       if (ops->repr >= AST_SDP_IMPL_END) {
-               ast_log(LOG_ERROR, "SDP translator has unrecognized representation\n");
-               return -1;
-       }
-
-       if (registered_ops[ops->repr] != NULL) {
-               ast_log(LOG_ERROR, "SDP_translator with this representation already registered\n");
-               return -1;
-       }
-
-       registered_ops[ops->repr] = ops;
-       ast_log(LOG_NOTICE, "Placed ops %p at slot %d\n", ops, ops->repr);
-       return 0;
-}
-
-void ast_sdp_unregister_translator(struct ast_sdp_translator_ops *ops)
-{
-       SCOPED_WRLOCK(lock, &registered_ops_lock);
-
-       if (ops->repr >= AST_SDP_IMPL_END) {
-               return;
-       }
-
-       registered_ops[ops->repr] = NULL;
-}
-
-struct ast_sdp_translator *ast_sdp_translator_new(enum ast_sdp_options_impl repr)
-{
-       struct ast_sdp_translator *translator;
-       SCOPED_RDLOCK(lock, &registered_ops_lock);
-
-       if (registered_ops[repr] == NULL) {
-               ast_log(LOG_NOTICE, "No registered SDP translator with representation %d\n", repr);
-               return NULL;
-       }
-
-       translator = ast_calloc(1, sizeof(*translator));
-       if (!translator) {
-               return NULL;
-       }
-
-       translator->ops = registered_ops[repr];
-
-       translator->translator_priv = translator->ops->translator_new();
-       if (!translator->translator_priv) {
-               ast_free(translator);
-               return NULL;
-       }
-
-       return translator;
-}
-
-void ast_sdp_translator_free(struct ast_sdp_translator *translator)
-{
-       if (!translator) {
-               return;
-       }
-       translator->ops->translator_free(translator->translator_priv);
-       ast_free(translator);
-}
-
-struct ast_sdp *ast_sdp_translator_to_sdp(struct ast_sdp_translator *translator,
-       const void *native_sdp)
-{
-       return translator->ops->to_sdp(native_sdp, translator->translator_priv);
-}
-
-const void *ast_sdp_translator_from_sdp(struct ast_sdp_translator *translator,
-       const struct ast_sdp *ast_sdp)
-{
-       return translator->ops->from_sdp(ast_sdp, translator->translator_priv);
-}
diff --git a/res/res_sdp_translator_pjmedia.c b/res/res_sdp_translator_pjmedia.c
deleted file mode 100644 (file)
index 676e740..0000000
+++ /dev/null
@@ -1,605 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2017, Digium, Inc.
- *
- * Mark Michelson <mmichelson@digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-#include "asterisk.h"
-
-#include <pjlib.h>
-#include <pjmedia.h>
-
-#include "asterisk/res_pjproject.h"
-#include "asterisk/sdp_translator.h"
-#include "asterisk/sdp_options.h"
-#include "asterisk/vector.h"
-#include "asterisk/netsock2.h"
-#include "asterisk/utils.h"
-#include "asterisk/config.h"
-#include "asterisk/test.h"
-#include "asterisk/module.h"
-
-#include "asterisk/sdp.h"
-
-/*** MODULEINFO
-       <depend>pjproject</depend>
-       <support_level>core</support_level>
- ***/
-
-/*
- * XXX TODO: The memory in the pool is held onto longer than necessary.  It
- * is kept and grows for the duration of the associated chan_pjsip session.
- *
- * The translation API does not need to be so generic.  The users will know
- * at compile time what the non-Asterisk SDP format they have or need.  They
- * should simply call the specific translation functions.  However, to make
- * this a loadable module we need to be able to keep it in memory when a
- * dependent module is loaded.
- *
- * To address both issues I propose this API:
- *
- * void ast_sdp_translate_pjmedia_ref(void) - Inc this module's user ref
- * void ast_sdp_translate_pjmedia_unref(void) - Dec this module's user ref.
- *    The res_pjsip_session.c:ast_sip_session_alloc() can call the module ref
- *    and the session's destructor can call the module unref.
- *
- * struct ast_sdp *ast_sdp_translate_pjmedia_from(const pjmedia_sdp_session *pjmedia_sdp);
- *
- * pjmedia_sdp_session *ast_sdp_translate_pjmedia_to(const struct ast_sdp *sdp, pj_pool_t *pool);
- *    Passing in a memory pool allows the memory to be obtained from an
- *    rdata memory pool that will be released when the message processing
- *    is complete.  This prevents memory from accumulating for the duration
- *    of a call.
- *
- * int ast_sdp_translate_pjmedia_set_remote_sdp(struct ast_sdp_state *sdp_state, const pjmedia_sdp_session *remote);
- * const pjmedia_sdp_session *ast_sdp_translate_pjmedia_get_local_sdp(struct ast_sdp_state *sdp_state, pj_pool_t *pool);
- *    These two functions just do the bookkeeping to translate and set or get
- *    the requested SDP.
- *
- *
- * XXX TODO: This code doesn't handle allocation failures very well.  i.e.,
- *   It assumes they will never happen.
- *
- * XXX TODO: This code uses ast_alloca() inside loops.  Doing so if the number
- *   of times through the loop is unconstrained will blow the stack.
- *   See dupa_pj_str() usage.
- */
-
-static pj_caching_pool sdp_caching_pool;
-
-
-static void *pjmedia_new(void)
-{
-       pj_pool_t *pool;
-
-       pool = pj_pool_create(&sdp_caching_pool.factory, "pjmedia sdp translator", 1024, 1024, NULL);
-
-       return pool;
-}
-
-static void pjmedia_free(void *translator_priv)
-{
-       pj_pool_t *pool = translator_priv;
-
-       pj_pool_release(pool);
-}
-
-#define dupa_pj_str(pjstr) \
-({ \
-       char *dest = ast_alloca(pjstr.slen + 1); \
-       memcpy(dest, pjstr.ptr, pjstr.slen); \
-       dest[pjstr.slen] = '\0'; \
-       dest; \
-})
-
-static struct ast_sdp_m_line *pjmedia_copy_m_line(struct pjmedia_sdp_media *pjmedia_m_line)
-{
-       int i;
-
-       struct ast_sdp_c_line *c_line = pjmedia_m_line->conn ?
-               ast_sdp_c_alloc(dupa_pj_str(pjmedia_m_line->conn->addr_type),
-               dupa_pj_str(pjmedia_m_line->conn->addr)) : NULL;
-
-       struct ast_sdp_m_line *m_line = ast_sdp_m_alloc(dupa_pj_str(pjmedia_m_line->desc.media),
-               pjmedia_m_line->desc.port, pjmedia_m_line->desc.port_count,
-               dupa_pj_str(pjmedia_m_line->desc.transport), c_line);
-
-       for (i = 0; i < pjmedia_m_line->desc.fmt_count; ++i) {
-               ast_sdp_m_add_payload(m_line,
-                       ast_sdp_payload_alloc(dupa_pj_str(pjmedia_m_line->desc.fmt[i])));
-       }
-
-       for (i = 0; i < pjmedia_m_line->attr_count; ++i) {
-               ast_sdp_m_add_a(m_line, ast_sdp_a_alloc(dupa_pj_str(pjmedia_m_line->attr[i]->name),
-                       dupa_pj_str(pjmedia_m_line->attr[i]->value)));
-       }
-
-       return m_line;
-}
-
-static void pjmedia_copy_a_lines(struct ast_sdp *new_sdp, const pjmedia_sdp_session *pjmedia_sdp)
-{
-       int i;
-
-       for (i = 0; i < pjmedia_sdp->attr_count; ++i) {
-               ast_sdp_add_a(new_sdp, ast_sdp_a_alloc(dupa_pj_str(pjmedia_sdp->attr[i]->name),
-                       dupa_pj_str(pjmedia_sdp->attr[i]->value)));
-       }
-}
-
-static void pjmedia_copy_m_lines(struct ast_sdp *new_sdp,
-       const struct pjmedia_sdp_session *pjmedia_sdp)
-{
-       int i;
-
-       for (i = 0; i < pjmedia_sdp->media_count; ++i) {
-               ast_sdp_add_m(new_sdp, pjmedia_copy_m_line(pjmedia_sdp->media[i]));
-       }
-}
-
-static struct ast_sdp *pjmedia_to_sdp(const void *in, void *translator_priv)
-{
-       const struct pjmedia_sdp_session *pjmedia_sdp = in;
-
-       struct ast_sdp_o_line *o_line = ast_sdp_o_alloc(dupa_pj_str(pjmedia_sdp->origin.user),
-               pjmedia_sdp->origin.id, pjmedia_sdp->origin.version,
-               dupa_pj_str(pjmedia_sdp->origin.addr_type), dupa_pj_str(pjmedia_sdp->origin.addr));
-
-       struct ast_sdp_c_line *c_line = pjmedia_sdp->conn ?
-               ast_sdp_c_alloc(dupa_pj_str(pjmedia_sdp->conn->addr_type),
-                       dupa_pj_str(pjmedia_sdp->conn->addr)) : NULL;
-
-       struct ast_sdp_s_line *s_line = ast_sdp_s_alloc(dupa_pj_str(pjmedia_sdp->name));
-
-       struct ast_sdp_t_line *t_line = ast_sdp_t_alloc(pjmedia_sdp->time.start,
-               pjmedia_sdp->time.stop);
-
-       struct ast_sdp *new_sdp = ast_sdp_alloc(o_line, c_line, s_line, t_line);
-
-       pjmedia_copy_a_lines(new_sdp, pjmedia_sdp);
-       pjmedia_copy_m_lines(new_sdp, pjmedia_sdp);
-
-       return new_sdp;
-}
-
-static void copy_o_line_pjmedia(pj_pool_t *pool, pjmedia_sdp_session *pjmedia_sdp,
-       struct ast_sdp_o_line *o_line)
-{
-       pjmedia_sdp->origin.id = o_line->session_id;
-       pjmedia_sdp->origin.version = o_line->session_version;
-       pj_strdup2(pool, &pjmedia_sdp->origin.user, o_line->username);
-       pj_strdup2(pool, &pjmedia_sdp->origin.addr_type, o_line->address_type);
-       pj_strdup2(pool, &pjmedia_sdp->origin.addr, o_line->address);
-       pj_strdup2(pool, &pjmedia_sdp->origin.net_type, "IN");
-}
-
-static void copy_s_line_pjmedia(pj_pool_t *pool, pjmedia_sdp_session *pjmedia_sdp,
-       struct ast_sdp_s_line *s_line)
-{
-       pj_strdup2(pool, &pjmedia_sdp->name, s_line->session_name);
-}
-
-static void copy_t_line_pjmedia(pj_pool_t *pool, pjmedia_sdp_session *pjmedia_sdp,
-       struct ast_sdp_t_line *t_line)
-{
-       pjmedia_sdp->time.start = t_line->start_time;
-       pjmedia_sdp->time.stop = t_line->stop_time;
-}
-
-static void copy_c_line_pjmedia(pj_pool_t *pool, pjmedia_sdp_conn **conn,
-       struct ast_sdp_c_line *c_line)
-{
-       pjmedia_sdp_conn *local_conn;
-       local_conn = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_conn);
-       pj_strdup2(pool, &local_conn->addr_type, c_line->address_type);
-       pj_strdup2(pool, &local_conn->addr, c_line->address);
-       pj_strdup2(pool, &local_conn->net_type, "IN");
-
-       *conn = local_conn;
-}
-
-static void copy_a_lines_pjmedia(pj_pool_t *pool, pjmedia_sdp_session *pjmedia_sdp,
-       const struct ast_sdp *sdp)
-{
-       int i;
-
-       for (i = 0; i < ast_sdp_get_a_count(sdp); ++i) {
-               pjmedia_sdp_attr *attr;
-               pj_str_t value;
-               struct ast_sdp_a_line *a_line;
-
-               a_line = ast_sdp_get_a(sdp, i);
-               pj_strdup2(pool, &value, a_line->value);
-               attr = pjmedia_sdp_attr_create(pool, a_line->name, &value);
-               pjmedia_sdp_session_add_attr(pjmedia_sdp, attr);
-       }
-}
-
-static void copy_a_lines_pjmedia_media(pj_pool_t *pool, pjmedia_sdp_media *media,
-       struct ast_sdp_m_line *m_line)
-{
-       int i;
-
-       for (i = 0; i < ast_sdp_m_get_a_count(m_line); ++i) {
-               pjmedia_sdp_attr *attr;
-               pj_str_t value;
-               struct ast_sdp_a_line *a_line;
-
-               a_line = ast_sdp_m_get_a(m_line, i);
-               pj_strdup2(pool, &value, a_line->value);
-               attr = pjmedia_sdp_attr_create(pool, a_line->name, &value);
-               pjmedia_sdp_media_add_attr(media, attr);
-       }
-}
-
-static void copy_m_line_pjmedia(pj_pool_t *pool, pjmedia_sdp_media *media,
-       struct ast_sdp_m_line *m_line)
-{
-       int i;
-
-       media->desc.port = m_line->port;
-       media->desc.port_count = m_line->port_count;
-       pj_strdup2(pool, &media->desc.transport, m_line->proto);
-       pj_strdup2(pool, &media->desc.media, m_line->type);
-
-       for (i = 0; i < ast_sdp_m_get_payload_count(m_line); ++i) {
-               pj_strdup2(pool, &media->desc.fmt[i], ast_sdp_m_get_payload(m_line, i)->fmt);
-               ++media->desc.fmt_count;
-       }
-       if (m_line->c_line && m_line->c_line->address) {
-               copy_c_line_pjmedia(pool, &media->conn, m_line->c_line);
-       }
-       copy_a_lines_pjmedia_media(pool, media, m_line);
-}
-
-static void copy_m_lines_pjmedia(pj_pool_t *pool, pjmedia_sdp_session *pjmedia_sdp,
-       const struct ast_sdp *sdp)
-{
-       int i;
-
-       for (i = 0; i < ast_sdp_get_m_count(sdp); ++i) {
-               pjmedia_sdp_media *media;
-
-               media = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_media);
-               copy_m_line_pjmedia(pool, media, ast_sdp_get_m(sdp, i));
-               pjmedia_sdp->media[pjmedia_sdp->media_count] = media;
-               ++pjmedia_sdp->media_count;
-       }
-}
-
-static const void *sdp_to_pjmedia(const struct ast_sdp *sdp, void *translator_priv)
-{
-       pj_pool_t *pool = translator_priv;
-       pjmedia_sdp_session *pjmedia_sdp;
-
-       pjmedia_sdp = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_session);
-       copy_o_line_pjmedia(pool, pjmedia_sdp, sdp->o_line);
-       copy_s_line_pjmedia(pool, pjmedia_sdp, sdp->s_line);
-       copy_t_line_pjmedia(pool, pjmedia_sdp, sdp->t_line);
-       copy_c_line_pjmedia(pool, &pjmedia_sdp->conn, sdp->c_line);
-       copy_a_lines_pjmedia(pool, pjmedia_sdp, sdp);
-       copy_m_lines_pjmedia(pool, pjmedia_sdp, sdp);
-       return pjmedia_sdp;
-}
-
-static struct ast_sdp_translator_ops pjmedia_translator = {
-       .repr = AST_SDP_IMPL_PJMEDIA,
-       .translator_new = pjmedia_new,
-       .translator_free = pjmedia_free,
-       .to_sdp = pjmedia_to_sdp,
-       .from_sdp = sdp_to_pjmedia,
-};
-
-#ifdef TEST_FRAMEWORK
-
-static int verify_s_line(struct ast_sdp_s_line *s_line, char *expected)
-{
-       return strcmp(s_line->session_name, expected) == 0;
-}
-
-static int verify_c_line(struct ast_sdp_c_line *c_line, char *family, char *addr)
-{
-       return strcmp(c_line->address_type, family) == 0 && strcmp(c_line->address, addr) == 0;
-}
-
-static int verify_t_line(struct ast_sdp_t_line *t_line, uint32_t start, uint32_t end)
-{
-       return t_line->start_time == start && t_line->stop_time == end;
-}
-
-static int verify_m_line(struct ast_sdp *sdp, int index, char *type, int port,
-       int port_count, char *profile, ...)
-{
-       struct ast_sdp_m_line *m_line;
-       int res;
-       va_list ap;
-       int i;
-
-       m_line = ast_sdp_get_m(sdp, index);
-
-       res = strcmp(m_line->type, type) == 0;
-       res |= m_line->port == port;
-       res |= m_line->port_count == port_count;
-       res |= strcmp(m_line->proto, profile) == 0;
-
-       va_start(ap, profile);
-       for (i = 0; i < ast_sdp_m_get_payload_count(m_line); ++i) {
-               char *payload;
-
-               payload = va_arg(ap, char *);
-               if (!payload) {
-                       res = -1;
-                       break;
-               }
-               res |= strcmp(ast_sdp_m_get_payload(m_line, i)->fmt, payload) == 0;
-       }
-       va_end(ap);
-       return res;
-}
-
-static int verify_a_line(struct ast_sdp *sdp, int m_index, int a_index, char *name,
-       char *value)
-{
-       struct ast_sdp_m_line *m_line;
-       struct ast_sdp_a_line *a_line;
-
-       m_line = ast_sdp_get_m(sdp, m_index);
-       a_line = ast_sdp_m_get_a(m_line, a_index);
-
-       return strcmp(a_line->name, name) == 0 && strcmp(a_line->value, value) == 0;
-}
-
-AST_TEST_DEFINE(pjmedia_to_sdp_test)
-{
-       struct ast_sdp_translator *translator;
-       pj_pool_t *pool;
-       char *sdp_str =
-      "v=0\r\n"
-      "o=alice 2890844526 2890844527 IN IP4 host.atlanta.example.com\r\n"
-      "s= \r\n"
-      "c=IN IP4 host.atlanta.example.com\r\n"
-      "t=123 456\r\n"
-      "m=audio 49170 RTP/AVP 0 8 97\r\n"
-      "a=rtpmap:0 PCMU/8000\r\n"
-      "a=rtpmap:8 PCMA/8000\r\n"
-      "a=rtpmap:97 iLBC/8000\r\n"
-         "a=sendrecv\r\n"
-      "m=video 51372 RTP/AVP 31 32\r\n"
-      "a=rtpmap:31 H261/90000\r\n"
-      "a=rtpmap:32 MPV/90000\r\n";
-       pjmedia_sdp_session *pjmedia_sdp;
-       struct ast_sdp *sdp = NULL;
-       pj_status_t status;
-       enum ast_test_result_state res = AST_TEST_PASS;
-
-       switch (cmd) {
-       case TEST_INIT:
-               info->name = "pjmedia_to_sdp";
-               info->category = "/main/sdp/";
-               info->summary = "PJMEDIA to SDP unit test";
-               info->description =
-                       "Ensures PJMEDIA SDPs are translated correctly";
-               return AST_TEST_NOT_RUN;
-       case TEST_EXECUTE:
-               break;
-       }
-
-       pool = pj_pool_create(&sdp_caching_pool.factory, "pjmedia to sdp test", 1024, 1024, NULL);
-
-       translator = ast_sdp_translator_new(AST_SDP_IMPL_PJMEDIA);
-       if (!translator) {
-               ast_test_status_update(test, "Failed to create SDP translator\n");
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       }
-
-       status = pjmedia_sdp_parse(pool, sdp_str, strlen(sdp_str), &pjmedia_sdp);
-       if (status != PJ_SUCCESS) {
-               ast_test_status_update(test, "Error parsing SDP\n");
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       }
-
-       sdp = ast_sdp_translator_to_sdp(translator, pjmedia_sdp);
-
-       if (strcmp(sdp->o_line->username, "alice")) {
-               ast_test_status_update(test, "Unexpected SDP user '%s'\n", sdp->o_line->username);
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       } else if (sdp->o_line->session_id != 2890844526UL) {
-               ast_test_status_update(test, "Unexpected SDP id '%" PRId64 "lu'\n", sdp->o_line->session_id);
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       } else if (sdp->o_line->session_version != 2890844527UL) {
-               ast_test_status_update(test, "Unexpected SDP version '%" PRId64 "'\n", sdp->o_line->session_version);
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       } else if (strcmp(sdp->o_line->address_type, "IP4")) {
-               ast_test_status_update(test, "Unexpected address family '%s'\n", sdp->o_line->address_type);
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       } else if (strcmp(sdp->o_line->address, "host.atlanta.example.com")) {
-               ast_test_status_update(test, "Unexpected address '%s'\n", sdp->o_line->address);
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       }
-
-       if (!verify_s_line(sdp->s_line, " ")) {
-               ast_test_status_update(test, "Bad s line\n");
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       } else if (!verify_c_line(sdp->c_line, "IP4", "host.atlanta.example.com")) {
-               ast_test_status_update(test, "Bad c line\n");
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       } else if (!verify_t_line(sdp->t_line, 123, 456)) {
-               ast_test_status_update(test, "Bad t line\n");
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       }
-
-       if (!verify_m_line(sdp, 0, "audio", 49170, 1, "RTP/AVP", "0", "8", "97", NULL)) {
-               ast_test_status_update(test, "Bad m line 1\n");
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       } else if (!verify_a_line(sdp, 0, 0, "rtpmap", "0 PCMU/8000")) {
-               ast_test_status_update(test, "Bad a line 1\n");
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       } else if (!verify_a_line(sdp, 0, 1, "rtpmap", "8 PCMA/8000")) {
-               ast_test_status_update(test, "Bad a line 2\n");
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       } else if (!verify_a_line(sdp, 0, 2, "rtpmap", "97 iLBC/8000")) {
-               ast_test_status_update(test, "Bad a line 3\n");
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       } else if (!verify_a_line(sdp, 0, 3, "sendrecv", "")) {
-               ast_test_status_update(test, "Bad a line 3\n");
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       } else if (!verify_m_line(sdp, 1, "video", 51372, 1, "RTP/AVP", "31", "32", NULL)) {
-               ast_test_status_update(test, "Bad m line 2\n");
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       } else if (!verify_a_line(sdp, 1, 0, "rtpmap", "31 H261/90000")) {
-               ast_test_status_update(test, "Bad a line 4\n");
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       } else if (!verify_a_line(sdp, 1, 1, "rtpmap", "32 MPV/90000")) {
-               ast_test_status_update(test, "Bad a line 5\n");
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       }
-
-cleanup:
-       ao2_cleanup(sdp);
-       ast_sdp_translator_free(translator);
-       pj_pool_release(pool);
-       return res;
-}
-
-AST_TEST_DEFINE(sdp_to_pjmedia_test)
-{
-       struct ast_sdp_translator *translator;
-       char *sdp_str =
-      "v=0\r\n"
-      "o=alice 2890844526 2890844526 IN IP4 host.atlanta.example.com\r\n"
-      "s= \r\n"
-      "c=IN IP4 host.atlanta.example.com\r\n"
-      "t=123 456\r\n"
-      "m=audio 49170 RTP/AVP 0 8 97\r\n"
-      "a=rtpmap:0 PCMU/8000\r\n"
-      "a=rtpmap:8 PCMA/8000\r\n"
-      "a=rtpmap:97 iLBC/8000\r\n"
-         "a=sendrecv\r\n"
-      "m=video 51372 RTP/AVP 31 32\r\n"
-      "a=rtpmap:31 H261/90000\r\n"
-      "a=rtpmap:32 MPV/90000\r\n\r\n";
-       pj_pool_t *pool;
-       pjmedia_sdp_session *pjmedia_sdp_orig;
-       const pjmedia_sdp_session *pjmedia_sdp_dup;
-       struct ast_sdp *sdp = NULL;
-       pj_status_t status;
-       enum ast_test_result_state res = AST_TEST_PASS;
-       char buf[2048];
-       char errbuf[256];
-
-       switch (cmd) {
-       case TEST_INIT:
-               info->name = "sdp_to_pjmedia";
-               info->category = "/main/sdp/";
-               info->summary = "SDP to PJMEDIA unit test";
-               info->description =
-                       "Ensures PJMEDIA SDPs are translated correctly";
-               return AST_TEST_NOT_RUN;
-       case TEST_EXECUTE:
-               break;
-       }
-
-       pool = pj_pool_create(&sdp_caching_pool.factory, "pjmedia to sdp test", 1024, 1024, NULL);
-
-       translator = ast_sdp_translator_new(AST_SDP_IMPL_PJMEDIA);
-       if (!translator) {
-               ast_test_status_update(test, "Failed to create SDP translator\n");
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       }
-
-       status = pjmedia_sdp_parse(pool, sdp_str, strlen(sdp_str), &pjmedia_sdp_orig);
-       if (status != PJ_SUCCESS) {
-               ast_test_status_update(test, "Error parsing SDP\n");
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       }
-
-       sdp = ast_sdp_translator_to_sdp(translator, pjmedia_sdp_orig);
-       pjmedia_sdp_dup = ast_sdp_translator_from_sdp(translator, sdp);
-
-       if ((status = pjmedia_sdp_session_cmp(pjmedia_sdp_orig, pjmedia_sdp_dup, 0)) != PJ_SUCCESS) {
-               ast_test_status_update(test, "SDPs aren't equal\n");
-               pjmedia_sdp_print(pjmedia_sdp_orig, buf, sizeof(buf));
-               ast_test_status_update(test, "Original SDP is %s\n", buf);
-               pjmedia_sdp_print(pjmedia_sdp_dup, buf, sizeof(buf));
-               ast_test_status_update(test, "New SDP is %s\n", buf);
-               pjmedia_strerror(status, errbuf, sizeof(errbuf));
-               ast_test_status_update(test, "PJMEDIA says %d: '%s'\n", status, errbuf);
-               res = AST_TEST_FAIL;
-               goto cleanup;
-       }
-
-cleanup:
-       ao2_cleanup(sdp);
-       ast_sdp_translator_free(translator);
-       pj_pool_release(pool);
-       return res;
-}
-
-#endif /* TEST_FRAMEWORK */
-
-static int load_module(void)
-{
-       if (ast_sdp_register_translator(&pjmedia_translator)) {
-               return AST_MODULE_LOAD_DECLINE;
-       }
-       ast_pjproject_caching_pool_init(&sdp_caching_pool, NULL, 1024 * 1024);
-       AST_TEST_REGISTER(pjmedia_to_sdp_test);
-       AST_TEST_REGISTER(sdp_to_pjmedia_test);
-
-       return AST_MODULE_LOAD_SUCCESS;
-}
-
-static int unload_module(void)
-{
-       ast_sdp_unregister_translator(&pjmedia_translator);
-       ast_pjproject_caching_pool_destroy(&sdp_caching_pool);
-       AST_TEST_UNREGISTER(pjmedia_to_sdp_test);
-       AST_TEST_UNREGISTER(sdp_to_pjmedia_test);
-       return 0;
-}
-
-static int reload_module(void)
-{
-       return 0;
-}
-
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJMEDIA SDP Translator",
-       .support_level = AST_MODULE_SUPPORT_CORE,
-       .load = load_module,
-       .unload = unload_module,
-       .reload = reload_module,
-       .load_pri = AST_MODPRI_CHANNEL_DEPEND,
-       .requires = "res_pjproject",
-);
diff --git a/tests/test_sdp.c b/tests/test_sdp.c
deleted file mode 100644 (file)
index 0ab8ec8..0000000
+++ /dev/null
@@ -1,2105 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2017, Digium Inc.
- *
- * Mark Michelson <mmmichelson@digium.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-/*** MODULEINFO
-       <depend>TEST_FRAMEWORK</depend>
-       <support_level>core</support_level>
- ***/
-
-#include "asterisk.h"
-#include "asterisk/test.h"
-#include "asterisk/module.h"
-#include "asterisk/sdp.h"
-#include "asterisk/stream.h"
-#include "asterisk/format.h"
-#include "asterisk/format_cache.h"
-#include "asterisk/format_cap.h"
-#include "asterisk/rtp_engine.h"
-
-static int validate_o_line(struct ast_test *test, const struct ast_sdp_o_line *o_line,
-       const char *sdpowner, const char *address_type, const char *address)
-{
-       if (!o_line) {
-               return -1;
-       }
-
-       if (strcmp(o_line->username, sdpowner)) {
-               ast_test_status_update(test, "Expected o-line SDP owner %s but got %s\n",
-                       sdpowner, o_line->username);
-               return -1;
-       }
-
-       if (strcmp(o_line->address_type, address_type)) {
-               ast_test_status_update(test, "Expected o-line SDP address type %s but got %s\n",
-                       address_type, o_line->address_type);
-               return -1;
-       }
-
-       if (strcmp(o_line->address, address)) {
-               ast_test_status_update(test, "Expected o-line SDP address %s but got %s\n",
-                       address, o_line->address);
-               return -1;
-       }
-
-       ast_test_status_update(test, "SDP o-line is as expected!\n");
-       return 0;
-}
-
-static int validate_c_line(struct ast_test *test, const struct ast_sdp_c_line *c_line,
-       const char *address_type, const char *address)
-{
-       if (strcmp(c_line->address_type, address_type)) {
-               ast_test_status_update(test, "Expected c-line SDP address type %s but got %s\n",
-                       address_type, c_line->address_type);
-               return -1;
-       }
-
-       if (strcmp(c_line->address, address)) {
-               ast_test_status_update(test, "Expected c-line SDP address %s but got %s\n",
-                       address, c_line->address);
-               return -1;
-       }
-
-       ast_test_status_update(test, "SDP c-line is as expected!\n");
-       return 0;
-}
-
-static int validate_m_line(struct ast_test *test, const struct ast_sdp_m_line *m_line,
-       const char *media_type, int num_payloads)
-{
-       if (strcmp(m_line->type, media_type)) {
-               ast_test_status_update(test, "Expected m-line media type %s but got %s\n",
-                       media_type, m_line->type);
-               return -1;
-       }
-
-       if (m_line->port == 0) {
-               ast_test_status_update(test, "Expected %s m-line to not be declined\n",
-                       media_type);
-               return -1;
-       }
-
-       if (ast_sdp_m_get_payload_count(m_line) != num_payloads) {
-               ast_test_status_update(test, "Expected %s m-line payload count %d but got %d\n",
-                       media_type, num_payloads, ast_sdp_m_get_payload_count(m_line));
-               return -1;
-       }
-
-       ast_test_status_update(test, "SDP %s m-line is as expected\n", media_type);
-       return 0;
-}
-
-static int validate_m_line_declined(struct ast_test *test,
-       const struct ast_sdp_m_line *m_line, const char *media_type)
-{
-       if (strcmp(m_line->type, media_type)) {
-               ast_test_status_update(test, "Expected m-line media type %s but got %s\n",
-                       media_type, m_line->type);
-               return -1;
-       }
-
-       if (m_line->port != 0) {
-               ast_test_status_update(test, "Expected %s m-line to be declined but got port %u\n",
-                       media_type, m_line->port);
-               return -1;
-       }
-
-       ast_test_status_update(test, "SDP %s m-line is as expected\n", media_type);
-       return 0;
-}
-
-static int validate_rtpmap(struct ast_test *test, const struct ast_sdp_m_line *m_line,
-       const char *media_name)
-{
-       struct ast_sdp_a_line *a_line;
-       int i;
-
-       for (i = 0; i < ast_sdp_m_get_a_count(m_line); ++i) {
-               struct ast_sdp_rtpmap *rtpmap;
-               int match;
-
-               a_line = ast_sdp_m_get_a(m_line, i);
-               if (strcmp(a_line->name, "rtpmap")) {
-                       continue;
-               }
-
-               rtpmap = ast_sdp_a_get_rtpmap(a_line);
-               if (!rtpmap) {
-                       return -1;
-               }
-
-               match = !strcmp(rtpmap->encoding_name, media_name);
-
-               ast_sdp_rtpmap_free(rtpmap);
-               if (match) {
-                       return 0;
-               }
-       }
-
-       ast_test_status_update(test, "Could not find rtpmap with encoding name %s\n", media_name);
-
-       return -1;
-}
-
-static enum ast_test_result_state validate_t38(struct ast_test *test, const struct ast_sdp_m_line *m_line)
-{
-       struct ast_sdp_a_line *a_line;
-
-       a_line = ast_sdp_m_find_attribute(m_line, "T38FaxVersion", -1);
-       ast_test_validate(test, a_line && !strcmp(a_line->value, "0"));
-
-       a_line = ast_sdp_m_find_attribute(m_line, "T38FaxMaxBitRate", -1);
-       ast_test_validate(test, a_line && !strcmp(a_line->value, "14400"));
-
-       a_line = ast_sdp_m_find_attribute(m_line, "T38FaxRateManagement", -1);
-       ast_test_validate(test, a_line && !strcmp(a_line->value, "transferredTCF"));
-
-       return AST_TEST_PASS;
-}
-
-AST_TEST_DEFINE(invalid_rtpmap)
-{
-       /* a=rtpmap: is already assumed. This is the part after that */
-       static const char *invalids[] = {
-               "J PCMU/8000",
-               "0 PCMU:8000",
-               "0 PCMU/EIGHT-THOUSAND",
-               "0 PCMU/8000million/2",
-               "0 PCMU//2",
-               "0 /8000/2",
-               "0 PCMU/8000/",
-               "0 PCMU/8000million",
-       };
-       int i;
-       enum ast_test_result_state res = AST_TEST_PASS;
-
-       switch(cmd) {
-       case TEST_INIT:
-               info->name = "invalid_rtpmap";
-               info->category = "/main/sdp/";
-               info->summary = "Ensure invalid rtpmaps are rejected";
-               info->description =
-                       "Try to convert several invalid rtpmap attributes. If\n"
-                       "any succeeds, the test fails.";
-               return AST_TEST_NOT_RUN;
-       case TEST_EXECUTE:
-               break;
-       }
-
-       for (i = 0; i < ARRAY_LEN(invalids); ++i) {
-               struct ast_sdp_a_line *a_line;
-               struct ast_sdp_rtpmap *rtpmap;
-
-               a_line = ast_sdp_a_alloc("rtpmap", invalids[i]);
-               rtpmap = ast_sdp_a_get_rtpmap(a_line);
-               if (rtpmap) {
-                       ast_test_status_update(test, "Invalid rtpmap '%s' was accepted as valid\n",
-                               invalids[i]);
-                       res = AST_TEST_FAIL;
-               }
-               ast_sdp_a_free(a_line);
-               ast_sdp_rtpmap_free(rtpmap);
-       }
-
-       return res;
-}
-
-AST_TEST_DEFINE(rtpmap)
-{
-       static const char *valids[] = {
-               "0 PCMU/8000",
-               "107 opus/48000/2",
-       };
-       static int payloads[] = {
-               0,
-               107,
-       };
-       static const char *encoding_names[] = {
-               "PCMU",
-               "opus",
-       };
-       static int clock_rates[] = {
-               8000,
-               48000,
-       };
-       static const char *encoding_parameters[] = {
-               "",
-               "2",
-       };
-       int i;
-       enum ast_test_result_state res = AST_TEST_PASS;
-
-       switch(cmd) {
-       case TEST_INIT:
-               info->name = "rtpmap";
-               info->category = "/main/sdp/";
-               info->summary = "Ensure rtpmap attribute values are parsed correctly";
-               info->description =
-                       "Parse several valid rtpmap attributes. Ensure that the parsed values\n"
-                       "are what we expect";
-               return AST_TEST_NOT_RUN;
-       case TEST_EXECUTE:
-               break;
-       }
-
-       for (i = 0; i < ARRAY_LEN(valids); ++i) {
-               struct ast_sdp_a_line *a_line;
-               struct ast_sdp_rtpmap *rtpmap;
-
-               a_line = ast_sdp_a_alloc("rtpmap", valids[i]);
-               rtpmap = ast_sdp_a_get_rtpmap(a_line);
-               if (!rtpmap) {
-                       ast_test_status_update(test, "Valid rtpmap '%s' was rejected as invalid\n",
-                               valids[i]);
-                       res = AST_TEST_FAIL;
-                       continue;
-               }
-               if (rtpmap->payload != payloads[i]) {
-                       ast_test_status_update(test, "RTPmap payload '%d' does not match expected '%d'\n",
-                               rtpmap->payload, payloads[i]);
-                       res = AST_TEST_FAIL;
-               }
-               if (strcmp(rtpmap->encoding_name, encoding_names[i])) {
-                       ast_test_status_update(test, "RTPmap encoding_name '%s' does not match expected '%s'\n",
-                               rtpmap->encoding_name, encoding_names[i]);
-                       res = AST_TEST_FAIL;
-               }
-               if (rtpmap->clock_rate != clock_rates[i]) {
-                       ast_test_status_update(test, "RTPmap clock rate '%d' does not match expected '%d'\n",
-                               rtpmap->clock_rate, clock_rates[i]);
-                       res = AST_TEST_FAIL;
-               }
-               if (strcmp(rtpmap->encoding_parameters, encoding_parameters[i])) {
-                       ast_test_status_update(test, "RTPmap encoding_parameter '%s' does not match expected '%s'\n",
-                               rtpmap->encoding_parameters, encoding_parameters[i]);
-                       res = AST_TEST_FAIL;
-               }
-               ast_sdp_a_free(a_line);
-               ast_sdp_rtpmap_free(rtpmap);
-       }
-
-       return res;
-}
-
-AST_TEST_DEFINE(find_attr)
-{
-       enum ast_test_result_state res = AST_TEST_PASS;
-       struct ast_sdp_m_line *m_line;
-       struct ast_sdp_a_line *a_line;
-       int idx;
-
-       switch(cmd) {
-       case TEST_INIT:
-               info->name = "find_attr";
-               info->category = "/main/sdp/";
-               info->summary = "Ensure that finding attributes works as expected";
-               info->description =
-                       "A SDP m-line is created, and attributes are added.\n"
-                       "We then attempt a series of attribute-finding calls that are expected to work\n"
-                       "followed by a series of attribute-finding calls that are expected fo fail.";
-               return AST_TEST_NOT_RUN;
-       case TEST_EXECUTE:
-               break;
-       }
-
-       m_line = ast_sdp_m_alloc("audio", 666, 1, "RTP/AVP", NULL);
-       if (!m_line) {
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-       a_line = ast_sdp_a_alloc("foo", "0 bar");
-       if (!a_line) {
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-       ast_sdp_m_add_a(m_line, a_line);
-       a_line = ast_sdp_a_alloc("foo", "0 bee");
-       if (!a_line) {
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-       ast_sdp_m_add_a(m_line, a_line);
-
-       a_line = ast_sdp_a_alloc("baz", "howdy");
-       if (!a_line) {
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-       ast_sdp_m_add_a(m_line, a_line);
-
-       /* These should work */
-       a_line = ast_sdp_m_find_attribute(m_line, "foo", 0);
-       if (!a_line || strcmp(a_line->value, "0 bar")) {
-               ast_test_status_update(test, "Failed to find attribute 'foo' with payload '0'\n");
-               res = AST_TEST_FAIL;
-       }
-       a_line = ast_sdp_m_find_attribute(m_line, "foo", -1);
-       if (!a_line || strcmp(a_line->value, "0 bar")) {
-               ast_test_status_update(test, "Failed to find attribute 'foo' with unspecified payload\n");
-               res = AST_TEST_FAIL;
-       }
-       a_line = ast_sdp_m_find_attribute(m_line, "baz", -1);
-       if (!a_line || strcmp(a_line->value, "howdy")) {
-               ast_test_status_update(test, "Failed to find attribute 'baz' with unspecified payload\n");
-               res = AST_TEST_FAIL;
-       }
-
-       idx = ast_sdp_m_find_a_first(m_line, "foo", 0);
-       if (idx < 0) {
-               ast_test_status_update(test, "Failed to find first attribute 'foo' with payload '0'\n");
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-       a_line = ast_sdp_m_get_a(m_line, idx);
-       if (!a_line || strcmp(a_line->value, "0 bar")) {
-               ast_test_status_update(test, "Find first attribute 'foo' with payload '0' didn't match\n");
-               res = AST_TEST_FAIL;
-       }
-       idx = ast_sdp_m_find_a_next(m_line, idx, "foo", 0);
-       if (idx < 0) {
-               ast_test_status_update(test, "Failed to find next attribute 'foo' with payload '0'\n");
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-       a_line = ast_sdp_m_get_a(m_line, idx);
-       if (!a_line || strcmp(a_line->value, "0 bee")) {
-               ast_test_status_update(test, "Find next attribute 'foo' with payload '0' didn't match\n");
-               res = AST_TEST_FAIL;
-       }
-       idx = ast_sdp_m_find_a_next(m_line, idx, "foo", 0);
-       if (0 <= idx) {
-               ast_test_status_update(test, "Find next attribute 'foo' with payload '0' found too many\n");
-               res = AST_TEST_FAIL;
-       }
-
-       idx = ast_sdp_m_find_a_first(m_line, "foo", -1);
-       if (idx < 0) {
-               ast_test_status_update(test, "Failed to find first attribute 'foo' with unspecified payload\n");
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-       a_line = ast_sdp_m_get_a(m_line, idx);
-       if (!a_line || strcmp(a_line->value, "0 bar")) {
-               ast_test_status_update(test, "Find first attribute 'foo' with unspecified payload didn't match\n");
-               res = AST_TEST_FAIL;
-       }
-       idx = ast_sdp_m_find_a_next(m_line, idx, "foo", -1);
-       if (idx < 0) {
-               ast_test_status_update(test, "Failed to find next attribute 'foo' with unspecified payload\n");
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-       a_line = ast_sdp_m_get_a(m_line, idx);
-       if (!a_line || strcmp(a_line->value, "0 bee")) {
-               ast_test_status_update(test, "Find next attribute 'foo' with unspecified payload didn't match\n");
-               res = AST_TEST_FAIL;
-       }
-       idx = ast_sdp_m_find_a_next(m_line, idx, "foo", -1);
-       if (0 <= idx) {
-               ast_test_status_update(test, "Find next attribute 'foo' with unspecified payload found too many\n");
-               res = AST_TEST_FAIL;
-       }
-
-       /* These should fail */
-       a_line = ast_sdp_m_find_attribute(m_line, "foo", 1);
-       if (a_line) {
-               ast_test_status_update(test, "Found non-existent attribute 'foo' with payload '1'\n");
-               res = AST_TEST_FAIL;
-       }
-       a_line = ast_sdp_m_find_attribute(m_line, "baz", 0);
-       if (a_line) {
-               ast_test_status_update(test, "Found non-existent attribute 'baz' with payload '0'\n");
-               res = AST_TEST_FAIL;
-       }
-       a_line = ast_sdp_m_find_attribute(m_line, "wibble", 0);
-       if (a_line) {
-               ast_test_status_update(test, "Found non-existent attribute 'wibble' with payload '0'\n");
-               res = AST_TEST_FAIL;
-       }
-       a_line = ast_sdp_m_find_attribute(m_line, "wibble", -1);
-       if (a_line) {
-               ast_test_status_update(test, "Found non-existent attribute 'wibble' with unspecified payload\n");
-               res = AST_TEST_FAIL;
-       }
-
-end:
-       ast_sdp_m_free(m_line);
-       return res;
-}
-
-static struct ast_sdp_options *sdp_options_common(void)
-{
-       struct ast_sdp_options *options;
-
-       options = ast_sdp_options_alloc();
-       if (!options) {
-               return NULL;
-       }
-       ast_sdp_options_set_media_address(options, "127.0.0.1");
-       ast_sdp_options_set_sdpowner(options, "me");
-       ast_sdp_options_set_rtp_engine(options, "asterisk");
-       ast_sdp_options_set_impl(options, AST_SDP_IMPL_PJMEDIA);
-
-       return options;
-}
-
-struct sdp_format {
-       enum ast_media_type type;
-       const char *formats;
-};
-
-static int build_sdp_option_formats(struct ast_sdp_options *options, int num_streams, const struct sdp_format *formats)
-{
-       int idx;
-
-       for (idx = 0; idx < num_streams; ++idx) {
-               struct ast_format_cap *caps;
-
-               if (ast_strlen_zero(formats[idx].formats)) {
-                       continue;
-               }
-
-               caps = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
-               if (!caps
-                       || ast_format_cap_update_by_allow_disallow(caps, formats[idx].formats, 1) < 0) {
-                       ao2_cleanup(caps);
-                       return -1;
-               }
-               ast_sdp_options_set_format_cap_type(options, formats[idx].type, caps);
-               ao2_cleanup(caps);
-       }
-       return 0;
-}
-
-/*!
- * \brief Common method to build an SDP state for a test.
- *
- * This uses the passed-in formats to create a stream topology, which is then used to create the SDP
- * state.
- *
- * There is an optional test_options field you can use if your test has specific options you need to
- * set. If your test does not require anything special, it can just pass NULL for this parameter. If
- * you do pass in test_options, this function steals ownership of those options.
- *
- * \param num_streams The number of elements in the formats array.
- * \param formats Array of media types and formats that will be in the state.
- * \param opt_num_streams The number of new stream types allowed to create.
- *           Not used if test_options provided.
- * \param opt_formats Array of new stream media types and formats allowed to create.
- *           NULL if use a default stream creation.
- *           Not used if test_options provided.
- * \param max_streams 0 if set max to max(3, num_streams) else max(max_streams, num_streams)
- *           Not used if test_options provided.
- * \param test_options Optional SDP options.
- */
-static struct ast_sdp_state *build_sdp_state(int num_streams, const struct sdp_format *formats,
-       int opt_num_streams, const struct sdp_format *opt_formats, unsigned int max_streams,
-       struct ast_sdp_options *test_options)
-{
-       struct ast_stream_topology *topology = NULL;
-       struct ast_sdp_state *state = NULL;
-       struct ast_sdp_options *options;
-       int i;
-
-       if (!test_options) {
-               static const struct sdp_format sdp_formats[] = {
-                       { AST_MEDIA_TYPE_AUDIO, "ulaw" },
-                       { AST_MEDIA_TYPE_VIDEO, "vp8" },
-                       { AST_MEDIA_TYPE_IMAGE, "t38" },
-               };
-
-               options = sdp_options_common();
-               if (!options) {
-                       goto end;
-               }
-
-               /* Determine max_streams to allow */
-               if (!max_streams) {
-                       max_streams = ARRAY_LEN(sdp_formats);
-               }
-               if (max_streams < num_streams) {
-                       max_streams = num_streams;
-               }
-               ast_sdp_options_set_max_streams(options, max_streams);
-
-               /* Determine new stream formats and types allowed */
-               if (!opt_formats) {
-                       opt_num_streams = ARRAY_LEN(sdp_formats);
-                       opt_formats = sdp_formats;
-               }
-               if (build_sdp_option_formats(options, opt_num_streams, opt_formats)) {
-                       goto end;
-               }
-       } else {
-               options = test_options;
-       }
-
-       topology = ast_stream_topology_alloc();
-       if (!topology) {
-               goto end;
-       }
-
-       for (i = 0; i < num_streams; ++i) {
-               struct ast_stream *stream;
-
-               stream = ast_stream_alloc("sure_thing", formats[i].type);
-               if (!stream) {
-                       goto end;
-               }
-               if (!ast_strlen_zero(formats[i].formats)) {
-                       struct ast_format_cap *caps;
-
-                       caps = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
-                       if (!caps
-                               || ast_format_cap_update_by_allow_disallow(caps, formats[i].formats, 1) < 0) {
-                               ao2_cleanup(caps);
-                               ast_stream_free(stream);
-                               goto end;
-                       }
-                       ast_stream_set_formats(stream, caps);
-                       ao2_cleanup(caps);
-               } else {
-                       ast_stream_set_state(stream, AST_STREAM_STATE_REMOVED);
-               }
-               if (ast_stream_topology_append_stream(topology, stream) < 0) {
-                       ast_stream_free(stream);
-                       goto end;
-               }
-       }
-
-       state = ast_sdp_state_alloc(topology, options);
-       if (!state) {
-               goto end;
-       }
-
-end:
-       ast_stream_topology_free(topology);
-       if (!state) {
-               ast_sdp_options_free(options);
-       }
-
-       return state;
-}
-
-AST_TEST_DEFINE(topology_to_sdp)
-{
-       enum ast_test_result_state res = AST_TEST_FAIL;
-       struct ast_sdp_state *sdp_state = NULL;
-       const struct ast_sdp *sdp = NULL;
-       struct ast_sdp_m_line *m_line = NULL;
-       struct sdp_format formats[] = {
-               { AST_MEDIA_TYPE_AUDIO, "ulaw,alaw,g722,opus" },
-               { AST_MEDIA_TYPE_VIDEO, "h264,vp8" },
-               { AST_MEDIA_TYPE_IMAGE, "t38" },
-       };
-
-       switch(cmd) {
-       case TEST_INIT:
-               info->name = "topology_to_sdp";
-               info->category = "/main/sdp/";
-               info->summary = "Convert a topology into an SDP";
-               info->description =
-                       "Ensure SDPs get converted to expected stream topology";
-               return AST_TEST_NOT_RUN;
-       case TEST_EXECUTE:
-               break;
-       }
-
-       sdp_state = build_sdp_state(ARRAY_LEN(formats), formats,
-               ARRAY_LEN(formats), formats, 0, NULL);
-       if (!sdp_state) {
-               goto end;
-       }
-
-       sdp = ast_sdp_state_get_local_sdp(sdp_state);
-       if (!sdp) {
-               goto end;
-       }
-
-       if (validate_o_line(test, sdp->o_line, "me", "IP4", "127.0.0.1")) {
-               goto end;
-       }
-
-       if (validate_c_line(test, sdp->c_line, "IP4", "127.0.0.1")) {
-               goto end;
-       }
-
-       if (ast_sdp_get_m_count(sdp) != 3) {
-               ast_test_status_update(test, "Unexpected number of streams in generated SDP: %d\n",
-                       ast_sdp_get_m_count(sdp));
-               goto end;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 0);
-
-       if (validate_m_line(test, m_line, "audio", 4)) {
-               goto end;
-       }
-
-       if (validate_rtpmap(test, m_line, "PCMU")) {
-               goto end;
-       }
-
-       if (validate_rtpmap(test, m_line, "PCMA")) {
-               goto end;
-       }
-
-       if (validate_rtpmap(test, m_line, "G722")) {
-               goto end;
-       }
-
-       if (validate_rtpmap(test, m_line, "opus")) {
-               goto end;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 1);
-       if (validate_m_line(test, m_line, "video", 2)) {
-               goto end;
-       }
-
-       if (validate_rtpmap(test, m_line, "VP8")) {
-               goto end;
-       }
-
-       if (validate_rtpmap(test, m_line, "H264")) {
-               goto end;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 2);
-       if (validate_m_line(test, m_line, "image", 1)) {
-               goto end;
-       }
-       if (validate_t38(test, m_line) != AST_TEST_PASS) {
-               goto end;
-       }
-
-       res = AST_TEST_PASS;
-
-end:
-       ast_sdp_state_free(sdp_state);
-       return res;
-}
-
-static int validate_formats(struct ast_test *test, struct ast_stream_topology *topology, int index,
-       enum ast_media_type type, int format_count, const char **expected_formats)
-{
-       struct ast_stream *stream;
-       struct ast_format_cap *caps;
-       struct ast_format *format;
-       int i;
-
-       stream = ast_stream_topology_get_stream(topology, index);
-       if (ast_stream_get_type(stream) != type) {
-               ast_test_status_update(test, "Unexpected stream type encountered\n");
-               return -1;
-       }
-       caps = ast_stream_get_formats(stream);
-
-       if (ast_format_cap_count(caps) != format_count) {
-               ast_test_status_update(test, "Unexpected format count '%d'. Expecting '%d'\n",
-                       (int) ast_format_cap_count(caps), format_count);
-               return -1;
-       }
-
-       for (i = 0; i < ast_format_cap_count(caps); ++i) {
-               format = ast_format_cap_get_format(caps, i);
-               if (strcmp(ast_format_get_name(format), expected_formats[i])) {
-                       ast_test_status_update(test, "Unexpected format '%s'at index %d. Expected '%s'\n",
-                               ast_format_get_name(format), i, expected_formats[i]);
-                       return -1;
-               }
-       }
-
-       return 0;
-}
-
-AST_TEST_DEFINE(sdp_to_topology)
-{
-       enum ast_test_result_state res = AST_TEST_PASS;
-       struct ast_sdp_state *sdp_state;
-       const struct ast_sdp *sdp;
-       struct ast_stream_topology *topology = NULL;
-       struct sdp_format sdp_formats[] = {
-               { AST_MEDIA_TYPE_AUDIO, "ulaw,alaw,g722,opus" },
-               { AST_MEDIA_TYPE_VIDEO, "h264,vp8" },
-               { AST_MEDIA_TYPE_IMAGE, "t38" },
-       };
-       static const char *expected_audio_formats[] = {
-               "ulaw",
-               "alaw",
-               "g722",
-               "opus",
-       };
-       static const char *expected_video_formats[] = {
-               "h264",
-               "vp8",
-       };
-       static const char *expected_image_formats[] = {
-               "t38",
-       };
-
-       switch(cmd) {
-       case TEST_INIT:
-               info->name = "sdp_to_topology";
-               info->category = "/main/sdp/";
-               info->summary = "Convert an SDP into a topology";
-               info->description =
-                       "Ensure SDPs get converted to expected stream topology";
-               return AST_TEST_NOT_RUN;
-       case TEST_EXECUTE:
-               break;
-       }
-
-       sdp_state = build_sdp_state(ARRAY_LEN(sdp_formats), sdp_formats,
-               ARRAY_LEN(sdp_formats), sdp_formats, 0, NULL);
-       if (!sdp_state) {
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-
-       sdp = ast_sdp_state_get_local_sdp(sdp_state);
-       if (!sdp) {
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-
-       topology = ast_get_topology_from_sdp(sdp, 0);
-       if (!topology) {
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-
-       if (ast_stream_topology_get_count(topology) != 3) {
-               ast_test_status_update(test, "Unexpected topology count '%d'. Expecting 3\n",
-                       ast_stream_topology_get_count(topology));
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-
-       if (validate_formats(test, topology, 0, AST_MEDIA_TYPE_AUDIO,
-                       ARRAY_LEN(expected_audio_formats), expected_audio_formats)) {
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-
-       if (validate_formats(test, topology, 1, AST_MEDIA_TYPE_VIDEO,
-                       ARRAY_LEN(expected_video_formats), expected_video_formats)) {
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-
-       if (validate_formats(test, topology, 2, AST_MEDIA_TYPE_IMAGE,
-                       ARRAY_LEN(expected_image_formats), expected_image_formats)) {
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-
-end:
-       ast_sdp_state_free(sdp_state);
-       ast_stream_topology_free(topology);
-       return res;
-}
-
-static int validate_avi_sdp_streams(struct ast_test *test, const struct ast_sdp *sdp)
-{
-       struct ast_sdp_m_line *m_line;
-
-       if (!sdp) {
-               return -1;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 0);
-       if (validate_m_line(test, m_line, "audio", 1)) {
-               return -1;
-       }
-       if (validate_rtpmap(test, m_line, "PCMU")) {
-               return -1;
-       }
-
-       /* The other audio formats should *NOT* be present */
-       if (!validate_rtpmap(test, m_line, "PCMA")) {
-               return -1;
-       }
-       if (!validate_rtpmap(test, m_line, "G722")) {
-               return -1;
-       }
-       if (!validate_rtpmap(test, m_line, "opus")) {
-               return -1;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 1);
-       if (validate_m_line(test, m_line, "video", 1)) {
-               return -1;
-       }
-       if (validate_rtpmap(test, m_line, "VP8")) {
-               return -1;
-       }
-       if (!validate_rtpmap(test, m_line, "H264")) {
-               return -1;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 2);
-       if (validate_m_line(test, m_line, "image", 1)) {
-               return -1;
-       }
-
-       return 0;
-}
-
-static enum ast_test_result_state sdp_negotiation_completed_tests(struct ast_test *test,
-       int offer_num_streams, const struct sdp_format *offer_formats,
-       int answer_num_streams, const struct sdp_format *answer_formats,
-       int allowed_ans_num_streams, const struct sdp_format *allowed_ans_formats,
-       unsigned int max_streams,
-       int (*validate_sdp)(struct ast_test *test, const struct ast_sdp *sdp))
-{
-       enum ast_test_result_state res = AST_TEST_PASS;
-       struct ast_sdp_state *sdp_state_offerer = NULL;
-       struct ast_sdp_state *sdp_state_answerer = NULL;
-       const struct ast_sdp *offerer_sdp;
-       const struct ast_sdp *answerer_sdp;
-
-       sdp_state_offerer = build_sdp_state(offer_num_streams, offer_formats,
-               offer_num_streams, offer_formats, max_streams, NULL);
-       if (!sdp_state_offerer) {
-               ast_test_status_update(test, "Building offerer SDP state failed\n");
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-
-       sdp_state_answerer = build_sdp_state(answer_num_streams, answer_formats,
-               allowed_ans_num_streams, allowed_ans_formats, max_streams, NULL);
-       if (!sdp_state_answerer) {
-               ast_test_status_update(test, "Building answerer SDP state failed\n");
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-
-       offerer_sdp = ast_sdp_state_get_local_sdp(sdp_state_offerer);
-       if (!offerer_sdp) {
-               ast_test_status_update(test, "Building offerer offer failed\n");
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-
-       if (ast_sdp_state_set_remote_sdp(sdp_state_answerer, offerer_sdp)) {
-               ast_test_status_update(test, "Setting answerer offer failed\n");
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-       answerer_sdp = ast_sdp_state_get_local_sdp(sdp_state_answerer);
-       if (!answerer_sdp) {
-               ast_test_status_update(test, "Building answerer answer failed\n");
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-
-       if (ast_sdp_state_set_remote_sdp(sdp_state_offerer, answerer_sdp)) {
-               ast_test_status_update(test, "Setting offerer answer failed\n");
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-
-       /*
-        * Restart SDP negotiations to build the joint SDP on the offerer
-        * side.  Otherwise we will get the original offer for use in
-        * case of retransmissions.
-        */
-       if (ast_sdp_state_restart_negotiations(sdp_state_offerer)) {
-               ast_test_status_update(test, "Restarting negotiations failed\n");
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-       offerer_sdp = ast_sdp_state_get_local_sdp(sdp_state_offerer);
-       if (!offerer_sdp) {
-               ast_test_status_update(test, "Building offerer current sdp failed\n");
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-       if (validate_sdp(test, offerer_sdp)) {
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-       if (validate_sdp(test, answerer_sdp)) {
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-
-end:
-       ast_sdp_state_free(sdp_state_offerer);
-       ast_sdp_state_free(sdp_state_answerer);
-
-       return res;
-}
-
-AST_TEST_DEFINE(sdp_negotiation_initial)
-{
-       static const struct sdp_format offerer_formats[] = {
-               { AST_MEDIA_TYPE_AUDIO, "ulaw,alaw,g722,opus" },
-               { AST_MEDIA_TYPE_VIDEO, "h264,vp8" },
-               { AST_MEDIA_TYPE_IMAGE, "t38" },
-       };
-
-       switch(cmd) {
-       case TEST_INIT:
-               info->name = "sdp_negotiation_initial";
-               info->category = "/main/sdp/";
-               info->summary = "Simulate an initial negotiation";
-               info->description =
-                       "Initial negotiation tests creating new streams on the answering side.\n"
-                       "After negotiation both offerer and answerer sides should have the same\n"
-                       "expected stream types and formats.";
-               return AST_TEST_NOT_RUN;
-       case TEST_EXECUTE:
-               break;
-       }
-
-       return sdp_negotiation_completed_tests(test,
-               ARRAY_LEN(offerer_formats), offerer_formats,
-               0, NULL,
-               0, NULL,
-               0,
-               validate_avi_sdp_streams);
-}
-
-AST_TEST_DEFINE(sdp_negotiation_type_change)
-{
-       static const struct sdp_format offerer_formats[] = {
-               { AST_MEDIA_TYPE_AUDIO, "ulaw,alaw,g722,opus" },
-               { AST_MEDIA_TYPE_VIDEO, "h264,vp8" },
-               { AST_MEDIA_TYPE_IMAGE, "t38" },
-       };
-       static const struct sdp_format answerer_formats[] = {
-               { AST_MEDIA_TYPE_IMAGE, "t38" },
-               { AST_MEDIA_TYPE_VIDEO, "vp8" },
-               { AST_MEDIA_TYPE_AUDIO, "ulaw" },
-       };
-
-       switch(cmd) {
-       case TEST_INIT:
-               info->name = "sdp_negotiation_type_change";
-               info->category = "/main/sdp/";
-               info->summary = "Simulate a re-negotiation changing stream types";
-               info->description =
-                       "Reinvite negotiation tests changing stream types on the answering side.\n"
-                       "After negotiation both offerer and answerer sides should have the same\n"
-                       "expected stream types and formats.";
-               return AST_TEST_NOT_RUN;
-       case TEST_EXECUTE:
-               break;
-       }
-
-       return sdp_negotiation_completed_tests(test,
-               ARRAY_LEN(offerer_formats), offerer_formats,
-               ARRAY_LEN(answerer_formats), answerer_formats,
-               0, NULL,
-               0,
-               validate_avi_sdp_streams);
-}
-
-static int validate_aviavia_declined_sdp_streams(struct ast_test *test, const struct ast_sdp *sdp)
-{
-       struct ast_sdp_m_line *m_line;
-
-       if (!sdp) {
-               return -1;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 0);
-       if (validate_m_line_declined(test, m_line, "audio")) {
-               return -1;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 1);
-       if (validate_m_line_declined(test, m_line, "video")) {
-               return -1;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 2);
-       if (validate_m_line_declined(test, m_line, "image")) {
-               return -1;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 3);
-       if (validate_m_line_declined(test, m_line, "audio")) {
-               return -1;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 4);
-       if (validate_m_line_declined(test, m_line, "video")) {
-               return -1;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 5);
-       if (validate_m_line_declined(test, m_line, "image")) {
-               return -1;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 6);
-       if (validate_m_line(test, m_line, "audio", 1)) {
-               return -1;
-       }
-       if (validate_rtpmap(test, m_line, "PCMU")) {
-               return -1;
-       }
-
-       /* The other audio formats should *NOT* be present */
-       if (!validate_rtpmap(test, m_line, "PCMA")) {
-               return -1;
-       }
-
-       return 0;
-}
-
-AST_TEST_DEFINE(sdp_negotiation_decline_incompatible)
-{
-       static const struct sdp_format offerer_formats[] = {
-               /* Incompatible declined streams */
-               { AST_MEDIA_TYPE_AUDIO, "alaw" },
-               { AST_MEDIA_TYPE_VIDEO, "vp8" },
-               { AST_MEDIA_TYPE_IMAGE, "t38" },
-               /* Initially declined streams */
-               { AST_MEDIA_TYPE_AUDIO, "" },
-               { AST_MEDIA_TYPE_VIDEO, "" },
-               { AST_MEDIA_TYPE_IMAGE, "" },
-               /* Compatible stream so not all are declined */
-               { AST_MEDIA_TYPE_AUDIO, "ulaw,alaw" },
-       };
-       static const struct sdp_format allowed_formats[] = {
-               { AST_MEDIA_TYPE_AUDIO, "ulaw" },
-       };
-
-       switch(cmd) {
-       case TEST_INIT:
-               info->name = "sdp_negotiation_decline_incompatible";
-               info->category = "/main/sdp/";
-               info->summary = "Simulate an initial negotiation declining streams";
-               info->description =
-                       "Initial negotiation tests declining incompatible streams.\n"
-                       "After negotiation both offerer and answerer sides should have\n"
-                       "the same expected stream types and formats.";
-               return AST_TEST_NOT_RUN;
-       case TEST_EXECUTE:
-               break;
-       }
-
-       return sdp_negotiation_completed_tests(test,
-               ARRAY_LEN(offerer_formats), offerer_formats,
-               0, NULL,
-               ARRAY_LEN(allowed_formats), allowed_formats,
-               ARRAY_LEN(offerer_formats),
-               validate_aviavia_declined_sdp_streams);
-}
-
-static int validate_aaaa_declined_sdp_streams(struct ast_test *test, const struct ast_sdp *sdp)
-{
-       struct ast_sdp_m_line *m_line;
-
-       if (!sdp) {
-               return -1;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 0);
-       if (validate_m_line(test, m_line, "audio", 1)) {
-               return -1;
-       }
-       if (validate_rtpmap(test, m_line, "PCMU")) {
-               return -1;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 1);
-       if (validate_m_line(test, m_line, "audio", 1)) {
-               return -1;
-       }
-       if (validate_rtpmap(test, m_line, "PCMU")) {
-               return -1;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 2);
-       if (validate_m_line(test, m_line, "audio", 1)) {
-               return -1;
-       }
-       if (validate_rtpmap(test, m_line, "PCMU")) {
-               return -1;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 3);
-       if (validate_m_line_declined(test, m_line, "audio")) {
-               return -1;
-       }
-
-       return 0;
-}
-
-AST_TEST_DEFINE(sdp_negotiation_decline_max_streams)
-{
-       static const struct sdp_format offerer_formats[] = {
-               { AST_MEDIA_TYPE_AUDIO, "ulaw" },
-               { AST_MEDIA_TYPE_AUDIO, "ulaw" },
-               { AST_MEDIA_TYPE_AUDIO, "ulaw" },
-               { AST_MEDIA_TYPE_AUDIO, "ulaw" },
-       };
-
-       switch(cmd) {
-       case TEST_INIT:
-               info->name = "sdp_negotiation_decline_max_streams";
-               info->category = "/main/sdp/";
-               info->summary = "Simulate an initial negotiation declining excessive streams";
-               info->description =
-                       "Initial negotiation tests declining too many streams on the answering side.\n"
-                       "After negotiation both offerer and answerer sides should have the same\n"
-                       "expected stream types and formats.";
-               return AST_TEST_NOT_RUN;
-       case TEST_EXECUTE:
-               break;
-       }
-
-       return sdp_negotiation_completed_tests(test,
-               ARRAY_LEN(offerer_formats), offerer_formats,
-               0, NULL,
-               0, NULL,
-               0,
-               validate_aaaa_declined_sdp_streams);
-}
-
-AST_TEST_DEFINE(sdp_negotiation_not_acceptable)
-{
-       enum ast_test_result_state res = AST_TEST_PASS;
-       struct ast_sdp_state *sdp_state_offerer = NULL;
-       struct ast_sdp_state *sdp_state_answerer = NULL;
-       const struct ast_sdp *offerer_sdp;
-
-       static const struct sdp_format offerer_formats[] = {
-               { AST_MEDIA_TYPE_AUDIO, "alaw" },
-               { AST_MEDIA_TYPE_AUDIO, "alaw" },
-       };
-
-       switch(cmd) {
-       case TEST_INIT:
-               info->name = "sdp_negotiation_not_acceptable";
-               info->category = "/main/sdp/";
-               info->summary = "Simulate an initial negotiation declining all streams";
-               info->description =
-                       "Initial negotiation tests declining all streams for a 488 on the answering side.\n"
-                       "Negotiations should fail because there are no acceptable streams.";
-               return AST_TEST_NOT_RUN;
-       case TEST_EXECUTE:
-               break;
-       }
-
-       sdp_state_offerer = build_sdp_state(ARRAY_LEN(offerer_formats), offerer_formats,
-               ARRAY_LEN(offerer_formats), offerer_formats, 0, NULL);
-       if (!sdp_state_offerer) {
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-
-       sdp_state_answerer = build_sdp_state(0, NULL, 0, NULL, 0, NULL);
-       if (!sdp_state_answerer) {
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-
-       offerer_sdp = ast_sdp_state_get_local_sdp(sdp_state_offerer);
-       if (!offerer_sdp) {
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-
-       if (!ast_sdp_state_set_remote_sdp(sdp_state_answerer, offerer_sdp)) {
-               ast_test_status_update(test, "Bad.  Setting remote SDP was successful.\n");
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-       if (!ast_sdp_state_is_offer_rejected(sdp_state_answerer)) {
-               ast_test_status_update(test, "Bad.  Negotiation failed for some other reason.\n");
-               res = AST_TEST_FAIL;
-               goto end;
-       }
-
-end:
-       ast_sdp_state_free(sdp_state_offerer);
-       ast_sdp_state_free(sdp_state_answerer);
-
-       return res;
-}
-
-static int validate_ssrc(struct ast_test *test, struct ast_sdp_m_line *m_line,
-       struct ast_rtp_instance *rtp)
-{
-       unsigned int ssrc;
-       const char *cname;
-       struct ast_sdp_a_line *a_line;
-       char attr_value[128];
-
-       ssrc = ast_rtp_instance_get_ssrc(rtp);
-       cname = ast_rtp_instance_get_cname(rtp);
-
-       snprintf(attr_value, sizeof(attr_value), "%u cname:%s", ssrc, cname);
-
-       a_line = ast_sdp_m_find_attribute(m_line, "ssrc", -1);
-       if (!a_line) {
-               ast_test_status_update(test, "Could not find 'ssrc' attribute\n");
-               return -1;
-       }
-
-       if (strcmp(a_line->value, attr_value)) {
-               ast_test_status_update(test, "SDP attribute '%s' did not match expected attribute '%s'\n",
-                       a_line->value, attr_value);
-               return -1;
-       }
-
-       return 0;
-}
-
-AST_TEST_DEFINE(sdp_ssrc_attributes)
-{
-       enum ast_test_result_state res;
-       struct ast_sdp_state *test_state = NULL;
-       struct ast_sdp_options *options;
-       struct sdp_format formats[] = {
-               { AST_MEDIA_TYPE_AUDIO, "ulaw,alaw,g722,opus" },
-       };
-       const struct ast_sdp *sdp;
-       struct ast_sdp_m_line *m_line;
-       struct ast_rtp_instance *rtp;
-
-       switch(cmd) {
-       case TEST_INIT:
-               info->name = "sdp_ssrc_attributes";
-               info->category = "/main/sdp/";
-               info->summary = "Ensure SSRC-level attributes are added to local SDPs";
-               info->description =
-                       "An SDP is created and is instructed to include SSRC-level attributes.\n"
-                       "This test ensures that the CNAME SSRC-level attribute is present and\n"
-                       "that the values match what the RTP instance reports";
-               return AST_TEST_NOT_RUN;
-       case TEST_EXECUTE:
-               break;
-       }
-
-       res = AST_TEST_FAIL;
-
-       options = sdp_options_common();
-       if (!options) {
-               ast_test_status_update(test, "Failed to allocate SDP options\n");
-               goto end;
-       }
-       if (build_sdp_option_formats(options, ARRAY_LEN(formats), formats)) {
-               goto end;
-       }
-       ast_sdp_options_set_ssrc(options, 1);
-
-       test_state = build_sdp_state(ARRAY_LEN(formats), formats, 0, NULL, 0, options);
-       if (!test_state) {
-               ast_test_status_update(test, "Failed to create SDP state\n");
-               goto end;
-       }
-
-       sdp = ast_sdp_state_get_local_sdp(test_state);
-       if (!sdp) {
-               ast_test_status_update(test, "Failed to get local SDP\n");
-               goto end;
-       }
-
-       /* Need a couple of sanity checks */
-       if (ast_sdp_get_m_count(sdp) != ARRAY_LEN(formats)) {
-               ast_test_status_update(test, "SDP m count is %d instead of %zu\n",
-                       ast_sdp_get_m_count(sdp), ARRAY_LEN(formats));
-               goto end;
-       }
-
-       m_line = ast_sdp_get_m(sdp, 0);
-       if (!m_line) {
-               ast_test_status_update(test, "Failed to get SDP m-line\n");
-               goto end;
-       }
-
-       rtp = ast_sdp_state_get_rtp_instance(test_state, 0);
-       if (!rtp) {
-               ast_test_status_update(test, "Failed to get the RTP instance\n");
-               goto end;
-       }
-
-       if (validate_ssrc(test, m_line, rtp)) {
-               goto end;
-       }
-
-       res = AST_TEST_PASS;
-
-end:
-       ast_sdp_state_free(test_state);
-       return res;
-}
-
-struct sdp_topology_stream {
-       /*! Media stream type: audio, video, image */
-       enum ast_media_type type;
-       /*! Media stream state: removed/declined, sendrecv */
-       enum ast_stream_state state;
-       /*! Comma separated list of formats allowed on the stream.  Can be NULL if stream is removed/declined. */
-       const char *formats;
-       /*! Optional name of stream.  NULL for default name. */
-       const char *name;
-};
-
-struct sdp_update_test {
-       /*! Maximum number of streams.  (0 if default) */
-       int max_streams;
-       /*! Optional initial SDP state topology (NULL if not present) */
-       const struct sdp_topology_stream * const *initial;
-       /*! Required first topology update */
-       const struct sdp_topology_stream * const *update_1;
-       /*! Optional second topology update (NULL if not present) */
-       const struct sdp_topology_stream * const *update_2;
-       /*! Expected topology to be offered */
-       const struct sdp_topology_stream * const *expected;
-};
-
-static struct ast_stream_topology *build_update_topology(const struct sdp_topology_stream * const *spec)
-{
-       struct ast_stream_topology *topology;
-       const struct sdp_topology_stream *desc;
-
-       topology = ast_stream_topology_alloc();
-       if (!topology) {
-               return NULL;
-       }
-
-       for (desc = *spec; desc; ++spec, desc = *spec) {
-               struct ast_stream *stream;
-               const char *name;
-
-               name = desc->name ?: ast_codec_media_type2str(desc->type);
-               stream = ast_stream_alloc(name, desc->type);
-               if (!stream) {
-                       goto fail;
-               }
-               ast_stream_set_state(stream, desc->state);
-               if (desc->formats) {
-                       struct ast_format_cap *caps;
-
-                       caps = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
-                       if (!caps
-                               || ast_format_cap_update_by_allow_disallow(caps, desc->formats, 1) < 0) {
-                               ao2_cleanup(caps);
-                               ast_stream_free(stream);
-                               goto fail;
-                       }
-                       ast_stream_set_formats(stream, caps);
-                       ao2_ref(caps, -1);
-               }
-               if (ast_stream_topology_append_stream(topology, stream) < 0) {
-                       ast_stream_free(stream);
-                       goto fail;
-               }
-       }
-       return topology;
-
-fail:
-       ast_stream_topology_free(topology);
-       return NULL;
-}
-
-static int cmp_update_topology(struct ast_test *test,
-       const struct ast_stream_topology *expected, const struct ast_stream_topology *merged)
-{
-       int status = 0;
-       int idx;
-       int max_streams;
-       struct ast_stream *exp_stream;
-       struct ast_stream *mrg_stream;
-
-       idx = ast_stream_topology_get_count(expected);
-       max_streams = ast_stream_topology_get_count(merged);
-       if (idx != max_streams) {
-               ast_test_status_update(test, "Expected %d streams got %d streams\n",
-                       idx, max_streams);
-               status = -1;
-       }
-       if (idx < max_streams) {
-               max_streams = idx;
-       }
-
-       /* Compare common streams by position */
-       for (idx = 0; idx < max_streams; ++idx) {
-               exp_stream = ast_stream_topology_get_stream(expected, idx);
-               mrg_stream = ast_stream_topology_get_stream(merged, idx);
-
-               if (strcmp(ast_stream_get_name(exp_stream), ast_stream_get_name(mrg_stream))) {
-                       ast_test_status_update(test,
-                               "Stream %d: Expected stream name '%s' got stream name '%s'\n",
-                               idx,
-                               ast_stream_get_name(exp_stream),
-                               ast_stream_get_name(mrg_stream));
-                       status = -1;
-               }
-
-               if (ast_stream_get_state(exp_stream) != ast_stream_get_state(mrg_stream)) {
-                       ast_test_status_update(test,
-                               "Stream %d: Expected stream state '%s' got stream state '%s'\n",
-                               idx,
-                               ast_stream_state2str(ast_stream_get_state(exp_stream)),
-                               ast_stream_state2str(ast_stream_get_state(mrg_stream)));
-                       status = -1;
-               }
-
-               if (ast_stream_get_type(exp_stream) != ast_stream_get_type(mrg_stream)) {
-                       ast_test_status_update(test,
-                               "Stream %d: Expected stream type '%s' got stream type '%s'\n",
-                               idx,
-                               ast_codec_media_type2str(ast_stream_get_type(exp_stream)),
-                               ast_codec_media_type2str(ast_stream_get_type(mrg_stream)));
-                       status = -1;
-                       continue;
-               }
-
-               if (ast_stream_get_state(exp_stream) == AST_STREAM_STATE_REMOVED
-                       || ast_stream_get_state(mrg_stream) == AST_STREAM_STATE_REMOVED) {
-                       /*
-                        * Cannot compare formats if one of the streams is
-                        * declined because there may not be any on the declined
-                        * stream.
-                        */
-                       continue;
-               }
-               if (!ast_format_cap_identical(ast_stream_get_formats(exp_stream),
-                       ast_stream_get_formats(mrg_stream))) {
-                       ast_test_status_update(test,
-                               "Stream %d: Expected formats do not match merged formats\n",
-                               idx);
-                       status = -1;
-               }
-       }
-
-       return status;
-}
-
-
-static const struct sdp_topology_stream audio_declined_no_name = {
-       AST_MEDIA_TYPE_AUDIO, AST_STREAM_STATE_REMOVED, NULL, NULL
-};
-
-static const struct sdp_topology_stream audio_ulaw_no_name = {
-       AST_MEDIA_TYPE_AUDIO, AST_STREAM_STATE_SENDRECV, "ulaw", NULL
-};
-
-static const struct sdp_topology_stream audio_alaw_no_name = {
-       AST_MEDIA_TYPE_AUDIO, AST_STREAM_STATE_SENDRECV, "alaw", NULL
-};
-
-static const struct sdp_topology_stream audio_g722_no_name = {
-       AST_MEDIA_TYPE_AUDIO, AST_STREAM_STATE_SENDRECV, "g722", NULL
-};
-
-static const struct sdp_topology_stream audio_g723_no_name = {
-       AST_MEDIA_TYPE_AUDIO, AST_STREAM_STATE_SENDRECV, "g723", NULL
-};
-
-static const struct sdp_topology_stream video_declined_no_name = {
-       AST_MEDIA_TYPE_VIDEO, AST_STREAM_STATE_REMOVED, NULL, NULL
-};
-
-static const struct sdp_topology_stream video_h261_no_name = {
-       AST_MEDIA_TYPE_VIDEO, AST_STREAM_STATE_SENDRECV, "h261", NULL
-};
-
-static const struct sdp_topology_stream video_h263_no_name = {
-       AST_MEDIA_TYPE_VIDEO, AST_STREAM_STATE_SENDRECV, "h263", NULL
-};
-
-static const struct sdp_topology_stream video_h264_no_name = {
-       AST_MEDIA_TYPE_VIDEO, AST_STREAM_STATE_SENDRECV, "h264", NULL
-};
-
-static const struct sdp_topology_stream video_vp8_no_name = {
-       AST_MEDIA_TYPE_VIDEO, AST_STREAM_STATE_SENDRECV, "vp8", NULL
-};
-
-static const struct sdp_topology_stream image_declined_no_name = {
-       AST_MEDIA_TYPE_IMAGE, AST_STREAM_STATE_REMOVED, NULL, NULL
-};
-
-static const struct sdp_topology_stream image_t38_no_name = {
-       AST_MEDIA_TYPE_IMAGE, AST_STREAM_STATE_SENDRECV, "t38", NULL
-};
-
-
-static const struct sdp_topology_stream *top_ulaw_alaw_h264__vp8[] = {
-       &audio_ulaw_no_name,
-       &audio_alaw_no_name,
-       &video_h264_no_name,
-       &video_vp8_no_name,
-       NULL
-};
-
-static const struct sdp_topology_stream *top__vp8_alaw_h264_ulaw[] = {
-       &video_vp8_no_name,
-       &audio_alaw_no_name,
-       &video_h264_no_name,
-       &audio_ulaw_no_name,
-       NULL
-};
-
-static const struct sdp_topology_stream *top_alaw_ulaw__vp8_h264[] = {
-       &audio_alaw_no_name,
-       &audio_ulaw_no_name,
-       &video_vp8_no_name,
-       &video_h264_no_name,
-       NULL
-};
-
-/* Sorting by type with no new or deleted streams */
-static const struct sdp_update_test mrg_by_type_00 = {
-       .initial  = top_ulaw_alaw_h264__vp8,
-       .update_1 = top__vp8_alaw_h264_ulaw,
-       .expected = top_alaw_ulaw__vp8_h264,
-};
-
-
-static const struct sdp_topology_stream *top_alaw__vp8[] = {
-       &audio_alaw_no_name,
-       &video_vp8_no_name,
-       NULL
-};
-
-static const struct sdp_topology_stream *top_h264__vp8_ulaw[] = {
-       &video_h264_no_name,
-       &video_vp8_no_name,
-       &audio_ulaw_no_name,
-       NULL
-};
-
-static const struct sdp_topology_stream *top_ulaw_h264__vp8[] = {
-       &audio_ulaw_no_name,
-       &video_h264_no_name,
-       &video_vp8_no_name,
-       NULL
-};
-
-/* Sorting by type and adding a stream */
-static const struct sdp_update_test mrg_by_type_01 = {
-       .initial  = top_alaw__vp8,
-       .update_1 = top_h264__vp8_ulaw,
-       .expected = top_ulaw_h264__vp8,
-};
-
-
-static const struct sdp_topology_stream *top_alaw__vp8_vdec[] = {
-       &audio_alaw_no_name,
-       &video_vp8_no_name,
-       &video_declined_no_name,
-       NULL
-};
-
-/* Sorting by type and deleting a stream */
-static const struct sdp_update_test mrg_by_type_02 = {
-       .initial  = top_ulaw_h264__vp8,
-       .update_1 = top_alaw__vp8,
-       .expected = top_alaw__vp8_vdec,
-};
-
-
-static const struct sdp_topology_stream *top_h264_alaw_ulaw[] = {
-       &video_h264_no_name,
-       &audio_alaw_no_name,
-       &audio_ulaw_no_name,
-       NULL
-};
-
-static const struct sdp_topology_stream *top__t38[] = {
-       &image_t38_no_name,
-       NULL
-};
-
-static const struct sdp_topology_stream *top_vdec__t38_adec[] = {
-       &video_declined_no_name,
-       &image_t38_no_name,
-       &audio_declined_no_name,
-       NULL
-};
-
-/* Sorting by type changing stream types for T.38 */
-static const struct sdp_update_test mrg_by_type_03 = {
-       .initial  = top_h264_alaw_ulaw,
-       .update_1 = top__t38,
-       .expected = top_vdec__t38_adec,
-};
-
-
-/* Sorting by type changing stream types back from T.38 */
-static const struct sdp_update_test mrg_by_type_04 = {
-       .initial  = top_vdec__t38_adec,
-       .update_1 = top_h264_alaw_ulaw,
-       .expected = top_h264_alaw_ulaw,
-};
-
-
-static const struct sdp_topology_stream *top_h264[] = {
-       &video_h264_no_name,
-       NULL
-};
-
-static const struct sdp_topology_stream *top_vdec__t38[] = {
-       &video_declined_no_name,
-       &image_t38_no_name,
-       NULL
-};
-
-/* Sorting by type changing stream types for T.38 */
-static const struct sdp_update_test mrg_by_type_05 = {
-       .initial  = top_h264,
-       .update_1 = top__t38,
-       .expected = top_vdec__t38,
-};
-
-
-static const struct sdp_topology_stream *top_h264_idec[] = {
-       &video_h264_no_name,
-       &image_declined_no_name,
-       NULL
-};
-
-/* Sorting by type changing stream types back from T.38 */
-static const struct sdp_update_test mrg_by_type_06 = {
-       .initial  = top_vdec__t38,
-       .update_1 = top_h264,
-       .expected = top_h264_idec,
-};
-
-
-static const struct sdp_topology_stream *top_ulaw_adec_h264__vp8[] = {
-       &audio_ulaw_no_name,
-       &audio_declined_no_name,
-       &video_h264_no_name,
-       &video_vp8_no_name,
-       NULL
-};
-
-static const struct sdp_topology_stream *top_h263_alaw_h261_h264_vp8[] = {
-       &video_h263_no_name,
-       &audio_alaw_no_name,
-       &video_h261_no_name,
-       &video_h264_no_name,
-       &video_vp8_no_name,
-       NULL
-};
-
-static const struct sdp_topology_stream *top_alaw_h264_h263_h261_vp8[] = {
-       &audio_alaw_no_name,
-       &video_h264_no_name,
-       &video_h263_no_name,
-       &video_h261_no_name,
-       &video_vp8_no_name,
-       NULL
-};
-
-/* Sorting by type with backfill and adding streams */
-static const struct sdp_update_test mrg_by_type_07 = {
-       .initial  = top_ulaw_adec_h264__vp8,
-       .update_1 = top_h263_alaw_h261_h264_vp8,
-       .expected = top_alaw_h264_h263_h261_vp8,
-};
-
-
-static const struct sdp_topology_stream *top_ulaw_alaw_h264__vp8_h261[] = {
-       &audio_ulaw_no_name,
-       &audio_alaw_no_name,
-       &video_h264_no_name,
-       &video_vp8_no_name,
-       &video_h261_no_name,
-       NULL
-};
-
-/* Sorting by type overlimit of 4 and drop */
-static const struct sdp_update_test mrg_by_type_08 = {
-       .max_streams = 4,
-       .initial  = top_ulaw_alaw_h264__vp8,
-       .update_1 = top_ulaw_alaw_h264__vp8_h261,
-       .expected = top_ulaw_alaw_h264__vp8,
-};
-
-
-static const struct sdp_topology_stream *top_ulaw_alaw_h264[] = {
-       &audio_ulaw_no_name,
-       &audio_alaw_no_name,
-       &video_h264_no_name,
-       NULL
-};
-
-static const struct sdp_topology_stream *top_alaw_h261__vp8[] = {
-       &audio_alaw_no_name,
-       &video_h261_no_name,
-       &video_vp8_no_name,
-       NULL
-};
-
-static const struct sdp_topology_stream *top_alaw_adec_h261__vp8[] = {
-       &audio_alaw_no_name,
-       &audio_declined_no_name,
-       &video_h261_no_name,
-       &video_vp8_no_name,
-       NULL
-};
-
-/* Sorting by type with delete and add of streams */
-static const struct sdp_update_test mrg_by_type_09 = {
-       .initial  = top_ulaw_alaw_h264,
-       .update_1 = top_alaw_h261__vp8,
-       .expected = top_alaw_adec_h261__vp8,
-};
-
-
-static const struct sdp_topology_stream *top_ulaw_adec_h264[] = {
-       &audio_ulaw_no_name,
-       &audio_declined_no_name,
-       &video_h264_no_name,
-       NULL
-};
-
-/* Sorting by type and adding streams */
-static const struct sdp_update_test mrg_by_type_10 = {
-       .initial  = top_ulaw_adec_h264,
-       .update_1 = top_alaw_ulaw__vp8_h264,
-       .expected = top_alaw_ulaw__vp8_h264,
-};
-
-
-static const struct sdp_topology_stream *top_adec_g722_h261[] = {
-       &audio_declined_no_name,
-       &audio_g722_no_name,
-       &video_h261_no_name,
-       NULL
-};
-
-/* Sorting by type and deleting old streams */
-static const struct sdp_update_test mrg_by_type_11 = {
-       .initial  = top_ulaw_alaw_h264,
-       .update_1 = top_adec_g722_h261,
-       .expected = top_adec_g722_h261,
-};
-
-
-static const struct sdp_topology_stream audio_alaw4dave = {
-       AST_MEDIA_TYPE_AUDIO, AST_STREAM_STATE_SENDRECV, "alaw", "dave"
-};
-
-static const struct sdp_topology_stream audio_g7224dave = {
-       AST_MEDIA_TYPE_AUDIO, AST_STREAM_STATE_SENDRECV, "g722", "dave"
-};
-
-static const struct sdp_topology_stream audio_ulaw4fred = {
-       AST_MEDIA_TYPE_AUDIO, AST_STREAM_STATE_SENDRECV, "ulaw", "fred"
-};
-
-static const struct sdp_topology_stream audio_alaw4fred = {
-       AST_MEDIA_TYPE_AUDIO, AST_STREAM_STATE_SENDRECV, "alaw", "fred"
-};
-
-static const struct sdp_topology_stream audio_ulaw4rose = {
-       AST_MEDIA_TYPE_AUDIO, AST_STREAM_STATE_SENDRECV, "ulaw", "rose"
-};
-
-static const struct sdp_topology_stream audio_g7224rose = {
-       AST_MEDIA_TYPE_AUDIO, AST_STREAM_STATE_SENDRECV, "g722", "rose"
-};
-
-
-static const struct sdp_topology_stream video_h2614dave = {
-       AST_MEDIA_TYPE_VIDEO, AST_STREAM_STATE_SENDRECV, "h261", "dave"
-};
-
-static const struct sdp_topology_stream video_h2634dave = {
-       AST_MEDIA_TYPE_VIDEO, AST_STREAM_STATE_SENDRECV, "h263", "dave"
-};
-
-static const struct sdp_topology_stream video_h2634fred = {
-       AST_MEDIA_TYPE_VIDEO, AST_STREAM_STATE_SENDRECV, "h263", "fred"
-};
-
-static const struct sdp_topology_stream video_h2644fred = {
-       AST_MEDIA_TYPE_VIDEO, AST_STREAM_STATE_SENDRECV, "h264", "fred"
-};
-
-static const struct sdp_topology_stream video_h2644rose = {
-       AST_MEDIA_TYPE_VIDEO, AST_STREAM_STATE_SENDRECV, "h264", "rose"
-};
-
-static const struct sdp_topology_stream video_h2614rose = {
-       AST_MEDIA_TYPE_VIDEO, AST_STREAM_STATE_SENDRECV, "h261", "rose"
-};
-
-
-static const struct sdp_topology_stream *top_adave_alaw_afred_ulaw_arose_g722_vdave_h261_vfred_h263_vrose_h264[] = {
-       &audio_alaw4dave,
-       &audio_alaw_no_name,
-       &audio_ulaw4fred,
-       &audio_ulaw_no_name,
-       &audio_g7224rose,
-       &audio_g722_no_name,
-       &video_h2614dave,
-       &video_h261_no_name,
-       &video_h2634fred,
-       &video_h263_no_name,
-       &video_h2644rose,
-       &video_h264_no_name,
-       NULL
-};
-
-static const struct sdp_topology_stream *top_vfred_vrose_vdave_h263_h264_h261_afred_ulaw_arose_g722_adave_alaw[] = {
-       &video_h2644fred,
-       &video_h2614rose,
-       &video_h2634dave,
-       &video_h263_no_name,
-       &video_h264_no_name,
-       &video_h261_no_name,
-       &audio_alaw4fred,
-       &audio_ulaw_no_name,
-       &audio_ulaw4rose,
-       &audio_g722_no_name,
-       &audio_g7224dave,
-       &audio_alaw_no_name,
-       NULL
-};
-
-static const struct sdp_topology_stream *top_adave_ulaw_afred_g722_arose_alaw_vdave_h263_vfred_h264_vrose_h261[] = {
-       &audio_g7224dave,
-       &audio_ulaw_no_name,
-       &audio_alaw4fred,
-       &audio_g722_no_name,
-       &audio_ulaw4rose,
-       &audio_alaw_no_name,
-       &video_h2634dave,
-       &video_h263_no_name,
-       &video_h2644fred,
-       &video_h264_no_name,
-       &video_h2614rose,
-       &video_h261_no_name,
-       NULL
-};
-
-/* Sorting by name and type with no new or deleted streams */
-static const struct sdp_update_test mrg_by_name_00 = {
-       .initial  = top_adave_alaw_afred_ulaw_arose_g722_vdave_h261_vfred_h263_vrose_h264,
-       .update_1 = top_vfred_vrose_vdave_h263_h264_h261_afred_ulaw_arose_g722_adave_alaw,
-       .expected = top_adave_ulaw_afred_g722_arose_alaw_vdave_h263_vfred_h264_vrose_h261,
-};
-
-
-static const struct sdp_topology_stream *top_adave_g723_h261[] = {
-       &audio_g7224dave,
-       &audio_g723_no_name,
-       &video_h261_no_name,
-       NULL
-};
-
-/* Sorting by name and type adding names to streams */
-static const struct sdp_update_test mrg_by_name_01 = {
-       .initial  = top_ulaw_alaw_h264,
-       .update_1 = top_adave_g723_h261,
-       .expected = top_adave_g723_h261,
-};
-
-
-/* Sorting by name and type removing names from streams */
-static const struct sdp_update_test mrg_by_name_02 = {
-       .initial  = top_adave_g723_h261,
-       .update_1 = top_ulaw_alaw_h264,
-       .expected = top_ulaw_alaw_h264,
-};
-
-
-static const struct sdp_update_test *sdp_update_cases[] = {
-       /* Merging by type */
-       /* 00 */ &mrg_by_type_00,
-       /* 01 */ &mrg_by_type_01,
-       /* 02 */ &mrg_by_type_02,
-       /* 03 */ &mrg_by_type_03,
-       /* 04 */ &mrg_by_type_04,
-       /* 05 */ &mrg_by_type_05,
-       /* 06 */ &mrg_by_type_06,
-       /* 07 */ &mrg_by_type_07,
-       /* 08 */ &mrg_by_type_08,
-       /* 09 */ &mrg_by_type_09,
-       /* 10 */ &mrg_by_type_10,
-       /* 11 */ &mrg_by_type_11,
-
-       /* Merging by name and type */
-       /* 12 */ &mrg_by_name_00,
-       /* 13 */ &mrg_by_name_01,
-       /* 14 */ &mrg_by_name_02,
-};
-
-AST_TEST_DEFINE(sdp_update_topology)
-{
-       enum ast_test_result_state res;
-       unsigned int idx;
-       int status;
-       struct ast_sdp_options *options;
-       struct ast_stream_topology *topology;
-       struct ast_sdp_state *test_state = NULL;
-
-       static const struct sdp_format sdp_formats[] = {
-               { AST_MEDIA_TYPE_AUDIO, "ulaw,alaw,g722,g723" },
-               { AST_MEDIA_TYPE_VIDEO, "h261,h263,h264,vp8" },
-               { AST_MEDIA_TYPE_IMAGE, "t38" },
-       };
-
-       switch(cmd) {
-       case TEST_INIT:
-               info->name = "sdp_update_topology";
-               info->category = "/main/sdp/";
-               info->summary = "Merge topology updates from the system";
-               info->description =
-                       "1) Create a SDP state with an optional initial topology.\n"
-                       "2) Update the initial topology with one or two new topologies.\n"
-                       "3) Get the SDP offer to merge the updates into the initial topology.\n"
-                       "4) Check that the offered topology matches the expected topology.\n"
-                       "5) Repeat these steps for each test case defined.";
-               return AST_TEST_NOT_RUN;
-       case TEST_EXECUTE:
-               break;
-       }
-
-       res = AST_TEST_FAIL;
-       for (idx = 0; idx < ARRAY_LEN(sdp_update_cases); ++idx) {
-               ast_test_status_update(test, "Starting update case %d\n", idx);
-
-               /* Create a SDP state with an optional initial topology. */
-               options = sdp_options_common();
-               if (!options) {
-                       ast_test_status_update(test, "Failed to allocate SDP options\n");
-                       goto end;
-               }
-               if (sdp_update_cases[idx]->max_streams) {
-                       ast_sdp_options_set_max_streams(options, sdp_update_cases[idx]->max_streams);
-               }
-               if (build_sdp_option_formats(options, ARRAY_LEN(sdp_formats), sdp_formats)) {
-                       ast_test_status_update(test, "Failed to setup SDP options new stream formats\n");
-                       goto end;
-               }
-               if (sdp_update_cases[idx]->initial) {
-                       topology = build_update_topology(sdp_update_cases[idx]->initial);
-                       if (!topology) {
-                               ast_test_status_update(test, "Failed to build initial SDP state topology\n");
-                               goto end;
-                       }
-               } else {
-                       topology = NULL;
-               }
-               test_state = ast_sdp_state_alloc(topology, options);
-               ast_stream_topology_free(topology);
-               if (!test_state) {
-                       ast_test_status_update(test, "Failed to build SDP state\n");
-                       goto end;
-               }
-
-               /* Update the initial topology with one or two new topologies. */
-               topology = build_update_topology(sdp_update_cases[idx]->update_1);
-               if (!topology) {
-                       ast_test_status_update(test, "Failed to build first update SDP state topology\n");
-                       goto end;
-               }
-   &n