kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joshua Colp
2017-07-26 08:31:13 -05:00
committed by Gerrit Code Review
parent 7ea6c66968 680c491a62
commit b610295b62
12 changed files with 108 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bridges/bridge_softmix.c
View File

@@ -985,6 +985,8 @@ static void softmix_bridge_write_voice(struct ast_bridge *bridge, struct ast_bri
*/
static int softmix_bridge_write_control(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, struct ast_frame *frame)
{
struct softmix_bridge_data *softmix_data = bridge->tech_pvt;
/*
* XXX Softmix needs to use channel roles to determine what to
* do with control frames.
@@ -992,7 +994,11 @@ static int softmix_bridge_write_control(struct ast_bridge *bridge, struct ast_br
switch (frame->subclass.integer) {
case AST_CONTROL_VIDUPDATE:
ast_bridge_queue_everyone_else(bridge, NULL, frame);
if (!bridge->softmix.video_mode.video_update_discard ||
ast_tvdiff_ms(ast_tvnow(), softmix_data->last_video_update) > bridge->softmix.video_mode.video_update_discard) {
ast_bridge_queue_everyone_else(bridge, NULL, frame);
softmix_data->last_video_update = ast_tvnow();
}
break;
default:
break;

2
bridges/bridge_softmix/include/bridge_softmix_internal.h
View File

@@ -198,6 +198,8 @@ struct softmix_bridge_data {
* (does not guarantee success)
*/
unsigned int binaural_init;
/*! The last time a video update was sent into the bridge */
struct timeval last_video_update;
};
struct softmix_mixing_array {