FS-9382

diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index 3a024a059ce43d70e63b15d9ae2d1108aa745f47..ca5aa70c28cfb521d0824615fca235afadafcc31 100644 (file)
--- a/src/switch_core_media.c
+++ b/src/switch_core_media.c
@@ -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;

diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c
index 2cadf833d4a23ff133094c6048a34adbc95da106..62d5daf60017335d175c42d97935410a6e8dd11d 100644 (file)
--- a/src/switch_ivr_bridge.c
+++ b/src/switch_ivr_bridge.c
@@ -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;