Changeset 2761 for pjproject

Timestamp:

Jun 13, 2009 3:51:30 PM (15 years ago)

Author:

nanang

Message:

Ticket #883:

• Fixed stream bug in generating RTP header for keep-alive packet with empty RTP.
• Updated stream to skip suspending the VAD when PJMEDIA_STREAM_VAD_SUSPEND_MSEC is set to 0.

File:

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

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

@@ -208 +208 @@
     /* Keep-alive packet is empty RTP */
     pj_status_t status;
+    void *rtphdr;
     int pkt_len;
 
 
     status = pjmedia_rtp_encode_rtp( &stream->enc->rtp,
-                                     stream->enc->pt, 1,
+                                     stream->enc->pt, 0,
                                      1,
                                      0,
-                                     (const void**)stream->enc->out_pkt,
+                                     (const void**)&rtphdr,
                                      &pkt_len);
     pj_assert(status == PJ_SUCCESS);
+
+    pj_memcpy(stream->enc->out_pkt, rtphdr, pkt_len);
     pjmedia_transport_send_rtp(stream->transport, stream->enc->out_pkt,
                                pkt_len);
@@ -1806 +1809 @@
     /* Initially disable the VAD in the stream, to help traverse NAT better */
     stream->vad_enabled = stream->codec_param.setting.vad;
-    if (stream->vad_enabled) {
+    if (PJMEDIA_STREAM_VAD_SUSPEND_MSEC > 0 && stream->vad_enabled) {
         stream->codec_param.setting.vad = 0;
         stream->ts_vad_disabled = 0;