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

Timestamp:

Mar 31, 2011 5:29:54 PM (14 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/test/vid_codec_test.c (modified) (8 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/test/vid_codec_test.c

@@ -7 +7 @@
 #define THIS_FILE "vid_codec.c"
 
-#define BYPASS_CODEC 0
+#define BYPASS_CODEC        0
+#define BYPASS_PACKETIZER   0
 
 typedef struct codec_port_data_t
@@ -15 +16 @@
     pj_uint8_t          *enc_buf;
     pj_size_t            enc_buf_size;
+    pj_uint8_t          *pack_buf;
+    pj_size_t            pack_buf_size;
 } codec_port_data_t;
 
@@ -33 +36 @@
         status = codec->op->encode(codec, frame, enc_frame.size, &enc_frame);
         if (status != PJ_SUCCESS) goto on_error;
+
+#if !BYPASS_PACKETIZER
+        if (enc_frame.size) {
+            unsigned pos = 0, i = 0;
+            pj_bool_t packetized = PJ_FALSE;
+            unsigned unpack_pos = 0;
+            
+            while (pos < enc_frame.size) {
+                pj_uint8_t *payload;
+                pj_size_t payload_len;
+
+                status = codec->op->packetize(codec, 
+                                              (pj_uint8_t*)enc_frame.buf,
+                                              enc_frame.size, &pos,
+                                              &payload, &payload_len);
+                if (status == PJ_ENOTSUP)
+                    break;
+                if (status != PJ_SUCCESS)
+                    goto on_error;
+
+                status = codec->op->unpacketize(codec, payload, payload_len,
+                                                port_data->pack_buf,
+                                                port_data->pack_buf_size,
+                                                &unpack_pos);
+                if (status != PJ_SUCCESS)
+                    goto on_error;
+
+                // what happen if the bitstream is broken?
+                //if (i++ != 1) unpack_pos -= 10;
+
+                packetized = PJ_TRUE;
+            }
+
+            if (packetized) {
+                enc_frame.buf  = port_data->pack_buf;
+                enc_frame.size = unpack_pos;
+            }
+        }
+#endif
+
         status = codec->op->decode(codec, &enc_frame, frame->size, frame);
         if (status != PJ_SUCCESS) goto on_error;
@@ -78 +121 @@
 
     for (i = 0; i < cnt; ++i) {
-        PJ_LOG(3, (THIS_FILE, "  %16.*s %c%c %s",
+        PJ_LOG(3, (THIS_FILE, "  %-16.*s %c%c %s",
                    info[i].encoding_name.slen, info[i].encoding_name.ptr,
                    (info[i].dir & PJMEDIA_DIR_ENCODING? 'E' : ' '),
@@ -123 +166 @@
     }
 
+
     /* Lookup colorbar source */
     status = pjmedia_vid_dev_lookup("Colorbar", "Colorbar generator", &cap_idx);
@@ -135 +179 @@
     }
 
+    raw_fmt_id = codec_info->dec_fmt_id[0];
+    cap_idx = 0; /* Use dshow capture */
+
+#if 0
+    // Now, the video port can do automatic conversion.
     /* Raw format ID "not specified", lets find common format among the codec
      * and the video devices
@@ -166 +215 @@
         }
     }
+#endif
 
     /* Prepare codec */
@@ -265 +315 @@
     codec_port_data.enc_buf = pj_pool_alloc(pool, 
                                             codec_port_data.enc_buf_size);
+    codec_port_data.pack_buf_size = codec_port_data.enc_buf_size;
+    codec_port_data.pack_buf = pj_pool_alloc(pool, 
+                                             codec_port_data.pack_buf_size);
 
     codec_port.put_frame = &codec_put_frame;