summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2016-11-07 16:53:27 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-11-07 16:53:27 -0600
commit87c884965c539d193bf0ab59c04c598318946b0a (patch)
treed6370e1dd4131d6684eb7225a8ab00bb7cf9a401 /main
parent222cee241076b500cd70d956d3e9ffc9761fbed9 (diff)
parent7c824b955d4200c82805b3e07aa3af30c43fd09d (diff)
Merge "main/bridge: Add some verbose logging for video source changes" into 13
Diffstat (limited to 'main')
-rw-r--r--main/bridge.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/main/bridge.c b/main/bridge.c
index a0f239bf8..6bbb967ff 100644
--- a/main/bridge.c
+++ b/main/bridge.c
@@ -3770,6 +3770,10 @@ void ast_bridge_set_single_src_video_mode(struct ast_bridge *bridge, struct ast_
cleanup_video_mode(bridge);
bridge->softmix.video_mode.mode = AST_BRIDGE_VIDEO_MODE_SINGLE_SRC;
bridge->softmix.video_mode.mode_data.single_src_data.chan_vsrc = ast_channel_ref(video_src_chan);
+ ast_verb(5, "Video source in bridge '%s' (%s) is now '%s' (%s)\n",
+ bridge->name, bridge->uniqueid,
+ ast_channel_name(video_src_chan),
+ ast_channel_uniqueid(video_src_chan));
ast_test_suite_event_notify("BRIDGE_VIDEO_MODE", "Message: video mode set to single source\r\nVideo Mode: %u\r\nVideo Channel: %s",
bridge->softmix.video_mode.mode, ast_channel_name(video_src_chan));
ast_indicate(video_src_chan, AST_CONTROL_VIDUPDATE);
@@ -3810,6 +3814,10 @@ void ast_bridge_update_talker_src_video_mode(struct ast_bridge *bridge, struct a
}
data->chan_vsrc = ast_channel_ref(chan);
data->average_talking_energy = talker_energy;
+ ast_verb(5, "Video source in bridge '%s' (%s) is now '%s' (%s)\n",
+ bridge->name, bridge->uniqueid,
+ ast_channel_name(data->chan_vsrc),
+ ast_channel_uniqueid(data->chan_vsrc));
ast_test_suite_event_notify("BRIDGE_VIDEO_SRC", "Message: video source updated\r\nVideo Channel: %s", ast_channel_name(data->chan_vsrc));
ast_indicate(data->chan_vsrc, AST_CONTROL_VIDUPDATE);
} else if ((data->average_talking_energy < talker_energy) && !is_keyframe) {
@@ -3817,6 +3825,10 @@ void ast_bridge_update_talker_src_video_mode(struct ast_bridge *bridge, struct a
} else if (!data->chan_vsrc && is_keyframe) {
data->chan_vsrc = ast_channel_ref(chan);
data->average_talking_energy = talker_energy;
+ ast_verb(5, "Video source in bridge '%s' (%s) is now '%s' (%s)\n",
+ bridge->name, bridge->uniqueid,
+ ast_channel_name(data->chan_vsrc),
+ ast_channel_uniqueid(data->chan_vsrc));
ast_test_suite_event_notify("BRIDGE_VIDEO_SRC", "Message: video source updated\r\nVideo Channel: %s", ast_channel_name(data->chan_vsrc));
ast_indicate(chan, AST_CONTROL_VIDUPDATE);
} else if (!data->chan_old_vsrc && is_keyframe) {