Changeset 4815 for pjproject/trunk/pjmedia/src/test/vid_codec_test.c

Timestamp:

Apr 10, 2014 10:01:07 AM (10 years ago)

Author:

bennylp

Message:

Re #1758: Initial implementation of OpenH264 wrapper. Supports:

• library detection via autoconf
• CBP
• packetization modes: 0, 1
• key frame request and indication
• obey remote's fmtp

Also added video codec test in samples (similar to the one in pjmedia test though).
And there are some fixes here and there too (e.g. in vid_codec_util.c).

File:

• pjproject/trunk/pjmedia/src/test/vid_codec_test.c (modified) (6 diffs)

pjproject/trunk/pjmedia/src/test/vid_codec_test.c

@@ -18 +18 @@
  */
 #include "test.h"
-#include <pjmedia-codec/ffmpeg_vid_codecs.h>
+#include <pjmedia-codec.h>
 #include <pjmedia-videodev/videodev.h>
 #include <pjmedia/vid_codec.h>
@@ -298 +298 @@
         codec_param.packing = packing;
 
+        /* Don't apply SDP fmtp */
+        codec_param.ignore_fmtp = PJ_TRUE;
+
         /* Open codec */
         status = pjmedia_vid_codec_mgr_alloc_codec(NULL, codec_info,
@@ -454 +457 @@
         return -10;
 
+#if PJMEDIA_HAS_VIDEO && PJMEDIA_HAS_OPENH264_CODEC
+    status = pjmedia_codec_openh264_vid_init(NULL, mem);
+    if (status != PJ_SUCCESS) {
+        return -22;
+    }
+#endif
+
 #if PJMEDIA_HAS_FFMPEG_VID_CODEC
     status = pjmedia_codec_ffmpeg_vid_init(NULL, mem);
@@ -464 +474 @@
         goto on_return;
 
+#if PJMEDIA_HAS_FFMPEG_VID_CODEC
     rc = encode_decode_test(pool, "h263-1998", PJMEDIA_VID_PACKING_WHOLE);
     if (rc != 0)
@@ -471 +482 @@
     if (rc != 0)
         goto on_return;
+#endif
+
+#if PJMEDIA_HAS_FFMPEG_VID_CODEC || PJMEDIA_HAS_OPENH264_CODEC
+    rc = encode_decode_test(pool, "h264", PJMEDIA_VID_PACKING_WHOLE);
+    if (rc != 0)
+        goto on_return;
+
+    rc = encode_decode_test(pool, "h264", PJMEDIA_VID_PACKING_PACKETS);
+    if (rc != 0)
+        goto on_return;
+#endif
+
 
 on_return:
@@ -476 +499 @@
     pjmedia_codec_ffmpeg_vid_deinit();
 #endif
+#if defined(PJMEDIA_HAS_OPENH264_CODEC) && PJMEDIA_HAS_OPENH264_CODEC != 0
+    pjmedia_codec_openh264_vid_deinit();
+#endif
     pjmedia_vid_dev_subsys_shutdown();
     pj_pool_release(pool);