sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re #1509: backported r4112-4121 

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@4122 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Benny Prijono 2012-05-14 11:04:46 +00:00
parent c8f451b884
commit 6de7667289
6 changed files with 74 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pjmedia/src/pjmedia/conf_switch.c
View File

@ -546,7 +546,7 @@ PJ_DEF(pj_status_t) pjmedia_conf_connect_port( pjmedia_conf *conf,
/* Channel count must match. */
if (src_afd->channel_count != dst_afd->channel_count) {
pj_mutex_unlock(conf->mutex);
return PJMEDIA_ENCCLOCKRATE;
return PJMEDIA_ENCCHANNEL;
}
/* Source and sink ptime must be equal or a multiplication factor. */

1
pjmedia/src/pjmedia/wav_player.c
View File

@ -157,6 +157,7 @@ static pj_status_t fill_buffer(struct file_reader_port *fport)
int val = pjmedia_linear2alaw(0);
pj_memset(fport->eofpos, val, size_left);
}
size_left = 0;
}
/* Rewind file */

38
pjsip-apps/src/python/setup-vc.py
View File

@ -24,17 +24,43 @@ import sys
# Find version
pj_version=""
f = open('../../../pjlib/src/pj/config.c', 'r')
pj_version_major=""
pj_version_minor=""
pj_version_rev=""
pj_version_suffix=""
f = open('../../../version.mak', 'r')
for line in f:
if line.find("PJ_VERSION") != -1:
pj_version = line.split("=")[1].strip('";\r\n ')
break
if line.find("export PJ_VERSION_MAJOR") != -1:
tokens=line.split("=")
if len(tokens)>1:
pj_version_major= tokens[1].strip()
elif line.find("export PJ_VERSION_MINOR") != -1:
tokens=line.split("=")
if len(tokens)>1:
pj_version_minor= line.split("=")[1].strip()
elif line.find("export PJ_VERSION_REV") != -1:
tokens=line.split("=")
if len(tokens)>1:
pj_version_rev= line.split("=")[1].strip()
elif line.find("export PJ_VERSION_SUFFIX") != -1:
tokens=line.split("=")
if len(tokens)>1:
pj_version_suffix= line.split("=")[1].strip()
f.close()
if pj_version=="":
print 'Unable to get PJ_pj_version'
if not pj_version_major:
print 'Unable to get PJ_VERSION_MAJOR'
sys.exit(1)
pj_version = pj_version_major + "." + pj_version_minor
if pj_version_rev:
pj_version += "." + pj_version_rev
if pj_version_suffix:
pj_version += "-" + pj_version_suffix
#print 'PJ_VERSION = "'+ pj_version + '"'
# Check that extension has been built
if not os.access('../../lib/_pjsua.pyd', os.R_OK):
print 'Error: file "../../lib/_pjsua.pyd" does not exist!'

37
pjsip-apps/src/python/setup.py
View File

@ -25,15 +25,40 @@ import platform
# find pjsip version
pj_version=""
f = open('../../../pjlib/src/pj/config.c', 'r')
pj_version_major=""
pj_version_minor=""
pj_version_rev=""
pj_version_suffix=""
f = open('../../../version.mak', 'r')
for line in f:
if line.find("PJ_VERSION") != -1:
pj_version= line.split(" = ")[1].strip('";\r\n')
break
if line.find("export PJ_VERSION_MAJOR") != -1:
tokens=line.split("=")
if len(tokens)>1:
pj_version_major= tokens[1].strip()
elif line.find("export PJ_VERSION_MINOR") != -1:
tokens=line.split("=")
if len(tokens)>1:
pj_version_minor= line.split("=")[1].strip()
elif line.find("export PJ_VERSION_REV") != -1:
tokens=line.split("=")
if len(tokens)>1:
pj_version_rev= line.split("=")[1].strip()
elif line.find("export PJ_VERSION_SUFFIX") != -1:
tokens=line.split("=")
if len(tokens)>1:
pj_version_suffix= line.split("=")[1].strip()
f.close()
if pj_version=="":
print 'Unable to get PJ_VERSION'
if not pj_version_major:
print 'Unable to get PJ_VERSION_MAJOR'
sys.exit(1)
pj_version = pj_version_major + "." + pj_version_minor
if pj_version_rev:
pj_version += "." + pj_version_rev
if pj_version_suffix:
pj_version += "-" + pj_version_suffix
#print 'PJ_VERSION = "'+ pj_version + '"'

12
pjsip/src/pjsua-lib/pjsua_core.c
View File

@ -2194,7 +2194,7 @@ PJ_DEF(pj_status_t) pjsua_transport_get_info( pjsua_transport_id id,
PJSUA_LOCK();
if (pjsua_var.tpdata[id].type == PJSIP_TRANSPORT_UDP) {
if (t->type == PJSIP_TRANSPORT_UDP) {
pjsip_transport *tp = t->data.tp;
@ -2215,7 +2215,9 @@ PJ_DEF(pj_status_t) pjsua_transport_get_info( pjsua_transport_id id,
status = PJ_SUCCESS;
} else if (pjsua_var.tpdata[id].type == PJSIP_TRANSPORT_TCP) {
} else if (t->type == PJSIP_TRANSPORT_TCP ||
t->type == PJSIP_TRANSPORT_TLS)
{
pjsip_tpfactory *factory = t->data.factory;
@ -2226,8 +2228,10 @@ PJ_DEF(pj_status_t) pjsua_transport_get_info( pjsua_transport_id id,
info->id = id;
info->type = t->type;
info->type_name = pj_str("TCP");
info->info = pj_str("TCP transport");
info->type_name = (t->type==PJSIP_TRANSPORT_TCP)? pj_str("TCP"):
pj_str("TLS");
info->info = (t->type==PJSIP_TRANSPORT_TCP)? pj_str("TCP transport"):
pj_str("TLS transport");
info->flag = factory->flag;
info->addr_len = sizeof(factory->local_addr);
info->local_addr = factory->local_addr;

1
version.mak
View File

@ -1,3 +1,4 @@
# Don't change the "export PJ_VERSION_xxx" style, they are parsed by setup.py
export PJ_VERSION_MAJOR := 2
export PJ_VERSION_MINOR := 0
export PJ_VERSION_REV :=