mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-19 11:42:27 +00:00
Only truly consider the channel in the same format if the format matches the raw format OR if a translation path already exists to translate between them. (issue #7887 reported by softins & issue #7803 reported by alvaro_palma_aste). Thanks goes to stubert for giving me access to a box and showing me a scenario where this occured.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@42600 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -2385,7 +2385,7 @@ static int set_format(struct ast_channel *chan, int fmt, int *rawformat, int *fo
|
|||||||
/* Now we have a good choice for both. */
|
/* Now we have a good choice for both. */
|
||||||
ast_mutex_lock(&chan->lock);
|
ast_mutex_lock(&chan->lock);
|
||||||
|
|
||||||
if ((*rawformat == native) && (*format == fmt)) {
|
if ((*rawformat == native) && (*format == fmt) && ((*rawformat == *format) || (*trans))) {
|
||||||
/* the channel is already in these formats, so nothing to do */
|
/* the channel is already in these formats, so nothing to do */
|
||||||
ast_mutex_unlock(&chan->lock);
|
ast_mutex_unlock(&chan->lock);
|
||||||
return 0;
|
return 0;
|
||||||
|
Reference in New Issue
Block a user