Changeset 4120 for pjproject/trunk

Timestamp:

May 12, 2012 7:18:09 AM (13 years ago)

Author:

ming

Message:

Re #1508 (misc): Fixed compilation error if PJMEDIA_STREAM_ENABLE_KA is enabled.
This fix also disable the keep-alive feature in video stream.

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• stream.c (modified) (1 diff)
• vid_stream.c (modified) (4 diffs)

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

@@ -1166 +1166 @@
                                            &frame->timestamp);
         if (dtx_duration >
-            PJMEDIA_STREAM_KA_INTERVAL * stream->port.info.clock_rate)
+            PJMEDIA_STREAM_KA_INTERVAL * PJMEDIA_PIA_SRATE(&stream->port.info))
         {
             send_keep_alive_packet(stream);

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

@@ -69 +69 @@
 #endif
 
+/* 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
+
 
 /**
@@ -402 +408 @@
 
     /* Keep-alive packet is empty RTP */
+    pjmedia_vid_channel *channel = (pjmedia_vid_channel *)stream;
     pj_status_t status;
     void *pkt;
@@ -423 +430 @@
 
     /* Send RTCP */
-    send_rtcp(stream, PJ_TRUE, PJ_FALSE, PJ_FALSE);
+    send_rtcp(stream, PJ_TRUE, PJ_FALSE);
 
 #elif PJMEDIA_STREAM_ENABLE_KA == PJMEDIA_STREAM_KA_USER
 
     /* Keep-alive packet is defined in PJMEDIA_STREAM_KA_USER_PKT */
+    pjmedia_vid_channel *channel = (pjmedia_vid_channel *)stream;
     int pkt_len;
     const pj_str_t str_ka = PJMEDIA_STREAM_KA_USER_PKT;
@@ -796 +804 @@
         dtx_duration = pj_timestamp_diff32(&stream->last_frm_ts_sent, 
                                            &frame->timestamp);
-        if (dtx_duration >
-            PJMEDIA_STREAM_KA_INTERVAL * channel->port.info.clock_rate)
+        /* Video stream keep-alive feature is currently disabled. */
+        /*
+        if (dtx_duration >
+            PJMEDIA_STREAM_KA_INTERVAL *
+            PJMEDIA_PIA_SRATE(&channel->port.info))
         {
             send_keep_alive_packet(stream);
             stream->last_frm_ts_sent = frame->timestamp;
         }
+        */
     }
 #endif