diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2017-04-26 16:22:38 -0500 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2017-05-02 10:59:53 -0500 |
| commit | cd272da7a8aa121113a7ca7e44d85eb88e721607 (patch) | |
| tree | 67a315dbdadd0b7c8d010dccf4acaba4b9ceac4e /main/sdp_options.c | |
| parent | dc948163cace1e71a8cbb069549a74ebf15b793c (diff) | |
SDP: Replace SDP telephone_event option with dtmf option
The telephone_event option was used as a flag and a bit mapped value in
different places when it is a boolean. It is also inadequate to configure
the DTMF operation of the RTP instance created for the stream.
Change-Id: Ib1addeaf0ce86f07039f2f979cab29405dc5239b
Diffstat (limited to 'main/sdp_options.c')
| -rw-r--r-- | main/sdp_options.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/sdp_options.c b/main/sdp_options.c index 3f25e4326..9b57e189f 100644 --- a/main/sdp_options.c +++ b/main/sdp_options.c @@ -23,8 +23,8 @@ #include "sdp_private.h" +#define DEFAULT_DTMF AST_SDP_DTMF_NONE #define DEFAULT_ICE AST_SDP_ICE_DISABLED -#define DEFAULT_TELEPHONE_EVENT 0 #define DEFAULT_IMPL AST_SDP_IMPL_STRING #define DEFAULT_ENCRYPTION AST_SDP_ENCRYPTION_DISABLED @@ -65,7 +65,6 @@ DEFINE_GETTERS_SETTERS_FOR(unsigned int, rtp_symmetric); DEFINE_GETTERS_SETTERS_FOR(unsigned int, udptl_symmetric); DEFINE_GETTERS_SETTERS_FOR(enum ast_t38_ec_modes, udptl_error_correction); DEFINE_GETTERS_SETTERS_FOR(unsigned int, udptl_far_max_datagram); -DEFINE_GETTERS_SETTERS_FOR(unsigned int, telephone_event); DEFINE_GETTERS_SETTERS_FOR(unsigned int, rtp_ipv6); DEFINE_GETTERS_SETTERS_FOR(unsigned int, g726_non_standard); DEFINE_GETTERS_SETTERS_FOR(unsigned int, rtcp_mux); @@ -73,6 +72,7 @@ DEFINE_GETTERS_SETTERS_FOR(unsigned int, tos_audio); DEFINE_GETTERS_SETTERS_FOR(unsigned int, cos_audio); DEFINE_GETTERS_SETTERS_FOR(unsigned int, tos_video); DEFINE_GETTERS_SETTERS_FOR(unsigned int, cos_video); +DEFINE_GETTERS_SETTERS_FOR(enum ast_sdp_options_dtmf, dtmf); DEFINE_GETTERS_SETTERS_FOR(enum ast_sdp_options_ice, ice); DEFINE_GETTERS_SETTERS_FOR(enum ast_sdp_options_impl, impl); DEFINE_GETTERS_SETTERS_FOR(enum ast_sdp_options_encryption, encryption); @@ -80,8 +80,8 @@ DEFINE_GETTERS_SETTERS_FOR(unsigned int, ssrc); static void set_defaults(struct ast_sdp_options *options) { + options->dtmf = DEFAULT_DTMF; options->ice = DEFAULT_ICE; - options->telephone_event = DEFAULT_TELEPHONE_EVENT; options->impl = DEFAULT_IMPL; options->encryption = DEFAULT_ENCRYPTION; } |