kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 00:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "bridge_softmix / res_rtp_asterisk: Fix packet loss and renegotiation issues." into 15

Browse Source
This commit is contained in:
Joshua Colp
2017-07-26 10:48:19 -05:00
committed by Gerrit Code Review
parent fab609deeb 451d86d62e
commit 1c07c80eef
12 changed files with 108 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/asterisk/bridge.h
View File

@@ -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;
};
/*!
@@ -902,6 +903,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.
*/

2
include/asterisk/frame.h
View File

@@ -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 {