diff options
| author | Joshua Colp <jcolp@digium.com> | 2014-05-10 18:50:17 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2014-05-10 18:50:17 +0000 |
| commit | 3b3e4b9b959e835dab1619beae89b2a469a13049 (patch) | |
| tree | 88d6f98479aa3bb219105950780c8a5b22bfce75 /main/channel.c | |
| parent | 21949def8ebc1ff3b3780983157119bb1927576e (diff) | |
framehooks: Add callback for determining if a hook is consuming frames of a specific type.
In the past framehooks have had no capability to determine what frame types a hook
is actually interested in consuming. This has meant that code has had to assume they
want all frames, thus preventing native bridging.
This change adds a callback which allows a framehook to be queried for whether it
is consuming a frame of a specific type. The native RTP bridging module has also
been updated to take advantange of this, allowing native bridging to occur when
previously it would not.
ASTERISK-23497 #comment Reported by: Etienne Lessard
ASTERISK-23497 #close
Review: https://reviewboard.asterisk.org/r/3522/
........
Merged revisions 413650 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@413651 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c index 1161fb676..2d84c771d 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2668,6 +2668,13 @@ int ast_channel_has_audio_frame_or_monitor(struct ast_channel *chan) || !ast_framehook_list_contains_no_active(ast_channel_framehooks(chan)); } +int ast_channel_has_hook_requiring_audio(struct ast_channel *chan) +{ + return ast_channel_monitor(chan) + || !ast_audiohook_write_list_empty(ast_channel_audiohooks(chan)) + || !ast_framehook_list_contains_no_active_of_type(ast_channel_framehooks(chan), AST_FRAME_VOICE); +} + static void destroy_hooks(struct ast_channel *chan) { if (ast_channel_audiohooks(chan)) { |