From: Sean Bright Date: Tue, 27 Dec 2011 17:17:13 +0000 (+0000) Subject: Once an audiohook is attached to a channel, we continue to transcode all of the X-Git-Tag: 10.1.0-rc1~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fa6d211f35c296c2e543f263d38708daf207d5c;p=thirdparty%2Fasterisk.git Once an audiohook is attached to a channel, we continue to transcode all of the frames, even after all of the hooks are detached. This patch short-cicuits us out before we transcode unnecessarily. ........ Merged revisions 349144 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@349145 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/audiohook.c b/main/audiohook.c index 83fec318fb..02207443b9 100644 --- a/main/audiohook.c +++ b/main/audiohook.c @@ -783,6 +783,12 @@ static struct ast_frame *audio_audiohook_write_list(struct ast_channel *chan, st int middle_frame_manipulated = 0; int removed = 0; + /* Don't translate our frame if we aren't going to bother to use it */ + if (AST_LIST_EMPTY(&audiohook_list->spy_list) + && AST_LIST_EMPTY(&audiohook_list->whisper_list) + && AST_LIST_EMPTY(&audiohook_list->manipulate_list)) + return end_frame; + /* ---Part_1. translate start_frame to SLINEAR if necessary. */ if (!(middle_frame = audiohook_list_translate_to_slin(audiohook_list, direction, start_frame))) { return frame;