diff options
| author | Benny Prijono <bennylp@teluu.com> | 2009-03-18 12:49:18 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2009-03-18 12:49:18 +0000 |
| commit | 73a119e652f4f639dca875a7db948039611f4c69 (patch) | |
| tree | b606fd3464392650accdfa3fa06b602008ea8adf | |
| parent | 8c89283f8ee5849c310fb898c449e79b4388c5e3 (diff) | |
APS-direct fix (ticket #738): G.711 is disabled accidently
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2521 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/include/pjmedia-codec/config.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pjmedia/include/pjmedia-codec/config.h b/pjmedia/include/pjmedia-codec/config.h index 49ac3214..805ac63c 100644 --- a/pjmedia/include/pjmedia-codec/config.h +++ b/pjmedia/include/pjmedia-codec/config.h @@ -217,12 +217,20 @@ #ifndef PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMU # define PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMU 1 -# undef PJMEDIA_HAS_G711_CODEC #endif #ifndef PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMA # define PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMA 1 +#endif + +/* If passthrough and PCMU/PCMA are enabled, disable the software + * G.711 codec + */ +#if PJMEDIA_HAS_PASSTHROUGH_CODECS && \ + (PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMU || PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMA) # undef PJMEDIA_HAS_G711_CODEC +# define PJMEDIA_HAS_G711_CODEC 0 #endif + #endif /* __PJMEDIA_CODEC_CONFIG_H__ */ |