Changeset 2521


Ignore:
Timestamp:
Mar 18, 2009 12:49:18 PM (12 years ago)
Author:
bennylp
Message:

APS-direct fix (ticket #738): G.711 is disabled accidently

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/include/pjmedia-codec/config.h

    r2506 r2521  
    218218#ifndef PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMU 
    219219#   define PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMU   1 
    220 #   undef PJMEDIA_HAS_G711_CODEC 
    221220#endif 
    222221 
    223222#ifndef PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMA 
    224223#   define PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMA   1 
     224#endif 
     225 
     226/* If passthrough and PCMU/PCMA are enabled, disable the software 
     227 * G.711 codec 
     228 */ 
     229#if PJMEDIA_HAS_PASSTHROUGH_CODECS && \ 
     230    (PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMU || PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMA) 
    225231#   undef PJMEDIA_HAS_G711_CODEC 
    226 #endif 
     232#   define PJMEDIA_HAS_G711_CODEC               0 
     233#endif 
     234 
    227235 
    228236#endif  /* __PJMEDIA_CODEC_CONFIG_H__ */ 
Note: See TracChangeset for help on using the changeset viewer.