Changeset 4815 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.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/pjsip/src/pjsua-lib/pjsua_vid.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

@@ -74 +74 @@
     }
 
+#if PJMEDIA_HAS_VIDEO && PJMEDIA_HAS_OPENH264_CODEC
+    status = pjmedia_codec_openh264_vid_init(NULL, &pjsua_var.cp.factory);
+    if (status != PJ_SUCCESS) {
+        PJ_PERROR(1,(THIS_FILE, status,
+                     "Error initializing OpenH264 library"));
+        goto on_error;
+    }
+#endif
+
 #if PJMEDIA_HAS_VIDEO && PJMEDIA_HAS_FFMPEG_VID_CODEC
     status = pjmedia_codec_ffmpeg_vid_init(NULL, &pjsua_var.cp.factory);
@@ -132 +141 @@
 #if PJMEDIA_HAS_FFMPEG_VID_CODEC
     pjmedia_codec_ffmpeg_vid_deinit();
+#endif
+
+#if defined(PJMEDIA_HAS_OPENH264_CODEC) && PJMEDIA_HAS_OPENH264_CODEC != 0
+    pjmedia_codec_openh264_vid_deinit();
 #endif