diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2011-10-18 01:51:01 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2011-10-18 01:51:01 +0000 |
| commit | 5586e0af18c3ba1ed079fae5901d0981fbbdf1a4 (patch) | |
| tree | 8b80c000e2082becd8da05249062503ce503285a /pjmedia/include/pjmedia-codec | |
| parent | f320d9e1d15975cc42c92e4aac50b4ba299981bb (diff) | |
Reenable ffmpeg H264 (re #1390):
- Review H264 codec settings such as profile, level, NAL unit size, bitrate, quality, latency.
- Added new format PJMEDIA_FORMAT_GBRP, 24 bits planar RGB, one of the formats outputted by the latest ffmpeg H264 decoder.
- Fixed format change detection bug in ffmpeg wrapper, decoder didn't update its internal state with the new format so format change event was generated in every decoding operation.
- Added compile time configurations for enabling/disabling ffmpeg codec H263+ & H264.
- Updated pjsua app to adjust window size to original video size. With H264, default window size will be too big as it is init'd with default H264 video size, e.g: 720x480 for profile level 30.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3819 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/include/pjmedia-codec')
| -rw-r--r-- | pjmedia/include/pjmedia-codec/config.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/pjmedia/include/pjmedia-codec/config.h b/pjmedia/include/pjmedia-codec/config.h index fb02d47a..6b55baa2 100644 --- a/pjmedia/include/pjmedia-codec/config.h +++ b/pjmedia/include/pjmedia-codec/config.h @@ -354,6 +354,24 @@ #endif /** + * Enable FFMPEG H263+/H263-1998 codec. + * + * Default: 1 + */ +#ifndef PJMEDIA_HAS_FFMPEG_CODEC_H263P +# define PJMEDIA_HAS_FFMPEG_CODEC_H263P 1 +#endif + +/** + * Enable FFMPEG H264 codec (requires libx264). + * + * Default: 0 + */ +#ifndef PJMEDIA_HAS_FFMPEG_CODEC_H264 +# define PJMEDIA_HAS_FFMPEG_CODEC_H264 0 +#endif + +/** * @} */ |