]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-11929: [core] improve detection of when video is ready.
authorMike Jerris <mike@signalwire.com>
Fri, 12 Jul 2019 17:22:26 +0000 (13:22 -0400)
committerAndrey Volk <andywolk@gmail.com>
Wed, 17 Jul 2019 20:55:56 +0000 (00:55 +0400)
src/switch_core_media.c

index ca4f2389bace6fab117222d7829f958aaae36ab1..498d5c5fd292820723156f86878d52b930214d86 100644 (file)
@@ -14919,7 +14919,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_video_frame(switch_core
        }
 
        if (!switch_channel_test_flag(session->channel, CF_VIDEO_READY) && *frame) {
-               if (((switch_channel_test_flag(session->channel, CF_VIDEO_DECODED_READ) && (*frame)->img) || (*frame)->m) && ++smh->ready_loops > 5) {
+               if (switch_channel_test_flag(session->channel, CF_VIDEO_DECODED_READ)) {
+                       if ((*frame)->img) {
+                               switch_channel_set_flag(session->channel, CF_VIDEO_READY);
+                       }
+               } else if ((*frame)->m || ++smh->ready_loops > 5) {
                        switch_channel_set_flag(session->channel, CF_VIDEO_READY);
                }
        }