Ignore:
Timestamp:
Mar 12, 2009 6:11:37 PM (14 years ago)
Author:
bennylp
Message:

(Major) Task #737 and #738: integration of APS-Direct and Audiodev from aps-direct branch to trunk.

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk

  • pjproject/trunk/pjmedia/include/pjmedia/config.h

    r2394 r2506  
    4545#endif 
    4646 
     47/** 
     48 * Specify whether we prefer to use audio switch board rather than  
     49 * conference bridge. 
     50 * 
     51 * Audio switch board is a kind of simplified version of conference  
     52 * bridge, but not really the subset of conference bridge. It has  
     53 * stricter rules on audio routing among the pjmedia ports and has 
     54 * no audio mixing capability. The power of it is it could work with 
     55 * encoded audio frames where conference brigde couldn't. 
     56 * 
     57 * Default: 0 
     58 */ 
     59#ifndef PJMEDIA_CONF_USE_SWITCH_BOARD 
     60#   define PJMEDIA_CONF_USE_SWITCH_BOARD    0 
     61#endif 
     62 
    4763/* 
    4864 * Types of sound stream backends. 
    4965 */ 
    5066 
    51 /** Constant for NULL sound backend. */ 
    52 #define PJMEDIA_SOUND_NULL_SOUND            0 
    53  
    54 /** Constant for PortAudio sound backend. */ 
    55 #define PJMEDIA_SOUND_PORTAUDIO_SOUND       1 
    56  
    57 /** Constant for Win32 DirectSound sound backend. */ 
    58 #define PJMEDIA_SOUND_WIN32_DIRECT_SOUND    2 
    59  
    60 /** Constant for Win32 MME sound backend. */ 
    61 #define PJMEDIA_SOUND_WIN32_MME_SOUND       3 
    62  
    63 /** When this is set, pjmedia will not provide any sound device backend.  
    64  *  Application will have to provide its own sound device backend 
    65  *  and link the application with it. 
    66  */ 
    67 #define PJMEDIA_SOUND_EXTERNAL              255 
    68  
    69  
    70 /** 
    71  * Unless specified otherwise, sound device uses PortAudio implementation 
    72  * by default. 
    73  */ 
    74 #ifndef PJMEDIA_SOUND_IMPLEMENTATION 
    75 #  if defined(PJ_WIN32) && PJ_WIN32!=0 
    76 /*#   define PJMEDIA_SOUND_IMPLEMENTATION   PJMEDIA_SOUND_WIN32_DIRECT_SOUND*/ 
    77 /*#   define PJMEDIA_SOUND_IMPLEMENTATION   PJMEDIA_SOUND_WIN32_MME_SOUND*/ 
    78 #   define PJMEDIA_SOUND_IMPLEMENTATION     PJMEDIA_SOUND_PORTAUDIO_SOUND 
    79 #  else 
    80 #   define PJMEDIA_SOUND_IMPLEMENTATION     PJMEDIA_SOUND_PORTAUDIO_SOUND 
    81 #  endif 
    82 #endif 
    83  
    84  
    85 /** 
    86  * Specify whether we prefer to use DirectSound on Windows. 
    87  * 
    88  * Default: 0 
    89  */ 
    90 #ifndef PJMEDIA_PREFER_DIRECT_SOUND 
    91 #   define PJMEDIA_PREFER_DIRECT_SOUND      0 
    92 #endif 
    93  
    94  
    95 /** 
    96  * Specify sound device latency default, in milisecond. 
     67/** 
     68 * This macro has been deprecated in releasee 1.1. Please see 
     69 * http://trac.pjsip.org/repos/wiki/Audio_Dev_API for more information. 
     70 */ 
     71#if defined(PJMEDIA_SOUND_IMPLEMENTATION) 
     72#   error PJMEDIA_SOUND_IMPLEMENTATION has been deprecated 
     73#endif 
     74 
     75/** 
     76 * This macro has been deprecated in releasee 1.1. Please see 
     77 * http://trac.pjsip.org/repos/wiki/Audio_Dev_API for more information. 
     78 */ 
     79#if defined(PJMEDIA_PREFER_DIRECT_SOUND) 
     80#   error PJMEDIA_PREFER_DIRECT_SOUND has been deprecated 
     81#endif 
     82 
     83/** 
     84 * This macro controls whether the legacy sound device API is to be 
     85 * implemented, for applications that still use the old sound device 
     86 * API (sound.h). If this macro is set to non-zero, the sound_legacy.c 
     87 * will be included in the compilation. The sound_legacy.c is an 
     88 * implementation of old sound device (sound.h) using the new Audio 
     89 * Device API. 
     90 * 
     91 * Please see http://trac.pjsip.org/repos/wiki/Audio_Dev_API for more 
     92 * info. 
     93 */ 
     94#ifndef PJMEDIA_HAS_LEGACY_SOUND_API 
     95#   define PJMEDIA_HAS_LEGACY_SOUND_API     1 
     96#endif 
     97 
     98/** 
     99 * Specify default sound device latency, in milisecond. 
    97100 */ 
    98101#ifndef PJMEDIA_SND_DEFAULT_REC_LATENCY 
    … …  
    100103#endif 
    101104 
     105/** 
     106 * Specify default sound device latency, in milisecond. 
     107 */ 
    102108#ifndef PJMEDIA_SND_DEFAULT_PLAY_LATENCY 
    103109#   define PJMEDIA_SND_DEFAULT_PLAY_LATENCY 100 
    104 #endif 
    105  
    106  
    107 /** 
    108  * Specify whether delay buffer is used for sound device. 
    109  * When delay buffer is enabled, the sound device callback  
    110  * will be called one after another evenly. 
    111  * The delay buffer also performs the best delay calculation 
    112  * for the sound device, and will try to limit the delay caused 
    113  * by uneven callback calls to this delay. 
    114  * 
    115  * When this setting is enabled, the PJMEDIA_SOUND_BUFFER_COUNT 
    116  * macro will specify the maximum size of the delay buffer. 
    117  */ 
    118 #ifndef PJMEDIA_SOUND_USE_DELAYBUF 
    119 #   define PJMEDIA_SOUND_USE_DELAYBUF       0 
    120110#endif 
    121111 
    … …  
    286276 */ 
    287277#ifndef PJMEDIA_FILE_PORT_BUFSIZE 
    288 #   define PJMEDIA_FILE_PORT_BUFSIZE    4000 
     278#   define PJMEDIA_FILE_PORT_BUFSIZE            4000 
    289279#endif 
    290280 
Note: See TracChangeset for help on using the changeset viewer.