Changeset 5524

Timestamp:

Jan 17, 2017 12:50:09 AM (8 years ago)

Author:

ming

Message:

Re #1945 (misc): move default setting of number of supported video device format to pjmedia-videodev config instead of config_site_sample, since not everybody will use the sample.

Location:

pjproject/trunk

Files:

• pjlib/include/pj/config_site_sample.h (modified) (1 diff)
• pjmedia/include/pjmedia-videodev/config.h (modified) (1 diff)

pjproject/trunk/pjlib/include/pj/config_site_sample.h

@@ -393 +393 @@
     #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.

pjproject/trunk/pjmedia/include/pjmedia-videodev/config.h

@@ -46 +46 @@
  * 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