diff options
author | Benny Prijono <bennylp@teluu.com> | 2014-04-10 10:01:07 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2014-04-10 10:01:07 +0000 |
commit | 0aa83d8efcf477675669569b037f291464c4f146 (patch) | |
tree | 063ff3ade6100cb7e2a0693b153045027422fc53 /pjsip-apps/src/samples/aviplay.c | |
parent | e7e444203e67583806aee77c0fc7d94115094efe (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-apps/src/samples/aviplay.c')
-rw-r--r-- | pjsip-apps/src/samples/aviplay.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pjsip-apps/src/samples/aviplay.c b/pjsip-apps/src/samples/aviplay.c index 35b05044..40dfaf90 100644 --- a/pjsip-apps/src/samples/aviplay.c +++ b/pjsip-apps/src/samples/aviplay.c @@ -500,6 +500,12 @@ static int main_func(int argc, char *argv[]) goto on_return; } +#if defined(PJMEDIA_HAS_OPENH264_CODEC) && PJMEDIA_HAS_OPENH264_CODEC != 0 + status = pjmedia_codec_openh264_vid_init(NULL, &cp.factory); + if (status != PJ_SUCCESS) + goto on_return; +#endif + #if PJMEDIA_HAS_FFMPEG_VID_CODEC status = pjmedia_codec_ffmpeg_vid_init(NULL, &cp.factory); if (status != PJ_SUCCESS) @@ -521,6 +527,9 @@ on_return: #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 pjmedia_aud_subsys_shutdown(); pjmedia_vid_dev_subsys_shutdown(); |