Changeset 3493 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_stream.c

Timestamp:

Mar 31, 2011 5:29:54 PM (13 years ago)

Author:

nanang

Message:

Re #1219:

• Initial version of H264 implementation (codec & packetization).
• Added vid_codec_util.h/c for video codec utilities (e.g: fmtp parser).
• Updated video RTP packetizations to be configurable and have internal state (to be more resilient to packet lost, etc).
• Fixed wrong SPF calculation in PJMEDIA_SPF2.
• Updated vid_codec_test.c to also have RTP packetization test.
• Updated sdp_neg.c to verify H.264 capability match.

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_stream.c (modified) (6 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_stream.c

@@ -769 +769 @@
         LOGERR_((channel->port.info.name.ptr, 
                 "Codec encode() error", status));
+
+        /* Update RTP timestamp */
+        pjmedia_rtp_encode_rtp(&channel->rtp, channel->pt, 1, 0,
+                               rtp_ts_len, &rtphdr, &rtphdrlen);
         return status;
     }
@@ -789 +793 @@
             LOGERR_((channel->port.info.name.ptr, 
                     "Codec pack() error", status));
+
+            /* Update RTP timestamp */
+            pjmedia_rtp_encode_rtp(&channel->rtp, channel->pt, 1, 0,
+                                   rtp_ts_len, &rtphdr, &rtphdrlen);
             return status;
         }
@@ -867 +875 @@
      */
     {
-        pj_uint8_t *p, *data;
-        char ptype;
-        pj_size_t psize, data_len;
-        pj_uint32_t ts;
-        int seq;
         pj_bool_t got_frame;
-        unsigned i;
+        unsigned cnt;
 
         channel->buf_len = 0;
@@ -881 +884 @@
         pj_mutex_lock( stream->jb_mutex );
 
-        for (i=0; ; ++i) {
-            /* Get frame from jitter buffer. */
-            pjmedia_jbuf_peek_frame(stream->jb, i, (const void**)&p,
-                                    &psize, &ptype, NULL, &ts, &seq);
+        /* Check if we got a decodable frame */
+        for (cnt=0; ; ++cnt) {
+            char ptype;
+            pj_uint32_t ts;
+            int seq;
+
+            /* Peek frame from jitter buffer. */
+            pjmedia_jbuf_peek_frame(stream->jb, cnt, NULL, NULL,
+                                    &ptype, NULL, &ts, &seq);
             if (ptype == PJMEDIA_JB_NORMAL_FRAME) {
                 if (last_ts == 0) {
@@ -890 +898 @@
                     frm_first_seq = seq;
                 }
-
                 if (ts != last_ts) {
                     got_frame = PJ_TRUE;
-                    pjmedia_jbuf_remove_frame(stream->jb, i);
                     break;
                 }
-
-                data = (pj_uint8_t*)channel->buf + channel->buf_len;
-                data_len = channel->buf_size - channel->buf_len;
-                status = (*stream->codec->op->unpacketize)(stream->codec,
-                                                           p, psize,
-                                                           data, &data_len);
-                channel->buf_len += data_len;
                 frm_last_seq = seq;
             } else if (ptype == PJMEDIA_JB_ZERO_EMPTY_FRAME) {
@@ -908 +907 @@
                 break;
             }
+        }
+
+        if (got_frame) {
+            unsigned i;
+
+            /* Generate frame bitstream from the payload */
+            channel->buf_len = 0;
+            for (i = 0; i < cnt; ++i) {
+                const pj_uint8_t *p;
+                pj_size_t psize;
+                char ptype;
+
+                /* We use jbuf_peek_frame() as it will returns the pointer of
+                 * the payload (no buffer and memcpy needed), just as we need.
+                 */
+                pjmedia_jbuf_peek_frame(stream->jb, i, &p,
+                                        &psize, &ptype, NULL, NULL, NULL);
+
+                if (ptype != PJMEDIA_JB_NORMAL_FRAME) {
+                    /* Packet lost, must set payload to NULL and keep going */
+                    p = NULL;
+                    psize = 0;
+                }
+
+                status = (*stream->codec->op->unpacketize)(
+                                                stream->codec,
+                                                p, psize,
+                                                (pj_uint8_t*)channel->buf,
+                                                channel->buf_size,
+                                                &channel->buf_len);
+                if (status != PJ_SUCCESS) {
+                    LOGERR_((channel->port.info.name.ptr, 
+                            "Codec unpack() error", status));
+                    /* Just ignore this unpack error */
+                }
+            }
+
+            pjmedia_jbuf_remove_frame(stream->jb, cnt);
         }