diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-07-26 10:48:19 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-07-26 10:48:19 -0500 |
| commit | 1c07c80eef93046ccb9b385230d164707fe4f310 (patch) | |
| tree | 02cd9c1cbe3268a4b73a7e712c9cd0ca2e7db7b1 /include | |
| parent | fab609deebc07c5ad7747d0e12a8bf61d49a61bb (diff) | |
| parent | 451d86d62e440545e6ab2026ce142d3130b5ac5f (diff) | |
Merge "bridge_softmix / res_rtp_asterisk: Fix packet loss and renegotiation issues." into 15
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/bridge.h | 9 | ||||
| -rw-r--r-- | include/asterisk/frame.h | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/asterisk/bridge.h b/include/asterisk/bridge.h index bc0e9c81e..8d5c50211 100644 --- a/include/asterisk/bridge.h +++ b/include/asterisk/bridge.h @@ -134,6 +134,7 @@ struct ast_bridge_video_mode { struct ast_bridge_video_single_src_data single_src_data; struct ast_bridge_video_talker_src_data talker_src_data; } mode_data; + unsigned int video_update_discard; }; /*! @@ -903,6 +904,14 @@ void ast_bridge_set_talker_src_video_mode(struct ast_bridge *bridge); void ast_bridge_set_sfu_video_mode(struct ast_bridge *bridge); /*! + * \brief Set the amount of time to discard subsequent video updates after a video update has been sent + * + * \param bridge Bridge to set the minimum video update wait time on + * \param video_update_discard Amount of time after sending a video update that others should be discarded + */ +void ast_bridge_set_video_update_discard(struct ast_bridge *bridge, unsigned int video_update_discard); + +/*! * \brief Update information about talker energy for talker src video mode. */ void ast_bridge_update_talker_src_video_mode(struct ast_bridge *bridge, struct ast_channel *chan, int talker_energy, int is_keyfame); diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h index 2f6c365ad..8f0daccb7 100644 --- a/include/asterisk/frame.h +++ b/include/asterisk/frame.h @@ -137,6 +137,8 @@ enum { AST_FRFLAG_HAS_TIMING_INFO = (1 << 0), /*! This frame has been requeued */ AST_FRFLAG_REQUEUED = (1 << 1), + /*! This frame contains a valid sequence number */ + AST_FRFLAG_HAS_SEQUENCE_NUMBER = (1 << 2), }; struct ast_frame_subclass { |