summaryrefslogtreecommitdiff
path: root/include/asterisk/channel.h
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2014-05-11 02:09:10 +0000
committerJoshua Colp <jcolp@digium.com>2014-05-11 02:09:10 +0000
commitd134150be28e9016131b4c0b5c9273ff65cf2084 (patch)
tree68fa1309a3b66b178e2275bf56fb56e191febf05 /include/asterisk/channel.h
parente2ed86e4ca7df1ec7038d9f744d3accf91a7989e (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 'include/asterisk/channel.h')
-rw-r--r--include/asterisk/channel.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 8cef68e87..a4ad2ae01 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -1049,8 +1049,8 @@ enum {
*/
AST_SOFTHANGUP_EXPLICIT = (1 << 5),
/*!
- * Used to break a bridge so the channel can be spied upon
- * instead of actually hanging up.
+ * Used to request that the bridge core re-evaluate the current
+ * bridging technology in use by the bridge this channel is in.
*/
AST_SOFTHANGUP_UNBRIDGE = (1 << 6),
/*!
@@ -4402,6 +4402,16 @@ const char *ast_channel_oldest_linkedid(const char *a, const char *b);
int ast_channel_has_audio_frame_or_monitor(struct ast_channel *chan);
/*!
+ * \brief Check if the channel has any active hooks that require audio.
+ * \since 12.3.0
+ *
+ * \param chan The channel to check.
+ *
+ * \retval non-zero if channel has active audiohooks, audio framehooks, or monitor.
+ */
+int ast_channel_has_hook_requiring_audio(struct ast_channel *chan);
+
+/*!
* \brief Removes the trailing identifiers from a channel name string
* \since 12.0.0
*