diff options
| -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__ */ |