diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2015-03-17 04:02:44 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2015-03-17 04:02:44 +0000 |
| commit | a4411dcd275cb3531587b3e07ac07f6fc6884168 (patch) | |
| tree | 18c45f48ffb8eae42ce9db1099d8a4d9c8d5bf36 /pjmedia/include | |
| parent | 6cdf95d0eb8a62ea5599f03db7298b4ab1ff1719 (diff) | |
Re #1822: Initial implementation of Android video capturer.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4994 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/include')
| -rw-r--r-- | pjmedia/include/pjmedia-videodev/config.h | 15 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia-videodev/videodev.h | 2 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia/format.h | 8 |
3 files changed, 22 insertions, 3 deletions
diff --git a/pjmedia/include/pjmedia-videodev/config.h b/pjmedia/include/pjmedia-videodev/config.h index 85c7415e..8b6ddccd 100644 --- a/pjmedia/include/pjmedia-videodev/config.h +++ b/pjmedia/include/pjmedia-videodev/config.h @@ -45,10 +45,10 @@ PJ_BEGIN_DECL * This setting controls the maximum number of formats that can be * supported by a video device. * - * Default: 16 + * Default: 64 */ #ifndef PJMEDIA_VID_DEV_INFO_FMT_CNT -# define PJMEDIA_VID_DEV_INFO_FMT_CNT 16 +# define PJMEDIA_VID_DEV_INFO_FMT_CNT 64 #endif @@ -192,6 +192,17 @@ PJ_BEGIN_DECL # define PJMEDIA_VIDEO_DEV_HAS_AVI 1 #endif + +/** + * This setting controls whether Android support should be included. + * + * Default: 0 + */ +#ifndef PJMEDIA_VIDEO_DEV_HAS_ANDROID +# define PJMEDIA_VIDEO_DEV_HAS_ANDROID 0 +#endif + + /** * Specify the SDL library name to be linked with Visual Studio project. * By default, the name is autodetected based on SDL version ("sdl.lib" or diff --git a/pjmedia/include/pjmedia-videodev/videodev.h b/pjmedia/include/pjmedia-videodev/videodev.h index 0bcb1686..f1f08b63 100644 --- a/pjmedia/include/pjmedia-videodev/videodev.h +++ b/pjmedia/include/pjmedia-videodev/videodev.h @@ -232,7 +232,7 @@ typedef enum pjmedia_vid_dev_cap * show or hide a preview window showing video directly from the camera * by setting this capability to PJ_TRUE or PJ_FALSE. Once the preview * is started, application may use PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW - * capability to query the vidow window. + * capability to query the video window. * * The value of this capability is a pj_bool_t containing boolean * PJ_TRUE or PJ_FALSE. diff --git a/pjmedia/include/pjmedia/format.h b/pjmedia/include/pjmedia/format.h index 6e7ac89e..70dad13b 100644 --- a/pjmedia/include/pjmedia/format.h +++ b/pjmedia/include/pjmedia/format.h @@ -177,6 +177,14 @@ typedef enum pjmedia_format_id PJMEDIA_FORMAT_YV12 = PJMEDIA_FORMAT_PACK('Y', 'V', '1', '2'), /** + * This is planar 4:2:0/12bpp YUV format, the data can be treated as + * two planes of color components, where the first plane contains + * only the Y samples, the second plane contains interleaved + * V (Cr) - U (Cb) samples. + */ + PJMEDIA_FORMAT_NV21 = PJMEDIA_FORMAT_PACK('N', 'V', '2', '1'), + + /** * This is planar 4:2:2/16bpp YUV format, the data can be treated as * three planes of color components, where the first plane contains * only the Y samples, the second plane contains only the U (Cb) samples, |