diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-03-21 11:59:15 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-03-21 11:59:15 +0000 |
| commit | 1ac65f3b18e59cd2206dfb8c237ca1007e1d873e (patch) | |
| tree | c1c34eca18160c62a9effc79e09ffdd449bc8ae7 /pjmedia/include | |
| parent | 61ff349aa29d8d3457120275a7213b72b57b785f (diff) | |
Added macro to exclude filters in resample and added options to select resample algorithm in conference
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@347 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/include')
| -rw-r--r-- | pjmedia/include/pjmedia/conference.h | 3 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia/config.h | 22 |
2 files changed, 25 insertions, 0 deletions
diff --git a/pjmedia/include/pjmedia/conference.h b/pjmedia/include/pjmedia/conference.h index f93e0e58..bde63f77 100644 --- a/pjmedia/include/pjmedia/conference.h +++ b/pjmedia/include/pjmedia/conference.h @@ -61,6 +61,9 @@ enum pjmedia_conf_option PJMEDIA_CONF_NO_MIC = 1, /**< Disable audio streams from the microphone device. */ PJMEDIA_CONF_NO_DEVICE = 2, /**< Do not create sound device. */ + PJMEDIA_CONF_SMALL_FILTER=4,/**< Use small filter table when resampling */ + PJMEDIA_CONF_USE_LINEAR=8, /**< Use linear resampling instead of filter + based. */ }; diff --git a/pjmedia/include/pjmedia/config.h b/pjmedia/include/pjmedia/config.h index 66f42d5e..c81693a5 100644 --- a/pjmedia/include/pjmedia/config.h +++ b/pjmedia/include/pjmedia/config.h @@ -41,10 +41,32 @@ /** * Unless specified otherwise, G711 codec is included by default. + * Note that there are parts of G711 codec (such as linear2ulaw) that are + * needed by other PJMEDIA components (e.g. silence detector, conference). + * Thus disabling G711 is generally not a good idea. */ #ifndef PJMEDIA_HAS_G711_CODEC # define PJMEDIA_HAS_G711_CODEC 1 #endif +/** + * Include small filter table in resample. + * This adds about 9KB in rdata. + */ +#ifndef PJMEDIA_HAS_SMALL_FILTER +# define PJMEDIA_HAS_SMALL_FILTER 1 +#endif + + +/** + * Include large filter table in resample. + * This adds about 32KB in rdata. + */ +#ifndef PJMEDIA_HAS_LARGE_FILTER +# define PJMEDIA_HAS_LARGE_FILTER 1 +#endif + + #endif /* __PJMEDIA_CONFIG_H__ */ + |