kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 12:52:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

ast_format: Adds an identifier for interleaved audio formats to the ast_format

Browse Source 
Adds an identifier (with a getter and setter) to detect channels with
interleaved audio.
This is needed by the binaural bridge_softmix patch (ASTERISK-26292) and
was already discussed here:
http://lists.digium.com/pipermail/asterisk-dev/2016-October/075900.html
The identifier can be set during fmtp parsing (to be seen in the
res_format_attr_opus.c change).

ASTERISK-26292

Change-Id: I359801cc5f98c35671c48dabc81a7f4ee1183d63
This commit is contained in:
frahaase
2016-11-06 12:40:14 +01:00
parent bf01ff53f8
commit b2b5f9d897
3 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/format.c
View File

@@ -49,6 +49,8 @@ struct ast_format {
void *attribute_data;
/*! \brief Pointer to the optional format interface */
const struct ast_format_interface *interface;
/*! \brief The number if audio channels used, if more than one an interleaved format is required */
unsigned int channel_count;
};
/*! \brief Structure used when registering a format interface */
@@ -175,6 +177,16 @@ void ast_format_set_attribute_data(struct ast_format *format, void *attribute_da
format->attribute_data = attribute_data;
}
unsigned int ast_format_get_channel_count(const struct ast_format *format)
{
return format->channel_count;
}
void ast_format_set_channel_count(struct ast_format *format, unsigned int channel_count)
{
format->channel_count = channel_count;
}
/*! \brief Destructor for media formats */
static void format_destroy(void *obj)
{
@@ -199,6 +211,7 @@ struct ast_format *ast_format_create_named(const char *format_name, struct ast_c
}
format->name = format_name;
format->codec = ao2_bump(codec);
format->channel_count = 1;
format_interface = ao2_find(interfaces, codec->name, OBJ_SEARCH_KEY);
if (format_interface) {