diff options
| author | frahaase <fra.haase@googlemail.com> | 2016-11-06 12:40:14 +0100 |
|---|---|---|
| committer | frahaase <fra.haase@googlemail.com> | 2016-11-06 15:56:58 +0100 |
| commit | b2b5f9d897d1534f366b1b96fb10ad1de4f9ba5d (patch) | |
| tree | 88fab2e74612cd3fdae87dd9b15008b5cb84c6f1 /main/format.c | |
| parent | bf01ff53f8d93d637981720331405e56f0b3b118 (diff) | |
ast_format: Adds an identifier for interleaved audio formats to the ast_format
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
Diffstat (limited to 'main/format.c')
| -rw-r--r-- | main/format.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/main/format.c b/main/format.c index b5e577913..5ae5ad986 100644 --- a/main/format.c +++ b/main/format.c @@ -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) { |