[asterisk-commits] dvossel: branch dvossel/fixtheworld_phase2 r306323 - in /team/dvossel/fixthew...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Fri Feb  4 12:26:32 2011
New Revision: 306323

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=306323
Log:
Fix error in SILK format attribute interface

Modified:
    team/dvossel/fixtheworld_phase2/include/asterisk/format.h
    team/dvossel/fixtheworld_phase2/main/rtp_engine.c

Modified: team/dvossel/fixtheworld_phase2/include/asterisk/format.h
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase2/include/asterisk/format.h?view=diff&rev=306323&r1=306322&r2=306323
==============================================================================
--- team/dvossel/fixtheworld_phase2/include/asterisk/format.h (original)
+++ team/dvossel/fixtheworld_phase2/include/asterisk/format.h Fri Feb  4 12:26:32 2011
@@ -116,9 +116,9 @@
 
 enum silk_attr_vals {
 	SILK_ATTR_VAL_SAMP_8KHZ = (1 << 0),
-	SILK_ATTR_VAL_SAMP_12KHZ = (2 << 0),
-	SILK_ATTR_VAL_SAMP_16KHZ = (3 << 0),
-	SILK_ATTR_VAL_SAMP_24KHZ = (4 << 0),
+	SILK_ATTR_VAL_SAMP_12KHZ = (1 << 1),
+	SILK_ATTR_VAL_SAMP_16KHZ = (1 << 2),
+	SILK_ATTR_VAL_SAMP_24KHZ = (1 << 3),
 };
 
 /*! \brief This structure contains the buffer used for format attributes */

Modified: team/dvossel/fixtheworld_phase2/main/rtp_engine.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase2/main/rtp_engine.c?view=diff&rev=306323&r1=306322&r2=306323
==============================================================================
--- team/dvossel/fixtheworld_phase2/main/rtp_engine.c (original)
+++ team/dvossel/fixtheworld_phase2/main/rtp_engine.c Fri Feb  4 12:26:32 2011
@@ -1858,7 +1858,8 @@
 	int x;
 	ast_rwlock_wrlock(&static_RTP_PT_lock);
 	if (map < 0) {
-		for (x = 97; x < 127; x++) {
+		/* find next available dynamic payload slot */
+		for (x = 96; x < 127; x++) {
 			if (!static_RTP_PT[x].asterisk_format && !static_RTP_PT[x].rtp_code) {
 				map = x;
 				break;