kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-14 16:15:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #577 in FS/freeswitch from ~BRADLEYJOKINEN/freeswitch:FS-8411 to master

Browse Source 
* commit 'e96c2d4917427614356460a23fa2652c1fe7e2c0':
  FS-8411 Replace ping_frame with video_ping_frame in a couple places that were missed
This commit is contained in:
Anthony Minessale II 2015-11-03 10:11:02 -06:00
commit cffc673879
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/switch_core_media.c
View File

@ -10757,12 +10757,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor
bug_frame.img = img;
if (bp->callback && switch_test_flag(bp, SMBF_WRITE_VIDEO_PING)) {
bp->ping_frame = &bug_frame;
bp->video_ping_frame = &bug_frame;
if (bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_WRITE_VIDEO_PING) == SWITCH_FALSE
|| (bp->stop_time && bp->stop_time <= switch_epoch_time_now(NULL))) {
ok = SWITCH_FALSE;
}
bp->ping_frame = NULL;
bp->video_ping_frame = NULL;
}
if (switch_core_media_bug_test_flag(bp, SMBF_SPY_VIDEO_STREAM_BLEG) && !patched) {
@ -10990,12 +10990,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_video_frame(switch_core
if (bp->callback && switch_test_flag(bp, SMBF_READ_VIDEO_PING)) {
bp->ping_frame = *frame;
bp->video_ping_frame = *frame;
if (bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_READ_VIDEO_PING) == SWITCH_FALSE
|| (bp->stop_time && bp->stop_time <= switch_epoch_time_now(NULL))) {
ok = SWITCH_FALSE;
}
bp->ping_frame = NULL;
bp->video_ping_frame = NULL;
}
if (switch_core_media_bug_test_flag(bp, SMBF_SPY_VIDEO_STREAM) && !patched) {