diff options
author | Matthew Jordan <mjordan@digium.com> | 2014-07-20 22:06:33 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2014-07-20 22:06:33 +0000 |
commit | a2c912e9972c91973ea66902d217746133f96026 (patch) | |
tree | 50e01d14ba62950e3f78766d5ba435ba51ca327d /channels/chan_mgcp.c | |
parent | b299052e203807c9a2111eb2cd919246d7589cb3 (diff) |
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_mgcp.c')
-rw-r--r-- | channels/chan_mgcp.c | 378 |
1 files changed, 208 insertions, 170 deletions
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 2d0afe29d..6021b6c1d 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -86,6 +86,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/features_config.h" #include "asterisk/parking.h" #include "asterisk/stasis_channels.h" +#include "asterisk/format_cache.h" /* * Define to work around buggy dlink MGCP phone firmware which @@ -1199,9 +1200,20 @@ static struct ast_frame *mgcp_rtp_read(struct mgcp_subchannel *sub) if (sub->owner) { /* We already hold the channel lock */ if (f->frametype == AST_FRAME_VOICE) { - if (!ast_format_cap_iscompatible(ast_channel_nativeformats(sub->owner), &f->subclass.format)) { - ast_debug(1, "Oooh, format changed to %s\n", ast_getformatname(&f->subclass.format)); - ast_format_cap_set(ast_channel_nativeformats(sub->owner), &f->subclass.format); + if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(sub->owner), f->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) { + struct ast_format_cap *caps; + + ast_debug(1, "Oooh, format changed to %s\n", ast_format_get_name(f->subclass.format)); + + caps = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT); + if (caps) { + ast_format_cap_append(caps, f->subclass.format, 0); + ast_channel_nativeformats_set(sub->owner, caps); + ao2_ref(caps, -1); + } else { + return &ast_null_frame; + } + ast_set_read_format(sub->owner, ast_channel_readformat(sub->owner)); ast_set_write_format(sub->owner, ast_channel_writeformat(sub->owner)); } @@ -1239,7 +1251,6 @@ static int mgcp_write(struct ast_channel *ast, struct ast_frame *frame) { struct mgcp_subchannel *sub = ast_channel_tech_pvt(ast); int res = 0; - char buf[256]; if (frame->frametype != AST_FRAME_VOICE) { if (frame->frametype == AST_FRAME_IMAGE) @@ -1249,12 +1260,14 @@ static int mgcp_write(struct ast_channel *ast, struct ast_frame *frame) return 0; } } else { - if (!(ast_format_cap_iscompatible(ast_channel_nativeformats(ast), &frame->subclass.format))) { + if (ast_format_cap_iscompatible_format(ast_channel_nativeformats(ast), frame->subclass.format) == AST_FORMAT_CMP_NOT_EQUAL) { + struct ast_str *cap_buf = ast_str_alloca(64); + ast_log(LOG_WARNING, "Asked to transmit frame type %s, while native formats is %s (read/write = %s/%s)\n", - ast_getformatname(&frame->subclass.format), - ast_getformatname_multiple(buf, sizeof(buf), ast_channel_nativeformats(ast)), - ast_getformatname(ast_channel_readformat(ast)), - ast_getformatname(ast_channel_writeformat(ast))); + ast_format_get_name(frame->subclass.format), + ast_format_cap_get_names(ast_channel_nativeformats(ast), &cap_buf), + ast_format_get_name(ast_channel_readformat(ast)), + ast_format_get_name(ast_channel_writeformat(ast))); /* return -1; */ } } @@ -1490,90 +1503,103 @@ static int mgcp_indicate(struct ast_channel *ast, int ind, const void *data, siz static struct ast_channel *mgcp_new(struct mgcp_subchannel *sub, int state, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor) { + struct ast_format_cap *caps = NULL; struct ast_channel *tmp; struct ast_variable *v = NULL; struct mgcp_endpoint *i = sub->parent; - struct ast_format tmpfmt; + struct ast_format *tmpfmt; + caps = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT); + if (!caps) { + ast_log(LOG_ERROR, "Format capabilities could not be created\n"); + return NULL; + } tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, i->accountcode, i->exten, i->context, assignedids, requestor, i->amaflags, "MGCP/%s@%s-%d", i->name, i->parent->name, sub->id); - if (tmp) { - ast_channel_stage_snapshot(tmp); - ast_channel_tech_set(tmp, &mgcp_tech); - ast_format_cap_copy(ast_channel_nativeformats(tmp), i->cap); - if (ast_format_cap_is_empty(ast_channel_nativeformats(tmp))) { - ast_format_cap_copy(ast_channel_nativeformats(tmp), global_capability); - } - if (sub->rtp) { - ast_channel_set_fd(tmp, 0, ast_rtp_instance_fd(sub->rtp, 0)); - } - if (i->dtmfmode & (MGCP_DTMF_INBAND | MGCP_DTMF_HYBRID)) { - i->dsp = ast_dsp_new(); - ast_dsp_set_features(i->dsp, DSP_FEATURE_DIGIT_DETECT); - /* this is to prevent clipping of dtmf tones during dsp processing */ - ast_dsp_set_digitmode(i->dsp, DSP_DIGITMODE_NOQUELCH); - } else { - i->dsp = NULL; - } - if (state == AST_STATE_RING) - ast_channel_rings_set(tmp, 1); - - ast_best_codec(ast_channel_nativeformats(tmp), &tmpfmt); - ast_format_copy(ast_channel_writeformat(tmp), &tmpfmt); - ast_format_copy(ast_channel_rawwriteformat(tmp), &tmpfmt); - ast_format_copy(ast_channel_readformat(tmp), &tmpfmt); - ast_format_copy(ast_channel_rawreadformat(tmp), &tmpfmt); - ast_channel_tech_pvt_set(tmp, sub); - if (!ast_strlen_zero(i->language)) - ast_channel_language_set(tmp, i->language); - if (!ast_strlen_zero(i->accountcode)) - ast_channel_accountcode_set(tmp, i->accountcode); - if (i->amaflags) - ast_channel_amaflags_set(tmp, i->amaflags); - mgcp_set_owner(sub, tmp); - ast_module_ref(ast_module_info->self); - ast_channel_callgroup_set(tmp, i->callgroup); - ast_channel_pickupgroup_set(tmp, i->pickupgroup); - ast_channel_call_forward_set(tmp, i->call_forward); - ast_channel_context_set(tmp, i->context); - ast_channel_exten_set(tmp, i->exten); - - /* Don't use ast_set_callerid() here because it will - * generate a needless NewCallerID event */ - if (!ast_strlen_zero(i->cid_num)) { - ast_channel_caller(tmp)->ani.number.valid = 1; - ast_channel_caller(tmp)->ani.number.str = ast_strdup(i->cid_num); - } - - if (!i->adsi) { - ast_channel_adsicpe_set(tmp, AST_ADSI_UNAVAILABLE); - } - ast_channel_priority_set(tmp, 1); + if (!tmp) { + ast_log(LOG_WARNING, "Channel could not be created\n"); + ao2_ref(caps, -1); + return NULL; + } - /* Set channel variables for this call from configuration */ - for (v = i->chanvars ; v ; v = v->next) { - char valuebuf[1024]; - pbx_builtin_setvar_helper(tmp, v->name, ast_get_encoded_str(v->value, valuebuf, sizeof(valuebuf))); - } + ast_channel_stage_snapshot(tmp); + ast_channel_tech_set(tmp, &mgcp_tech); + if (ast_format_cap_count(i->cap)) { + ast_format_cap_append_from_cap(caps, i->cap, AST_MEDIA_TYPE_UNKNOWN); + } else { + ast_format_cap_append_from_cap(caps, global_capability, AST_MEDIA_TYPE_UNKNOWN); + } + ast_channel_nativeformats_set(tmp, caps); + ao2_ref(caps, -1); + if (sub->rtp) { + ast_channel_set_fd(tmp, 0, ast_rtp_instance_fd(sub->rtp, 0)); + } + if (i->dtmfmode & (MGCP_DTMF_INBAND | MGCP_DTMF_HYBRID)) { + i->dsp = ast_dsp_new(); + ast_dsp_set_features(i->dsp, DSP_FEATURE_DIGIT_DETECT); + /* this is to prevent clipping of dtmf tones during dsp processing */ + ast_dsp_set_digitmode(i->dsp, DSP_DIGITMODE_NOQUELCH); + } else { + i->dsp = NULL; + } + if (state == AST_STATE_RING) { + ast_channel_rings_set(tmp, 1); + } + + tmpfmt = ast_format_cap_get_format(ast_channel_nativeformats(tmp), 0); + ast_channel_set_writeformat(tmp, tmpfmt); + ast_channel_set_rawwriteformat(tmp, tmpfmt); + ast_channel_set_readformat(tmp, tmpfmt); + ast_channel_set_rawreadformat(tmp, tmpfmt); + ao2_ref(tmpfmt, -1); + ast_channel_tech_pvt_set(tmp, sub); + if (!ast_strlen_zero(i->language)) + ast_channel_language_set(tmp, i->language); + if (!ast_strlen_zero(i->accountcode)) + ast_channel_accountcode_set(tmp, i->accountcode); + if (i->amaflags) + ast_channel_amaflags_set(tmp, i->amaflags); + mgcp_set_owner(sub, tmp); + ast_module_ref(ast_module_info->self); + ast_channel_callgroup_set(tmp, i->callgroup); + ast_channel_pickupgroup_set(tmp, i->pickupgroup); + ast_channel_call_forward_set(tmp, i->call_forward); + ast_channel_context_set(tmp, i->context); + ast_channel_exten_set(tmp, i->exten); + /* Don't use ast_set_callerid() here because it will + * generate a needless NewCallerID event */ + if (!ast_strlen_zero(i->cid_num)) { + ast_channel_caller(tmp)->ani.number.valid = 1; + ast_channel_caller(tmp)->ani.number.str = ast_strdup(i->cid_num); + } + + if (!i->adsi) { + ast_channel_adsicpe_set(tmp, AST_ADSI_UNAVAILABLE); + } + ast_channel_priority_set(tmp, 1); + + /* Set channel variables for this call from configuration */ + for (v = i->chanvars ; v ; v = v->next) { + char valuebuf[1024]; + pbx_builtin_setvar_helper(tmp, v->name, ast_get_encoded_str(v->value, valuebuf, sizeof(valuebuf))); + } - if (sub->rtp) { - ast_jb_configure(tmp, &global_jbconf); - } + if (sub->rtp) { + ast_jb_configure(tmp, &global_jbconf); + } - ast_channel_stage_snapshot_done(tmp); - ast_channel_unlock(tmp); + ast_channel_stage_snapshot_done(tmp); + ast_channel_unlock(tmp); - if (state != AST_STATE_DOWN) { - if (ast_pbx_start(tmp)) { - ast_log(LOG_WARNING, "Unable to start PBX on %s\n", ast_channel_name(tmp)); - ast_hangup(tmp); - tmp = NULL; - } + if (state != AST_STATE_DOWN) { + if (ast_pbx_start(tmp)) { + ast_log(LOG_WARNING, "Unable to start PBX on %s\n", ast_channel_name(tmp)); + ast_hangup(tmp); + tmp = NULL; } - ast_verb(3, "MGCP mgcp_new(%s) created in state: %s\n", - ast_channel_name(tmp), ast_state2str(state)); - } else { - ast_log(LOG_WARNING, "Unable to allocate channel structure\n"); } + ast_verb(3, "MGCP mgcp_new(%s) created in state: %s\n", + ast_channel_name(tmp), ast_state2str(state)); + return tmp; } @@ -1973,7 +1999,9 @@ static int process_sdp(struct mgcp_subchannel *sub, struct mgcp_request *req) int codec, codec_count=0; int iterator; struct mgcp_endpoint *p = sub->parent; - char tmp1[256], tmp2[256], tmp3[256]; + struct ast_str *global_buf = ast_str_alloca(64); + struct ast_str *peer_buf = ast_str_alloca(64); + struct ast_str *pvt_buf = ast_str_alloca(64); /* Get codec and RTP info from SDP */ m = get_sdp(req, "m"); @@ -2030,20 +2058,20 @@ static int process_sdp(struct mgcp_subchannel *sub, struct mgcp_request *req) } /* Now gather all of the codecs that were asked for: */ - if (!(peercap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_NOLOCK))) { + if (!(peercap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) { return -1; } ast_rtp_codecs_payload_formats(ast_rtp_instance_get_codecs(sub->rtp), peercap, &peerNonCodecCapability); - ast_format_cap_joint_copy(global_capability, peercap, p->cap); + ast_format_cap_get_compatible(global_capability, peercap, p->cap); ast_debug(1, "Capabilities: us - %s, them - %s, combined - %s\n", - ast_getformatname_multiple(tmp1, sizeof(tmp1), global_capability), - ast_getformatname_multiple(tmp2, sizeof(tmp2), peercap), - ast_getformatname_multiple(tmp3, sizeof(tmp3), p->cap)); - peercap = ast_format_cap_destroy(peercap); + ast_format_cap_get_names(global_capability, &global_buf), + ast_format_cap_get_names(peercap, &peer_buf), + ast_format_cap_get_names(p->cap, &pvt_buf)); + ao2_ref(peercap, -1); ast_debug(1, "Non-codec capabilities: us - %d, them - %d, combined - %d\n", nonCodecCapability, peerNonCodecCapability, p->nonCodecCapability); - if (ast_format_cap_is_empty(p->cap)) { + if (!ast_format_cap_count(p->cap)) { ast_log(LOG_WARNING, "No compatible codecs!\n"); return -1; } @@ -2201,7 +2229,6 @@ static int add_sdp(struct mgcp_request *resp, struct mgcp_subchannel *sub, struc char m[256] = ""; char a[1024] = ""; int x; - struct ast_format tmpfmt; struct sockaddr_in dest = { 0, }; struct ast_sockaddr dest_tmp; struct mgcp_endpoint *p = sub->parent; @@ -2236,24 +2263,25 @@ static int add_sdp(struct mgcp_request *resp, struct mgcp_subchannel *sub, struc ast_copy_string(t, "t=0 0\r\n", sizeof(t)); snprintf(m, sizeof(m), "m=audio %d RTP/AVP", ntohs(dest.sin_port)); - ast_format_cap_iter_start(p->cap); - while (!(ast_format_cap_iter_next(p->cap, &tmpfmt))) { - if (AST_FORMAT_GET_TYPE(tmpfmt.id) != AST_FORMAT_TYPE_AUDIO) { - /* Audio is now discontiguous */ + for (x = 0; x < ast_format_cap_count(p->cap); x++) { + struct ast_format *format = ast_format_cap_get_format(p->cap, x); + + if (ast_format_get_type(format) != AST_MEDIA_TYPE_AUDIO) { + ao2_ref(format, -1); continue; } - if (ast_format_cap_iscompatible(p->cap, &tmpfmt)) { - ast_debug(1, "Answering with capability %s\n", ast_getformatname(&tmpfmt)); - codec = ast_rtp_codecs_payload_code(ast_rtp_instance_get_codecs(sub->rtp), 1, &tmpfmt, 0); - if (codec > -1) { - snprintf(costr, sizeof(costr), " %d", codec); - strncat(m, costr, sizeof(m) - strlen(m) - 1); - snprintf(costr, sizeof(costr), "a=rtpmap:%d %s/8000\r\n", codec, ast_rtp_lookup_mime_subtype2(1, &tmpfmt, 0, 0)); - strncat(a, costr, sizeof(a) - strlen(a) - 1); - } + + ast_debug(1, "Answering with capability %s\n", ast_format_get_name(format)); + codec = ast_rtp_codecs_payload_code(ast_rtp_instance_get_codecs(sub->rtp), 1, format, 0); + if (codec > -1) { + snprintf(costr, sizeof(costr), " %d", codec); + strncat(m, costr, sizeof(m) - strlen(m) - 1); + snprintf(costr, sizeof(costr), "a=rtpmap:%d %s/8000\r\n", codec, ast_rtp_lookup_mime_subtype2(1, format, 0, 0)); + strncat(a, costr, sizeof(a) - strlen(a) - 1); } + + ao2_ref(format, -1); } - ast_format_cap_iter_end(p->cap); for (x = 1LL; x <= AST_RTP_MAX; x <<= 1) { if (p->nonCodecCapability & x) { @@ -2292,7 +2320,7 @@ static int transmit_modify_with_sdp(struct mgcp_subchannel *sub, struct ast_rtp_ char local[256]; char tmp[80]; struct mgcp_endpoint *p = sub->parent; - struct ast_format tmpfmt; + int i; struct ast_sockaddr sub_tmpdest_tmp; unsigned int oseq; @@ -2304,18 +2332,20 @@ static int transmit_modify_with_sdp(struct mgcp_subchannel *sub, struct ast_rtp_ return 0; } ast_copy_string(local, "e:on, s:off, p:20", sizeof(local)); - ast_format_cap_iter_start(p->cap); - while (!(ast_format_cap_iter_next(p->cap, &tmpfmt))) { - if (AST_FORMAT_GET_TYPE(tmpfmt.id) != AST_FORMAT_TYPE_AUDIO) { - /* Audio is now discontiguous */ + + for (i = 0; i < ast_format_cap_count(p->cap); i++) { + struct ast_format *format = ast_format_cap_get_format(p->cap, i); + + if (ast_format_get_type(format) != AST_MEDIA_TYPE_AUDIO) { + ao2_ref(format, -1); continue; } - if (ast_format_cap_iscompatible(p->cap, &tmpfmt)) { - snprintf(tmp, sizeof(tmp), ", a:%s", ast_rtp_lookup_mime_subtype2(1, &tmpfmt, 0, 0)); - strncat(local, tmp, sizeof(local) - strlen(local) - 1); - } + + snprintf(tmp, sizeof(tmp), ", a:%s", ast_rtp_lookup_mime_subtype2(1, format, 0, 0)); + strncat(local, tmp, sizeof(local) - strlen(local) - 1); + + ao2_ref(format, -1); } - ast_format_cap_iter_end(p->cap); if (sub->gate) { if (sub->gate->state == GATE_ALLOCATED || sub->gate->state == GATE_OPEN) { @@ -2351,7 +2381,7 @@ static int transmit_connect_with_sdp(struct mgcp_subchannel *sub, struct ast_rtp struct mgcp_request resp; char local[256]; char tmp[80]; - struct ast_format tmpfmt; + int i; struct mgcp_endpoint *p = sub->parent; unsigned int oseq; @@ -2360,18 +2390,19 @@ static int transmit_connect_with_sdp(struct mgcp_subchannel *sub, struct ast_rtp ast_copy_string(local, "e:on, s:off, p:20", sizeof(local)); - ast_format_cap_iter_start(p->cap); - while (!(ast_format_cap_iter_next(p->cap, &tmpfmt))) { - if (AST_FORMAT_GET_TYPE(tmpfmt.id) != AST_FORMAT_TYPE_AUDIO) { - /* Audio is now discontiguous */ + for (i = 0; i < ast_format_cap_count(p->cap); i++) { + struct ast_format *format = ast_format_cap_get_format(p->cap, i); + + if (ast_format_get_type(format) != AST_MEDIA_TYPE_AUDIO) { + ao2_ref(format, -1); continue; } - if (ast_format_cap_iscompatible(p->cap, &tmpfmt)) { - snprintf(tmp, sizeof(tmp), ", a:%s", ast_rtp_lookup_mime_subtype2(1, &tmpfmt, 0, 0)); - strncat(local, tmp, sizeof(local) - strlen(local) - 1); - } + + snprintf(tmp, sizeof(tmp), ", a:%s", ast_rtp_lookup_mime_subtype2(1, format, 0, 0)); + strncat(local, tmp, sizeof(local) - strlen(local) - 1); + + ao2_ref(format, -1); } - ast_format_cap_iter_end(p->cap); if (sub->gate) { if(sub->gate->state == GATE_ALLOCATED) { @@ -2447,22 +2478,23 @@ static int mgcp_alloc_pktcgate(struct mgcp_subchannel *sub) static int transmit_connect(struct mgcp_subchannel *sub) { struct mgcp_request resp; + int x; char local[256]; char tmp[80]; - struct ast_format tmpfmt; + struct ast_format *tmpfmt; struct mgcp_endpoint *p = sub->parent; unsigned int oseq; ast_copy_string(local, "p:20, s:off, e:on", sizeof(local)); - ast_format_cap_iter_start(p->cap); - while (!(ast_format_cap_iter_next(p->cap, &tmpfmt))) { - if (ast_format_cap_iscompatible(p->cap, &tmpfmt)) { - snprintf(tmp, sizeof(tmp), ", a:%s", ast_rtp_lookup_mime_subtype2(1, &tmpfmt, 0, 0)); - strncat(local, tmp, sizeof(local) - strlen(local) - 1); - } + for (x = 0; x < ast_format_cap_count(p->cap); x++) { + tmpfmt = ast_format_cap_get_format(p->cap, x); + + snprintf(tmp, sizeof(tmp), ", a:%s", ast_rtp_lookup_mime_subtype2(1, tmpfmt, 0, 0)); + strncat(local, tmp, sizeof(local) - strlen(local) - 1); + + ao2_ref(tmpfmt, -1); } - ast_format_cap_iter_end(p->cap); ast_debug(3, "Creating connection for %s@%s-%d in cxmode: %s callid: %s\n", p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode], sub->callid); @@ -2557,7 +2589,7 @@ static int transmit_modify_request(struct mgcp_subchannel *sub) { struct mgcp_request resp; struct mgcp_endpoint *p = sub->parent; - struct ast_format tmpfmt; + int i; int fc = 1; char local[256]; char tmp[80]; @@ -2572,18 +2604,22 @@ static int transmit_modify_request(struct mgcp_subchannel *sub) p->name, p->parent->name, sub->id, mgcp_cxmodes[sub->cxmode], sub->callid); ast_copy_string(local, "", sizeof(local)); - ast_format_cap_iter_start(p->cap); - while (!(ast_format_cap_iter_next(p->cap, &tmpfmt))) { + for (i = 0; i < ast_format_cap_count(p->cap); i++) { + struct ast_format *format = ast_format_cap_get_format(p->cap, i); + if (p->ncs && !fc) { - ast_format_cap_set(p->cap, &tmpfmt); /* sb5120e bug */ + ast_format_cap_remove_by_type(p->cap, AST_MEDIA_TYPE_UNKNOWN); + ast_format_cap_append(p->cap, format, 0); /* sb5120e bug */ + ao2_ref(format, -1); break; } else { fc = 0; - snprintf(tmp, sizeof(tmp), ", a:%s", ast_rtp_lookup_mime_subtype2(1, &tmpfmt, 0, 0)); + snprintf(tmp, sizeof(tmp), ", a:%s", ast_rtp_lookup_mime_subtype2(1, format, 0, 0)); } strncat(local, tmp, sizeof(local) - strlen(local) - 1); + + ao2_ref(format, -1); } - ast_format_cap_iter_end(p->cap); if (!sub->sdpsent) { if (sub->gate) { @@ -3948,8 +3984,10 @@ static struct ast_channel *mgcp_request(const char *type, struct ast_format_cap struct ast_channel *tmpc = NULL; char tmp[256]; - if (!(ast_format_cap_has_joint(cap, global_capability))) { - ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format '%s'\n", ast_getformatname_multiple(tmp, sizeof(tmp), cap)); + if (!(ast_format_cap_iscompatible(cap, global_capability))) { + struct ast_str *cap_buf = ast_str_alloca(64); + ast_log(LOG_NOTICE, "Asked to get a channel of unsupported format '%s'\n", + ast_format_cap_get_names(cap, &cap_buf)); /*return NULL;*/ } ast_copy_string(tmp, dest, sizeof(tmp)); @@ -4185,7 +4223,7 @@ static struct mgcp_gateway *build_gateway(char *cat, struct ast_variable *v) ast_mutex_init(&e->lock); ast_mutex_init(&e->rqnt_queue_lock); ast_mutex_init(&e->cmd_queue_lock); - e->cap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_NOLOCK); + e->cap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT); ast_copy_string(e->name, v->value, sizeof(e->name)); e->needaudit = 1; } @@ -4210,7 +4248,7 @@ static struct mgcp_gateway *build_gateway(char *cat, struct ast_variable *v) snprintf(e->rqnt_ident, sizeof(e->rqnt_ident), "%08lx", (unsigned long)ast_random()); e->msgstate = -1; e->amaflags = amaflags; - ast_format_cap_copy(e->cap, global_capability); + ast_format_cap_append_from_cap(e->cap, global_capability, AST_MEDIA_TYPE_UNKNOWN); e->parent = gw; e->ncs = ncs; e->dtmfmode = dtmfmode; @@ -4292,7 +4330,7 @@ static struct mgcp_gateway *build_gateway(char *cat, struct ast_variable *v) ast_mutex_init(&e->lock); ast_mutex_init(&e->rqnt_queue_lock); ast_mutex_init(&e->cmd_queue_lock); - e->cap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_NOLOCK); + e->cap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT); ast_copy_string(e->name, v->value, sizeof(e->name)); e->needaudit = 1; } @@ -4314,7 +4352,7 @@ static struct mgcp_gateway *build_gateway(char *cat, struct ast_variable *v) e->parent = gw; } e->amaflags = amaflags; - ast_format_cap_copy(e->cap, global_capability); + ast_format_cap_append_from_cap(e->cap, global_capability, AST_MEDIA_TYPE_UNKNOWN); e->dtmfmode = dtmfmode; e->ncs = ncs; e->pktcgatealloc = pktcgatealloc; @@ -4470,7 +4508,8 @@ static void mgcp_get_codec(struct ast_channel *chan, struct ast_format_cap *resu { struct mgcp_subchannel *sub = ast_channel_tech_pvt(chan); struct mgcp_endpoint *p = sub->parent; - ast_format_cap_copy(result, p->cap); + + ast_format_cap_append_from_cap(result, p->cap, AST_MEDIA_TYPE_UNKNOWN); } static struct ast_rtp_glue mgcp_rtp_glue = { @@ -4556,7 +4595,7 @@ static void destroy_endpoint(struct mgcp_endpoint *e) ast_mutex_destroy(&e->lock); ast_mutex_destroy(&e->rqnt_queue_lock); ast_mutex_destroy(&e->cmd_queue_lock); - e->cap = ast_format_cap_destroy(e->cap); + ao2_ref(e->cap, -1); ast_free(e); } @@ -4654,7 +4693,6 @@ static int reload_config(int reload) char *cat; struct ast_hostent ahp; struct hostent *hp; - struct ast_format format; struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; if (gethostname(ourhost, sizeof(ourhost)-1)) { @@ -4694,19 +4732,9 @@ static int reload_config(int reload) memcpy(&bindaddr.sin_addr, hp->h_addr, sizeof(bindaddr.sin_addr)); } } else if (!strcasecmp(v->name, "allow")) { - ast_getformatbyname(v->value, &format); - if (!format.id) { - ast_log(LOG_WARNING, "Cannot allow unknown format '%s'\n", v->value); - } else { - ast_format_cap_add(global_capability, &format); - } + ast_format_cap_update_by_allow_disallow(global_capability, v->value, 1); } else if (!strcasecmp(v->name, "disallow")) { - ast_getformatbyname(v->value, &format); - if (!format.id) { - ast_log(LOG_WARNING, "Cannot allow unknown format '%s'\n", v->value); - } else { - ast_format_cap_remove(global_capability, &format); - } + ast_format_cap_update_by_allow_disallow(global_capability, v->value, 0); } else if (!strcasecmp(v->name, "tos")) { if (ast_str2tos(v->value, &qos.tos)) { ast_log(LOG_WARNING, "Invalid tos value at line %d, refer to QoS documentation\n", v->lineno); @@ -4831,36 +4859,44 @@ static int reload_config(int reload) */ static int load_module(void) { - struct ast_format tmpfmt; - - if (!(global_capability = ast_format_cap_alloc(0))) { + if (!(global_capability = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) { return AST_MODULE_LOAD_FAILURE; } - if (!(mgcp_tech.capabilities = ast_format_cap_alloc(0))) { + if (!(mgcp_tech.capabilities = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) { + ao2_ref(global_capability, -1); return AST_MODULE_LOAD_FAILURE; } - ast_format_cap_add(global_capability, ast_format_set(&tmpfmt, AST_FORMAT_ULAW, 0)); - ast_format_cap_add(mgcp_tech.capabilities, ast_format_set(&tmpfmt, AST_FORMAT_ULAW, 0)); - ast_format_cap_add(mgcp_tech.capabilities, ast_format_set(&tmpfmt, AST_FORMAT_ALAW, 0)); + ast_format_cap_append(global_capability, ast_format_ulaw, 0); + ast_format_cap_append(mgcp_tech.capabilities, ast_format_ulaw, 0); + ast_format_cap_append(mgcp_tech.capabilities, ast_format_alaw, 0); if (!(sched = ast_sched_context_create())) { ast_log(LOG_WARNING, "Unable to create schedule context\n"); + ao2_ref(global_capability, -1); + ao2_ref(mgcp_tech.capabilities, -1); return AST_MODULE_LOAD_FAILURE; } if (!(io = io_context_create())) { ast_log(LOG_WARNING, "Unable to create I/O context\n"); ast_sched_context_destroy(sched); + ao2_ref(global_capability, -1); + ao2_ref(mgcp_tech.capabilities, -1); return AST_MODULE_LOAD_FAILURE; } - if (reload_config(0)) + if (reload_config(0)) { + ao2_ref(global_capability, -1); + ao2_ref(mgcp_tech.capabilities, -1); return AST_MODULE_LOAD_DECLINE; + } /* Make sure we can register our mgcp channel type */ if (ast_channel_register(&mgcp_tech)) { ast_log(LOG_ERROR, "Unable to register channel class 'MGCP'\n"); io_context_destroy(io); ast_sched_context_destroy(sched); + ao2_ref(global_capability, -1); + ao2_ref(mgcp_tech.capabilities, -1); return AST_MODULE_LOAD_FAILURE; } @@ -4973,8 +5009,10 @@ static int unload_module(void) ast_cli_unregister_multiple(cli_mgcp, sizeof(cli_mgcp) / sizeof(struct ast_cli_entry)); ast_sched_context_destroy(sched); - global_capability = ast_format_cap_destroy(global_capability); - mgcp_tech.capabilities = ast_format_cap_destroy(mgcp_tech.capabilities); + ao2_ref(global_capability, -1); + global_capability = NULL; + ao2_ref(mgcp_tech.capabilities, -1); + mgcp_tech.capabilities = NULL; return 0; } |