Ignore:
Timestamp:
Aug 19, 2008 3:01:48 PM (16 years ago)
Author:
bennylp
Message:

More ticket #583: a bit of tidying up and renamed macro names etc.

File:
1 edited

Legend:

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

    r2219 r2225  
    8585 
    8686/** 
    87  * IPP codecs are excluded by default. IPP codecs contain various codecs, 
    88  * e.g: G.729, G.723.1, G.726, G.728, G.722.1, AMR. 
     87 * Enable the features provided by Intel IPP libraries, for example 
     88 * codecs such as G.729, G.723.1, G.726, G.728, G.722.1, and AMR. 
     89 * 
     90 * By default this is disabled. Please follow the instructions in 
     91 * http://trac.pjsip.org/repos/wiki/Intel_IPP_Codecs on how to setup 
     92 * Intel IPP with PJMEDIA. 
    8993 */ 
    90 #ifndef PJMEDIA_HAS_INTEL_IPP_CODECS 
    91 #   define PJMEDIA_HAS_INTEL_IPP_CODECS         0 
     94#ifndef PJMEDIA_HAS_INTEL_IPP 
     95#   define PJMEDIA_HAS_INTEL_IPP                0 
    9296#endif 
    9397 
     98 
    9499/** 
    95  * Specify IPP codecs content. If PJMEDIA_HAS_INTEL_IPP_CODECS is not set, 
    96  * these settings will be ignored. 
     100 * Visual Studio only: when this option is set, the Intel IPP libraries 
     101 * will be automatically linked to application using pragma(comment) 
     102 * constructs. This is convenient, however it will only link with 
     103 * the stub libraries and the Intel IPP DLL's will be required when 
     104 * distributing the application. 
     105 * 
     106 * If application wants to link with the different types of the Intel IPP 
     107 * libraries (for example, the static libraries), it must set this option 
     108 * to zero and specify the Intel IPP libraries in the application's input 
     109 * library specification manually. 
     110 * 
     111 * Default 1. 
     112 */ 
     113#ifndef PJMEDIA_AUTO_LINK_IPP_LIBS 
     114#   define PJMEDIA_AUTO_LINK_IPP_LIBS           1 
     115#endif 
     116 
     117 
     118/** 
     119 * Enable Intel IPP AMR codec. This also needs to be enabled when AMR WB 
     120 * codec is enabled. This option is only used when PJMEDIA_HAS_INTEL_IPP  
     121 * is enabled. 
     122 * 
     123 * Default: 1 
    97124 */ 
    98125#ifndef PJMEDIA_HAS_INTEL_IPP_CODEC_AMR 
     
    100127#endif 
    101128 
     129 
     130/** 
     131 * Enable Intel IPP AMR wideband codec. The PJMEDIA_HAS_INTEL_IPP_CODEC_AMR 
     132 * option must also be enabled to use this codec. This option is only used  
     133 * when PJMEDIA_HAS_INTEL_IPP is enabled. 
     134 * 
     135 * Default: 1 
     136 */ 
    102137#ifndef PJMEDIA_HAS_INTEL_IPP_CODEC_AMRWB 
    103138#   define PJMEDIA_HAS_INTEL_IPP_CODEC_AMRWB    1 
    104139#endif 
    105140 
     141 
     142/** 
     143 * Enable Intel IPP G.729 codec. This option is only used when 
     144 * PJMEDIA_HAS_INTEL_IPP is enabled. 
     145 * 
     146 * Default: 1 
     147 */ 
    106148#ifndef PJMEDIA_HAS_INTEL_IPP_CODEC_G729 
    107149#   define PJMEDIA_HAS_INTEL_IPP_CODEC_G729     1 
    108150#endif 
    109151 
    110 #ifndef PJMEDIA_HAS_INTEL_IPP_CODEC_G723 
    111 #   define PJMEDIA_HAS_INTEL_IPP_CODEC_G723     1 
     152 
     153/** 
     154 * Enable Intel IPP G.723.1 codec. This option is only used when 
     155 * PJMEDIA_HAS_INTEL_IPP is enabled. 
     156 * 
     157 * Default: 1 
     158 */ 
     159#ifndef PJMEDIA_HAS_INTEL_IPP_CODEC_G723_1 
     160#   define PJMEDIA_HAS_INTEL_IPP_CODEC_G723_1   1 
    112161#endif 
    113162 
     163 
     164/** 
     165 * Enable Intel IPP G.726 codec. This option is only used when 
     166 * PJMEDIA_HAS_INTEL_IPP is enabled. 
     167 * 
     168 * Default: 1 
     169 */ 
    114170#ifndef PJMEDIA_HAS_INTEL_IPP_CODEC_G726 
    115171#   define PJMEDIA_HAS_INTEL_IPP_CODEC_G726     1 
    116172#endif 
    117173 
     174 
     175/** 
     176 * Enable Intel IPP G.728 codec. This option is only used when 
     177 * PJMEDIA_HAS_INTEL_IPP is enabled. 
     178 * 
     179 * Default: 1 
     180 */ 
    118181#ifndef PJMEDIA_HAS_INTEL_IPP_CODEC_G728 
    119182#   define PJMEDIA_HAS_INTEL_IPP_CODEC_G728     1 
    120183#endif 
    121184 
     185 
     186/** 
     187 * Enable Intel IPP G.722.1 codec. This option is only used when 
     188 * PJMEDIA_HAS_INTEL_IPP is enabled. 
     189 * 
     190 * Default: 1 
     191 */ 
    122192#ifndef PJMEDIA_HAS_INTEL_IPP_CODEC_G722_1 
    123193#   define PJMEDIA_HAS_INTEL_IPP_CODEC_G722_1   1 
Note: See TracChangeset for help on using the changeset viewer.