diff options
| author | Matt Jordan <mjordan@digium.com> | 2015-11-17 14:35:22 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-11-17 14:35:22 -0600 |
| commit | f57da2ae908e490d85bbe1dc0284c629bfcd4f97 (patch) | |
| tree | 420190daf7fcdde58744b2c33f617a55c1cc0738 | |
| parent | e6ac74f0f76f1e0525a4db2bd00c24002528792a (diff) | |
| parent | fd23d423d8e7be865112b8bda58f61ea6e3d0b8f (diff) | |
Merge "format: Register format-attribute module with cached formats."
| -rw-r--r-- | main/format.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/main/format.c b/main/format.c index b9931e544..cc9ac45d7 100644 --- a/main/format.c +++ b/main/format.c @@ -302,6 +302,14 @@ const void *ast_format_attribute_get(const struct ast_format *format, const char { const struct ast_format_interface *interface = format->interface; + if (!interface) { + struct format_interface *format_interface = ao2_find(interfaces, format->codec->name, OBJ_SEARCH_KEY); + if (format_interface) { + interface = format_interface->interface; + ao2_ref(format_interface, -1); + } + } + if (!interface || !interface->format_attribute_get) { return NULL; } @@ -330,11 +338,21 @@ struct ast_format *ast_format_parse_sdp_fmtp(const struct ast_format *format, co void ast_format_generate_sdp_fmtp(const struct ast_format *format, unsigned int payload, struct ast_str **str) { - if (!format->interface || !format->interface->format_generate_sdp_fmtp) { + const struct ast_format_interface *interface = format->interface; + + if (!interface) { + struct format_interface *format_interface = ao2_find(interfaces, format->codec->name, OBJ_SEARCH_KEY); + if (format_interface) { + interface = format_interface->interface; + ao2_ref(format_interface, -1); + } + } + + if (!interface || !interface->format_generate_sdp_fmtp) { return; } - format->interface->format_generate_sdp_fmtp(format, payload, str); + interface->format_generate_sdp_fmtp(format, payload, str); } struct ast_codec *ast_format_get_codec(const struct ast_format *format) |