diff options
| -rw-r--r-- | pjlib/include/pj/config_site_sample.h | 3 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia-videodev/config.h | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pjlib/include/pj/config_site_sample.h b/pjlib/include/pj/config_site_sample.h index 9c3ecc65..059f6e83 100644 --- a/pjlib/include/pj/config_site_sample.h +++ b/pjlib/include/pj/config_site_sample.h @@ -392,9 +392,6 @@ /* Fine tune Speex's default settings for best performance/quality */ #define PJMEDIA_CODEC_SPEEX_DEFAULT_QUALITY 5 - /* Increase number of video device's supported formats */ - #define PJMEDIA_VID_DEV_INFO_FMT_CNT 128 - /* * PJSIP settings. */ diff --git a/pjmedia/include/pjmedia-videodev/config.h b/pjmedia/include/pjmedia-videodev/config.h index 9322f7af..670a265e 100644 --- a/pjmedia/include/pjmedia-videodev/config.h +++ b/pjmedia/include/pjmedia-videodev/config.h @@ -45,10 +45,14 @@ PJ_BEGIN_DECL * This setting controls the maximum number of formats that can be * supported by a video device. * - * Default: 64 + * Default: 128 (for Android), 64 (for others) */ #ifndef PJMEDIA_VID_DEV_INFO_FMT_CNT -# define PJMEDIA_VID_DEV_INFO_FMT_CNT 64 +# if defined(PJ_ANDROID) && PJ_ANDROID != 0 +# define PJMEDIA_VID_DEV_INFO_FMT_CNT 128 +# else +# define PJMEDIA_VID_DEV_INFO_FMT_CNT 64 +# endif #endif |