diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2008-06-10 18:56:10 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2008-06-10 18:56:10 +0000 |
commit | ebbdbaed47300ebf9742a3a06438dd11ac1a5bae (patch) | |
tree | 5b73b5fecc202da6fd58d12c3a9d5836bb74a5c0 | |
parent | 64f897daea6dd72f43f9985fef8d747d1598c72b (diff) |
Updated default speex quality settings and reenabled pjsua to set Speex codec quality based on media quality config
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2004 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r-- | pjlib/include/pj/config_site_sample.h | 7 | ||||
-rw-r--r-- | pjmedia/include/pjmedia-codec/config.h | 5 | ||||
-rw-r--r-- | pjsip/include/pjsua-lib/pjsua.h | 2 | ||||
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 5 |
4 files changed, 15 insertions, 4 deletions
diff --git a/pjlib/include/pj/config_site_sample.h b/pjlib/include/pj/config_site_sample.h index 086214f1..44e791b8 100644 --- a/pjlib/include/pj/config_site_sample.h +++ b/pjlib/include/pj/config_site_sample.h @@ -27,6 +27,10 @@ # undef PJMEDIA_RESAMPLE_IMP # define PJMEDIA_RESAMPLE_IMP PJMEDIA_RESAMPLE_LIBRESAMPLE # define PJMEDIA_WSOLA_IMP PJMEDIA_WSOLA_IMP_WSOLA_LITE + + /* Speex default quality settings */ +# define PJSUA_DEFAULT_CODEC_QUALITY 5 +# define PJMEDIA_CODEC_SPEEX_DEFAULT_QUALITY 5 #endif @@ -100,6 +104,9 @@ # define PJSUA_MAX_CONF_PORTS (PJSUA_MAX_CALLS+2*PJSUA_MAX_PLAYERS) # define PJSUA_MAX_BUDDIES 32 + /* Speex default quality settings */ +# define PJSUA_DEFAULT_CODEC_QUALITY 5 +# define PJMEDIA_CODEC_SPEEX_DEFAULT_QUALITY 5 #endif diff --git a/pjmedia/include/pjmedia-codec/config.h b/pjmedia/include/pjmedia-codec/config.h index d52044f1..ac9ef916 100644 --- a/pjmedia/include/pjmedia-codec/config.h +++ b/pjmedia/include/pjmedia-codec/config.h @@ -59,10 +59,11 @@ #endif /** - * Speex codec default quality setting. + * Speex codec default quality setting. Please note that pjsua-lib may override + * this setting via its codec quality setting (i.e PJSUA_DEFAULT_CODEC_QUALITY). */ #ifndef PJMEDIA_CODEC_SPEEX_DEFAULT_QUALITY -# define PJMEDIA_CODEC_SPEEX_DEFAULT_QUALITY 5 +# define PJMEDIA_CODEC_SPEEX_DEFAULT_QUALITY 8 #endif diff --git a/pjsip/include/pjsua-lib/pjsua.h b/pjsip/include/pjsua-lib/pjsua.h index 9e9ee2a2..21d8ffb1 100644 --- a/pjsip/include/pjsua-lib/pjsua.h +++ b/pjsip/include/pjsua-lib/pjsua.h @@ -3674,7 +3674,7 @@ PJ_DECL(pj_status_t) pjsua_im_typing(pjsua_acc_id acc_id, * for pjsua_media_config.quality. */ #ifndef PJSUA_DEFAULT_CODEC_QUALITY -# define PJSUA_DEFAULT_CODEC_QUALITY 5 +# define PJSUA_DEFAULT_CODEC_QUALITY 8 #endif /** diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index 9449a33c..d8c2cd9c 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -91,7 +91,10 @@ pj_status_t pjsua_media_subsys_init(const pjsua_media_config *cfg) /* Register all codecs */ #if PJMEDIA_HAS_SPEEX_CODEC /* Register speex. */ - status = pjmedia_codec_speex_init_default(pjsua_var.med_endpt); + status = pjmedia_codec_speex_init(pjsua_var.med_endpt, + 0, + pjsua_var.media_cfg.quality, + -1); if (status != PJ_SUCCESS) { pjsua_perror(THIS_FILE, "Error initializing Speex codec", status); |