diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2009-06-16 10:46:03 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2009-06-16 10:46:03 +0000 |
| commit | 91538ff6ee81c5e593beb508864bfff9a2b165d4 (patch) | |
| tree | e1d72b3df95c1e7e38b78bbba73f81059e6c94a7 /pjmedia | |
| parent | f44d17658e64639499d53b2c524718546bb2bd5e (diff) | |
Ticket #808: Added compile time trap to avoid both implementations coexist.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2763 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/include/pjmedia-codec/config.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/pjmedia/include/pjmedia-codec/config.h b/pjmedia/include/pjmedia-codec/config.h index 83e2dc04..7571db44 100644 --- a/pjmedia/include/pjmedia-codec/config.h +++ b/pjmedia/include/pjmedia-codec/config.h @@ -254,5 +254,21 @@ #endif +/** + * Enabling both G.722.1 codec implementations, internal PJMEDIA and IPP, + * may cause problem in SDP, i.e: payload types duplications. So, let's + * just trap such case here at compile time. + * + * Application can control which implementation to be used by manipulating + * PJMEDIA_HAS_G7221_CODEC and PJMEDIA_HAS_INTEL_IPP_CODEC_G722_1 in + * config_site.h. + */ +#if (PJMEDIA_HAS_G7221_CODEC != 0) && (PJMEDIA_HAS_INTEL_IPP != 0) && \ + (PJMEDIA_HAS_INTEL_IPP_CODEC_G722_1 != 0) +# error Only one G.722.1 implementation can be enabled at the same time. \ + Please use PJMEDIA_HAS_G7221_CODEC and \ + PJMEDIA_HAS_INTEL_IPP_CODEC_G722_1 in your config_site.h \ + to control which implementation to be used. +#endif #endif /* __PJMEDIA_CODEC_CONFIG_H__ */ |