[asterisk-commits] rmudgett: trunk r397440 - in /trunk/main: abstract_jb.c bridge_channel.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Aug 22 12:34:46 2013
New Revision: 397440

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397440
Log:
Made the abstract jitter buffer resync on some more control frames.

Resync the abstract jitter buffer on the following additional control
frames:
AST_CONTROL_HOLD
AST_CONTROL_UNHOLD
AST_CONTROL_T38_PARAMETERS

Modified:
    trunk/main/abstract_jb.c
    trunk/main/bridge_channel.c

Modified: trunk/main/abstract_jb.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/abstract_jb.c?view=diff&rev=397440&r1=397439&r2=397440
==============================================================================
--- trunk/main/abstract_jb.c (original)
+++ trunk/main/abstract_jb.c Thu Aug 22 12:34:46 2013
@@ -980,6 +980,9 @@
 
 	if (frame->frametype == AST_FRAME_CONTROL) {
 		switch(frame->subclass.integer) {
+		case AST_CONTROL_HOLD:
+		case AST_CONTROL_UNHOLD:
+		case AST_CONTROL_T38_PARAMETERS:
 		case AST_CONTROL_SRCUPDATE:
 		case AST_CONTROL_SRCCHANGE:
 			framedata->jb_impl->force_resync(framedata->jb_obj);

Modified: trunk/main/bridge_channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridge_channel.c?view=diff&rev=397440&r1=397439&r2=397440
==============================================================================
--- trunk/main/bridge_channel.c (original)
+++ trunk/main/bridge_channel.c Thu Aug 22 12:34:46 2013
@@ -1529,11 +1529,6 @@
  * When the receiving channel is pulled from the bridge it needs to generate its own UNHOLD.
  * Something similar needs to be done for DTMF begin/end.
  */
-	case AST_CONTROL_VIDUPDATE:
-	case AST_CONTROL_SRCUPDATE:
-	case AST_CONTROL_SRCCHANGE:
-	case AST_CONTROL_T38_PARAMETERS:
-/* BUGBUG may have to do something with a jitter buffer for these. */
 		ast_indicate_data(chan, fr->subclass.integer, fr->data.ptr, fr->datalen);
 		break;
 	case AST_CONTROL_OPTION: