[asterisk-commits] dvossel: branch dvossel/fixtheworld_phase1_step3 r305986 - in /team/dvossel/f...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Feb  3 09:42:50 2011
New Revision: 305986

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=305986
Log:
addresses some minor reviewboard comments

Modified:
    team/dvossel/fixtheworld_phase1_step3/include/asterisk/rtp_engine.h
    team/dvossel/fixtheworld_phase1_step3/include/asterisk/translate.h
    team/dvossel/fixtheworld_phase1_step3/main/app.c
    team/dvossel/fixtheworld_phase1_step3/main/channel.c

Modified: team/dvossel/fixtheworld_phase1_step3/include/asterisk/rtp_engine.h
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/include/asterisk/rtp_engine.h?view=diff&rev=305986&r1=305985&r2=305986
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/include/asterisk/rtp_engine.h (original)
+++ team/dvossel/fixtheworld_phase1_step3/include/asterisk/rtp_engine.h Thu Feb  3 09:42:50 2011
@@ -1072,7 +1072,7 @@
  * \code
  * struct ast_format_cap *astformats = ast_format_cap_alloc_nolock()
  * int nonastformats;
- * ast_rtp_codecs_payload_Formats(&codecs, &astformats, &nonastformats);
+ * ast_rtp_codecs_payload_formats(&codecs, &astformats, &nonastformats);
  * \endcode
  *
  * This retrieves all the formats known about in the codecs structure and puts the Asterisk ones in the integer
@@ -1086,7 +1086,7 @@
  * \brief Retrieve a payload based on whether it is an Asterisk format and the code
  *
  * \param codecs Codecs structure to look in
- * \param asterisk_format Non-zero if the given asterisk format is present
+ * \param asterisk_format Non-zero if the given Asterisk format is present
  * \param format Asterisk format to look for
  * \param code The format to look for
  *

Modified: team/dvossel/fixtheworld_phase1_step3/include/asterisk/translate.h
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/include/asterisk/translate.h?view=diff&rev=305986&r1=305985&r2=305986
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/include/asterisk/translate.h (original)
+++ team/dvossel/fixtheworld_phase1_step3/include/asterisk/translate.h Thu Feb  3 09:42:50 2011
@@ -32,7 +32,6 @@
 #include "asterisk/frame.h"
 #include "asterisk/plc.h"
 #include "asterisk/linkedlists.h"
-// XXX #include "asterisk/module.h"
 #endif
 
 struct ast_trans_pvt;	/* declared below */
@@ -51,9 +50,9 @@
  * \details This table is built in a way that allows translation
  * paths to be built that guarantee the best possible balance
  * between performance and quality.  With this table direct
- * translation paths between two formats always takes precedence
- * over multi step paths, lossless intermediate steps are always
- * chosen over lossy intermediate steps, and preservation of
+ * translation paths between two formats will always take precedence
+ * over multi step paths, lossless intermediate steps will always
+ * be chosen over lossy intermediate steps, and preservation of
  * sample rate across the translation will always have precedence
  * over a path that involves any re-sampling.
  */

Modified: team/dvossel/fixtheworld_phase1_step3/main/app.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/main/app.c?view=diff&rev=305986&r1=305985&r2=305986
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/main/app.c (original)
+++ team/dvossel/fixtheworld_phase1_step3/main/app.c Thu Feb  3 09:42:50 2011
@@ -742,10 +742,11 @@
 	int totalsilence = 0;
 	int dspsilence = 0;
 	int olddspsilence = 0;
-	struct ast_format rfmt = { 0, };
+	struct ast_format rfmt;
 	struct ast_silence_generator *silgen = NULL;
 	char prependfile[80];
 
+	ast_format_clear(&rfmt);
 	if (silencethreshold < 0) {
 		silencethreshold = global_silence_threshold;
 	}

Modified: team/dvossel/fixtheworld_phase1_step3/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/main/channel.c?view=diff&rev=305986&r1=305985&r2=305986
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/main/channel.c (original)
+++ team/dvossel/fixtheworld_phase1_step3/main/channel.c Thu Feb  3 09:42:50 2011
@@ -5526,6 +5526,7 @@
 		if (strcasecmp(type, chan->tech->type))
 			continue;
 
+		ast_format_clear(&best_audio_fmt);
 		/* find the best audio format to use */
 		if ((tmp_cap = ast_format_cap_get_type(request_cap, AST_FORMAT_TYPE_AUDIO))) {
 			/* We have audio - is it possible to connect the various calls to each other?