diff options
| author | Joshua Colp <jcolp@digium.com> | 2014-05-11 02:09:10 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2014-05-11 02:09:10 +0000 |
| commit | d134150be28e9016131b4c0b5c9273ff65cf2084 (patch) | |
| tree | 68fa1309a3b66b178e2275bf56fb56e191febf05 /bridges | |
| parent | e2ed86e4ca7df1ec7038d9f744d3accf91a7989e (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 413681 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@413682 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/bridge_native_rtp.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/bridges/bridge_native_rtp.c b/bridges/bridge_native_rtp.c index 02b094b31..7e48ab92f 100644 --- a/bridges/bridge_native_rtp.c +++ b/bridges/bridge_native_rtp.c @@ -288,10 +288,16 @@ static struct ast_frame *native_rtp_framehook(struct ast_channel *chan, struct a return f; } +/*! \brief Callback function which informs upstream if we are consuming a frame of a specific type */ +static int native_rtp_framehook_consume(void *data, enum ast_frame_type type) +{ + return (type == AST_FRAME_CONTROL ? 1 : 0); +} + /*! \brief Internal helper function which checks whether the channels are compatible with our native bridging */ static int native_rtp_bridge_capable(struct ast_channel *chan) { - return !ast_channel_has_audio_frame_or_monitor(chan); + return !ast_channel_has_hook_requiring_audio(chan); } static int native_rtp_bridge_compatible(struct ast_bridge *bridge) @@ -392,6 +398,7 @@ static int native_rtp_bridge_framehook_attach(struct ast_bridge_channel *bridge_ static struct ast_framehook_interface hook = { .version = AST_FRAMEHOOK_INTERFACE_VERSION, .event_cb = native_rtp_framehook, + .consume_cb = native_rtp_framehook_consume, }; if (!data) { |