CHANNEL(callid): Give dialplan access to the callid.
[asterisk/asterisk.git] / main / rtp_engine.c
index 5174b9c..931f89d 100644 (file)
                                        and sending this report.</para>
                                </parameter>
                        </syntax>
+                       <see-also>
+                               <ref type="managerEvent">RTCPReceived</ref>
+                       </see-also>
                </managerEventInstance>
        </managerEvent>
        <managerEvent language="en_US" name="RTCPReceived">
                                <xi:include xpointer="xpointer(/docs/managerEvent[@name='RTCPSent']/managerEventInstance/syntax/parameter[@name='SentOctets'])" />
                                <xi:include xpointer="xpointer(/docs/managerEvent[@name='RTCPSent']/managerEventInstance/syntax/parameter[contains(@name, 'ReportX')])" />
                        </syntax>
+                       <see-also>
+                               <ref type="managerEvent">RTCPSent</ref>
+                       </see-also>
                </managerEventInstance>
        </managerEvent>
  ***/
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
-#include <math.h>
-
-#include "asterisk/channel.h"
-#include "asterisk/frame.h"
-#include "asterisk/module.h"
-#include "asterisk/rtp_engine.h"
+#include <math.h>                       /* for sqrt, MAX */
+#include <sched.h>                      /* for sched_yield */
+#include <sys/time.h>                   /* for timeval */
+#include <time.h>                       /* for time_t */
+
+#include "asterisk/_private.h"          /* for ast_rtp_engine_init prototype */
+#include "asterisk/astobj2.h"           /* for ao2_cleanup, ao2_ref, etc */
+#include "asterisk/channel.h"           /* for ast_channel_name, etc */
+#include "asterisk/codec.h"             /* for ast_codec_media_type2str, etc */
+#include "asterisk/format.h"            /* for ast_format_cmp, etc */
+#include "asterisk/format_cache.h"      /* for ast_format_adpcm, etc */
+#include "asterisk/format_cap.h"        /* for ast_format_cap_alloc, etc */
+#include "asterisk/json.h"              /* for ast_json_ref, etc */
+#include "asterisk/linkedlists.h"       /* for ast_rtp_engine::<anonymous>, etc */
+#include "asterisk/lock.h"              /* for ast_rwlock_unlock, etc */
+#include "asterisk/logger.h"            /* for ast_log, ast_debug, etc */
 #include "asterisk/manager.h"
-#include "asterisk/options.h"
-#include "asterisk/astobj2.h"
-#include "asterisk/pbx.h"
-#include "asterisk/translate.h"
-#include "asterisk/netsock2.h"
-#include "asterisk/_private.h"
-#include "asterisk/framehook.h"
-#include "asterisk/stasis.h"
-#include "asterisk/json.h"
-#include "asterisk/stasis_channels.h"
+#include "asterisk/module.h"            /* for ast_module_unref, etc */
+#include "asterisk/netsock2.h"          /* for ast_sockaddr_copy, etc */
+#include "asterisk/options.h"           /* for ast_option_rtpptdynamic */
+#include "asterisk/pbx.h"               /* for pbx_builtin_setvar_helper */
+#include "asterisk/res_srtp.h"          /* for ast_srtp_res */
+#include "asterisk/rtp_engine.h"        /* for ast_rtp_codecs, etc */
+#include "asterisk/stasis.h"            /* for stasis_message_data, etc */
+#include "asterisk/stasis_channels.h"   /* for ast_channel_stage_snapshot, etc */
+#include "asterisk/strings.h"           /* for ast_str_append, etc */
+#include "asterisk/time.h"              /* for ast_tvdiff_ms, ast_tvnow */
+#include "asterisk/translate.h"         /* for ast_translate_available_formats */
+#include "asterisk/utils.h"             /* for ast_free, ast_strdup, etc */
+#include "asterisk/vector.h"            /* for AST_VECTOR_GET, etc */
 
 struct ast_srtp_res *res_srtp = NULL;
 struct ast_srtp_policy_res *res_srtp_policy = NULL;
@@ -170,8 +187,10 @@ struct ast_rtp_instance {
        int properties[AST_RTP_PROPERTY_MAX];
        /*! Address that we are expecting RTP to come in to */
        struct ast_sockaddr local_address;
+       /*! The original source address */
+       struct ast_sockaddr requested_target_address;
        /*! Address that we are sending RTP to */
-       struct ast_sockaddr remote_address;
+       struct ast_sockaddr incoming_source_address;
        /*! Instance that we are bridged to if doing remote or local bridging */
        struct ast_rtp_instance *bridged;
        /*! Payload and packetization information */
@@ -186,8 +205,14 @@ struct ast_rtp_instance {
        struct ast_rtp_glue *glue;
        /*! SRTP info associated with the instance */
        struct ast_srtp *srtp;
+       /*! SRTP info dedicated for RTCP associated with the instance */
+       struct ast_srtp *rtcp_srtp;
        /*! Channel unique ID */
        char channel_uniqueid[AST_MAX_UNIQUEID];
+       /*! Time of last packet sent */
+       time_t last_tx;
+       /*! Time of last packet received */
+       time_t last_rx;
 };
 
 /*! List of RTP engines that are currently registered */
@@ -196,12 +221,18 @@ static AST_RWLIST_HEAD_STATIC(engines, ast_rtp_engine);
 /*! List of RTP glues */
 static AST_RWLIST_HEAD_STATIC(glues, ast_rtp_glue);
 
+#define MAX_RTP_MIME_TYPES 128
+
 /*! The following array defines the MIME Media type (and subtype) for each
    of our codecs, or RTP-specific data type. */
 static struct ast_rtp_mime_type {
+       /*! \brief A mapping object between the Asterisk codec and this RTP payload */
        struct ast_rtp_payload_type payload_type;
-       char *type;
-       char *subtype;
+       /*! \brief The media type */
+       char type[16];
+       /*! \brief The format type */
+       char subtype[64];
+       /*! \brief Expected sample rate of the /c subtype */
        unsigned int sample_rate;
 } ast_rtp_mime_types[128]; /* This will Likely not need to grow any time soon. */
 static ast_rwlock_t mime_types_lock;
@@ -217,12 +248,34 @@ static int mime_types_len = 0;
  * See http://www.iana.org/assignments/rtp-parameters for a list of
  * assigned values
  */
-static struct ast_rtp_payload_type static_RTP_PT[AST_RTP_MAX_PT];
+static struct ast_rtp_payload_type *static_RTP_PT[AST_RTP_MAX_PT];
 static ast_rwlock_t static_RTP_PT_lock;
 
 /*! \brief \ref stasis topic for RTP related messages */
 static struct stasis_topic *rtp_topic;
 
+
+/*!
+ * \internal
+ * \brief Destructor for \c ast_rtp_payload_type
+ */
+static void rtp_payload_type_dtor(void *obj)
+{
+       struct ast_rtp_payload_type *payload = obj;
+
+       ao2_cleanup(payload->format);
+}
+
+struct ast_rtp_payload_type *ast_rtp_engine_alloc_payload_type(void)
+{
+       struct ast_rtp_payload_type *payload;
+
+       payload = ao2_alloc_options(sizeof(*payload), rtp_payload_type_dtor,
+               AO2_ALLOC_OPT_LOCK_NOLOCK);
+
+       return payload;
+}
+
 int ast_rtp_engine_register2(struct ast_rtp_engine *engine, struct ast_module *module)
 {
        struct ast_rtp_engine *current_engine;
@@ -330,6 +383,10 @@ static void instance_destructor(void *obj)
                res_srtp->destroy(instance->srtp);
        }
 
+       if (instance->rtcp_srtp) {
+               res_srtp->destroy(instance->rtcp_srtp);
+       }
+
        ast_rtp_codecs_payloads_destroy(&instance->codecs);
 
        /* Drop our engine reference */
@@ -443,20 +500,28 @@ int ast_rtp_instance_set_local_address(struct ast_rtp_instance *instance,
        return 0;
 }
 
-int ast_rtp_instance_set_remote_address(struct ast_rtp_instance *instance,
-               const struct ast_sockaddr *address)
+int ast_rtp_instance_set_incoming_source_address(struct ast_rtp_instance *instance,
+                                                const struct ast_sockaddr *address)
 {
-       ast_sockaddr_copy(&instance->remote_address, address);
+       ast_sockaddr_copy(&instance->incoming_source_address, address);
 
        /* moo */
 
        if (instance->engine->remote_address_set) {
-               instance->engine->remote_address_set(instance, &instance->remote_address);
+               instance->engine->remote_address_set(instance, &instance->incoming_source_address);
        }
 
        return 0;
 }
 
+int ast_rtp_instance_set_requested_target_address(struct ast_rtp_instance *instance,
+                                                 const struct ast_sockaddr *address)
+{
+       ast_sockaddr_copy(&instance->requested_target_address, address);
+
+       return ast_rtp_instance_set_incoming_source_address(instance, address);
+}
+
 int ast_rtp_instance_get_and_cmp_local_address(struct ast_rtp_instance *instance,
                struct ast_sockaddr *address)
 {
@@ -474,21 +539,27 @@ void ast_rtp_instance_get_local_address(struct ast_rtp_instance *instance,
        ast_sockaddr_copy(address, &instance->local_address);
 }
 
-int ast_rtp_instance_get_and_cmp_remote_address(struct ast_rtp_instance *instance,
+int ast_rtp_instance_get_and_cmp_requested_target_address(struct ast_rtp_instance *instance,
                struct ast_sockaddr *address)
 {
-       if (ast_sockaddr_cmp(address, &instance->remote_address) != 0) {
-               ast_sockaddr_copy(address, &instance->remote_address);
+       if (ast_sockaddr_cmp(address, &instance->requested_target_address) != 0) {
+               ast_sockaddr_copy(address, &instance->requested_target_address);
                return 1;
        }
 
        return 0;
 }
 
-void ast_rtp_instance_get_remote_address(struct ast_rtp_instance *instance,
-               struct ast_sockaddr *address)
+void ast_rtp_instance_get_incoming_source_address(struct ast_rtp_instance *instance,
+                                                 struct ast_sockaddr *address)
+{
+       ast_sockaddr_copy(address, &instance->incoming_source_address);
+}
+
+void ast_rtp_instance_get_requested_target_address(struct ast_rtp_instance *instance,
+                                                  struct ast_sockaddr *address)
 {
-       ast_sockaddr_copy(address, &instance->remote_address);
+       ast_sockaddr_copy(address, &instance->requested_target_address);
 }
 
 void ast_rtp_instance_set_extended_prop(struct ast_rtp_instance *instance, int property, void *value)
@@ -526,39 +597,46 @@ struct ast_rtp_codecs *ast_rtp_instance_get_codecs(struct ast_rtp_instance *inst
        return &instance->codecs;
 }
 
-static int rtp_payload_type_hash(const void *obj, const int flags)
+int ast_rtp_codecs_payloads_initialize(struct ast_rtp_codecs *codecs)
 {
-       const struct ast_rtp_payload_type *type = obj;
-       const int *payload = obj;
+       int res;
+
+       codecs->framing = 0;
+       ast_rwlock_init(&codecs->codecs_lock);
+       res = AST_VECTOR_INIT(&codecs->payload_mapping_rx, AST_RTP_MAX_PT);
+       res |= AST_VECTOR_INIT(&codecs->payload_mapping_tx, AST_RTP_MAX_PT);
+       if (res) {
+               AST_VECTOR_FREE(&codecs->payload_mapping_rx);
+               AST_VECTOR_FREE(&codecs->payload_mapping_tx);
+       }
 
-       return (flags & OBJ_KEY) ? *payload : type->payload;
+       return res;
 }
 
-static int rtp_payload_type_cmp(void *obj, void *arg, int flags)
+void ast_rtp_codecs_payloads_destroy(struct ast_rtp_codecs *codecs)
 {
-       struct ast_rtp_payload_type *type1 = obj, *type2 = arg;
-       const int *payload = arg;
+       int idx;
+       struct ast_rtp_payload_type *type;
 
-       return (type1->payload == (OBJ_KEY ? *payload : type2->payload)) ? CMP_MATCH | CMP_STOP : 0;
-}
+       for (idx = 0; idx < AST_VECTOR_SIZE(&codecs->payload_mapping_rx); ++idx) {
+               type = AST_VECTOR_GET(&codecs->payload_mapping_rx, idx);
+               ao2_t_cleanup(type, "destroying ast_rtp_codec rx mapping");
+       }
+       AST_VECTOR_FREE(&codecs->payload_mapping_rx);
 
-int ast_rtp_codecs_payloads_initialize(struct ast_rtp_codecs *codecs)
-{
-       if (!(codecs->payloads = ao2_container_alloc(AST_RTP_MAX_PT, rtp_payload_type_hash, rtp_payload_type_cmp))) {
-               return -1;
+       for (idx = 0; idx < AST_VECTOR_SIZE(&codecs->payload_mapping_tx); ++idx) {
+               type = AST_VECTOR_GET(&codecs->payload_mapping_tx, idx);
+               ao2_t_cleanup(type, "destroying ast_rtp_codec tx mapping");
        }
+       AST_VECTOR_FREE(&codecs->payload_mapping_tx);
 
-       return 0;
-}
-
-void ast_rtp_codecs_payloads_destroy(struct ast_rtp_codecs *codecs)
-{
-       ao2_cleanup(codecs->payloads);
+       ast_rwlock_destroy(&codecs->codecs_lock);
 }
 
 void ast_rtp_codecs_payloads_clear(struct ast_rtp_codecs *codecs, struct ast_rtp_instance *instance)
 {
        ast_rtp_codecs_payloads_destroy(codecs);
+       ast_rtp_codecs_payloads_initialize(codecs);
 
        if (instance && instance->engine && instance->engine->payload_set) {
                int i;
@@ -566,111 +644,324 @@ void ast_rtp_codecs_payloads_clear(struct ast_rtp_codecs *codecs, struct ast_rtp
                        instance->engine->payload_set(instance, i, 0, NULL, 0);
                }
        }
-
-       ast_rtp_codecs_payloads_initialize(codecs);
 }
 
-void ast_rtp_codecs_payloads_default(struct ast_rtp_codecs *codecs, struct ast_rtp_instance *instance)
+/*!
+ * \internal
+ * \brief Clear the rx primary mapping flag on all other matching mappings.
+ * \since 14.0.0
+ *
+ * \param codecs Codecs that need rx clearing.
+ * \param to_match Payload type object to compare against.
+ *
+ * \note It is assumed that codecs is write locked before calling.
+ *
+ * \return Nothing
+ */
+static void payload_mapping_rx_clear_primary(struct ast_rtp_codecs *codecs, struct ast_rtp_payload_type *to_match)
 {
-       int i;
+       int idx;
+       struct ast_rtp_payload_type *current;
+       struct ast_rtp_payload_type *new_type;
+       struct timeval now;
 
-       ast_rwlock_rdlock(&static_RTP_PT_lock);
-       for (i = 0; i < AST_RTP_MAX_PT; i++) {
-               if (static_RTP_PT[i].rtp_code || static_RTP_PT[i].asterisk_format) {
-                       struct ast_rtp_payload_type *type;
-
-                       if (!(type = ao2_alloc(sizeof(*type), NULL))) {
-                               /* Unfortunately if this occurs the payloads container will not contain all possible default payloads
-                                * but we err on the side of doing what we can in the hopes that the extreme memory conditions which
-                                * caused this to occur will go away.
-                                */
+       if (!to_match->primary_mapping) {
+               return;
+       }
+
+       now = ast_tvnow();
+       for (idx = 0; idx < AST_VECTOR_SIZE(&codecs->payload_mapping_rx); ++idx) {
+               current = AST_VECTOR_GET(&codecs->payload_mapping_rx, idx);
+
+               if (!current || current == to_match || !current->primary_mapping) {
+                       continue;
+               }
+               if (current->asterisk_format && to_match->asterisk_format) {
+                       if (ast_format_cmp(current->format, to_match->format) == AST_FORMAT_CMP_NOT_EQUAL) {
+                               continue;
+                       }
+               } else if (!current->asterisk_format && !to_match->asterisk_format) {
+                       if (current->rtp_code != to_match->rtp_code) {
                                continue;
                        }
+               } else {
+                       continue;
+               }
 
-                       type->payload = i;
-                       type->asterisk_format = static_RTP_PT[i].asterisk_format;
-                       type->rtp_code = static_RTP_PT[i].rtp_code;
-                       ast_format_copy(&type->format, &static_RTP_PT[i].format);
+               /* Replace current with non-primary marked version */
+               new_type = ast_rtp_engine_alloc_payload_type();
+               if (!new_type) {
+                       continue;
+               }
+               *new_type = *current;
+               new_type->primary_mapping = 0;
+               new_type->when_retired = now;
+               ao2_bump(new_type->format);
+               AST_VECTOR_REPLACE(&codecs->payload_mapping_rx, idx, new_type);
+               ao2_ref(current, -1);
+       }
+}
 
-                       ao2_link_flags(codecs->payloads, type, OBJ_NOLOCK);
+/*!
+ * \internal
+ * \brief Put the new_type into the rx payload type mapping.
+ * \since 14.0.0
+ *
+ * \param codecs Codecs structure to put new_type into
+ * \param payload type position to replace.
+ * \param new_type RTP payload mapping object to store.
+ *
+ * \note It is assumed that codecs is write locked before calling.
+ *
+ * \return Nothing
+ */
+static void rtp_codecs_payload_replace_rx(struct ast_rtp_codecs *codecs, int payload, struct ast_rtp_payload_type *new_type)
+{
+       ao2_ref(new_type, +1);
+       if (payload < AST_VECTOR_SIZE(&codecs->payload_mapping_rx)) {
+               ao2_t_cleanup(AST_VECTOR_GET(&codecs->payload_mapping_rx, payload),
+                       "cleaning up rx mapping vector element about to be replaced");
+       }
+       AST_VECTOR_REPLACE(&codecs->payload_mapping_rx, payload, new_type);
 
-                       if (instance && instance->engine && instance->engine->payload_set) {
-                               instance->engine->payload_set(instance, i, type->asterisk_format, &type->format, type->rtp_code);
-                       }
+       payload_mapping_rx_clear_primary(codecs, new_type);
+}
+
+/*!
+ * \internal
+ * \brief Copy the rx payload type mapping to the destination.
+ * \since 14.0.0
+ *
+ * \param src The source codecs structure
+ * \param dest The destination codecs structure that the values from src will be copied to
+ * \param instance Optionally the instance that the dst codecs structure belongs to
+ *
+ * \note It is assumed that src is at least read locked before calling.
+ * \note It is assumed that dest is write locked before calling.
+ *
+ * \return Nothing
+ */
+static void rtp_codecs_payloads_copy_rx(struct ast_rtp_codecs *src, struct ast_rtp_codecs *dest, struct ast_rtp_instance *instance)
+{
+       int idx;
+       struct ast_rtp_payload_type *type;
 
-                       ao2_ref(type, -1);
+       for (idx = 0; idx < AST_VECTOR_SIZE(&src->payload_mapping_rx); ++idx) {
+               type = AST_VECTOR_GET(&src->payload_mapping_rx, idx);
+               if (!type) {
+                       continue;
+               }
+
+               ast_debug(2, "Copying rx payload mapping %d (%p) from %p to %p\n",
+                       idx, type, src, dest);
+               rtp_codecs_payload_replace_rx(dest, idx, type);
+
+               if (instance && instance->engine && instance->engine->payload_set) {
+                       instance->engine->payload_set(instance, idx, type->asterisk_format, type->format, type->rtp_code);
                }
        }
-       ast_rwlock_unlock(&static_RTP_PT_lock);
 }
 
-void ast_rtp_codecs_payloads_copy(struct ast_rtp_codecs *src, struct ast_rtp_codecs *dest, struct ast_rtp_instance *instance)
+/*!
+ * \internal
+ * \brief Determine if a type of payload is already present in mappings.
+ * \since 14.0.0
+ *
+ * \param codecs Codecs to be checked for mappings.
+ * \param to_match Payload type object to compare against.
+ *
+ * \note It is assumed that codecs is write locked before calling.
+ *
+ * \retval 0 not found
+ * \retval 1 found
+ */
+static int payload_mapping_tx_is_present(const struct ast_rtp_codecs *codecs, const struct ast_rtp_payload_type *to_match)
 {
-       int i;
-       struct ast_rtp_payload_type *type;
+       int idx;
+       struct ast_rtp_payload_type *current;
 
-       for (i = 0; i < AST_RTP_MAX_PT; i++) {
-               struct ast_rtp_payload_type *new_type;
+       for (idx = 0; idx < AST_VECTOR_SIZE(&codecs->payload_mapping_tx); ++idx) {
+               current = AST_VECTOR_GET(&codecs->payload_mapping_tx, idx);
 
-               if (!(type = ao2_find(src->payloads, &i, OBJ_KEY | OBJ_NOLOCK))) {
+               if (!current) {
                        continue;
                }
-
-               if (!(new_type = ao2_alloc(sizeof(*new_type), NULL))) {
+               if (current == to_match) {
+                       /* The exact object is already in the mapping. */
+                       return 1;
+               }
+               if (current->asterisk_format && to_match->asterisk_format) {
+                       if (ast_format_get_codec_id(current->format) != ast_format_get_codec_id(to_match->format)) {
+                               continue;
+                       } else if (current->payload == to_match->payload) {
+                               return 0;
+                       }
+               } else if (!current->asterisk_format && !to_match->asterisk_format) {
+                       if (current->rtp_code != to_match->rtp_code) {
+                               continue;
+                       }
+               } else {
                        continue;
                }
 
-               ast_debug(2, "Copying payload %d from %p to %p\n", i, src, dest);
+               return 1;
+       }
 
-               new_type->payload = i;
-               *new_type = *type;
+       return 0;
+}
 
-               ao2_link_flags(dest->payloads, new_type, OBJ_NOLOCK);
+/*!
+ * \internal
+ * \brief Copy the tx payload type mapping to the destination.
+ * \since 14.0.0
+ *
+ * \param src The source codecs structure
+ * \param dest The destination codecs structure that the values from src will be copied to
+ * \param instance Optionally the instance that the dst codecs structure belongs to
+ *
+ * \note It is assumed that src is at least read locked before calling.
+ * \note It is assumed that dest is write locked before calling.
+ *
+ * \return Nothing
+ */
+static void rtp_codecs_payloads_copy_tx(struct ast_rtp_codecs *src, struct ast_rtp_codecs *dest, struct ast_rtp_instance *instance)
+{
+       int idx;
+       struct ast_rtp_payload_type *type;
 
-               ao2_ref(new_type, -1);
+       for (idx = 0; idx < AST_VECTOR_SIZE(&src->payload_mapping_tx); ++idx) {
+               type = AST_VECTOR_GET(&src->payload_mapping_tx, idx);
+               if (!type) {
+                       continue;
+               }
 
-               if (instance && instance->engine && instance->engine->payload_set) {
-                       instance->engine->payload_set(instance, i, type->asterisk_format, &type->format, type->rtp_code);
+               ast_debug(2, "Copying tx payload mapping %d (%p) from %p to %p\n",
+                       idx, type, src, dest);
+               ao2_ref(type, +1);
+               if (idx < AST_VECTOR_SIZE(&dest->payload_mapping_tx)) {
+                       ao2_t_cleanup(AST_VECTOR_GET(&dest->payload_mapping_tx, idx),
+                               "cleaning up tx mapping vector element about to be replaced");
                }
+               AST_VECTOR_REPLACE(&dest->payload_mapping_tx, idx, type);
 
-               ao2_ref(type, -1);
+               if (instance && instance->engine && instance->engine->payload_set) {
+                       instance->engine->payload_set(instance, idx, type->asterisk_format, type->format, type->rtp_code);
+               }
        }
 }
 
-void ast_rtp_codecs_payloads_set_m_type(struct ast_rtp_codecs *codecs, struct ast_rtp_instance *instance, int payload)
+void ast_rtp_codecs_payloads_copy(struct ast_rtp_codecs *src, struct ast_rtp_codecs *dest, struct ast_rtp_instance *instance)
 {
+       int idx;
        struct ast_rtp_payload_type *type;
 
-       ast_rwlock_rdlock(&static_RTP_PT_lock);
+       ast_rwlock_wrlock(&dest->codecs_lock);
 
-       if (payload < 0 || payload >= AST_RTP_MAX_PT) {
-               ast_rwlock_unlock(&static_RTP_PT_lock);
-               return;
+       /* Deadlock avoidance because of held write lock. */
+       while (ast_rwlock_tryrdlock(&src->codecs_lock)) {
+               ast_rwlock_unlock(&dest->codecs_lock);
+               sched_yield();
+               ast_rwlock_wrlock(&dest->codecs_lock);
        }
 
-       if (!(type = ao2_find(codecs->payloads, &payload, OBJ_KEY | OBJ_NOLOCK))) {
-               if (!(type = ao2_alloc(sizeof(*type), NULL))) {
-                       ast_rwlock_unlock(&static_RTP_PT_lock);
-                       return;
+       /*
+        * This represents a completely new mapping of what the remote party is
+        * expecting for payloads, so we clear out the entire tx payload mapping
+        * vector and replace it.
+        */
+       for (idx = 0; idx < AST_VECTOR_SIZE(&dest->payload_mapping_tx); ++idx) {
+               type = AST_VECTOR_GET(&dest->payload_mapping_tx, idx);
+               ao2_t_cleanup(type, "destroying ast_rtp_codec tx mapping");
+               AST_VECTOR_REPLACE(&dest->payload_mapping_tx, idx, NULL);
+       }
+
+       rtp_codecs_payloads_copy_rx(src, dest, instance);
+       rtp_codecs_payloads_copy_tx(src, dest, instance);
+       dest->framing = src->framing;
+
+       ast_rwlock_unlock(&src->codecs_lock);
+       ast_rwlock_unlock(&dest->codecs_lock);
+}
+
+void ast_rtp_codecs_payloads_xover(struct ast_rtp_codecs *src, struct ast_rtp_codecs *dest, struct ast_rtp_instance *instance)
+{
+       int idx;
+       struct ast_rtp_payload_type *type;
+
+       ast_rwlock_wrlock(&dest->codecs_lock);
+       if (src != dest) {
+               /* Deadlock avoidance because of held write lock. */
+               while (ast_rwlock_tryrdlock(&src->codecs_lock)) {
+                       ast_rwlock_unlock(&dest->codecs_lock);
+                       sched_yield();
+                       ast_rwlock_wrlock(&dest->codecs_lock);
                }
-               type->payload = payload;
-               ao2_link_flags(codecs->payloads, type, OBJ_NOLOCK);
        }
 
-       type->asterisk_format = static_RTP_PT[payload].asterisk_format;
-       type->rtp_code = static_RTP_PT[payload].rtp_code;
-       type->payload = payload;
-       ast_format_copy(&type->format, &static_RTP_PT[payload].format);
+       /* Crossover copy payload type tx mapping to rx mapping. */
+       for (idx = 0; idx < AST_VECTOR_SIZE(&src->payload_mapping_tx); ++idx) {
+               type = AST_VECTOR_GET(&src->payload_mapping_tx, idx);
+               if (!type) {
+                       continue;
+               }
 
-       ast_debug(1, "Setting payload %d based on m type on %p\n", payload, codecs);
+               /* All tx mapping elements should have the primary flag set. */
+               ast_assert(type->primary_mapping);
 
-       if (instance && instance->engine && instance->engine->payload_set) {
-               instance->engine->payload_set(instance, payload, type->asterisk_format, &type->format, type->rtp_code);
+               ast_debug(2, "Crossover copying tx to rx payload mapping %d (%p) from %p to %p\n",
+                       idx, type, src, dest);
+               rtp_codecs_payload_replace_rx(dest, idx, type);
+
+               if (instance && instance->engine && instance->engine->payload_set) {
+                       instance->engine->payload_set(instance, idx, type->asterisk_format, type->format, type->rtp_code);
+               }
        }
 
-       ao2_ref(type, -1);
+       dest->framing = src->framing;
+
+       if (src != dest) {
+               ast_rwlock_unlock(&src->codecs_lock);
+       }
+       ast_rwlock_unlock(&dest->codecs_lock);
+}
+
+void ast_rtp_codecs_payloads_set_m_type(struct ast_rtp_codecs *codecs, struct ast_rtp_instance *instance, int payload)
+{
+       struct ast_rtp_payload_type *new_type;
+
+       if (payload < 0 || payload >= AST_RTP_MAX_PT) {
+               return;
+       }
 
+       ast_rwlock_rdlock(&static_RTP_PT_lock);
+       new_type = ao2_bump(static_RTP_PT[payload]);
        ast_rwlock_unlock(&static_RTP_PT_lock);
+       if (!new_type) {
+               ast_debug(1, "Don't have a default tx payload type %d format for m type on %p\n",
+                       payload, codecs);
+               return;
+       }
+
+       ast_debug(1, "Setting tx payload type %d based on m type on %p\n",
+               payload, codecs);
+
+       ast_rwlock_wrlock(&codecs->codecs_lock);
+
+       if (!payload_mapping_tx_is_present(codecs, new_type)) {
+               if (payload < AST_VECTOR_SIZE(&codecs->payload_mapping_tx)) {
+                       ao2_t_cleanup(AST_VECTOR_GET(&codecs->payload_mapping_tx, payload),
+                               "cleaning up replaced tx payload type");
+               }
+               AST_VECTOR_REPLACE(&codecs->payload_mapping_tx, payload, new_type);
+
+               if (instance && instance->engine && instance->engine->payload_set) {
+                       instance->engine->payload_set(instance, payload, new_type->asterisk_format, new_type->format, new_type->rtp_code);
+               }
+       } else {
+               ao2_ref(new_type, -1);
+       }
+
+       ast_rwlock_unlock(&codecs->codecs_lock);
 }
 
 int ast_rtp_codecs_payloads_set_rtpmap_type_rate(struct ast_rtp_codecs *codecs, struct ast_rtp_instance *instance, int pt,
@@ -678,16 +969,19 @@ int ast_rtp_codecs_payloads_set_rtpmap_type_rate(struct ast_rtp_codecs *codecs,
                                 enum ast_rtp_options options,
                                 unsigned int sample_rate)
 {
-       unsigned int i;
+       unsigned int idx;
        int found = 0;
 
-       if (pt < 0 || pt >= AST_RTP_MAX_PT)
+       if (pt < 0 || pt >= AST_RTP_MAX_PT) {
                return -1; /* bogus payload type */
+       }
 
        ast_rwlock_rdlock(&mime_types_lock);
-       for (i = 0; i < mime_types_len; ++i) {
-               const struct ast_rtp_mime_type *t = &ast_rtp_mime_types[i];
-               struct ast_rtp_payload_type *type;
+       ast_rwlock_wrlock(&codecs->codecs_lock);
+
+       for (idx = 0; idx < mime_types_len; ++idx) {
+               const struct ast_rtp_mime_type *t = &ast_rtp_mime_types[idx];
+               struct ast_rtp_payload_type *new_type;
 
                if (strcasecmp(mimesubtype, t->subtype)) {
                        continue;
@@ -707,29 +1001,46 @@ int ast_rtp_codecs_payloads_set_rtpmap_type_rate(struct ast_rtp_codecs *codecs,
 
                found = 1;
 
-               if (!(type = ao2_find(codecs->payloads, &pt, OBJ_KEY | OBJ_NOLOCK))) {
-                       if (!(type = ao2_alloc(sizeof(*type), NULL))) {
-                               continue;
-                       }
-                       type->payload = pt;
-                       ao2_link_flags(codecs->payloads, type, OBJ_NOLOCK);
+               new_type = ast_rtp_engine_alloc_payload_type();
+               if (!new_type) {
+                       continue;
                }
 
-               *type = t->payload_type;
-               type->payload = pt;
-
-               if ((t->payload_type.format.id == AST_FORMAT_G726) && t->payload_type.asterisk_format && (options & AST_RTP_OPT_G726_NONSTANDARD)) {
-                       ast_format_set(&type->format, AST_FORMAT_G726_AAL2, 0);
+               new_type->asterisk_format = t->payload_type.asterisk_format;
+               new_type->rtp_code = t->payload_type.rtp_code;
+               new_type->payload = pt;
+               new_type->primary_mapping = 1;
+               if (t->payload_type.asterisk_format
+                       && ast_format_cmp(t->payload_type.format, ast_format_g726) == AST_FORMAT_CMP_EQUAL
+                       && (options & AST_RTP_OPT_G726_NONSTANDARD)) {
+                       new_type->format = ast_format_g726_aal2;
+               } else {
+                       new_type->format = t->payload_type.format;
                }
 
-               if (instance && instance->engine && instance->engine->payload_set) {
-                       instance->engine->payload_set(instance, pt, type->asterisk_format, &type->format, type->rtp_code);
+               if (new_type->format) {
+                       /* SDP parsing automatically increases the reference count */
+                       new_type->format = ast_format_parse_sdp_fmtp(new_type->format, "");
                }
 
-               ao2_ref(type, -1);
+               if (!payload_mapping_tx_is_present(codecs, new_type)) {
+                       if (pt < AST_VECTOR_SIZE(&codecs->payload_mapping_tx)) {
+                               ao2_t_cleanup(AST_VECTOR_GET(&codecs->payload_mapping_tx, pt),
+                                       "cleaning up replaced tx payload type");
+                       }
+                       AST_VECTOR_REPLACE(&codecs->payload_mapping_tx, pt, new_type);
+
+                       if (instance && instance->engine && instance->engine->payload_set) {
+                               instance->engine->payload_set(instance, pt, new_type->asterisk_format, new_type->format, new_type->rtp_code);
+                       }
+               } else {
+                       ao2_ref(new_type, -1);
+               }
 
                break;
        }
+
+       ast_rwlock_unlock(&codecs->codecs_lock);
        ast_rwlock_unlock(&mime_types_lock);
 
        return (found ? 0 : -2);
@@ -742,158 +1053,448 @@ int ast_rtp_codecs_payloads_set_rtpmap_type(struct ast_rtp_codecs *codecs, struc
 
 void ast_rtp_codecs_payloads_unset(struct ast_rtp_codecs *codecs, struct ast_rtp_instance *instance, int payload)
 {
+       struct ast_rtp_payload_type *type;
+
        if (payload < 0 || payload >= AST_RTP_MAX_PT) {
                return;
        }
 
        ast_debug(2, "Unsetting payload %d on %p\n", payload, codecs);
 
-       ao2_find(codecs->payloads, &payload, OBJ_KEY | OBJ_NOLOCK | OBJ_NODATA | OBJ_UNLINK);
+       ast_rwlock_wrlock(&codecs->codecs_lock);
+
+       if (payload < AST_VECTOR_SIZE(&codecs->payload_mapping_tx)) {
+               type = AST_VECTOR_GET(&codecs->payload_mapping_tx, payload);
+               ao2_cleanup(type);
+               AST_VECTOR_REPLACE(&codecs->payload_mapping_tx, payload, NULL);
+       }
 
        if (instance && instance->engine && instance->engine->payload_set) {
                instance->engine->payload_set(instance, payload, 0, NULL, 0);
        }
+
+       ast_rwlock_unlock(&codecs->codecs_lock);
 }
 
-struct ast_rtp_payload_type ast_rtp_codecs_payload_lookup(struct ast_rtp_codecs *codecs, int payload)
+struct ast_rtp_payload_type *ast_rtp_codecs_get_payload(struct ast_rtp_codecs *codecs, int payload)
 {
-       struct ast_rtp_payload_type result = { .asterisk_format = 0, }, *type;
+       struct ast_rtp_payload_type *type = NULL;
 
        if (payload < 0 || payload >= AST_RTP_MAX_PT) {
-               return result;
+               return NULL;
        }
 
-       if ((type = ao2_find(codecs->payloads, &payload, OBJ_KEY | OBJ_NOLOCK))) {
-               result = *type;
-               ao2_ref(type, -1);
+       ast_rwlock_rdlock(&codecs->codecs_lock);
+       if (payload < AST_VECTOR_SIZE(&codecs->payload_mapping_rx)) {
+               type = AST_VECTOR_GET(&codecs->payload_mapping_rx, payload);
+               ao2_bump(type);
        }
+       ast_rwlock_unlock(&codecs->codecs_lock);
 
-       if (!result.rtp_code && !result.asterisk_format) {
+       if (!type) {
                ast_rwlock_rdlock(&static_RTP_PT_lock);
-               result = static_RTP_PT[payload];
+               type = ao2_bump(static_RTP_PT[payload]);
                ast_rwlock_unlock(&static_RTP_PT_lock);
        }
 
-       return result;
+       return type;
 }
 
+int ast_rtp_codecs_payload_replace_format(struct ast_rtp_codecs *codecs, int payload, struct ast_format *format)
+{
+       struct ast_rtp_payload_type *type;
+
+       if (payload < 0 || payload >= AST_RTP_MAX_PT || !format) {
+               return -1;
+       }
+
+       type = ast_rtp_engine_alloc_payload_type();
+       if (!type) {
+               return -1;
+       }
+       ao2_ref(format, +1);
+       type->format = format;
+       type->asterisk_format = 1;
+       type->payload = payload;
+       type->primary_mapping = 1;
+
+       ast_rwlock_wrlock(&codecs->codecs_lock);
+       if (!payload_mapping_tx_is_present(codecs, type)) {
+               if (payload < AST_VECTOR_SIZE(&codecs->payload_mapping_tx)) {
+                       ao2_cleanup(AST_VECTOR_GET(&codecs->payload_mapping_tx, payload));
+               }
+               AST_VECTOR_REPLACE(&codecs->payload_mapping_tx, payload, type);
+       } else {
+               ao2_ref(type, -1);
+       }
+       ast_rwlock_unlock(&codecs->codecs_lock);
+
+       return 0;
+}
 
 struct ast_format *ast_rtp_codecs_get_payload_format(struct ast_rtp_codecs *codecs, int payload)
 {
        struct ast_rtp_payload_type *type;
-       struct ast_format *format;
+       struct ast_format *format = NULL;
 
        if (payload < 0 || payload >= AST_RTP_MAX_PT) {
                return NULL;
        }
 
-       if (!(type = ao2_find(codecs->payloads, &payload, OBJ_KEY | OBJ_NOLOCK))) {
-               return NULL;
+       ast_rwlock_rdlock(&codecs->codecs_lock);
+       if (payload < AST_VECTOR_SIZE(&codecs->payload_mapping_tx)) {
+               type = AST_VECTOR_GET(&codecs->payload_mapping_tx, payload);
+               if (type && type->asterisk_format) {
+                       format = ao2_bump(type->format);
+               }
        }
-
-       format = type->asterisk_format ? &type->format : NULL;
-
-       ao2_ref(type, -1);
+       ast_rwlock_unlock(&codecs->codecs_lock);
 
        return format;
 }
 
-static int rtp_payload_type_add_ast(void *obj, void *arg, int flags)
+void ast_rtp_codecs_set_framing(struct ast_rtp_codecs *codecs, unsigned int framing)
 {
-       struct ast_rtp_payload_type *type = obj;
-       struct ast_format_cap *astformats = arg;
-
-       if (type->asterisk_format) {
-               ast_format_cap_add(astformats, &type->format);
+       if (!framing) {
+               return;
        }
 
-       return 0;
+       ast_rwlock_wrlock(&codecs->codecs_lock);
+       codecs->framing = framing;
+       ast_rwlock_unlock(&codecs->codecs_lock);
 }
 
-static int rtp_payload_type_add_nonast(void *obj, void *arg, int flags)
+unsigned int ast_rtp_codecs_get_framing(struct ast_rtp_codecs *codecs)
 {
-       struct ast_rtp_payload_type *type = obj;
-       int *nonastformats = arg;
+       unsigned int framing;
 
-       if (!type->asterisk_format) {
-               *nonastformats |= type->rtp_code;
-       }
+       ast_rwlock_rdlock(&codecs->codecs_lock);
+       framing = codecs->framing;
+       ast_rwlock_unlock(&codecs->codecs_lock);
 
-       return 0;
+       return framing;
 }
 
 void ast_rtp_codecs_payload_formats(struct ast_rtp_codecs *codecs, struct ast_format_cap *astformats, int *nonastformats)
 {
-       ast_format_cap_remove_all(astformats);
+       int idx;
+
+       ast_format_cap_remove_by_type(astformats, AST_MEDIA_TYPE_UNKNOWN);
        *nonastformats = 0;
 
-       ao2_callback(codecs->payloads, OBJ_NODATA | OBJ_MULTIPLE | OBJ_NOLOCK, rtp_payload_type_add_ast, astformats);
-       ao2_callback(codecs->payloads, OBJ_NODATA | OBJ_MULTIPLE | OBJ_NOLOCK, rtp_payload_type_add_nonast, nonastformats);
+       ast_rwlock_rdlock(&codecs->codecs_lock);
+
+       for (idx = 0; idx < AST_VECTOR_SIZE(&codecs->payload_mapping_tx); ++idx) {
+               struct ast_rtp_payload_type *type;
+
+               type = AST_VECTOR_GET(&codecs->payload_mapping_tx, idx);
+               if (!type) {
+                       continue;
+               }
+
+               if (type->asterisk_format) {
+                       ast_format_cap_append(astformats, type->format, 0);
+               } else {
+                       *nonastformats |= type->rtp_code;
+               }
+       }
+       if (codecs->framing) {
+               ast_format_cap_set_framing(astformats, codecs->framing);
+       }
+
+       ast_rwlock_unlock(&codecs->codecs_lock);
 }
 
-static int rtp_payload_type_find_format(void *obj, void *arg, int flags)
+/*!
+ * \internal
+ * \brief Find the static payload type mapping for the format.
+ * \since 14.0.0
+ *
+ * \param asterisk_format Non-zero if the given Asterisk format is present
+ * \param format Asterisk format to look for
+ * \param code The non-Asterisk format code to look for
+ *
+ * \note It is assumed that static_RTP_PT_lock is at least read locked before calling.
+ *
+ * \retval Numerical payload type
+ * \retval -1 if not found.
+ */
+static int find_static_payload_type(int asterisk_format, const struct ast_format *format, int code)
 {
-       struct ast_rtp_payload_type *type = obj;
-       struct ast_format *format = arg;
+       int idx;
+       int payload = -1;
+
+       if (!asterisk_format) {
+               for (idx = 0; idx < AST_RTP_MAX_PT; ++idx) {
+                       if (static_RTP_PT[idx]
+                               && !static_RTP_PT[idx]->asterisk_format
+                               && static_RTP_PT[idx]->rtp_code == code) {
+                               payload = idx;
+                               break;
+                       }
+               }
+       } else if (format) {
+               for (idx = 0; idx < AST_RTP_MAX_PT; ++idx) {
+                       if (static_RTP_PT[idx]
+                               && static_RTP_PT[idx]->asterisk_format
+                               && ast_format_cmp(format, static_RTP_PT[idx]->format)
+                                       != AST_FORMAT_CMP_NOT_EQUAL) {
+                               payload = idx;
+                               break;
+                       }
+               }
+       }
 
-       return (type->asterisk_format && (ast_format_cmp(&type->format, format) != AST_FORMAT_CMP_NOT_EQUAL)) ? CMP_MATCH | CMP_STOP : 0;
+       return payload;
 }
 
-static int rtp_payload_type_find_nonast_format(void *obj, void *arg, int flags)
+/*!
+ * \internal
+ * \brief Find the first unused dynamic rx payload type.
+ * \since 14.0.0
+ *
+ * \param codecs Codecs structure to look in
+ *
+ * \note It is assumed that codecs is at least read locked before calling.
+ *
+ * \retval Numerical payload type
+ * \retval -1 if not found.
+ */
+static int rtp_codecs_find_empty_dynamic_rx(struct ast_rtp_codecs *codecs)
 {
-       struct ast_rtp_payload_type *type = obj;
-       int *rtp_code = arg;
-
-       return ((!type->asterisk_format && (type->rtp_code == *rtp_code)) ? CMP_MATCH | CMP_STOP : 0);
+       struct ast_rtp_payload_type *type;
+       int idx;
+       int payload = -1;
+
+       idx = AST_RTP_PT_FIRST_DYNAMIC;
+       for (; idx < AST_VECTOR_SIZE(&codecs->payload_mapping_rx); ++idx) {
+               type = AST_VECTOR_GET(&codecs->payload_mapping_rx, idx);
+               if (!type) {
+                       payload = idx;
+                       break;
+               }
+       }
+       return payload;
 }
 
-int ast_rtp_codecs_payload_code(struct ast_rtp_codecs *codecs, int asterisk_format, const struct ast_format *format, int code)
+/*!
+ * \internal
+ * \brief Find the oldest non-primary dynamic rx payload type.
+ * \since 14.0.0
+ *
+ * \param codecs Codecs structure to look in
+ *
+ * \note It is assumed that codecs is at least read locked before calling.
+ *
+ * \retval Numerical payload type
+ * \retval -1 if not found.
+ */
+static int rtp_codecs_find_non_primary_dynamic_rx(struct ast_rtp_codecs *codecs)
 {
        struct ast_rtp_payload_type *type;
-       int i, res = -1;
+       struct timeval oldest;
+       int idx;
+       int payload = -1;
+
+       idx = AST_RTP_PT_FIRST_DYNAMIC;
+       for (; idx < AST_VECTOR_SIZE(&codecs->payload_mapping_rx); ++idx) {
+               type = AST_VECTOR_GET(&codecs->payload_mapping_rx, idx);
+               if (type
+                       && !type->primary_mapping
+                       && (payload == -1
+                               || ast_tvdiff_ms(type->when_retired, oldest) < 0)) {
+                       oldest = type->when_retired;
+                       payload = idx;
+               }
+       }
+       return payload;
+}
 
-       if (asterisk_format && format && (type = ao2_callback(codecs->payloads, OBJ_NOLOCK, rtp_payload_type_find_format, (void*)format))) {
-               res = type->payload;
-               ao2_ref(type, -1);
-               return res;
-       } else if (!asterisk_format && (type = ao2_callback(codecs->payloads, OBJ_NOLOCK, rtp_payload_type_find_nonast_format, (void*)&code))) {
-               res = type->payload;
-               ao2_ref(type, -1);
-               return res;
+/*!
+ * \internal
+ * \brief Assign a payload type for the rx mapping.
+ * \since 14.0.0
+ *
+ * \param codecs Codecs structure to look in
+ * \param asterisk_format Non-zero if the given Asterisk format is present
+ * \param format Asterisk format to look for
+ * \param code The format to look for
+ *
+ * \note It is assumed that static_RTP_PT_lock is at least read locked before calling.
+ *
+ * \retval Numerical payload type
+ * \retval -1 if could not assign.
+ */
+static int rtp_codecs_assign_payload_code_rx(struct ast_rtp_codecs *codecs, int asterisk_format, struct ast_format *format, int code)
+{
+       int payload;
+       struct ast_rtp_payload_type *new_type;
+
+       payload = find_static_payload_type(asterisk_format, format, code);
+       if (payload < 0) {
+               return payload;
        }
 
+       new_type = ast_rtp_engine_alloc_payload_type();
+       if (!new_type) {
+               return -1;
+       }
+       new_type->format = ao2_bump(format);
+       new_type->asterisk_format = asterisk_format;
+       new_type->rtp_code = code;
+       new_type->payload = payload;
+       new_type->primary_mapping = 1;
+
+       ast_rwlock_wrlock(&codecs->codecs_lock);
+       if (payload < AST_RTP_PT_FIRST_DYNAMIC
+               || AST_VECTOR_SIZE(&codecs->payload_mapping_rx) <= payload
+               || !AST_VECTOR_GET(&codecs->payload_mapping_rx, payload)) {
+               /*
+                * The payload type is a static assignment
+                * or our default dynamic position is available.
+                */
+               rtp_codecs_payload_replace_rx(codecs, payload, new_type);
+       } else if (-1 < (payload = rtp_codecs_find_empty_dynamic_rx(codecs))
+               || -1 < (payload = rtp_codecs_find_non_primary_dynamic_rx(codecs))) {
+               /*
+                * We found the first available empty dynamic position
+                * or we found a mapping that should no longer be
+                * actively used.
+                */
+               new_type->payload = payload;
+               rtp_codecs_payload_replace_rx(codecs, payload, new_type);
+       } else {
+               /*
+                * There are no empty or non-primary dynamic positions
+                * left.  Sadness.
+                *
+                * I don't think this is really possible.
+                */
+               ast_log(LOG_WARNING, "No dynamic RTP payload type values available!\n");
+       }
+       ast_rwlock_unlock(&codecs->codecs_lock);
+
+       ao2_ref(new_type, -1);
+
+       return payload;
+}
+
+int ast_rtp_codecs_payload_code(struct ast_rtp_codecs *codecs, int asterisk_format, struct ast_format *format, int code)
+{
+       struct ast_rtp_payload_type *type;
+       int idx;
+       int payload = -1;
+
        ast_rwlock_rdlock(&static_RTP_PT_lock);
-       for (i = 0; i < AST_RTP_MAX_PT; i++) {
-               if (static_RTP_PT[i].asterisk_format && asterisk_format && format &&
-                       (ast_format_cmp(format, &static_RTP_PT[i].format) != AST_FORMAT_CMP_NOT_EQUAL)) {
-                       res = i;
-                       break;
-               } else if (!static_RTP_PT[i].asterisk_format && !asterisk_format &&
-                       (static_RTP_PT[i].rtp_code == code)) {
-                       res = i;
-                       break;
+       if (!asterisk_format) {
+               ast_rwlock_rdlock(&codecs->codecs_lock);
+               for (idx = 0; idx < AST_VECTOR_SIZE(&codecs->payload_mapping_rx); ++idx) {
+                       type = AST_VECTOR_GET(&codecs->payload_mapping_rx, idx);
+                       if (!type) {
+                               continue;
+                       }
+
+                       if (!type->asterisk_format
+                               && type->primary_mapping
+                               && type->rtp_code == code) {
+                               payload = idx;
+                               break;
+                       }
+               }
+               ast_rwlock_unlock(&codecs->codecs_lock);
+       } else if (format) {
+               ast_rwlock_rdlock(&codecs->codecs_lock);
+               for (idx = 0; idx < AST_VECTOR_SIZE(&codecs->payload_mapping_rx); ++idx) {
+                       type = AST_VECTOR_GET(&codecs->payload_mapping_rx, idx);
+                       if (!type) {
+                               continue;
+                       }
+
+                       if (type->asterisk_format
+                               && type->primary_mapping
+                               && ast_format_cmp(format, type->format) == AST_FORMAT_CMP_EQUAL) {
+                               payload = idx;
+                               break;
+                       }
                }
+               ast_rwlock_unlock(&codecs->codecs_lock);
+       }
+
+       if (payload < 0) {
+               payload = rtp_codecs_assign_payload_code_rx(codecs, asterisk_format, format,
+                       code);
        }
        ast_rwlock_unlock(&static_RTP_PT_lock);
 
-       return res;
+       return payload;
 }
-int ast_rtp_codecs_find_payload_code(struct ast_rtp_codecs *codecs, int code)
+
+int ast_rtp_codecs_payload_code_tx(struct ast_rtp_codecs *codecs, int asterisk_format, const struct ast_format *format, int code)
+{
+       struct ast_rtp_payload_type *type;
+       int idx;
+       int payload = -1;
+
+       if (!asterisk_format) {
+               ast_rwlock_rdlock(&codecs->codecs_lock);
+               for (idx = 0; idx < AST_VECTOR_SIZE(&codecs->payload_mapping_tx); ++idx) {
+                       type = AST_VECTOR_GET(&codecs->payload_mapping_tx, idx);
+                       if (!type) {
+                               continue;
+                       }
+
+                       if (!type->asterisk_format
+                               && type->rtp_code == code) {
+                               payload = idx;
+                               break;
+                       }
+               }
+               ast_rwlock_unlock(&codecs->codecs_lock);
+       } else if (format) {
+               ast_rwlock_rdlock(&codecs->codecs_lock);
+               for (idx = 0; idx < AST_VECTOR_SIZE(&codecs->payload_mapping_tx); ++idx) {
+                       type = AST_VECTOR_GET(&codecs->payload_mapping_tx, idx);
+                       if (!type) {
+                               continue;
+                       }
+
+                       if (type->asterisk_format
+                               && ast_format_cmp(format, type->format) == AST_FORMAT_CMP_EQUAL) {
+                               payload = idx;
+                               break;
+                       }
+               }
+               ast_rwlock_unlock(&codecs->codecs_lock);
+       }
+
+       if (payload < 0) {
+               ast_rwlock_rdlock(&static_RTP_PT_lock);
+               payload = find_static_payload_type(asterisk_format, format, code);
+               ast_rwlock_unlock(&static_RTP_PT_lock);
+       }
+
+       return payload;
+}
+
+int ast_rtp_codecs_find_payload_code(struct ast_rtp_codecs *codecs, int payload)
 {
        struct ast_rtp_payload_type *type;
        int res = -1;
 
-       /* Search the payload type in the codecs passed */
-       if ((type = ao2_find(codecs->payloads, &code, OBJ_NOLOCK | OBJ_KEY)))
-       {
-               res = type->payload;
-               ao2_ref(type, -1);
-               return res;
+       ast_rwlock_rdlock(&codecs->codecs_lock);
+       if (payload < AST_VECTOR_SIZE(&codecs->payload_mapping_tx)) {
+               type = AST_VECTOR_GET(&codecs->payload_mapping_tx, payload);
+               if (type) {
+                       res = payload;
+               }
        }
+       ast_rwlock_unlock(&codecs->codecs_lock);
 
        return res;
 }
-const char *ast_rtp_lookup_mime_subtype2(const int asterisk_format, struct ast_format *format, int code, enum ast_rtp_options options)
+
+const char *ast_rtp_lookup_mime_subtype2(const int asterisk_format,
+       const struct ast_format *format, int code, enum ast_rtp_options options)
 {
        int i;
        const char *res = "";
@@ -901,8 +1502,9 @@ const char *ast_rtp_lookup_mime_subtype2(const int asterisk_format, struct ast_f
        ast_rwlock_rdlock(&mime_types_lock);
        for (i = 0; i < mime_types_len; i++) {
                if (ast_rtp_mime_types[i].payload_type.asterisk_format && asterisk_format && format &&
-                       (ast_format_cmp(format, &ast_rtp_mime_types[i].payload_type.format) != AST_FORMAT_CMP_NOT_EQUAL)) {
-                       if ((format->id == AST_FORMAT_G726_AAL2) && (options & AST_RTP_OPT_G726_NONSTANDARD)) {
+                       (ast_format_cmp(format, ast_rtp_mime_types[i].payload_type.format) != AST_FORMAT_CMP_NOT_EQUAL)) {
+                       if ((ast_format_cmp(format, ast_format_g726_aal2) == AST_FORMAT_CMP_EQUAL) &&
+                                       (options & AST_RTP_OPT_G726_NONSTANDARD)) {
                                res = "G726-32";
                                break;
                        } else {
@@ -921,7 +1523,8 @@ const char *ast_rtp_lookup_mime_subtype2(const int asterisk_format, struct ast_f
        return res;
 }
 
-unsigned int ast_rtp_lookup_sample_rate2(int asterisk_format, struct ast_format *format, int code)
+unsigned int ast_rtp_lookup_sample_rate2(int asterisk_format,
+       const struct ast_format *format, int code)
 {
        unsigned int i;
        unsigned int res = 0;
@@ -929,7 +1532,7 @@ unsigned int ast_rtp_lookup_sample_rate2(int asterisk_format, struct ast_format
        ast_rwlock_rdlock(&mime_types_lock);
        for (i = 0; i < mime_types_len; ++i) {
                if (ast_rtp_mime_types[i].payload_type.asterisk_format && asterisk_format && format &&
-                       (ast_format_cmp(format, &ast_rtp_mime_types[i].payload_type.format) != AST_FORMAT_CMP_NOT_EQUAL)) {
+                       (ast_format_cmp(format, ast_rtp_mime_types[i].payload_type.format) != AST_FORMAT_CMP_NOT_EQUAL)) {
                        res = ast_rtp_mime_types[i].sample_rate;
                        break;
                } else if (!ast_rtp_mime_types[i].payload_type.asterisk_format && !asterisk_format &&
@@ -953,15 +1556,15 @@ char *ast_rtp_lookup_mime_multiple2(struct ast_str *buf, struct ast_format_cap *
 
 
        if (asterisk_format) {
-               struct ast_format tmp_fmt;
-               ast_format_cap_iter_start(ast_format_capability);
-               while (!ast_format_cap_iter_next(ast_format_capability, &tmp_fmt)) {
-                       name = ast_rtp_lookup_mime_subtype2(asterisk_format, &tmp_fmt, 0, options);
+               int x;
+               struct ast_format *tmp_fmt;
+               for (x = 0; x < ast_format_cap_count(ast_format_capability); x++) {
+                       tmp_fmt = ast_format_cap_get_format(ast_format_capability, x);
+                       name = ast_rtp_lookup_mime_subtype2(asterisk_format, tmp_fmt, 0, options);
+                       ao2_ref(tmp_fmt, -1);
                        ast_str_append(&buf, 0, "%s|", name);
                        found = 1;
                }
-               ast_format_cap_iter_end(ast_format_capability);
-
        } else {
                int x;
                ast_str_append(&buf, 0, "0x%x (", (unsigned int) rtp_capability);
@@ -979,15 +1582,6 @@ char *ast_rtp_lookup_mime_multiple2(struct ast_str *buf, struct ast_format_cap *
        return ast_str_buffer(buf);
 }
 
-void ast_rtp_codecs_packetization_set(struct ast_rtp_codecs *codecs, struct ast_rtp_instance *instance, struct ast_codec_pref *prefs)
-{
-       codecs->pref = *prefs;
-
-       if (instance && instance->engine->packetization_set) {
-               instance->engine->packetization_set(instance, &instance->codecs.pref);
-       }
-}
-
 int ast_rtp_instance_dtmf_begin(struct ast_rtp_instance *instance, char digit)
 {
        return instance->engine->dtmf_begin ? instance->engine->dtmf_begin(instance, digit) : -1;
@@ -1089,8 +1683,8 @@ void ast_rtp_instance_early_bridge_make_compatible(struct ast_channel *c_dst, st
        struct ast_rtp_glue *glue_dst, *glue_src;
        enum ast_rtp_glue_result audio_glue_dst_res = AST_RTP_GLUE_RESULT_FORBID, video_glue_dst_res = AST_RTP_GLUE_RESULT_FORBID;
        enum ast_rtp_glue_result audio_glue_src_res = AST_RTP_GLUE_RESULT_FORBID, video_glue_src_res = AST_RTP_GLUE_RESULT_FORBID;
-       struct ast_format_cap *cap_dst = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_NOLOCK);
-       struct ast_format_cap *cap_src = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_NOLOCK);
+       struct ast_format_cap *cap_dst = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
+       struct ast_format_cap *cap_src = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
 
        /* Lock both channels so we can look for the glue that binds them together */
        ast_channel_lock_both(c_dst, c_src);
@@ -1131,17 +1725,17 @@ void ast_rtp_instance_early_bridge_make_compatible(struct ast_channel *c_dst, st
        }
 
        /* Make sure we have matching codecs */
-       if (!ast_format_cap_has_joint(cap_dst, cap_src)) {
+       if (!ast_format_cap_iscompatible(cap_dst, cap_src)) {
                goto done;
        }
 
-       ast_rtp_codecs_payloads_copy(&instance_src->codecs, &instance_dst->codecs, instance_dst);
+       ast_rtp_codecs_payloads_xover(&instance_src->codecs, &instance_dst->codecs, instance_dst);
 
        if (vinstance_dst && vinstance_src) {
-               ast_rtp_codecs_payloads_copy(&vinstance_src->codecs, &vinstance_dst->codecs, vinstance_dst);
+               ast_rtp_codecs_payloads_xover(&vinstance_src->codecs, &vinstance_dst->codecs, vinstance_dst);
        }
        if (tinstance_dst && tinstance_src) {
-               ast_rtp_codecs_payloads_copy(&tinstance_src->codecs, &tinstance_dst->codecs, tinstance_dst);
+               ast_rtp_codecs_payloads_xover(&tinstance_src->codecs, &tinstance_dst->codecs, tinstance_dst);
        }
 
        if (glue_dst->update_peer(c_dst, instance_src, vinstance_src, tinstance_src, cap_src, 0)) {
@@ -1156,8 +1750,8 @@ done:
        ast_channel_unlock(c_dst);
        ast_channel_unlock(c_src);
 
-       ast_format_cap_destroy(cap_dst);
-       ast_format_cap_destroy(cap_src);
+       ao2_cleanup(cap_dst);
+       ao2_cleanup(cap_src);
 
        unref_instance_cond(&instance_dst);
        unref_instance_cond(&instance_src);
@@ -1175,13 +1769,13 @@ int ast_rtp_instance_early_bridge(struct ast_channel *c0, struct ast_channel *c1
        struct ast_rtp_glue *glue0, *glue1;
        enum ast_rtp_glue_result audio_glue0_res = AST_RTP_GLUE_RESULT_FORBID, video_glue0_res = AST_RTP_GLUE_RESULT_FORBID;
        enum ast_rtp_glue_result audio_glue1_res = AST_RTP_GLUE_RESULT_FORBID, video_glue1_res = AST_RTP_GLUE_RESULT_FORBID;
-       struct ast_format_cap *cap0 = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_NOLOCK);
-       struct ast_format_cap *cap1 = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_NOLOCK);
+       struct ast_format_cap *cap0 = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
+       struct ast_format_cap *cap1 = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
 
        /* If there is no second channel just immediately bail out, we are of no use in that scenario */
        if (!c1 || !cap1 || !cap0) {
-               ast_format_cap_destroy(cap0);
-               ast_format_cap_destroy(cap1);
+               ao2_cleanup(cap0);
+               ao2_cleanup(cap1);
                return -1;
        }
 
@@ -1220,7 +1814,7 @@ int ast_rtp_instance_early_bridge(struct ast_channel *c0, struct ast_channel *c1
        }
 
        /* Make sure we have matching codecs */
-       if (!ast_format_cap_has_joint(cap0, cap1)) {
+       if (!ast_format_cap_iscompatible(cap0, cap1)) {
                goto done;
        }
 
@@ -1233,8 +1827,8 @@ done:
        ast_channel_unlock(c0);
        ast_channel_unlock(c1);
 
-       ast_format_cap_destroy(cap0);
-       ast_format_cap_destroy(cap1);
+       ao2_cleanup(cap0);
+       ao2_cleanup(cap1);
 
        unref_instance_cond(&instance0);
        unref_instance_cond(&instance1);
@@ -1307,16 +1901,16 @@ void ast_rtp_instance_set_stats_vars(struct ast_channel *chan, struct ast_rtp_in
 {
        char quality_buf[AST_MAX_USER_FIELD];
        char *quality;
-       struct ast_channel *bridge = ast_channel_bridge_peer(chan);
+       struct ast_channel *bridge;
 
-       ast_channel_lock(chan);
-       ast_channel_stage_snapshot(chan);
-       ast_channel_unlock(chan);
+       bridge = ast_channel_bridge_peer(chan);
        if (bridge) {
-               ast_channel_lock(bridge);
+               ast_channel_lock_both(chan, bridge);
                ast_channel_stage_snapshot(bridge);
-               ast_channel_unlock(bridge);
+       } else {
+               ast_channel_lock(chan);
        }
+       ast_channel_stage_snapshot(chan);
 
        quality = ast_rtp_instance_get_quality(instance, AST_RTP_INSTANCE_STAT_FIELD_QUALITY,
                quality_buf, sizeof(quality_buf));
@@ -1354,11 +1948,9 @@ void ast_rtp_instance_set_stats_vars(struct ast_channel *chan, struct ast_rtp_in
                }
        }
 
-       ast_channel_lock(chan);
        ast_channel_stage_snapshot_done(chan);
        ast_channel_unlock(chan);
        if (bridge) {
-               ast_channel_lock(bridge);
                ast_channel_stage_snapshot_done(bridge);
                ast_channel_unlock(bridge);
                ast_channel_unref(bridge);
@@ -1419,7 +2011,7 @@ void ast_rtp_instance_available_formats(struct ast_rtp_instance *instance, struc
 {
        if (instance->engine->available_formats) {
                instance->engine->available_formats(instance, to_endpoint, to_asterisk, result);
-               if (!ast_format_cap_is_empty(result)) {
+               if (ast_format_cap_count(result)) {
                        return;
                }
        }
@@ -1507,29 +2099,38 @@ int ast_rtp_engine_srtp_is_registered(void)
        return res_srtp && res_srtp_policy;
 }
 
-int ast_rtp_instance_add_srtp_policy(struct ast_rtp_instance *instance, struct ast_srtp_policy *remote_policy, struct ast_srtp_policy *local_policy)
+int ast_rtp_instance_add_srtp_policy(struct ast_rtp_instance *instance, struct ast_srtp_policy *remote_policy, struct ast_srtp_policy *local_policy, int rtcp)
 {
        int res = 0;
+       struct ast_srtp **srtp;
 
        if (!res_srtp) {
                return -1;
        }
 
-       if (!instance->srtp) {
-               res = res_srtp->create(&instance->srtp, instance, remote_policy);
+
+       srtp = rtcp ? &instance->rtcp_srtp : &instance->srtp;
+
+       if (!*srtp) {
+               res = res_srtp->create(srtp, instance, remote_policy);
        } else {
-               res = res_srtp->replace(&instance->srtp, instance, remote_policy);
+               res = res_srtp->replace(srtp, instance, remote_policy);
        }
        if (!res) {
-               res = res_srtp->add_stream(instance->srtp, local_policy);
+               res = res_srtp->add_stream(*srtp, local_policy);
        }
 
        return res;
 }
 
-struct ast_srtp *ast_rtp_instance_get_srtp(struct ast_rtp_instance *instance)
+struct ast_srtp *ast_rtp_instance_get_srtp(struct ast_rtp_instance *instance, int rtcp)
 {
-       return instance->srtp;
+       if (rtcp && instance->rtcp_srtp) {
+               return instance->rtcp_srtp;
+       }
+       else {
+               return instance->srtp;
+       }
 }
 
 int ast_rtp_instance_sendcng(struct ast_rtp_instance *instance, int level)
@@ -1556,25 +2157,51 @@ int ast_rtp_dtls_cfg_parse(struct ast_rtp_dtls_cfg *dtls_cfg, const char *name,
        if (!strcasecmp(name, "dtlsenable")) {
                dtls_cfg->enabled = ast_true(value) ? 1 : 0;
        } else if (!strcasecmp(name, "dtlsverify")) {
-               dtls_cfg->verify = ast_true(value) ? 1 : 0;
+               if (!strcasecmp(value, "yes")) {
+                       dtls_cfg->verify = AST_RTP_DTLS_VERIFY_FINGERPRINT | AST_RTP_DTLS_VERIFY_CERTIFICATE;
+               } else if (!strcasecmp(value, "fingerprint")) {
+                       dtls_cfg->verify = AST_RTP_DTLS_VERIFY_FINGERPRINT;
+               } else if (!strcasecmp(value, "certificate")) {
+                       dtls_cfg->verify = AST_RTP_DTLS_VERIFY_CERTIFICATE;
+               } else if (!strcasecmp(value, "no")) {
+                       dtls_cfg->verify = AST_RTP_DTLS_VERIFY_NONE;
+               } else {
+                       return -1;
+               }
        } else if (!strcasecmp(name, "dtlsrekey")) {
                if (sscanf(value, "%30u", &dtls_cfg->rekey) != 1) {
                        return -1;
                }
        } else if (!strcasecmp(name, "dtlscertfile")) {
                ast_free(dtls_cfg->certfile);
+               if (!ast_strlen_zero(value) && !ast_file_is_readable(value)) {
+                       ast_log(LOG_ERROR, "%s file %s does not exist or is not readable\n", name, value);
+                       return -1;
+               }
                dtls_cfg->certfile = ast_strdup(value);
        } else if (!strcasecmp(name, "dtlsprivatekey")) {
                ast_free(dtls_cfg->pvtfile);
+               if (!ast_strlen_zero(value) && !ast_file_is_readable(value)) {
+                       ast_log(LOG_ERROR, "%s file %s does not exist or is not readable\n", name, value);
+                       return -1;
+               }
                dtls_cfg->pvtfile = ast_strdup(value);
        } else if (!strcasecmp(name, "dtlscipher")) {
                ast_free(dtls_cfg->cipher);
                dtls_cfg->cipher = ast_strdup(value);
        } else if (!strcasecmp(name, "dtlscafile")) {
                ast_free(dtls_cfg->cafile);
+               if (!ast_strlen_zero(value) && !ast_file_is_readable(value)) {
+                       ast_log(LOG_ERROR, "%s file %s does not exist or is not readable\n", name, value);
+                       return -1;
+               }
                dtls_cfg->cafile = ast_strdup(value);
        } else if (!strcasecmp(name, "dtlscapath") || !strcasecmp(name, "dtlscadir")) {
                ast_free(dtls_cfg->capath);
+               if (!ast_strlen_zero(value) && !ast_file_is_readable(value)) {
+                       ast_log(LOG_ERROR, "%s file %s does not exist or is not readable\n", name, value);
+                       return -1;
+               }
                dtls_cfg->capath = ast_strdup(value);
        } else if (!strcasecmp(name, "dtlssetup")) {
                if (!strcasecmp(value, "active")) {
@@ -1584,6 +2211,12 @@ int ast_rtp_dtls_cfg_parse(struct ast_rtp_dtls_cfg *dtls_cfg, const char *name,
                } else if (!strcasecmp(value, "actpass")) {
                        dtls_cfg->default_setup = AST_RTP_DTLS_SETUP_ACTPASS;
                }
+       } else if (!strcasecmp(name, "dtlsfingerprint")) {
+               if (!strcasecmp(value, "sha-256")) {
+                       dtls_cfg->hash = AST_RTP_DTLS_HASH_SHA256;
+               } else if (!strcasecmp(value, "sha-1")) {
+                       dtls_cfg->hash = AST_RTP_DTLS_HASH_SHA1;
+               }
        } else {
                return -1;
        }
@@ -1593,10 +2226,13 @@ int ast_rtp_dtls_cfg_parse(struct ast_rtp_dtls_cfg *dtls_cfg, const char *name,
 
 void ast_rtp_dtls_cfg_copy(const struct ast_rtp_dtls_cfg *src_cfg, struct ast_rtp_dtls_cfg *dst_cfg)
 {
+       ast_rtp_dtls_cfg_free(dst_cfg);         /* Prevent a double-call leaking memory via ast_strdup */
+
        dst_cfg->enabled = src_cfg->enabled;
        dst_cfg->verify = src_cfg->verify;
        dst_cfg->rekey = src_cfg->rekey;
        dst_cfg->suite = src_cfg->suite;
+       dst_cfg->hash = src_cfg->hash;
        dst_cfg->certfile = ast_strdup(src_cfg->certfile);
        dst_cfg->pvtfile = ast_strdup(src_cfg->pvtfile);
        dst_cfg->cipher = ast_strdup(src_cfg->cipher);
@@ -1608,81 +2244,161 @@ void ast_rtp_dtls_cfg_copy(const struct ast_rtp_dtls_cfg *src_cfg, struct ast_rt
 void ast_rtp_dtls_cfg_free(struct ast_rtp_dtls_cfg *dtls_cfg)
 {
        ast_free(dtls_cfg->certfile);
+       dtls_cfg->certfile = NULL;
        ast_free(dtls_cfg->pvtfile);
+       dtls_cfg->pvtfile = NULL;
        ast_free(dtls_cfg->cipher);
+       dtls_cfg->cipher = NULL;
        ast_free(dtls_cfg->cafile);
+       dtls_cfg->cafile = NULL;
        ast_free(dtls_cfg->capath);
+       dtls_cfg->capath = NULL;
 }
 
-static void set_next_mime_type(const struct ast_format *format, int rtp_code, char *type, char *subtype, unsigned int sample_rate)
+/*! \internal
+ * \brief Small helper routine that cleans up entry i in
+ * \c ast_rtp_mime_types.
+ */
+static void rtp_engine_mime_type_cleanup(int i)
 {
-       int x = mime_types_len;
-       if (ARRAY_LEN(ast_rtp_mime_types) == mime_types_len) {
+       ao2_cleanup(ast_rtp_mime_types[i].payload_type.format);
+       memset(&ast_rtp_mime_types[i], 0, sizeof(struct ast_rtp_mime_type));
+}
+
+static void set_next_mime_type(struct ast_format *format, int rtp_code, const char *type, const char *subtype, unsigned int sample_rate)
+{
+       int x;
+
+       ast_rwlock_wrlock(&mime_types_lock);
+
+       x = mime_types_len;
+       if (ARRAY_LEN(ast_rtp_mime_types) <= x) {
+               ast_rwlock_unlock(&mime_types_lock);
                return;
        }
 
-       ast_rwlock_wrlock(&mime_types_lock);
+       /* Make sure any previous value in ast_rtp_mime_types is cleaned up */
+       memset(&ast_rtp_mime_types[x], 0, sizeof(struct ast_rtp_mime_type));    
        if (format) {
                ast_rtp_mime_types[x].payload_type.asterisk_format = 1;
-               ast_format_copy(&ast_rtp_mime_types[x].payload_type.format, format);
+               ast_rtp_mime_types[x].payload_type.format = ao2_bump(format);
        } else {
                ast_rtp_mime_types[x].payload_type.rtp_code = rtp_code;
        }
-       ast_rtp_mime_types[x].type = type;
-       ast_rtp_mime_types[x].subtype = subtype;
+       ast_copy_string(ast_rtp_mime_types[x].type, type, sizeof(ast_rtp_mime_types[x].type));
+       ast_copy_string(ast_rtp_mime_types[x].subtype, subtype, sizeof(ast_rtp_mime_types[x].subtype));
        ast_rtp_mime_types[x].sample_rate = sample_rate;
        mime_types_len++;
+
        ast_rwlock_unlock(&mime_types_lock);
 }
 
-static void add_static_payload(int map, const struct ast_format *format, int rtp_code)
+static void add_static_payload(int map, struct ast_format *format, int rtp_code)
 {
        int x;
+       struct ast_rtp_payload_type *type;
+
+       /*
+        * ARRAY_LEN's result is cast to an int so 'map' is not autocast to a size_t,
+        * which if negative would cause an assertion.
+        */
+       ast_assert(map < (int)ARRAY_LEN(static_RTP_PT));
+
        ast_rwlock_wrlock(&static_RTP_PT_lock);
        if (map < 0) {
                /* find next available dynamic payload slot */
-               for (x = 96; x < 127; x++) {
-                       if (!static_RTP_PT[x].asterisk_format && !static_RTP_PT[x].rtp_code) {
+               for (x = AST_RTP_PT_FIRST_DYNAMIC; x < AST_RTP_MAX_PT; ++x) {
+                       if (!static_RTP_PT[x]) {
                                map = x;
                                break;
                        }
                }
-       }
 
-       if (map < 0) {
-               ast_log(LOG_WARNING, "No Dynamic RTP mapping available for format %s\n" ,ast_getformatname(format));
-               ast_rwlock_unlock(&static_RTP_PT_lock);
-               return;
+               /* http://www.iana.org/assignments/rtp-parameters
+                * RFC 3551, Section 3: "[...] applications which need to define more
+                * than 32 dynamic payload types MAY bind codes below 96, in which case
+                * it is RECOMMENDED that unassigned payload type numbers be used
+                * first". Updated by RFC 5761, Section 4: "[...] values in the range
+                * 64-95 MUST NOT be used [to avoid conflicts with RTCP]". Summaries:
+                * https://tools.ietf.org/html/draft-roach-mmusic-unified-plan#section-3.2.1.2
+                * https://tools.ietf.org/html/draft-wu-avtcore-dynamic-pt-usage#section-3
+                */
+               if (map < 0) {
+                       for (x = MAX(ast_option_rtpptdynamic, 35); x <= AST_RTP_PT_LAST_REASSIGN; ++x) {
+                               if (!static_RTP_PT[x]) {
+                                       map = x;
+                                       break;
+                               }
+                       }
+               }
+               /* Yet, reusing mappings below 35 is not supported in Asterisk because
+                * when Compact Headers are activated, no rtpmap is send for those below
+                * 35. If you want to use 35 and below
+                * A) do not use Compact Headers,
+                * B) remove that code in chan_sip/res_pjsip, or
+                * C) add a flag that this RTP Payload Type got reassigned dynamically
+                *    and requires a rtpmap even with Compact Headers enabled.
+                */
+               if (map < 0) {
+                       for (x = MAX(ast_option_rtpptdynamic, 20); x < 35; ++x) {
+                               if (!static_RTP_PT[x]) {
+                                       map = x;
+                                       break;
+                               }
+                       }
+               }
+               if (map < 0) {
+                       for (x = MAX(ast_option_rtpptdynamic, 0); x < 20; ++x) {
+                               if (!static_RTP_PT[x]) {
+                                       map = x;
+                                       break;
+                               }
+                       }
+               }
+
+               if (map < 0) {
+                       if (format) {
+                               ast_log(LOG_WARNING, "No Dynamic RTP mapping available for format %s\n",
+                                       ast_format_get_name(format));
+                       } else {
+                               ast_log(LOG_WARNING, "No Dynamic RTP mapping available for RTP code %d\n",
+                                       rtp_code);
+                       }
+                       ast_rwlock_unlock(&static_RTP_PT_lock);
+                       return;
+               }
        }
 
-       if (format) {
-               static_RTP_PT[map].asterisk_format = 1;
-               ast_format_copy(&static_RTP_PT[map].format, format);
-       } else {
-               static_RTP_PT[map].rtp_code = rtp_code;
+       type = ast_rtp_engine_alloc_payload_type();
+       if (type) {
+               if (format) {
+                       ao2_ref(format, +1);
+                       type->format = format;
+                       type->asterisk_format = 1;
+               } else {
+                       type->rtp_code = rtp_code;
+               }
+               type->payload = map;
+               type->primary_mapping = 1;
+               ao2_cleanup(static_RTP_PT[map]);
+               static_RTP_PT[map] = type;
        }
        ast_rwlock_unlock(&static_RTP_PT_lock);
 }
 
-int ast_rtp_engine_load_format(const struct ast_format *format)
+int ast_rtp_engine_load_format(struct ast_format *format)
 {
-       switch (format->id) {
-       case AST_FORMAT_SILK:
-               set_next_mime_type(format, 0, "audio", "SILK", ast_format_rate(format));
-               add_static_payload(-1, format, 0);
-               break;
-       case AST_FORMAT_CELT:
-               set_next_mime_type(format, 0, "audio", "CELT", ast_format_rate(format));
-               add_static_payload(-1, format, 0);
-               break;
-       default:
-               break;
-       }
+       set_next_mime_type(format,
+               0,
+               ast_codec_media_type2str(ast_format_get_type(format)),
+               ast_format_get_codec_name(format),
+               ast_format_get_sample_rate(format));
+       add_static_payload(-1, format, 0);
 
        return 0;
 }
 
-int ast_rtp_engine_unload_format(const struct ast_format *format)
+int ast_rtp_engine_unload_format(struct ast_format *format)
 {
        int x;
        int y = 0;
@@ -1690,20 +2406,24 @@ int ast_rtp_engine_unload_format(const struct ast_format *format)
        ast_rwlock_wrlock(&static_RTP_PT_lock);
        /* remove everything pertaining to this format id from the lists */
        for (x = 0; x < AST_RTP_MAX_PT; x++) {
-               if (ast_format_cmp(&static_RTP_PT[x].format, format) == AST_FORMAT_CMP_EQUAL) {
-                       memset(&static_RTP_PT[x], 0, sizeof(struct ast_rtp_payload_type));
+               if (static_RTP_PT[x]
+                       && ast_format_cmp(static_RTP_PT[x]->format, format) == AST_FORMAT_CMP_EQUAL) {
+                       ao2_ref(static_RTP_PT[x], -1);
+                       static_RTP_PT[x] = NULL;
                }
        }
        ast_rwlock_unlock(&static_RTP_PT_lock);
 
-
        ast_rwlock_wrlock(&mime_types_lock);
        /* rebuild the list skipping the items matching this id */
        for (x = 0; x < mime_types_len; x++) {
-               if (ast_format_cmp(&ast_rtp_mime_types[x].payload_type.format, format) == AST_FORMAT_CMP_EQUAL) {
+               if (ast_format_cmp(ast_rtp_mime_types[x].payload_type.format, format) == AST_FORMAT_CMP_EQUAL) {
+                       rtp_engine_mime_type_cleanup(x);
                        continue;
                }
-               ast_rtp_mime_types[y] = ast_rtp_mime_types[x];
+               if (x != y) {
+                       ast_rtp_mime_types[y] = ast_rtp_mime_types[x];
+               }
                y++;
        }
        mime_types_len = y;
@@ -1773,7 +2493,7 @@ static struct ast_manager_event_blob *rtcp_report_to_ami(struct stasis_message *
        if (type == AST_RTP_RTCP_SR) {
                ast_str_append(&packet_string, 0, "SentNTP: %lu.%06lu\r\n",
                        (unsigned long)payload->report->sender_information.ntp_timestamp.tv_sec,
-                       (unsigned long)payload->report->sender_information.ntp_timestamp.tv_usec * 4096);
+                       (unsigned long)payload->report->sender_information.ntp_timestamp.tv_usec);
                ast_str_append(&packet_string, 0, "SentRTP: %u\r\n",
                                payload->report->sender_information.rtp_timestamp);
                ast_str_append(&packet_string, 0, "SentPackets: %u\r\n",
@@ -1835,15 +2555,17 @@ static struct ast_json *rtcp_report_to_json(struct stasis_message *msg,
                return NULL;
        }
 
-       for (i = 0; i < payload->report->reception_report_count; i++) {
+       for (i = 0; i < payload->report->reception_report_count && payload->report->report_block[i]; i++) {
                struct ast_json *json_report_block;
-               json_report_block = ast_json_pack("{s: i, s: i, s: i, s: i, s: i, s: i, s: i}",
+               char str_lsr[32];
+               snprintf(str_lsr, sizeof(str_lsr), "%u", payload->report->report_block[i]->lsr);
+               json_report_block = ast_json_pack("{s: i, s: i, s: i, s: i, s: i, s: s, s: i}",
                                "source_ssrc", payload->report->report_block[i]->source_ssrc,
                                "fraction_lost", payload->report->report_block[i]->lost_count.fraction,
                                "packets_lost", payload->report->report_block[i]->lost_count.packets,
                                "highest_seq_no", payload->report->report_block[i]->highest_seq_no,
                                "ia_jitter", payload->report->report_block[i]->ia_jitter,
-                               "lsr", payload->report->report_block[i]->lsr,
+                               "lsr", str_lsr,
                                "dlsr", payload->report->report_block[i]->dlsr);
                if (!json_report_block) {
                        return NULL;
@@ -1855,9 +2577,13 @@ static struct ast_json *rtcp_report_to_json(struct stasis_message *msg,
        }
 
        if (payload->report->type == AST_RTP_RTCP_SR) {
-               json_rtcp_sender_info = ast_json_pack("{s: i, s: i, s: i, s: i, s: i}",
-                               "ntp_timestamp_sec", payload->report->sender_information.ntp_timestamp.tv_sec,
-                               "ntp_timestamp_usec", payload->report->sender_information.ntp_timestamp.tv_usec,
+               char sec[32];
+               char usec[32];
+               snprintf(sec, sizeof(sec), "%lu", (unsigned long)payload->report->sender_information.ntp_timestamp.tv_sec);
+               snprintf(usec, sizeof(usec), "%lu", (unsigned long)payload->report->sender_information.ntp_timestamp.tv_usec);
+               json_rtcp_sender_info = ast_json_pack("{s: s, s: s, s: i, s: i, s: i}",
+                               "ntp_timestamp_sec", sec,
+                               "ntp_timestamp_usec", usec,
                                "rtp_timestamp", payload->report->sender_information.rtp_timestamp,
                                "packets", payload->report->sender_information.packet_count,
                                "octets", payload->report->sender_information.octet_count);
@@ -1866,12 +2592,12 @@ static struct ast_json *rtcp_report_to_json(struct stasis_message *msg,
                }
        }
 
-       json_rtcp_report = ast_json_pack("{s: i, s: i, s: i, s: O, s: O}",
+       json_rtcp_report = ast_json_pack("{s: i, s: i, s: i, s: o, s: o}",
                        "ssrc", payload->report->ssrc,
                        "type", payload->report->type,
                        "report_count", payload->report->reception_report_count,
-                       "sender_information", json_rtcp_sender_info ? json_rtcp_sender_info : ast_json_null(),
-                       "report_blocks", json_rtcp_report_blocks);
+                       "sender_information", json_rtcp_sender_info ? ast_json_ref(json_rtcp_sender_info) : ast_json_ref(ast_json_null()),
+                       "report_blocks", ast_json_ref(json_rtcp_report_blocks));
        if (!json_rtcp_report) {
                return NULL;
        }
@@ -1883,10 +2609,10 @@ static struct ast_json *rtcp_report_to_json(struct stasis_message *msg,
                }
        }
 
-       return ast_json_pack("{s: O, s: O, s: O}",
-               "channel", payload->snapshot ? json_channel : ast_json_null(),
-               "rtcp_report", json_rtcp_report,
-               "blob", payload->blob);
+       return ast_json_pack("{s: o, s: o, s: o}",
+               "channel", payload->snapshot ? ast_json_ref(json_channel) : ast_json_ref(ast_json_null()),
+               "rtcp_report", ast_json_ref(json_rtcp_report),
+               "blob", ast_json_deep_copy(payload->blob));
 }
 
 static void rtp_rtcp_report_dtor(void *obj)
@@ -1918,6 +2644,10 @@ void ast_rtp_publish_rtcp_message(struct ast_rtp_instance *rtp,
        RAII_VAR(struct rtcp_message_payload *, payload, NULL, ao2_cleanup);
        RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup);
 
+       if (!message_type) {
+               return;
+       }
+
        payload = ao2_alloc(sizeof(*payload), rtcp_message_payload_dtor);
        if (!payload || !report) {
                return;
@@ -1959,16 +2689,32 @@ struct stasis_topic *ast_rtp_topic(void)
 
 static void rtp_engine_shutdown(void)
 {
+       int x;
+
        ao2_cleanup(rtp_topic);
        rtp_topic = NULL;
        STASIS_MESSAGE_TYPE_CLEANUP(ast_rtp_rtcp_received_type);
        STASIS_MESSAGE_TYPE_CLEANUP(ast_rtp_rtcp_sent_type);
+
+       ast_rwlock_wrlock(&static_RTP_PT_lock);
+       for (x = 0; x < AST_RTP_MAX_PT; x++) {
+               ao2_cleanup(static_RTP_PT[x]);
+               static_RTP_PT[x] = NULL;
+       }
+       ast_rwlock_unlock(&static_RTP_PT_lock);
+
+       ast_rwlock_wrlock(&mime_types_lock);
+       for (x = 0; x < mime_types_len; x++) {
+               if (ast_rtp_mime_types[x].payload_type.format) {
+                       rtp_engine_mime_type_cleanup(x);
+               }
+       }
+       mime_types_len = 0;
+       ast_rwlock_unlock(&mime_types_lock);
 }
 
-int ast_rtp_engine_init()
+int ast_rtp_engine_init(void)
 {
-       struct ast_format tmpfmt;
-
        ast_rwlock_init(&mime_types_lock);
        ast_rwlock_init(&static_RTP_PT_lock);
 
@@ -1978,93 +2724,128 @@ int ast_rtp_engine_init()
        }
        STASIS_MESSAGE_TYPE_INIT(ast_rtp_rtcp_sent_type);
        STASIS_MESSAGE_TYPE_INIT(ast_rtp_rtcp_received_type);
-       ast_register_atexit(rtp_engine_shutdown);
+       ast_register_cleanup(rtp_engine_shutdown);
 
        /* Define all the RTP mime types available */
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_G723_1, 0), 0, "audio", "G723", 8000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_GSM, 0), 0, "audio", "GSM", 8000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_ULAW, 0), 0, "audio", "PCMU", 8000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_ULAW, 0), 0, "audio", "G711U", 8000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_ALAW, 0), 0, "audio", "PCMA", 8000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_ALAW, 0), 0, "audio", "G711A", 8000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_G726, 0), 0, "audio", "G726-32", 8000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_ADPCM, 0), 0, "audio", "DVI4", 8000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_SLINEAR, 0), 0, "audio", "L16", 8000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_SLINEAR16, 0), 0, "audio", "L16", 16000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_SLINEAR16, 0), 0, "audio", "L16-256", 16000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_LPC10, 0), 0, "audio", "LPC", 8000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_G729A, 0), 0, "audio", "G729", 8000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_G729A, 0), 0, "audio", "G729A", 8000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_G729A, 0), 0, "audio", "G.729", 8000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_SPEEX, 0), 0, "audio", "speex", 8000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_SPEEX16, 0), 0,  "audio", "speex", 16000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_SPEEX32, 0), 0,  "audio", "speex", 32000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_ILBC, 0), 0, "audio", "iLBC", 8000);
+       set_next_mime_type(ast_format_g723, 0, "audio", "G723", 8000);
+       set_next_mime_type(ast_format_gsm, 0, "audio", "GSM", 8000);
+       set_next_mime_type(ast_format_ulaw, 0, "audio", "PCMU", 8000);
+       set_next_mime_type(ast_format_ulaw, 0, "audio", "G711U", 8000);
+       set_next_mime_type(ast_format_alaw, 0, "audio", "PCMA", 8000);
+       set_next_mime_type(ast_format_alaw, 0, "audio", "G711A", 8000);
+       set_next_mime_type(ast_format_g726, 0, "audio", "G726-32", 8000);
+       set_next_mime_type(ast_format_adpcm, 0, "audio", "DVI4", 8000);
+       set_next_mime_type(ast_format_slin, 0, "audio", "L16", 8000);
+       set_next_mime_type(ast_format_slin16, 0, "audio", "L16", 16000);
+       set_next_mime_type(ast_format_slin16, 0, "audio", "L16-256", 16000);
+       set_next_mime_type(ast_format_slin12, 0, "audio", "L16", 12000);
+       set_next_mime_type(ast_format_slin24, 0, "audio", "L16", 24000);
+       set_next_mime_type(ast_format_slin32, 0, "audio", "L16", 32000);
+       set_next_mime_type(ast_format_slin44, 0, "audio", "L16", 44000);
+       set_next_mime_type(ast_format_slin48, 0, "audio", "L16", 48000);
+       set_next_mime_type(ast_format_slin96, 0, "audio", "L16", 96000);
+       set_next_mime_type(ast_format_slin192, 0, "audio", "L16", 192000);
+       set_next_mime_type(ast_format_lpc10, 0, "audio", "LPC", 8000);
+       set_next_mime_type(ast_format_g729, 0, "audio", "G729", 8000);
+       set_next_mime_type(ast_format_g729, 0, "audio", "G729A", 8000);
+       set_next_mime_type(ast_format_g729, 0, "audio", "G.729", 8000);
+       set_next_mime_type(ast_format_speex, 0, "audio", "speex", 8000);
+       set_next_mime_type(ast_format_speex16, 0,  "audio", "speex", 16000);
+       set_next_mime_type(ast_format_speex32, 0,  "audio", "speex", 32000);
+       set_next_mime_type(ast_format_ilbc, 0, "audio", "iLBC", 8000);
        /* this is the sample rate listed in the RTP profile for the G.722 codec, *NOT* the actual sample rate of the media stream */
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_G722, 0), 0, "audio", "G722", 8000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_G726_AAL2, 0), 0, "audio", "AAL2-G726-32", 8000);
+       set_next_mime_type(ast_format_g722, 0, "audio", "G722", 8000);
+       set_next_mime_type(ast_format_g726_aal2, 0, "audio", "AAL2-G726-32", 8000);
        set_next_mime_type(NULL, AST_RTP_DTMF, "audio", "telephone-event", 8000);
        set_next_mime_type(NULL, AST_RTP_CISCO_DTMF, "audio", "cisco-telephone-event", 8000);
        set_next_mime_type(NULL, AST_RTP_CN, "audio", "CN", 8000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_JPEG, 0), 0, "video", "JPEG", 90000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_PNG, 0), 0, "video", "PNG", 90000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_H261, 0), 0, "video", "H261", 90000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_H263, 0), 0, "video", "H263", 90000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_H263_PLUS, 0), 0, "video", "H263-1998", 90000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_H264, 0), 0, "video", "H264", 90000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_MP4_VIDEO, 0), 0, "video", "MP4V-ES", 90000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_T140RED, 0), 0, "text", "RED", 1000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_T140, 0), 0, "text", "T140", 1000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_SIREN7, 0), 0, "audio", "G7221", 16000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_SIREN14, 0), 0, "audio", "G7221", 32000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_G719, 0), 0, "audio", "G719", 48000);
+       set_next_mime_type(ast_format_jpeg, 0, "video", "JPEG", 90000);
+       set_next_mime_type(ast_format_png, 0, "video", "PNG", 90000);
+       set_next_mime_type(ast_format_h261, 0, "video", "H261", 90000);
+       set_next_mime_type(ast_format_h263, 0, "video", "H263", 90000);
+       set_next_mime_type(ast_format_h263p, 0, "video", "h263-1998", 90000);
+       set_next_mime_type(ast_format_h264, 0, "video", "H264", 90000);
+       set_next_mime_type(ast_format_mp4, 0, "video", "MP4V-ES", 90000);
+       set_next_mime_type(ast_format_t140_red, 0, "text", "RED", 1000);
+       set_next_mime_type(ast_format_t140, 0, "text", "T140", 1000);
+       set_next_mime_type(ast_format_siren7, 0, "audio", "G7221", 16000);
+       set_next_mime_type(ast_format_siren14, 0, "audio", "G7221", 32000);
+       set_next_mime_type(ast_format_g719, 0, "audio", "G719", 48000);
        /* Opus and VP8 */
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_OPUS, 0), 0,  "audio", "opus", 48000);
-       set_next_mime_type(ast_format_set(&tmpfmt, AST_FORMAT_VP8, 0), 0,  "video", "VP8", 90000);
+       set_next_mime_type(ast_format_opus, 0,  "audio", "opus", 48000);
+       set_next_mime_type(ast_format_vp8, 0,  "video", "VP8", 90000);
 
        /* Define the static rtp payload mappings */
-       add_static_payload(0, ast_format_set(&tmpfmt, AST_FORMAT_ULAW, 0), 0);
+       add_static_payload(0, ast_format_ulaw, 0);
        #ifdef USE_DEPRECATED_G726
-       add_static_payload(2, ast_format_set(&tmpfmt, AST_FORMAT_G726, 0), 0);/* Technically this is G.721, but if Cisco can do it, so can we... */
+       add_static_payload(2, ast_format_g726, 0);/* Technically this is G.721, but if Cisco can do it, so can we... */
        #endif
-       add_static_payload(3, ast_format_set(&tmpfmt, AST_FORMAT_GSM, 0), 0);
-       add_static_payload(4, ast_format_set(&tmpfmt, AST_FORMAT_G723_1, 0), 0);
-       add_static_payload(5, ast_format_set(&tmpfmt, AST_FORMAT_ADPCM, 0), 0);/* 8 kHz */
-       add_static_payload(6, ast_format_set(&tmpfmt, AST_FORMAT_ADPCM, 0), 0); /* 16 kHz */
-       add_static_payload(7, ast_format_set(&tmpfmt, AST_FORMAT_LPC10, 0), 0);
-       add_static_payload(8, ast_format_set(&tmpfmt, AST_FORMAT_ALAW, 0), 0);
-       add_static_payload(9, ast_format_set(&tmpfmt, AST_FORMAT_G722, 0), 0);
-       add_static_payload(10, ast_format_set(&tmpfmt, AST_FORMAT_SLINEAR, 0), 0); /* 2 channels */
-       add_static_payload(11, ast_format_set(&tmpfmt, AST_FORMAT_SLINEAR, 0), 0); /* 1 channel */
+       add_static_payload(3, ast_format_gsm, 0);
+       add_static_payload(4, ast_format_g723, 0);
+       add_static_payload(5, ast_format_adpcm, 0);/* 8 kHz */
+       add_static_payload(6, ast_format_adpcm, 0); /* 16 kHz */
+       add_static_payload(7, ast_format_lpc10, 0);
+       add_static_payload(8, ast_format_alaw, 0);
+       add_static_payload(9, ast_format_g722, 0);
+       add_static_payload(10, ast_format_slin, 0); /* 2 channels */
+       add_static_payload(11, ast_format_slin, 0); /* 1 channel */
        add_static_payload(13, NULL, AST_RTP_CN);
-       add_static_payload(16, ast_format_set(&tmpfmt, AST_FORMAT_ADPCM, 0), 0); /* 11.025 kHz */
-       add_static_payload(17, ast_format_set(&tmpfmt, AST_FORMAT_ADPCM, 0), 0); /* 22.050 kHz */
-       add_static_payload(18, ast_format_set(&tmpfmt, AST_FORMAT_G729A, 0), 0);
+       add_static_payload(16, ast_format_adpcm, 0); /* 11.025 kHz */
+       add_static_payload(17, ast_format_adpcm, 0); /* 22.050 kHz */
+       add_static_payload(18, ast_format_g729, 0);
        add_static_payload(19, NULL, AST_RTP_CN);         /* Also used for CN */
-       add_static_payload(26, ast_format_set(&tmpfmt, AST_FORMAT_JPEG, 0), 0);
-       add_static_payload(31, ast_format_set(&tmpfmt, AST_FORMAT_H261, 0), 0);
-       add_static_payload(34, ast_format_set(&tmpfmt, AST_FORMAT_H263, 0), 0);
-       add_static_payload(97, ast_format_set(&tmpfmt, AST_FORMAT_ILBC, 0), 0);
-       add_static_payload(98, ast_format_set(&tmpfmt, AST_FORMAT_H263_PLUS, 0), 0);
-       add_static_payload(99, ast_format_set(&tmpfmt, AST_FORMAT_H264, 0), 0);
+       add_static_payload(26, ast_format_jpeg, 0);
+       add_static_payload(31, ast_format_h261, 0);
+       add_static_payload(34, ast_format_h263, 0);
+       add_static_payload(97, ast_format_ilbc, 0);
+       add_static_payload(98, ast_format_h263p, 0);
+       add_static_payload(99, ast_format_h264, 0);
        add_static_payload(101, NULL, AST_RTP_DTMF);
-       add_static_payload(102, ast_format_set(&tmpfmt, AST_FORMAT_SIREN7, 0), 0);
-       add_static_payload(103, ast_format_set(&tmpfmt, AST_FORMAT_H263_PLUS, 0), 0);
-       add_static_payload(104, ast_format_set(&tmpfmt, AST_FORMAT_MP4_VIDEO, 0), 0);
-       add_static_payload(105, ast_format_set(&tmpfmt, AST_FORMAT_T140RED, 0), 0);   /* Real time text chat (with redundancy encoding) */
-       add_static_payload(106, ast_format_set(&tmpfmt, AST_FORMAT_T140, 0), 0);     /* Real time text chat */
-       add_static_payload(110, ast_format_set(&tmpfmt, AST_FORMAT_SPEEX, 0), 0);
-       add_static_payload(111, ast_format_set(&tmpfmt, AST_FORMAT_G726, 0), 0);
-       add_static_payload(112, ast_format_set(&tmpfmt, AST_FORMAT_G726_AAL2, 0), 0);
-       add_static_payload(115, ast_format_set(&tmpfmt, AST_FORMAT_SIREN14, 0), 0);
-       add_static_payload(116, ast_format_set(&tmpfmt, AST_FORMAT_G719, 0), 0);
-       add_static_payload(117, ast_format_set(&tmpfmt, AST_FORMAT_SPEEX16, 0), 0);
-       add_static_payload(118, ast_format_set(&tmpfmt, AST_FORMAT_SLINEAR16, 0), 0); /* 16 Khz signed linear */
-       add_static_payload(119, ast_format_set(&tmpfmt, AST_FORMAT_SPEEX32, 0), 0);
+       add_static_payload(102, ast_format_siren7, 0);
+       add_static_payload(103, ast_format_h263p, 0);
+       add_static_payload(104, ast_format_mp4, 0);
+       add_static_payload(105, ast_format_t140_red, 0);   /* Real time text chat (with redundancy encoding) */
+       add_static_payload(106, ast_format_t140, 0);     /* Real time text chat */
+       add_static_payload(110, ast_format_speex, 0);
+       add_static_payload(111, ast_format_g726, 0);
+       add_static_payload(112, ast_format_g726_aal2, 0);
+       add_static_payload(115, ast_format_siren14, 0);
+       add_static_payload(116, ast_format_g719, 0);
+       add_static_payload(117, ast_format_speex16, 0);
+       add_static_payload(118, ast_format_slin16, 0); /* 16 Khz signed linear */
+       add_static_payload(119, ast_format_speex32, 0);
        add_static_payload(121, NULL, AST_RTP_CISCO_DTMF);   /* Must be type 121 */
+       add_static_payload(122, ast_format_slin12, 0);
+       add_static_payload(123, ast_format_slin24, 0);
+       add_static_payload(124, ast_format_slin32, 0);
+       add_static_payload(125, ast_format_slin44, 0);
+       add_static_payload(126, ast_format_slin48, 0);
+       add_static_payload(127, ast_format_slin96, 0);
+       /* payload types above 127 are not valid */
+       add_static_payload(96, ast_format_slin192, 0);
        /* Opus and VP8 */
-       add_static_payload(100, ast_format_set(&tmpfmt, AST_FORMAT_VP8, 0), 0);
-       add_static_payload(107, ast_format_set(&tmpfmt, AST_FORMAT_OPUS, 0), 0);
+       add_static_payload(100, ast_format_vp8, 0);
+       add_static_payload(107, ast_format_opus, 0);
 
        return 0;
 }
+
+time_t ast_rtp_instance_get_last_tx(const struct ast_rtp_instance *rtp)
+{
+       return rtp->last_tx;
+}
+
+void ast_rtp_instance_set_last_tx(struct ast_rtp_instance *rtp, time_t time)
+{
+       rtp->last_tx = time;
+}
+
+time_t ast_rtp_instance_get_last_rx(const struct ast_rtp_instance *rtp)
+{
+       return rtp->last_rx;
+}
+
+void ast_rtp_instance_set_last_rx(struct ast_rtp_instance *rtp, time_t time)
+{
+       rtp->last_rx = time;
+}