Changeset 5960

Timestamp:

Mar 27, 2019 1:53:57 AM (6 years ago)

Author:

ming

Message:

Fixed #2186: Enable video stream keep alive mechanism

• Also add video stream port to video conf when call is on local hold in order for video stream to keep sending keep-alive.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/vid_stream.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

@@ -74 +74 @@
  */
 #define MIN_CHUNKS_PER_FRM      30
-
-/* Video stream keep-alive feature is currently disabled. */
-#if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA != 0
-#   undef PJMEDIA_STREAM_ENABLE_KA
-#   define PJMEDIA_STREAM_ENABLE_KA 0
-#endif
 
 
@@ -908 +902 @@
         dtx_duration = pj_timestamp_diff32(&stream->last_frm_ts_sent, 
                                            &frame->timestamp);
-        /* Video stream keep-alive feature is currently disabled. */
-        /*
+
         if (dtx_duration >
-            PJMEDIA_STREAM_KA_INTERVAL *
-            PJMEDIA_PIA_SRATE(&channel->port.info))
+            PJMEDIA_STREAM_KA_INTERVAL * stream->info.codec_info.clock_rate)
         {
             send_keep_alive_packet(stream);
             stream->last_frm_ts_sent = frame->timestamp;
         }
-        */
     }
 #endif

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

@@ -1158 +1158 @@
             call_med->strm.v.cap_win_id = wid;
             pj_log_pop_indent();
+
+        } else if (si->dir & PJMEDIA_DIR_ENCODING && call->local_hold) {
+            /* This is similar as above, but we are on local hold. So
+             * we just get the stream encoding port and add it to the
+             * video conference, in order for the stream to be able to
+             * keep sending keep-alive.
+             */
+            PJ_LOG(4,(THIS_FILE, "Setting up TX.."));
+
+            status = pjmedia_vid_stream_get_port(call_med->strm.v.stream,
+                                                 PJMEDIA_DIR_ENCODING,
+                                                 &media_port);
+            if (status != PJ_SUCCESS)
+                goto on_error;
+
+            status = pjsua_vid_conf_add_port(tmp_pool, media_port, NULL,
+                                             &call_med->strm.v.strm_enc_slot);
+            if (status != PJ_SUCCESS)
+                goto on_error;
         }