Ignore:
Timestamp:
Mar 22, 2012 9:56:52 AM (7 years ago)
Author:
bennylp
Message:

Re: #1463 (Third party media support). Tnitial work and it works, tested on Linux. Details:

  • add PJSUA_MEDIA_HAS_PJMEDIA macro
  • move pjmedia specific implementation in pjsua_media.c and pjsua_call.c into pjsua_aud.c
  • add pjsip-apps/src/third_party_media sample containing:
    • alt_pjsua_aud.c
    • alt_pjsua_vid.c
  • moved pjmedia_vid_stream_info_from_sdp() into pjmedia/vid_stream_info.c
  • moved pjmedia_stream_info_from_sdp() into pjmedia/stream_info.c
  • misc: fixed mips_test.c if codecs are disabled
File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/test/mips_test.c

    r3841 r3982  
    794794} 
    795795 
     796#if PJMEDIA_HAS_G711_CODEC 
    796797/* G.711 benchmark */ 
    797798static pjmedia_port* g711_encode_decode(  pj_pool_t *pool, 
     
    807808                               samples_per_frame, flags, te); 
    808809} 
     810#endif 
    809811 
    810812/* GSM benchmark */ 
     813#if PJMEDIA_HAS_GSM_CODEC 
    811814static pjmedia_port* gsm_encode_decode(  pj_pool_t *pool, 
    812815                                         unsigned clock_rate, 
     
    821824                               samples_per_frame, flags, te); 
    822825} 
    823  
     826#endif 
     827 
     828#if PJMEDIA_HAS_ILBC_CODEC 
    824829static pj_status_t ilbc_init(pjmedia_endpt *endpt) 
    825830{ 
     
    840845                               channel_count, samples_per_frame, flags, te); 
    841846} 
    842  
     847#endif 
     848 
     849#if PJMEDIA_HAS_SPEEX_CODEC 
    843850/* Speex narrowband benchmark */ 
    844851static pjmedia_port* speex8_encode_decode(pj_pool_t *pool, 
     
    870877                               samples_per_frame, flags, te); 
    871878} 
    872  
     879#endif 
     880 
     881#if PJMEDIA_HAS_G722_CODEC 
    873882/* G.722 benchmark benchmark */ 
    874883static pjmedia_port* g722_encode_decode(pj_pool_t *pool, 
     
    884893                               samples_per_frame, flags, te); 
    885894} 
     895#endif 
    886896 
    887897#if PJMEDIA_HAS_G7221_CODEC 
     
    17971807} 
    17981808 
     1809#if PJMEDIA_HAS_G711_CODEC 
    17991810/* G.711 stream, no SRTP */ 
    18001811static pjmedia_port* create_stream_pcmu( pj_pool_t *pool, 
     
    18711882                         samples_per_frame, flags, te); 
    18721883} 
    1873  
     1884#endif 
     1885 
     1886#if PJMEDIA_HAS_GSM_CODEC 
    18741887/* GSM stream */ 
    18751888static pjmedia_port* create_stream_gsm(  pj_pool_t *pool, 
     
    19461959                         samples_per_frame, flags, te); 
    19471960} 
    1948  
     1961#endif 
     1962 
     1963#if PJMEDIA_HAS_G722_CODEC 
    19491964/* G722 stream */ 
    19501965static pjmedia_port* create_stream_g722( pj_pool_t *pool, 
     
    19611976                         samples_per_frame, flags, te); 
    19621977} 
    1963  
     1978#endif 
     1979 
     1980#if PJMEDIA_HAS_G7221_CODEC 
    19641981/* G722.1 stream */ 
    1965 #if PJMEDIA_HAS_G7221_CODEC 
    19661982static pjmedia_port* create_stream_g7221( pj_pool_t *pool, 
    19671983                                          unsigned clock_rate, 
Note: See TracChangeset for help on using the changeset viewer.