retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-9382

This commit is contained in:
Anthony Minessale 2016-07-26 21:33:14 -05:00
parent e89b8a481b
commit 0dc59995c6
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/switch_core_media.c
View File

@ -11304,7 +11304,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor
switch_status_t status = SWITCH_STATUS_FALSE;
switch_time_t now = switch_micro_time_now();
switch_codec_t *codec = switch_core_session_get_video_write_codec(session);
//switch_timer_t *timer;
switch_timer_t *timer;
switch_media_handle_t *smh;
switch_image_t *dup_img = NULL, *img = frame->img;
switch_status_t encode_status;
@ -11454,7 +11454,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor
frame = &write_frame;
frame->img = img;
#if 0
if (!switch_test_flag(frame, SFF_USE_VIDEO_TIMESTAMP)) {
if (!(timer = switch_core_media_get_timer(session, SWITCH_MEDIA_TYPE_VIDEO))) {
@ -11468,7 +11468,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor
frame->timestamp = timer->samplecount;
}
#endif
switch_clear_flag(frame, SFF_SAME_IMAGE);
frame->m = 0;

1
src/switch_ivr_bridge.c
View File

@ -195,7 +195,6 @@ static void video_bridge_thread(switch_core_session_t *session, void *obj)
if (switch_channel_media_up(b_channel)) {
switch_set_flag(read_frame, SFF_PROXY_PACKET);
if (switch_core_session_write_video_frame(vh->session_b, read_frame, SWITCH_IO_FLAG_NONE, 0) != SWITCH_STATUS_SUCCESS) {
switch_cond_next();
continue;