[svn-commits] mmichelson: branch 1.8 r354594 - /branches/1.8/main/translate.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Feb  9 11:32:47 2012
New Revision: 354594

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=354594
Log:
Fix translation path choices.

This change makes it so computational cost is not taken into account
when deciding if a multistep path is better than a single-step path. This
means that the only time a multistep path will be chosen is if no single-step
path exists. This ensures a better quality translation even if it turns out
to be slightly slower.

(closes issue ASTERISK-16821)
reported by Andrew Lindh

Review: https://reviewboard.asterisk.org/r/1715


Modified:
    branches/1.8/main/translate.c

Modified: branches/1.8/main/translate.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/translate.c?view=diff&rev=354594&r1=354593&r2=354594
==============================================================================
--- branches/1.8/main/translate.c (original)
+++ branches/1.8/main/translate.c Thu Feb  9 11:32:47 2012
@@ -521,8 +521,6 @@
 					 * 3. if x->y->z results in a more optimal sample rate conversion. */
 					if (!tr_matrix[x][z].step) {
 						better_choice = 1;
-					} else if ((newcost < tr_matrix[x][z].cost) && (new_rate_change <= tr_matrix[x][z].rate_change)) {
-						better_choice = 1;
 					} else if (new_rate_change < tr_matrix[x][z].rate_change) {
 						better_choice = 1;
 					} else {