Changeset 4805

Timestamp:

Mar 28, 2014 7:44:31 AM (9 years ago)

Author:

nanang

Message:

Fix #1754: Fixed crash in video stream when encoder returns zero payload length.

File:

• pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c (modified) (1 diff)

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

@@ -881 +881 @@
         }
 
-        // Copy RTP header to the beginning of packet
-        pj_memcpy(channel->buf, rtphdr, sizeof(pjmedia_rtp_hdr));
-
-        // Send the RTP packet to the transport.
-        status = pjmedia_transport_send_rtp(stream->transport,
-                                            (char*)channel->buf,
-                                            frame_out.size +
-                                                sizeof(pjmedia_rtp_hdr));
-        if (status != PJ_SUCCESS) {
-            enum { COUNT_TO_REPORT = 20 };
-            if (stream->send_err_cnt++ == 0) {
-                LOGERR_((channel->port.info.name.ptr,
-                         "Transport send_rtp() error",
-                         status));
+        /* When the payload length is zero, we should not send anything,
+         * but proceed the rest normally.
+         */
+        if (frame_out.size != 0) {
+            // Copy RTP header to the beginning of packet
+            pj_memcpy(channel->buf, rtphdr, sizeof(pjmedia_rtp_hdr));
+
+            // Send the RTP packet to the transport.
+            status = pjmedia_transport_send_rtp(stream->transport,
+                                                (char*)channel->buf,
+                                                frame_out.size +
+                                                    sizeof(pjmedia_rtp_hdr));
+            if (status != PJ_SUCCESS) {
+                enum { COUNT_TO_REPORT = 20 };
+                if (stream->send_err_cnt++ == 0) {
+                    LOGERR_((channel->port.info.name.ptr,
+                             "Transport send_rtp() error",
+                             status));
+                }
+                if (stream->send_err_cnt > COUNT_TO_REPORT)
+                    stream->send_err_cnt = 0;
+                /* Ignore this error */
             }
-            if (stream->send_err_cnt > COUNT_TO_REPORT)
-                stream->send_err_cnt = 0;
-            /* Ignore this error */
-        }
-
-        pjmedia_rtcp_tx_rtp(&stream->rtcp, (unsigned)frame_out.size);
-        total_sent += frame_out.size;
-        pkt_cnt++;
+
+            pjmedia_rtcp_tx_rtp(&stream->rtcp, (unsigned)frame_out.size);
+            total_sent += frame_out.size;
+            pkt_cnt++;
+        }
 
         if (!has_more_data)