Skip to content

Commit

Permalink
Binaural synthesis (confbridge): interleaved two-channel audio.
Browse files Browse the repository at this point in the history
Asterisk only supports mono audio at the moment.
This patch adds interleaved two-channel audio to Asterisk's channels.

ASTERISK-26292

Change-Id: I7a547cea0fd3c6d1e502709d9e7e39605035757a
  • Loading branch information
frahaase authored and dennisguse committed Oct 3, 2016
1 parent e711e57 commit c455823
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 9 deletions.
10 changes: 10 additions & 0 deletions include/asterisk/channel.h
Expand Up @@ -2016,6 +2016,16 @@ int ast_set_write_format_from_cap(struct ast_channel *chan, struct ast_format_ca
*/
int ast_set_write_format(struct ast_channel *chan, struct ast_format *format);

/*!
* \brief Sets write format for a channel.
* All internal data will than be handled in an interleaved format. (needed by binaural opus)
*
* \param chan channel to change
* \param format format to set for writing
* \return Returns 0 on success, -1 on failure
*/
int ast_set_write_format_interleaved_stereo(struct ast_channel *chan, struct ast_format *format);

/*!
* \brief Sends text to a channel
*
Expand Down
1 change: 1 addition & 0 deletions include/asterisk/translate.h
Expand Up @@ -231,6 +231,7 @@ struct ast_trans_pvt {
* explicit_dst contains an attribute which describes whether both parties
* want to do forward-error correction (FEC). */
struct ast_format *explicit_dst;
int interleaved_stereo; /*!< indicates if samples are in interleaved order, for stereo lin */
};

/*! \brief generic frameout function */
Expand Down
42 changes: 33 additions & 9 deletions main/channel.c
Expand Up @@ -5407,7 +5407,7 @@ static const struct set_format_access set_format_access_write = {
.setoption = AST_OPTION_FORMAT_WRITE,
};

static int set_format(struct ast_channel *chan, struct ast_format_cap *cap_set, const int direction)
static int set_format(struct ast_channel *chan, struct ast_format_cap *cap_set, const int direction, int interleaved_stereo)
{
struct ast_trans_pvt *trans_pvt;
struct ast_format_cap *cap_native;
Expand Down Expand Up @@ -5509,16 +5509,20 @@ static int set_format(struct ast_channel *chan, struct ast_format_cap *cap_set,
}

/* Now we have a good choice for both. */
trans_pvt = access->get_trans(chan);
if ((ast_format_cmp(rawformat, best_native_fmt) != AST_FORMAT_CMP_NOT_EQUAL) &&
(ast_format_cmp(format, best_set_fmt) != AST_FORMAT_CMP_NOT_EQUAL) &&
((ast_format_cmp(rawformat, format) != AST_FORMAT_CMP_NOT_EQUAL) || access->get_trans(chan))) {
/* the channel is already in these formats, so nothing to do */
ast_channel_unlock(chan);
return 0;
/* the channel is already in these formats, so nothing to do, unless the interleaved format is not set correctly */
if (trans_pvt != NULL) {
if (trans_pvt->interleaved_stereo == interleaved_stereo) {
ast_channel_unlock(chan);
return 0;
}
}
}

/* Free any translation we have right now */
trans_pvt = access->get_trans(chan);
if (trans_pvt) {
ast_translator_free_path(trans_pvt);
access->set_trans(chan, NULL);
Expand All @@ -5536,9 +5540,11 @@ static int set_format(struct ast_channel *chan, struct ast_format_cap *cap_set,
if (!direction) {
/* reading */
trans_pvt = ast_translator_build_path(best_set_fmt, best_native_fmt);
trans_pvt->interleaved_stereo = 0;
} else {
/* writing */
trans_pvt = ast_translator_build_path(best_native_fmt, best_set_fmt);
trans_pvt->interleaved_stereo = interleaved_stereo;
}
access->set_trans(chan, trans_pvt);
res = trans_pvt ? 0 : -1;
Expand Down Expand Up @@ -5578,15 +5584,33 @@ int ast_set_read_format(struct ast_channel *chan, struct ast_format *format)
}
ast_format_cap_append(cap, format, 0);

res = set_format(chan, cap, 0);
res = set_format(chan, cap, 0, 0);

ao2_cleanup(cap);
return res;
}

int ast_set_read_format_from_cap(struct ast_channel *chan, struct ast_format_cap *cap)
{
return set_format(chan, cap, 0);
return set_format(chan, cap, 0, 0);
}

int ast_set_write_format_interleaved_stereo(struct ast_channel *chan, struct ast_format *format)
{
struct ast_format_cap *cap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
int res;

ast_assert(format != NULL);

if (!cap) {
return -1;
}
ast_format_cap_append(cap, format, 0);

res = set_format(chan, cap, 1, 1);

ao2_cleanup(cap);
return res;
}

int ast_set_write_format(struct ast_channel *chan, struct ast_format *format)
Expand All @@ -5601,15 +5625,15 @@ int ast_set_write_format(struct ast_channel *chan, struct ast_format *format)
}
ast_format_cap_append(cap, format, 0);

res = set_format(chan, cap, 1);
res = set_format(chan, cap, 1, 0);

ao2_cleanup(cap);
return res;
}

int ast_set_write_format_from_cap(struct ast_channel *chan, struct ast_format_cap *cap)
{
return set_format(chan, cap, 1);
return set_format(chan, cap, 1, 0);
}

const char *ast_channel_reason2str(int reason)
Expand Down

0 comments on commit c455823

Please sign in to comment.