Changeset 2759 for pjproject/trunk/pjmedia/src/pjmedia/stream.c

Timestamp:

Jun 12, 2009 5:37:13 PM (15 years ago)

Author:

nanang

Message:

Ticket #883: Added user defined NAT hole-punching and keep-alive mechanism to media stream.

File:

• pjproject/trunk/pjmedia/src/pjmedia/stream.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -169 +169 @@
                                                     address                 */
 #endif
+
+#if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
+    pj_timestamp             last_frm_ts_sent; /**< Timestamp of last sending
+                                                    packet                  */
+#endif
 };
 
@@ -193 +198 @@
 }
 
+/*
+ * Send keep-alive packet.
+ */
+static void send_keep_alive_packet(pjmedia_stream *stream)
+{
+#if defined(PJMEDIA_STREAM_ENABLE_KA) && \
+    PJMEDIA_STREAM_ENABLE_KA == PJMEDIA_STREAM_KA_EMPTY_RTP
+
+    /* Keep-alive packet is empty RTP */
+    pj_status_t status;
+    int pkt_len;
+
+
+    status = pjmedia_rtp_encode_rtp( &stream->enc->rtp,
+                                     stream->enc->pt, 1,
+                                     1,
+                                     0,
+                                     (const void**)stream->enc->out_pkt,
+                                     &pkt_len);
+    pj_assert(status == PJ_SUCCESS);
+    pjmedia_transport_send_rtp(stream->transport, stream->enc->out_pkt,
+                               pkt_len);
+    TRC_((stream->port.info.name.ptr, "Keep-alive sent (empty RTP)"));
+
+#elif defined(PJMEDIA_STREAM_ENABLE_KA) && \
+      PJMEDIA_STREAM_ENABLE_KA == PJMEDIA_STREAM_KA_USER
+
+    /* Keep-alive packet is defined in PJMEDIA_STREAM_KA_USER_PKT */
+    int pkt_len;
+    const pj_str_t str_ka = PJMEDIA_STREAM_KA_USER_PKT;
+
+    pj_memcpy(stream->enc->out_pkt, str_ka.ptr, str_ka.slen);
+    pkt_len = str_ka.slen;
+    pjmedia_transport_send_rtp(stream->transport, stream->enc->out_pkt,
+                               pkt_len);
+    TRC_((stream->port.info.name.ptr, "Keep-alive sent"));
+
+#else
+    
+    PJ_UNUSED_ARG(stream);
+
+#endif
+}
 
 /*
@@ -787 +835 @@
     int rtphdrlen;
     int inc_timestamp = 0;
+
+
+#if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA != 0
+    /* If the interval since last sending packet is greater than
+     * PJMEDIA_STREAM_KA_INTERVAL, send keep-alive packet.
+     */
+    {
+        pj_uint32_t dtx_duration;
+
+        dtx_duration = pj_timestamp_diff32(&stream->last_frm_ts_sent, 
+                                           &frame->timestamp);
+        if (dtx_duration >
+            PJMEDIA_STREAM_KA_INTERVAL * stream->port.info.clock_rate)
+        {
+            send_keep_alive_packet(stream);
+            stream->last_frm_ts_sent = frame->timestamp;
+        }
+    }
+#endif
 
     /* Don't do anything if stream is paused */
@@ -991 +1058 @@
     stream->rtcp.stat.rtp_tx_last_seq = pj_ntohs(stream->enc->rtp.out_hdr.seq);
 
+#if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
+    /* Update timestamp of last sending packet. */
+    stream->last_frm_ts_sent = frame->timestamp;
+#endif
+
     return PJ_SUCCESS;
 }
@@ -1910 +1982 @@
                                     stream->enc->out_pkt, len);
     }
+
+#if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
+    /* NAT hole punching by sending KA packet via RTP transport. */
+    send_keep_alive_packet(stream);
+#endif
 
     /* Success! */