FS-8716 #resolve [recording offset is delayed few seconds for rtmp stream]

diff --git a/src/switch_channel.c b/src/switch_channel.c
index 8a7a5ceab78d0c82f36e179f6c0ce0ad45b7b1a6..c989ce2cb3b7828dab892c46a91b7c3ab6098d4a 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -379,6 +379,7 @@ SWITCH_DECLARE(void) switch_channel_perform_video_sync(switch_channel_t *channel
                msg->_func = func;
                msg->_line = line;
 
+               switch_core_session_request_video_refresh(channel->session);
                switch_core_session_queue_message(channel->session, msg);
        }
 }
@@ -1869,9 +1870,6 @@ SWITCH_DECLARE(void) switch_channel_set_flag_value(switch_channel_t *channel, sw
        
        if (flag == CF_VIDEO_DECODED_READ && channel->flags[CF_VIDEO]) {
                switch_core_session_request_video_refresh(channel->session);
-               if (!switch_core_session_in_video_thread(channel->session)) {
-                       switch_channel_wait_for_flag(channel, CF_VIDEO_READY, SWITCH_TRUE, 10000, NULL);
-               }
        }
 }
 
@@ -3812,10 +3810,6 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_answer(switch_channel_t *
        if (switch_core_session_in_thread(channel->session) && !switch_channel_test_flag(channel, CF_PROXY_MODE)) {
                const char *delay;
 
-               if (switch_channel_test_flag(channel, CF_VIDEO)) {
-                       switch_channel_wait_for_flag(channel, CF_VIDEO_READY, SWITCH_TRUE, 10000, NULL);
-               }
-               
                if ((delay = switch_channel_get_variable(channel, "answer_delay"))) {
                        uint32_t msec = atoi(delay);
                        

diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index 6513eb9a66553f130db87c04bffba45e0a034c8d..84a73eb151a28968f38e88c75a018d517d521c28 100644 (file)
--- a/src/switch_core_media.c
+++ b/src/switch_core_media.c
@@ -2139,9 +2139,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_read_frame(switch_core_session
 
        while (smh->media_flags[SCMF_RUNNING] && engine->read_frame.datalen == 0) {
                engine->read_frame.flags = SFF_NONE;
-
                status = switch_rtp_zerocopy_read_frame(engine->rtp_session, &engine->read_frame, flags);
-
                if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) {
                        if (status == SWITCH_STATUS_TIMEOUT) {
 
@@ -4535,6 +4533,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
                                case SWITCH_MEDIA_FLOW_RECVONLY:
                                        switch_channel_set_variable(smh->session->channel, "video_media_flow", "sendonly");
                                        v_engine->smode = SWITCH_MEDIA_FLOW_SENDONLY;
+                                       switch_channel_set_flag(smh->session->channel, CF_VIDEO_READY);
                                        break;
                                case SWITCH_MEDIA_FLOW_SENDONLY:
                                        switch_channel_set_variable(smh->session->channel, "video_media_flow", "recvonly");
@@ -5067,7 +5066,8 @@ static void *SWITCH_THREAD_FUNC video_helper_thread(switch_thread_t *thread, voi
                        continue;
                }
 
-               if (!switch_channel_test_flag(channel, CF_VIDEO_DECODED_READ) && (++xloops > 20 || switch_channel_test_flag(channel, CF_VIDEO_PASSIVE))) {
+               if (!switch_channel_test_flag(channel, CF_VIDEO_READY) && 
+                       switch_channel_test_flag(channel, CF_VIDEO_DECODED_READ) && (++xloops > 10 || switch_channel_test_flag(channel, CF_VIDEO_PASSIVE))) {
                        switch_channel_set_flag(channel, CF_VIDEO_READY);
                }
        
@@ -5109,10 +5109,6 @@ static void *SWITCH_THREAD_FUNC video_helper_thread(switch_thread_t *thread, voi
                        }
                }
 
-               if (v_engine->smode == SWITCH_MEDIA_FLOW_SENDONLY) {
-                       switch_channel_set_flag(channel, CF_VIDEO_READY);
-               }
-
                //if (!smh->video_write_fh || !switch_channel_test_flag(channel, CF_VIDEO_READY)) {
                status = switch_core_session_read_video_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0);
                
@@ -5143,10 +5139,6 @@ static void *SWITCH_THREAD_FUNC video_helper_thread(switch_thread_t *thread, voi
                        switch_core_media_gen_key_frame(session);
                }
 
-               if (v_engine->smode == SWITCH_MEDIA_FLOW_SENDONLY) {
-                       send_blank = 1;
-               }
-
                if (switch_channel_test_flag(channel, CF_VIDEO_READY)) {
                        switch_mutex_lock(mh->file_mutex);
                        if (smh->video_write_fh && switch_channel_ready(session->channel) && switch_test_flag(smh->video_write_fh, SWITCH_FILE_OPEN)) {
@@ -5163,7 +5155,7 @@ static void *SWITCH_THREAD_FUNC video_helper_thread(switch_thread_t *thread, voi
                                send_blank = 0;
                        } 
                        switch_mutex_unlock(mh->file_mutex);
-               } else if (switch_channel_test_flag(channel, CF_VIDEO_DECODED_READ)) {
+               } else if (switch_channel_test_flag(channel, CF_VIDEO_DECODED_READ) || v_engine->smode == SWITCH_MEDIA_FLOW_SENDONLY) {
                        send_blank = 1;
                }
 
@@ -11001,14 +10993,15 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_video_frame(switch_core
 
                decode_status = switch_core_codec_decode_video((*frame)->codec, *frame);
                
-               if ((*frame)->img && switch_channel_test_flag(session->channel, CF_VIDEO_DEBUG_READ)) {
+               if ((*frame)->img) {// && switch_channel_test_flag(session->channel, CF_VIDEO_DEBUG_READ)) {
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "IMAGE %dx%d %dx%d\n", 
                                                          (*frame)->img->w, (*frame)->img->h, (*frame)->img->d_w, (*frame)->img->d_h);
                }
 
-
                if ((*frame)->img && (*frame)->img->d_w && (*frame)->img->d_h && ++smh->ready_loops > 5) {
-                       switch_channel_set_flag(session->channel, CF_VIDEO_READY);
+                       if (!switch_channel_test_flag(session->channel, CF_VIDEO_READY)) {
+                               switch_channel_set_flag(session->channel, CF_VIDEO_READY);
+                       }
                        smh->vid_params.width = (*frame)->img->d_w;
                        smh->vid_params.height = (*frame)->img->d_h;
                }