[asterisk-commits] oej: branch oej/roibos-cng-support-1.8 r411926 - in /team/oej/roibos-cng-supp...

[SVN commits to the Asterisk project]

Author: oej
Date: Tue Apr  8 09:40:24 2014
New Revision: 411926

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=411926
Log:
Various mistakes. I blame the weather.

Modified:
    team/oej/roibos-cng-support-1.8/channels/chan_iax2.c
    team/oej/roibos-cng-support-1.8/channels/chan_sip.c
    team/oej/roibos-cng-support-1.8/main/audiohook.c

Modified: team/oej/roibos-cng-support-1.8/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/roibos-cng-support-1.8/channels/chan_iax2.c?view=diff&rev=411926&r1=411925&r2=411926
==============================================================================
--- team/oej/roibos-cng-support-1.8/channels/chan_iax2.c (original)
+++ team/oej/roibos-cng-support-1.8/channels/chan_iax2.c Tue Apr  8 09:40:24 2014
@@ -1329,6 +1329,7 @@
 	case AST_CONTROL_T38_PARAMETERS:
 	case AST_CONTROL_AOC:
 	case AST_CONTROL_INCOMPLETE:
+	case AST_CONTROL_CNG_END:
 		is_allowed = -1;
 		break;
 

Modified: team/oej/roibos-cng-support-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/roibos-cng-support-1.8/channels/chan_sip.c?view=diff&rev=411926&r1=411925&r2=411926
==============================================================================
--- team/oej/roibos-cng-support-1.8/channels/chan_sip.c (original)
+++ team/oej/roibos-cng-support-1.8/channels/chan_sip.c Tue Apr  8 09:40:24 2014
@@ -7477,7 +7477,6 @@
 	and send CNG (comfort noise generation) requests instead */
 static int activate_silence_detection(struct sip_pvt *dialog)
 {
-	int res = 0;
 	ast_debug(3, "SILDET: Checking if we need silence detection on %s\n", dialog->callid);
 
 	/* Check if we really want silence suppression */

Modified: team/oej/roibos-cng-support-1.8/main/audiohook.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/roibos-cng-support-1.8/main/audiohook.c?view=diff&rev=411926&r1=411925&r2=411926
==============================================================================
--- team/oej/roibos-cng-support-1.8/main/audiohook.c (original)
+++ team/oej/roibos-cng-support-1.8/main/audiohook.c Tue Apr  8 09:40:24 2014
@@ -730,7 +730,7 @@
 
 	if (middle_frame == end_frame) {
 		/* Middle frame was modified and became the end frame... let's see if we need to transcode */
-		if (end_frame->frametype == AST_FRAME_AUDIO && end_frame->subclass.codec != start_frame->subclass.codec) {
+		if (end_frame->frametype == AST_FRAME_VOICE && end_frame->subclass.codec != start_frame->subclass.codec) {
 			if (out_translate->format != start_frame->subclass.codec) {
 				if (out_translate->trans_pvt)
 					ast_translator_free_path(out_translate->trans_pvt);