summaryrefslogtreecommitdiff
path: root/pjsip
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2014-04-10 10:01:07 +0000
committerBenny Prijono <bennylp@teluu.com>2014-04-10 10:01:07 +0000
commit0aa83d8efcf477675669569b037f291464c4f146 (patch)
tree063ff3ade6100cb7e2a0693b153045027422fc53 /pjsip
parente7e444203e67583806aee77c0fc7d94115094efe (diff)
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). git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4815 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
-rw-r--r--pjsip/src/pjsua-lib/pjsua_vid.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_vid.c b/pjsip/src/pjsua-lib/pjsua_vid.c
index 026942d1..c12cfd16 100644
--- a/pjsip/src/pjsua-lib/pjsua_vid.c
+++ b/pjsip/src/pjsua-lib/pjsua_vid.c
@@ -73,6 +73,15 @@ pj_status_t pjsua_vid_subsys_init(void)
goto on_error;
}
+#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);
if (status != PJ_SUCCESS) {
@@ -133,6 +142,10 @@ pj_status_t pjsua_vid_subsys_destroy(void)
pjmedia_codec_ffmpeg_vid_deinit();
#endif
+#if defined(PJMEDIA_HAS_OPENH264_CODEC) && PJMEDIA_HAS_OPENH264_CODEC != 0
+ pjmedia_codec_openh264_vid_deinit();
+#endif
+
if (pjmedia_vid_codec_mgr_instance())
pjmedia_vid_codec_mgr_destroy(NULL);