]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7500: fix regression in no-camera mode
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 4 Mar 2015 20:20:13 +0000 (14:20 -0600)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:47:08 +0000 (12:47 -0500)
src/switch_core_media.c

index 64aae8328d22d7e3b499acbf6a7a413360d95d4e..92b502d959c5c1edc67157b4815f9fe3284da3b9 100644 (file)
@@ -4638,18 +4638,19 @@ static void *SWITCH_THREAD_FUNC video_helper_thread(switch_thread_t *thread, voi
        unsigned char *buf = NULL;
        switch_image_t *blank_img = NULL;
        switch_rgb_color_t bgcolor;
+       switch_rtp_engine_t *v_engine = NULL;
 
        switch_color_set_rgb(&bgcolor, "#000000");
        blank_img = switch_img_alloc(NULL, SWITCH_IMG_FMT_I420, 320, 240, 1);
        switch_img_fill(blank_img, 0, 0, blank_img->d_w, blank_img->d_h, &bgcolor);
        
-       //switch_rtp_engine_t *v_engine = NULL;
+
        
        if (!(smh = session->media_handle)) {
                return NULL;
        }
        
-       //v_engine = &smh->engines[SWITCH_MEDIA_TYPE_VIDEO];
+       v_engine = &smh->engines[SWITCH_MEDIA_TYPE_VIDEO];
 
        switch_core_session_read_lock(session);
 
@@ -4713,6 +4714,10 @@ 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);