SDP: Add get/set option calls for RTP sched context per type.

Change-Id: I82dc75c63c48904e9e5a49e2205dcc06e88487e4

diff --git a/include/asterisk/sdp_options.h b/include/asterisk/sdp_options.h
index f49b79483bd15e31cf26693fc2b3f9c74d483559..b8c1bbd56eb544c282e74a4d656cf3c41b53d2fc 100644 (file)
--- a/include/asterisk/sdp_options.h
+++ b/include/asterisk/sdp_options.h
@@ -522,4 +522,29 @@ void ast_sdp_options_set_ssrc(struct ast_sdp_options *options, unsigned int ssrc
  */
 unsigned int ast_sdp_options_get_ssrc(const struct ast_sdp_options *options);
 
+/*!
+ * \brief Set the SDP options scheduler context used to create new streams of the type.
+ * \since 15.0.0
+ *
+ * \param options SDP Options
+ * \param type Media type the scheduler context is for.
+ * \param sched Scheduler context to use for the specified media type.
+ *
+ * \return Nothing
+ */
+void ast_sdp_options_set_sched_type(struct ast_sdp_options *options,
+       enum ast_media_type type, struct ast_sched_context *sched);
+
+/*!
+ * \brief Get the SDP options scheduler context used to create new streams of the type.
+ * \since 15.0.0
+ *
+ * \param options SDP Options
+ * \param type Media type the format cap represents.
+ *
+ * \return The stored scheduler context to create new streams of the type.
+ */
+struct ast_sched_context *ast_sdp_options_get_sched_type(const struct ast_sdp_options *options,
+       enum ast_media_type type);
+
 #endif /* _ASTERISK_SDP_OPTIONS_H */

diff --git a/main/sdp_options.c b/main/sdp_options.c
index ab8fb2973975bcf083de623db4f7743a542ad25c..a938583c6837a91a0ae0a8f829c1ddb49b929fd8 100644 (file)
--- a/main/sdp_options.c
+++ b/main/sdp_options.c
@@ -77,6 +77,39 @@ DEFINE_GETTERS_SETTERS_FOR(enum ast_sdp_options_impl, impl);
 DEFINE_GETTERS_SETTERS_FOR(enum ast_sdp_options_encryption, encryption);
 DEFINE_GETTERS_SETTERS_FOR(unsigned int, ssrc);
 
+struct ast_sched_context *ast_sdp_options_get_sched_type(const struct ast_sdp_options *options, enum ast_media_type type)
+{
+       struct ast_sched_context *sched = NULL;
+
+       switch (type) {
+       case AST_MEDIA_TYPE_AUDIO:
+       case AST_MEDIA_TYPE_VIDEO:
+       case AST_MEDIA_TYPE_IMAGE:
+       case AST_MEDIA_TYPE_TEXT:
+               sched = options->sched[type];
+               break;
+       case AST_MEDIA_TYPE_UNKNOWN:
+       case AST_MEDIA_TYPE_END:
+               break;
+       }
+       return sched;
+}
+
+void ast_sdp_options_set_sched_type(struct ast_sdp_options *options, enum ast_media_type type, struct ast_sched_context *sched)
+{
+       switch (type) {
+       case AST_MEDIA_TYPE_AUDIO:
+       case AST_MEDIA_TYPE_VIDEO:
+       case AST_MEDIA_TYPE_IMAGE:
+       case AST_MEDIA_TYPE_TEXT:
+               options->sched[type] = sched;
+               break;
+       case AST_MEDIA_TYPE_UNKNOWN:
+       case AST_MEDIA_TYPE_END:
+               break;
+       }
+}
+
 static void set_defaults(struct ast_sdp_options *options)
 {
        options->dtmf = DEFAULT_DTMF;

diff --git a/main/sdp_private.h b/main/sdp_private.h
index a0b63df032dcfa24e136bcea7296fa21e3eaafa4..62228a5c89eb313421489d82e0bffb9bfea9ea94 100644 (file)
--- a/main/sdp_private.h
+++ b/main/sdp_private.h
@@ -35,6 +35,8 @@ struct ast_sdp_options {
                /*! RTP Engine Name */
                AST_STRING_FIELD(rtp_engine);
        );
+       /*! Scheduler context for the media stream types (Mainly for RTP) */
+       struct ast_sched_context *sched[AST_MEDIA_TYPE_END];
        struct {
                unsigned int rtp_symmetric:1;
                unsigned int udptl_symmetric:1;

diff --git a/main/sdp_state.c b/main/sdp_state.c
index 0f06bf9e3032e75ae9e4be5adec1f9521082b384..99421ad4da702b13869e4138a09829b1c6c50555 100644 (file)
--- a/main/sdp_state.c
+++ b/main/sdp_state.c
@@ -151,12 +151,6 @@ static void sdp_state_capabilities_free(struct sdp_state_capabilities *capabilit
        ast_free(capabilities);
 }
 
-/* TODO
- * This isn't set anywhere yet.
- */
-/*! \brief Scheduler for RTCP purposes */
-static struct ast_sched_context *sched;
-
 /*! \brief Internal function which creates an RTP instance */
 static struct sdp_state_rtp *create_rtp(const struct ast_sdp_options *options,
        enum ast_media_type media_type)
@@ -185,7 +179,8 @@ static struct sdp_state_rtp *create_rtp(const struct ast_sdp_options *options,
                return NULL;
        }
 
-       rtp->instance = ast_rtp_instance_new(options->rtp_engine, sched, media_address, NULL);
+       rtp->instance = ast_rtp_instance_new(options->rtp_engine,
+               ast_sdp_options_get_sched_type(options, media_type), media_address, NULL);
        if (!rtp->instance) {
                ast_log(LOG_ERROR, "Unable to create RTP instance using RTP engine '%s'\n",
                        options->rtp_engine);