[commit] r10378 - freeswitch/trunk/src/mod/applications/mod_conference
Author: anthm Date: Thu Nov 13 14:08:54 2008 New Revision: 10378 Log: update Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Nov 13 14:08:54 2008 @@ -790,7 +790,6 @@ if (switch_channel_test_flag(switch_core_session_get_channel(conference->floor_holder->session), CF_VIDEO)) { status = switch_core_session_read_video_frame(conference->floor_holder->session, &vid_frame, SWITCH_IO_FLAG_NONE, 0); - if (!SWITCH_READ_ACCEPTABLE(status)) { conference->floor_holder = NULL; req_iframe = 0; @@ -817,7 +816,8 @@ #endif if (vid_frame->codec->implementation->ianacode == 34) { /* h.263 */ - iframe = (*((int16_t *) vid_frame->data) >> 12 == 6); + //iframe = (*((int16_t *) vid_frame->data) >> 12 == 6); + iframe = 1; } else if (vid_frame->codec->implementation->ianacode == 115) { /* h.263-1998 */ int y = *((int8_t *) vid_frame->data + 2) & 0xfe; iframe = (y == 0x80 || y == 0x82); @@ -4641,6 +4641,7 @@ switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_thread_create(&thread, thd_attr, conference_video_thread_run, conference, conference->pool); + conference->video_running = 1; } static void launch_conference_record_thread(conference_obj_t *conference, char *path)
participants (1)
-
FreeSWITCH SVN