[svn-commits] dvossel: branch dvossel/fixtheworld_phase2 r307317 - /team/dvossel/fixtheworl...

[SVN commits to the Digium repositories]

Author: dvossel
Date: Wed Feb  9 16:03:58 2011
New Revision: 307317

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=307317
Log:
changes to SILK attribute interface

Modified:
    team/dvossel/fixtheworld_phase2/formats/format_attr_silk.c

Modified: team/dvossel/fixtheworld_phase2/formats/format_attr_silk.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase2/formats/format_attr_silk.c?view=diff&rev=307317&r1=307316&r2=307317
==============================================================================
--- team/dvossel/fixtheworld_phase2/formats/format_attr_silk.c (original)
+++ team/dvossel/fixtheworld_phase2/formats/format_attr_silk.c Wed Feb  9 16:03:58 2011
@@ -121,9 +121,15 @@
 	int joint = -1;
 
 	attr_res->samplerate = attr1->samplerate & attr2->samplerate;
+	/* sample rate is the only attribute that has any bearing on if joint capabilities exist or not */
 	if (attr_res->samplerate) {
 		joint = 0;
 	}
+	/* take the lowest max bitrate */
+	attr_res->maxbitrate = attr1->maxbitrate < attr2->maxbitrate ? attr1->maxbitrate : attr2->maxbitrate;
+
+	/* Only do dtx if both sides want it */
+	attr_res->dtx = attr1->dtx && attr2->dtx ? 1 : 0;
 	return joint;
 }