kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-7502: add some changes for video media bug

This commit is contained in:
Anthony Minessale 2015-04-01 19:37:25 -05:00 committed by Michael Jerris
parent 026ae6945e
commit ee81167996
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_core.h
View File

@ -301,6 +301,8 @@ SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_native_read_frame(swi
SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_native_write_frame(switch_media_bug_t *bug); SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_native_write_frame(switch_media_bug_t *bug);
SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_video_ping_frame(switch_media_bug_t *bug);
/*! /*!
\brief Set a return replace frame \brief Set a return replace frame
\param bug the bug to set the frame on \param bug the bug to set the frame on

2
src/switch_core_media.c
View File

@ -10423,7 +10423,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_video_frame(switch_core
} }
if (bp->ready && switch_test_flag(bp, SMBF_READ_VIDEO_PING)) { if (bp->ready && switch_test_flag(bp, SMBF_READ_VIDEO_PING)) {
switch_mutex_lock(bp->read_mutex);
bp->ping_frame = *frame; bp->ping_frame = *frame;
if (bp->callback) { if (bp->callback) {
if (bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_READ_VIDEO_PING) == SWITCH_FALSE if (bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_READ_VIDEO_PING) == SWITCH_FALSE
@ -10432,7 +10431,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_video_frame(switch_core
} }
} }
bp->ping_frame = NULL; bp->ping_frame = NULL;
switch_mutex_unlock(bp->read_mutex);
} }
if (ok == SWITCH_FALSE) { if (ok == SWITCH_FALSE) {

5
src/switch_core_media_bug.c
View File

@ -88,6 +88,11 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_media_bug_get_session(switch
return bug->session; return bug->session;
} }
SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_video_ping_frame(switch_media_bug_t *bug)
{
return bug->ping_frame;
}
SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_write_replace_frame(switch_media_bug_t *bug) SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_write_replace_frame(switch_media_bug_t *bug)
{ {
return bug->write_replace_frame_in; return bug->write_replace_frame_in;