Changeset 4193 for pjproject


Ignore:
Timestamp:
Jul 3, 2012 7:51:53 AM (12 years ago)
Author:
ming
Message:

Re #1518: Add support for OpenSL ES audio device

Location:
pjproject/branches/projects/android/pjmedia
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/android/pjmedia/build/Makefile

    r4150 r4193  
    8282export PJMEDIA_AUDIODEV_OBJS +=  audiodev.o audiotest.o errno.o \ 
    8383                                 coreaudio_dev.o legacy_dev.o null_dev.o pa_dev.o wmme_dev.o \ 
    84                                  alsa_dev.o bb10_dev.o 
     84                                 alsa_dev.o bb10_dev.o opensl_dev.o 
    8585export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS) 
    8686 
  • pjproject/branches/projects/android/pjmedia/include/pjmedia-audiodev/config.h

    r4150 r4193  
    5656#       define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO  1 
    5757#   endif 
     58#endif 
     59 
     60/** 
     61 * This setting controls whether Android OpenSL audio support should be 
     62 * included. 
     63 */ 
     64#ifndef PJMEDIA_AUDIO_DEV_HAS_OPENSL 
     65#   define PJMEDIA_AUDIO_DEV_HAS_OPENSL         0 
    5866#endif 
    5967 
  • pjproject/branches/projects/android/pjmedia/src/pjmedia-audiodev/audiodev.c

    r4150 r4193  
    7979#endif 
    8080 
     81#if PJMEDIA_AUDIO_DEV_HAS_OPENSL 
     82pjmedia_aud_dev_factory* pjmedia_opensl_factory(pj_pool_factory *pf); 
     83#endif 
     84 
    8185#if PJMEDIA_AUDIO_DEV_HAS_BB10 
    8286pjmedia_aud_dev_factory* pjmedia_bb10_factory(pj_pool_factory *pf); 
     
    392396 
    393397    /* Register creation functions */ 
     398#if PJMEDIA_AUDIO_DEV_HAS_OPENSL 
     399    aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_opensl_factory; 
     400#endif 
    394401#if PJMEDIA_AUDIO_DEV_HAS_BB10 
    395402    aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_bb10_factory; 
Note: See TracChangeset for help on using the changeset viewer.