diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2013-03-11 06:32:58 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2013-03-11 06:32:58 +0000 |
| commit | 92de554adbf95a303f1051d85bef05abac9f1e8a (patch) | |
| tree | 17019c03731e797280398e58b99044862341834a /pjlib | |
| parent | 2c2752f536e55bff7055eed2ed8e558163e1f9b6 (diff) | |
Re #1639: merged android branch into trunk (except sample apps, i.e: apjsua & apjloader)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4435 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib')
| -rw-r--r-- | pjlib/include/pj/compat/socket.h | 1 | ||||
| -rw-r--r-- | pjlib/include/pj/config_site_sample.h | 62 |
2 files changed, 63 insertions, 0 deletions
diff --git a/pjlib/include/pj/compat/socket.h b/pjlib/include/pj/compat/socket.h index 0babcc51..8a011c1a 100644 --- a/pjlib/include/pj/compat/socket.h +++ b/pjlib/include/pj/compat/socket.h @@ -175,6 +175,7 @@ */ #undef s_addr #undef s6_addr +#undef sin_zero /* * Linux kernel specifics diff --git a/pjlib/include/pj/config_site_sample.h b/pjlib/include/pj/config_site_sample.h index 845d1bba..8dfbb110 100644 --- a/pjlib/include/pj/config_site_sample.h +++ b/pjlib/include/pj/config_site_sample.h @@ -361,6 +361,68 @@ #endif /* + * Android sample settings. + */ +#if PJ_CONFIG_ANDROID + + #define PJ_ANDROID 1 + + /* + * PJLIB settings. + */ + + /* Disable floating point support */ + #undef PJ_HAS_FLOATING_POINT + #define PJ_HAS_FLOATING_POINT 0 + + /* + * PJMEDIA settings + */ + + /* We have our own OpenSL ES backend */ + #define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO 0 + #define PJMEDIA_AUDIO_DEV_HAS_WMME 0 + #define PJMEDIA_AUDIO_DEV_HAS_OPENSL 1 + #define PJMEDIA_AUDIO_DEV_HAS_ANDROID_JNI 0 + + /* Disable some codecs */ + #define PJMEDIA_HAS_L16_CODEC 0 + #define PJMEDIA_HAS_G722_CODEC 0 + + /* Fine tune Speex's default settings for best performance/quality */ + #define PJMEDIA_CODEC_SPEEX_DEFAULT_QUALITY 5 + + /* + * PJSIP settings. + */ + + /* Increase allowable packet size, just in case */ + //#define PJSIP_MAX_PKT_LEN 2000 + + /* + * PJSUA settings. + */ + + /* Default codec quality, previously was set to 5, however it is now + * set to 4 to make sure pjsua instantiates resampler with small filter. + */ + #define PJSUA_DEFAULT_CODEC_QUALITY 4 + + /* Set maximum number of dialog/transaction/calls to minimum */ + #define PJSIP_MAX_TSX_COUNT 31 + #define PJSIP_MAX_DIALOG_COUNT 31 + #define PJSUA_MAX_CALLS 4 + + /* Other pjsua settings */ + #define PJSUA_MAX_ACC 4 + #define PJSUA_MAX_PLAYERS 4 + #define PJSUA_MAX_RECORDERS 4 + #define PJSUA_MAX_CONF_PORTS (PJSUA_MAX_CALLS+2*PJSUA_MAX_PLAYERS) + #define PJSUA_MAX_BUDDIES 32 +#endif + + +/* * Minimum size */ #ifdef PJ_CONFIG_MINIMAL_SIZE |