Changeset 32040


Ignore:
Timestamp:
2012-06-04T01:37:58+02:00 (5 years ago)
Author:
luka
Message:

pjsip: update to version 1.14.2

Location:
trunk/package/pjsip
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/pjsip/Makefile

    r30520 r32040  
    11# 
    2 # Copyright (C) 2010-2011 OpenWrt.org 
     2# Copyright (C) 2010-2012 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=pjsip 
    11 PKG_VERSION:=1.12 
     11PKG_VERSION:=1.14.2 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=pjproject-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://www.pjsip.org/release/$(PKG_VERSION)/ 
    16 PKG_MD5SUM:=1db8e5a5dd73b216409b15afa34651a4 
     16PKG_MD5SUM:=05428502384c16e7abd85f047e6e2f6c 
    1717 
    1818PKG_INSTALL:=1 
     
    9797endef 
    9898 
    99 define Package/pjsip-$(BUILD_VARIANT)/install 
    100         echo "foo" 
    101 endef 
    102  
    10399$(eval $(call BuildPackage,pjsip-oss)) 
    104100$(eval $(call BuildPackage,pjsip-ltq-tapi)) 
  • trunk/package/pjsip/patches/0001-configure-fixup.patch

    r30520 r32040  
    1 From 01108f66fd20dcdbb9fde0dd00924ee4e8c28a7c Mon Sep 17 00:00:00 2001 
    2 From: John Crispin <blogic@openwrt.org> 
    3 Date: Sat, 28 Jan 2012 21:41:18 +0100 
    4 Subject: [PATCH 1/3] configure fixup 
    5  
    6 --- 
    7  pjproject-1.12/aconfigure.ac                |   13 +++++++++++-- 
    8  pjproject-1.12/pjmedia/build/os-auto.mak.in |    9 ++++++++- 
    9  2 files changed, 19 insertions(+), 3 deletions(-) 
    10  
    11 diff --git a/aconfigure.ac b/aconfigure.ac 
    12 index 84295b5..e34fd32 100644 
    131--- a/aconfigure.ac 
    142+++ b/aconfigure.ac 
     
    2513 if test "$LDOUT" = ""; then LDOUT="-o "; fi 
    2614 AC_SUBST(LDOUT) 
    27 @@ -604,6 +604,15 @@ AC_ARG_ENABLE(ext_sound, 
     15@@ -616,6 +616,15 @@ AC_ARG_ENABLE(ext_sound, 
     16                AC_MSG_RESULT([Checking if external sound is set... yes]) 
    2817               fi] 
    2918              ) 
    30   
     19+ 
    3120+AC_ARG_ENABLE(ltq_tapi, 
    3221+             AC_HELP_STRING([--enable-ltq-tapi], 
     
    3726+              fi] 
    3827+             ) 
    39 + 
     28  
    4029 dnl # Include resampling small filter 
    4130 AC_SUBST(ac_no_small_filter) 
    42  AC_ARG_ENABLE(small-filter, 
    43 diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in 
    44 index 145f1d5..be38aeb 100644 
    4531--- a/pjmedia/build/os-auto.mak.in 
    4632+++ b/pjmedia/build/os-auto.mak.in 
     
    5844+export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_TAPI_DEVICE=1 
    5945+endif 
    60 --  
    61 1.7.7.1 
    62  
  • trunk/package/pjsip/patches/0002-register-tapi.patch

    r30520 r32040  
    1 From 455f6f2234a36aeeb97d3e05e9cbe3afad147341 Mon Sep 17 00:00:00 2001 
    2 From: John Crispin <blogic@openwrt.org> 
    3 Date: Sat, 28 Jan 2012 21:43:49 +0100 
    4 Subject: [PATCH 2/3] register tapi 
    5  
    6 --- 
    7  .../pjmedia/src/pjmedia-audiodev/audiodev.c        |    7 + 
    8  .../pjmedia/src/pjmedia-audiodev/tapi_dev.c        | 1300 ++++++++++++++++++++ 
    9  2 files changed, 1307 insertions(+), 0 deletions(-) 
    10  create mode 100644 pjproject-1.12/pjmedia/src/pjmedia-audiodev/tapi_dev.c 
    11  
    12 diff --git a/pjmedia/src/pjmedia-audiodev/audiodev.c b/pjmedia/src/pjmedia-audiodev/audiodev.c 
    13 index 3b7e121..82b364c 100644 
    141--- a/pjmedia/src/pjmedia-audiodev/audiodev.c 
    152+++ b/pjmedia/src/pjmedia-audiodev/audiodev.c 
    16 @@ -98,6 +98,10 @@ pjmedia_aud_dev_factory* pjmedia_symb_mda_factory(pj_pool_factory *pf); 
     3@@ -98,6 +98,10 @@ pjmedia_aud_dev_factory* pjmedia_symb_md 
    174 pjmedia_aud_dev_factory* pjmedia_null_audio_factory(pj_pool_factory *pf); 
    185 #endif 
     
    2512 #define MAX_DEVS       64 
    2613  
    27 @@ -409,6 +413,9 @@ PJ_DEF(pj_status_t) pjmedia_aud_subsys_init(pj_pool_factory *pf) 
     14@@ -409,6 +413,9 @@ PJ_DEF(pj_status_t) pjmedia_aud_subsys_i 
    2815 #if PJMEDIA_AUDIO_DEV_HAS_NULL_AUDIO 
    2916     aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_null_audio_factory; 
     
    3522     /* Initialize each factory and build the device ID list */ 
    3623     for (i=0; i<aud_subsys.drv_cnt; ++i) { 
    37 diff --git a/pjmedia/src/pjmedia-audiodev/tapi_dev.c b/pjmedia/src/pjmedia-audiodev/tapi_dev.c 
    38 new file mode 100644 
    39 index 0000000..2c65a0d 
    4024--- /dev/null 
    4125+++ b/pjmedia/src/pjmedia-audiodev/tapi_dev.c 
    42 @@ -0,0 +1,1300 @@ 
     26@@ -0,0 +1,1307 @@ 
    4327+/****************************************************************************** 
    4428+ 
     
    238222+               tapi_cid_type = IFX_TAPI_CID_STD_KPN_DTMF_FSK; 
    239223+               PJ_LOG(3, (THIS_FILE, "using KPN DTMF FSK configuration for TAPI CID")); 
    240 +       }  
     224+       } 
    241225+} 
    242226+ 
     
    876860+                                       tapi_digit_callback(i, tapiEvent.data.dtmf.ascii); 
    877861+                               break; 
     862+                       case IFX_TAPI_EVENT_PULSE_DIGIT: 
     863+                               if(tapi_digit_callback) 
     864+                                       if(tapiEvent.data.pulse.digit == 0xB) 
     865+                                               tapi_digit_callback(i, '0'); 
     866+                                       else 
     867+                                               tapi_digit_callback(i, '0' + tapiEvent.data.pulse.digit); 
     868+                               break; 
    878869+                       case IFX_TAPI_EVENT_COD_DEC_CHG: 
    879870+                       case IFX_TAPI_EVENT_TONE_GEN_END: 
     
    13411332+ 
    13421333+#endif /* PJMEDIA_AUDIO_DEV_HAS_TAPI_DEVICE */ 
    1343 --  
    1344 1.7.7.1 
    1345  
  • trunk/package/pjsip/patches/0003-adds-PJ_DEF-pj_status_t-pjsua_add_snd_port-int-id.patch

    r30520 r32040  
    1 From 1e0d5dbf8b7714dfd490add0e2b507fd513414f3 Mon Sep 17 00:00:00 2001 
    2 From: John Crispin <blogic@openwrt.org> 
    3 Date: Fri, 3 Feb 2012 21:45:08 +0100 
    4 Subject: [PATCH 3/3] adds PJ_DEF(pj_status_t) pjsua_add_snd_port(int id) 
    5  
    6 --- 
    7  pjproject-1.12/pjsip/include/pjsua-lib/pjsua.h     |    2 + 
    8  .../pjsip/include/pjsua-lib/pjsua_internal.h       |    4 +- 
    9  pjproject-1.12/pjsip/src/pjsua-lib/pjsua_media.c   |   69 ++++++++++++++------ 
    10  3 files changed, 54 insertions(+), 21 deletions(-) 
    11  
    12 diff --git a/pjsip/include/pjsua-lib/pjsua.h b/pjsip/include/pjsua-lib/pjsua.h 
    13 index 85dbbbb..ad3e020 100644 
    141--- a/pjsip/include/pjsua-lib/pjsua.h 
    152+++ b/pjsip/include/pjsua-lib/pjsua.h 
    16 @@ -1543,6 +1543,8 @@ PJ_DECL(pjmedia_endpt*) pjsua_get_pjmedia_endpt(void); 
     3@@ -1543,6 +1543,8 @@ PJ_DECL(pjmedia_endpt*) pjsua_get_pjmedi 
    174 PJ_DECL(pj_pool_factory*) pjsua_get_pool_factory(void); 
    185  
     
    2310 /***************************************************************************** 
    2411  * Utilities. 
    25 diff --git a/pjsip/include/pjsua-lib/pjsua_internal.h b/pjsip/include/pjsua-lib/pjsua_internal.h 
    26 index 6c27826..4ba91ed 100644 
    2712--- a/pjsip/include/pjsua-lib/pjsua_internal.h 
    2813+++ b/pjsip/include/pjsua-lib/pjsua_internal.h 
     
    4530     pjmedia_master_port        *null_snd;  /**< Master port for null sound.    */ 
    4631     pjmedia_port       *null_port; /**< Null port.                     */ 
    47 diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c 
    48 index 7d53cad..8a882f3 100644 
    4932--- a/pjsip/src/pjsua-lib/pjsua_media.c 
    5033+++ b/pjsip/src/pjsua-lib/pjsua_media.c 
     
    5437      */ 
    5538-    if ((pjsua_var.snd_port!=NULL || pjsua_var.null_snd!=NULL) &&  
    56 +    if ((pjsua_var.snd_port[0]!=NULL || pjsua_var.null_snd!=NULL) &&  
     39+    if ((pjsua_var.snd_port[0]!=NULL || pjsua_var.null_snd!=NULL) && 
    5740        pjsua_var.snd_idle_timer.id == PJ_FALSE && 
    5841        pjmedia_conf_get_connect_count(pjsua_var.mconf) == 0 && 
    5942        call_cnt == 0 && 
    60 @@ -2009,7 +2009,7 @@ PJ_DEF(pj_status_t) pjsua_conf_connect( pjsua_conf_port_id source, 
     43@@ -2008,7 +2008,7 @@ PJ_DEF(pj_status_t) pjsua_conf_connect( 
    6144        pj_assert(status == PJ_SUCCESS); 
    6245  
    6346        /* Check if sound device is instantiated. */ 
    6447-       need_reopen = (pjsua_var.snd_port==NULL && pjsua_var.null_snd==NULL &&  
    65 +       need_reopen = (pjsua_var.snd_port[0]==NULL && pjsua_var.null_snd==NULL &&  
     48+       need_reopen = (pjsua_var.snd_port[0]==NULL && pjsua_var.null_snd==NULL && 
    6649                      !pjsua_var.no_snd); 
    6750  
    6851        /* Check if sound device need to reopen because it needs to modify  
    69 @@ -2067,7 +2067,7 @@ PJ_DEF(pj_status_t) pjsua_conf_connect( pjsua_conf_port_id source, 
     52@@ -2072,7 +2072,7 @@ PJ_DEF(pj_status_t) pjsua_conf_connect( 
    7053        /* The bridge version */ 
    7154  
    7255        /* Create sound port if none is instantiated */ 
    7356-       if (pjsua_var.snd_port==NULL && pjsua_var.null_snd==NULL &&  
    74 +       if (pjsua_var.snd_port[0]==NULL && pjsua_var.null_snd==NULL &&  
     57+       if (pjsua_var.snd_port[0]==NULL && pjsua_var.null_snd==NULL && 
    7558            !pjsua_var.no_snd)  
    7659        { 
    7760            pj_status_t status; 
    78 @@ -2679,9 +2679,9 @@ static pj_status_t update_initial_aud_param() 
     61@@ -2686,9 +2686,9 @@ static pj_status_t update_initial_aud_pa 
    7962     pjmedia_aud_param param; 
    8063     pj_status_t status; 
     
    8871     status = pjmedia_aud_stream_get_param(strm, &param); 
    8972     if (status != PJ_SUCCESS) { 
    90 @@ -2747,7 +2747,7 @@ static pj_status_t open_snd_dev(pjmedia_snd_port_param *param) 
     73@@ -2754,7 +2754,7 @@ static pj_status_t open_snd_dev(pjmedia_ 
    9174              1000 / param->base.clock_rate)); 
    9275  
     
    9780        return status; 
    9881  
    99 @@ -2805,13 +2805,13 @@ static pj_status_t open_snd_dev(pjmedia_snd_port_param *param) 
     82@@ -2812,13 +2812,13 @@ static pj_status_t open_snd_dev(pjmedia_ 
    10083     } 
    10184  
    10285     /* Connect sound port to the bridge */ 
    10386-    status = pjmedia_snd_port_connect(pjsua_var.snd_port,        
    104 +    status = pjmedia_snd_port_connect(pjsua_var.snd_port[0],     
     87+    status = pjmedia_snd_port_connect(pjsua_var.snd_port[0], 
    10588                                      conf_port );        
    10689     if (status != PJ_SUCCESS) {          
     
    10992-       pjmedia_snd_port_destroy(pjsua_var.snd_port);     
    11093-       pjsua_var.snd_port = NULL;        
    111 +       pjmedia_snd_port_destroy(pjsua_var.snd_port[0]);          
    112 +       pjsua_var.snd_port[0] = NULL;     
     94+       pjmedia_snd_port_destroy(pjsua_var.snd_port[0]); 
     95+       pjsua_var.snd_port[0] = NULL; 
    11396        return status;    
    11497     } 
    11598  
    116 @@ -2826,7 +2826,7 @@ static pj_status_t open_snd_dev(pjmedia_snd_port_param *param) 
     99@@ -2833,7 +2833,7 @@ static pj_status_t open_snd_dev(pjmedia_ 
    117100        pjmedia_aud_param si; 
    118101         pj_str_t tmp; 
     
    123106        if (status == PJ_SUCCESS) 
    124107            status = pjmedia_aud_dev_get_info(si.rec_id, &rec_info); 
    125 @@ -2869,12 +2869,12 @@ static pj_status_t open_snd_dev(pjmedia_snd_port_param *param) 
     108@@ -2876,12 +2876,12 @@ static pj_status_t open_snd_dev(pjmedia_ 
    126109 static void close_snd_dev(void) 
    127110 { 
     
    138121  
    139122        if (pjmedia_aud_dev_get_info(param.rec_id, &cap_info) != PJ_SUCCESS) 
    140 @@ -2886,9 +2886,9 @@ static void close_snd_dev(void) 
     123@@ -2893,9 +2893,9 @@ static void close_snd_dev(void) 
    141124                             "%s sound capture device", 
    142125                             play_info.name, cap_info.name)); 
     
    151134  
    152135     /* Close null sound device */ 
    153 @@ -2968,6 +2968,35 @@ PJ_DEF(pj_status_t) pjsua_set_snd_dev( int capture_dev, 
     136@@ -2984,6 +2984,35 @@ PJ_DEF(pj_status_t) pjsua_set_snd_dev( i 
    154137     return PJ_SUCCESS; 
    155138 } 
     
    187170 /* 
    188171  * Get currently active sound devices. If sound devices has not been created 
    189 @@ -3054,8 +3083,8 @@ PJ_DEF(pj_status_t) pjsua_set_ec(unsigned tail_ms, unsigned options) 
    190  { 
    191      pjsua_var.media_cfg.ec_tail_len = tail_ms; 
    192   
    193 -    if (pjsua_var.snd_port) 
    194 -       return pjmedia_snd_port_set_ec( pjsua_var.snd_port, pjsua_var.pool, 
    195 +    if (pjsua_var.snd_port[0]) 
    196 +       return pjmedia_snd_port_set_ec( pjsua_var.snd_port[0], pjsua_var.pool, 
    197                                         tail_ms, options); 
     172@@ -3088,7 +3117,7 @@ PJ_DEF(pj_status_t) pjsua_set_ec(unsigne 
     173     pjsua_var.media_cfg.ec_options = options; 
     174  
     175     if (pjsua_var.snd_port) 
     176-       status = pjmedia_snd_port_set_ec(pjsua_var.snd_port, pjsua_var.pool, 
     177+       status = pjmedia_snd_port_set_ec(pjsua_var.snd_port[0], pjsua_var.pool, 
     178                                         tail_ms, options); 
    198179      
    199      return PJ_SUCCESS; 
    200 @@ -3077,7 +3106,7 @@ PJ_DEF(pj_status_t) pjsua_get_ec_tail(unsigned *p_tail_ms) 
     180     PJSUA_UNLOCK(); 
     181@@ -3111,7 +3140,7 @@ PJ_DEF(pj_status_t) pjsua_get_ec_tail(un 
    201182  */ 
    202183 PJ_DEF(pj_bool_t) pjsua_snd_is_active(void) 
     
    207188  
    208189  
    209 @@ -3099,7 +3128,7 @@ PJ_DEF(pj_status_t) pjsua_snd_set_setting( pjmedia_aud_dev_cap cap, 
     190@@ -3135,7 +3164,7 @@ PJ_DEF(pj_status_t) pjsua_snd_set_settin 
    210191     if (pjsua_snd_is_active()) { 
    211192        pjmedia_aud_stream *strm; 
     
    216197     } else { 
    217198        status = PJ_SUCCESS; 
    218 @@ -3137,7 +3166,7 @@ PJ_DEF(pj_status_t) pjsua_snd_get_setting( pjmedia_aud_dev_cap cap, 
     199@@ -3181,7 +3210,7 @@ PJ_DEF(pj_status_t) pjsua_snd_get_settin 
    219200        /* Sound is active, retrieve from device directly */ 
    220201        pjmedia_aud_stream *strm; 
     
    222203-       strm = pjmedia_snd_port_get_snd_stream(pjsua_var.snd_port); 
    223204+       strm = pjmedia_snd_port_get_snd_stream(pjsua_var.snd_port[0]); 
    224         return pjmedia_aud_stream_get_cap(strm, cap, pval); 
     205        status = pjmedia_aud_stream_get_cap(strm, cap, pval); 
    225206     } else { 
    226207        /* Otherwise retrieve from internal param */ 
    227 --  
    228 1.7.7.1 
    229  
Note: See TracChangeset for help on using the changeset viewer.