From ae7fb07092e8c2f24e9a8cddc497106f5b05ce75 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Thu, 22 Aug 2013 17:34:46 +0000 Subject: [PATCH] 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397440 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/abstract_jb.c | 3 +++ main/bridge_channel.c | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/main/abstract_jb.c b/main/abstract_jb.c index c968bac75c..99d7395dae 100644 --- a/main/abstract_jb.c +++ b/main/abstract_jb.c @@ -980,6 +980,9 @@ static struct ast_frame *hook_event_cb(struct ast_channel *chan, struct ast_fram 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); diff --git a/main/bridge_channel.c b/main/bridge_channel.c index f49fddc0fc..0759634a0a 100644 --- a/main/bridge_channel.c +++ b/main/bridge_channel.c @@ -1529,11 +1529,6 @@ static void bridge_channel_handle_control(struct ast_bridge_channel *bridge_chan * 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: