From 94c9db95b198434b06dbdff14da91c0dcb8bd1f7 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 31 Oct 2006 06:10:59 +0000
Subject: [PATCH] Merged revisions 46554 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r46554 | russell | 2006-10-31 00:55:07 -0500 (Tue, 31 Oct 2006) | 5 lines
Add a small tweak to the code that checks to see whether destination formats
are translatable based on the source format. If we have already determined
that there is no translation path in one direction, don't bother checking the
other direction.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46556 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/translate.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/main/translate.c b/main/translate.c
index 136537ea6c..7405708552 100644
--- a/main/translate.c
+++ b/main/translate.c
@@ -781,13 +781,14 @@ unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src
/* if we don't have a translation path from the src
to this format, remove it from the result */
- if (!tr_matrix[src_audio][powerof(x)].step)
+ if (!tr_matrix[src_audio][powerof(x)].step) {
res &= ~x;
+ continue;
+ }
/* now check the opposite direction */
if (!tr_matrix[powerof(x)][src_audio].step)
res &= ~x;
-
}
/* For a given source video format, traverse the list of
@@ -806,8 +807,10 @@ unsigned int ast_translate_available_formats(unsigned int dest, unsigned int src
/* if we don't have a translation path from the src
to this format, remove it from the result */
- if (!tr_matrix[src_video][powerof(x)].step)
+ if (!tr_matrix[src_video][powerof(x)].step) {
res &= ~x;
+ continue;
+ }
/* now check the opposite direction */
if (!tr_matrix[powerof(x)][src_video].step)
--
GitLab