FS-7500: another refactoring pass, temp code still in place, WORK IN PROGRESS

This commit is contained in:
Anthony Minessale
2014-11-18 16:39:32 -06:00
committed by Michael Jerris
parent 258dacc742
commit 0cd5658caa
16 changed files with 482 additions and 485 deletions
+1 -25
View File
@@ -2676,6 +2676,7 @@ SWITCH_DECLARE(void) switch_core_session_video_reset(switch_core_session_t *sess
{
switch_channel_set_flag(session->channel, CF_VIDEO_ECHO);
switch_channel_clear_flag(session->channel, CF_VIDEO_PASSIVE);
switch_channel_clear_flag(session->channel, CF_VIDEO_DECODED_READ);
switch_core_session_refresh_video(session);
session->image_write_callback = NULL;
session->image_write_callback_user_data = NULL;
@@ -3065,31 +3066,6 @@ SWITCH_DECLARE(void) switch_core_session_debug_pool(switch_stream_handle_t *stre
session_manager.running, session_manager.busy, session_manager.popping);
}
SWITCH_DECLARE(switch_status_t) switch_core_session_set_video_thread_callback(switch_core_session_t *session, switch_core_video_thread_callback_func_t *func, void *user_data)
{
if (!func) {
session->_video_thread_callback = NULL;
session->_video_thread_user_data = NULL;
return SWITCH_STATUS_SUCCESS;
} else if (session->_video_thread_callback) {
return SWITCH_STATUS_FALSE;
} else {
session->_video_thread_callback = func;
session->_video_thread_user_data = user_data;
return SWITCH_STATUS_SUCCESS;
}
}
SWITCH_DECLARE(switch_status_t) switch_core_session_video_thread_callback(switch_core_session_t *session, switch_frame_t *frame)
{
if (session->_video_thread_callback) {
return session->_video_thread_callback(session, frame, session->_video_thread_user_data);
}
return SWITCH_STATUS_CONTINUE;
}
/* For Emacs:
* Local Variables:
* mode:c