updated pjsip stack
There is still a bug on incoming calls when buiding for android
diff --git a/jni/pjproject-android/pjsip-apps/build/dummy.c b/jni/pjproject-android/pjsip-apps/build/dummy.c
index 1cb9b48..5da5da3 100644
--- a/jni/pjproject-android/pjsip-apps/build/dummy.c
+++ b/jni/pjproject-android/pjsip-apps/build/dummy.c
@@ -1,4 +1,4 @@
-/* $Id: dummy.c 2660 2009-04-28 19:38:43Z nanang $ */
+/* $Id$ */
/**
* This is an empty C file for helping libpjproject so it gets built properly.
diff --git a/jni/pjproject-android/pjsip-apps/build/get-footprint.py b/jni/pjproject-android/pjsip-apps/build/get-footprint.py
index f936c0c..cb6f686 100644
--- a/jni/pjproject-android/pjsip-apps/build/get-footprint.py
+++ b/jni/pjproject-android/pjsip-apps/build/get-footprint.py
@@ -1,4 +1,4 @@
-# $Id: get-footprint.py 1352 2007-06-08 01:41:25Z bennylp $
+# $Id$
#
# This file is used to generate PJSIP/PJMEDIA footprint report.
# To use this file, just run it in pjsip-apps/build directory, to
diff --git a/jni/pjproject-android/pjsip-apps/src/3rdparty_media_sample/alt_pjsua_aud.c b/jni/pjproject-android/pjsip-apps/src/3rdparty_media_sample/alt_pjsua_aud.c
index fd2bf71..2b85421 100644
--- a/jni/pjproject-android/pjsip-apps/src/3rdparty_media_sample/alt_pjsua_aud.c
+++ b/jni/pjproject-android/pjsip-apps/src/3rdparty_media_sample/alt_pjsua_aud.c
@@ -1,4 +1,4 @@
-/* $Id: alt_pjsua_aud.c 4174 2012-06-21 08:09:53Z bennylp $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/3rdparty_media_sample/alt_pjsua_vid.c b/jni/pjproject-android/pjsip-apps/src/3rdparty_media_sample/alt_pjsua_vid.c
index 08f7aff..aac10e6 100644
--- a/jni/pjproject-android/pjsip-apps/src/3rdparty_media_sample/alt_pjsua_vid.c
+++ b/jni/pjproject-android/pjsip-apps/src/3rdparty_media_sample/alt_pjsua_vid.c
@@ -1,4 +1,4 @@
-/* $Id: alt_pjsua_vid.c 4174 2012-06-21 08:09:53Z bennylp $ */
+/* $Id$ */
/*
* Copyright (C) 2011-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/confbot/confbot.py b/jni/pjproject-android/pjsip-apps/src/confbot/confbot.py
index 572c50c..aa5efbf 100644
--- a/jni/pjproject-android/pjsip-apps/src/confbot/confbot.py
+++ b/jni/pjproject-android/pjsip-apps/src/confbot/confbot.py
@@ -1,4 +1,4 @@
-# $Id: confbot.py 2912 2009-08-24 11:56:13Z bennylp $
+# $Id$
#
# SIP Conference Bot
#
diff --git a/jni/pjproject-android/pjsip-apps/src/confbot/config.py b/jni/pjproject-android/pjsip-apps/src/confbot/config.py
index 9dd31b4..5eadcd7 100644
--- a/jni/pjproject-android/pjsip-apps/src/confbot/config.py
+++ b/jni/pjproject-android/pjsip-apps/src/confbot/config.py
@@ -1,4 +1,4 @@
-# $Id: config.py 2912 2009-08-24 11:56:13Z bennylp $
+# $Id$
#
# Confbot settings
#
diff --git a/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/RootViewController.h b/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/RootViewController.h
index 72627d2..17942a6 100644
--- a/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/RootViewController.h
+++ b/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/RootViewController.h
@@ -1,4 +1,4 @@
-/* $Id: RootViewController.h 3552 2011-05-05 05:50:48Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2010-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/RootViewController.m b/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/RootViewController.m
index e4cfab0..a3be41b 100644
--- a/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/RootViewController.m
+++ b/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/RootViewController.m
@@ -1,4 +1,4 @@
-/* $Id: RootViewController.m 3552 2011-05-05 05:50:48Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2010-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/TestViewController.h b/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/TestViewController.h
index 9cbc057..7186f28 100644
--- a/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/TestViewController.h
+++ b/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/TestViewController.h
@@ -1,4 +1,4 @@
-/* $Id: TestViewController.h 3552 2011-05-05 05:50:48Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2010-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/TestViewController.m b/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/TestViewController.m
index 404a0e8..ae816cc 100644
--- a/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/TestViewController.m
+++ b/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/TestViewController.m
@@ -1,4 +1,4 @@
-/* $Id: TestViewController.m 3552 2011-05-05 05:50:48Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2010-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/ipjsystestAppDelegate.h b/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/ipjsystestAppDelegate.h
index ddce05c..9e357aa 100644
--- a/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/ipjsystestAppDelegate.h
+++ b/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/ipjsystestAppDelegate.h
@@ -1,4 +1,4 @@
-/* $Id: ipjsystestAppDelegate.h 3552 2011-05-05 05:50:48Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2010-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/ipjsystestAppDelegate.m b/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/ipjsystestAppDelegate.m
index f206348..7e2f591 100644
--- a/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/ipjsystestAppDelegate.m
+++ b/jni/pjproject-android/pjsip-apps/src/ipjsystest/Classes/ipjsystestAppDelegate.m
@@ -1,4 +1,4 @@
-/* $Id: ipjsystestAppDelegate.m 3552 2011-05-05 05:50:48Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2010-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/ipjsystest/main.m b/jni/pjproject-android/pjsip-apps/src/ipjsystest/main.m
index 186fe8a..ac38841 100644
--- a/jni/pjproject-android/pjsip-apps/src/ipjsystest/main.m
+++ b/jni/pjproject-android/pjsip-apps/src/ipjsystest/main.m
@@ -1,4 +1,4 @@
-/* $Id: main.m 3552 2011-05-05 05:50:48Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2010-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsua/gui.h b/jni/pjproject-android/pjsip-apps/src/pjsua/gui.h
index f7ad169..21ab748 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsua/gui.h
+++ b/jni/pjproject-android/pjsip-apps/src/pjsua/gui.h
@@ -1,4 +1,4 @@
-/* $Id: gui.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj b/jni/pjproject-android/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj
index 8d1f9d3..5c0b4c6 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj
+++ b/jni/pjproject-android/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj
@@ -420,6 +420,7 @@
);
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
+ VALID_ARCHS = armv7;
WRAPPER_EXTENSION = app;
};
name = Debug;
@@ -454,6 +455,7 @@
);
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
+ VALID_ARCHS = armv7;
WRAPPER_EXTENSION = app;
};
name = Release;
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaAppDelegate.m b/jni/pjproject-android/pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaAppDelegate.m
index 739d88a..5bcf240 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaAppDelegate.m
+++ b/jni/pjproject-android/pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaAppDelegate.m
@@ -151,26 +151,20 @@
}
- (void)keepAlive {
- int i, timeout = KEEP_ALIVE_INTERVAL;
+ int i;
if (!pj_thread_is_registered())
{
pj_thread_register("ipjsua", a_thread_desc, &a_thread);
}
+ /* Since iOS requires that the minimum keep alive interval is 600s,
+ * application needs to make sure that the account's registration
+ * timeout is long enough.
+ */
for (i = 0; i < (int)pjsua_acc_get_count(); ++i) {
if (pjsua_acc_is_valid(i)) {
- pjsua_acc_config acc_cfg;
-
- pjsua_acc_get_config(i, &acc_cfg);
- if (!acc_cfg.reg_uri.slen)
- continue;
- if (acc_cfg.reg_timeout < timeout) {
- acc_cfg.reg_timeout = timeout;
- pjsua_acc_modify(i, &acc_cfg);
- } else {
- pjsua_acc_set_registration(i, PJ_TRUE);
- }
+ pjsua_acc_set_registration(i, PJ_TRUE);
}
}
}
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsua/main.c b/jni/pjproject-android/pjsip-apps/src/pjsua/main.c
index 424b08a..ef89e6b 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsua/main.c
+++ b/jni/pjproject-android/pjsip-apps/src/pjsua/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c 4522 2013-05-23 03:48:31Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app.c b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app.c
index 6257543..2521193 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app.c
+++ b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app.c
@@ -1,4 +1,4 @@
-/* $Id: pjsua_app.c 4525 2013-05-28 12:03:36Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -1279,6 +1279,7 @@
pjsua_transport_id transport_id = -1;
pjsua_transport_config tcp_cfg;
unsigned i;
+ pj_pool_t *tmp_pool;
pj_status_t status;
/** Create pjsua **/
@@ -1288,6 +1289,7 @@
/* Create pool for application */
app_config.pool = pjsua_pool_create("pjsua-app", 1000, 1000);
+ tmp_pool = pjsua_pool_create("tmp-pjsua", 1000, 1000);;
/* Init CLI & its FE settings */
if (!app_running) {
@@ -1299,8 +1301,10 @@
/** Parse args **/
status = load_config(app_cfg.argc, app_cfg.argv, &uri_arg);
- if (status != PJ_SUCCESS)
+ if (status != PJ_SUCCESS) {
+ pj_pool_release(tmp_pool);
return status;
+ }
/* Initialize application callbacks */
app_config.cfg.cb.on_call_state = &on_call_state;
@@ -1339,8 +1343,10 @@
/* Initialize pjsua */
status = pjsua_init(&app_config.cfg, &app_config.log_cfg,
&app_config.media_cfg);
- if (status != PJ_SUCCESS)
+ if (status != PJ_SUCCESS) {
+ pj_pool_release(tmp_pool);
return status;
+ }
/* Initialize our module to handle otherwise unhandled request */
status = pjsip_endpt_register_module(pjsua_get_pjsip_endpt(),
@@ -1587,7 +1593,7 @@
pjsua_acc_add_local(transport_id, PJ_TRUE, &aid);
if (PJMEDIA_HAS_VIDEO) {
pjsua_acc_config acc_cfg;
- pjsua_acc_get_config(aid, &acc_cfg);
+ pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
app_config_init_video(&acc_cfg);
pjsua_acc_modify(aid, &acc_cfg);
}
@@ -1626,7 +1632,7 @@
pjsua_acc_add_local(transport_id, PJ_TRUE, &aid);
if (PJMEDIA_HAS_VIDEO) {
pjsua_acc_config acc_cfg;
- pjsua_acc_get_config(aid, &acc_cfg);
+ pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
app_config_init_video(&acc_cfg);
if (app_config.ipv6)
acc_cfg.ipv6_media_use = PJSUA_IPV6_ENABLED;
@@ -1660,7 +1666,7 @@
pjsua_acc_add_local(transport_id, PJ_TRUE, &aid);
if (PJMEDIA_HAS_VIDEO) {
pjsua_acc_config acc_cfg;
- pjsua_acc_get_config(aid, &acc_cfg);
+ pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
app_config_init_video(&acc_cfg);
pjsua_acc_modify(aid, &acc_cfg);
}
@@ -1685,7 +1691,7 @@
pjsua_acc_add_local(transport_id, PJ_TRUE, &aid);
if (PJMEDIA_HAS_VIDEO) {
pjsua_acc_config acc_cfg;
- pjsua_acc_get_config(aid, &acc_cfg);
+ pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
app_config_init_video(&acc_cfg);
if (app_config.ipv6)
acc_cfg.ipv6_media_use = PJSUA_IPV6_ENABLED;
@@ -1720,7 +1726,7 @@
pjsua_acc_add_local(transport_id, PJ_FALSE, &acc_id);
if (PJMEDIA_HAS_VIDEO) {
pjsua_acc_config acc_cfg;
- pjsua_acc_get_config(acc_id, &acc_cfg);
+ pjsua_acc_get_config(acc_id, tmp_pool, &acc_cfg);
app_config_init_video(&acc_cfg);
pjsua_acc_modify(acc_id, &acc_cfg);
}
@@ -1744,7 +1750,7 @@
pjsua_acc_add_local(transport_id, PJ_TRUE, &aid);
if (PJMEDIA_HAS_VIDEO) {
pjsua_acc_config acc_cfg;
- pjsua_acc_get_config(aid, &acc_cfg);
+ pjsua_acc_get_config(aid, tmp_pool, &acc_cfg);
app_config_init_video(&acc_cfg);
if (app_config.ipv6)
acc_cfg.ipv6_media_use = PJSUA_IPV6_ENABLED;
@@ -1829,9 +1835,11 @@
call_opt.aud_cnt = app_config.aud_cnt;
call_opt.vid_cnt = app_config.vid.vid_cnt;
+ pj_pool_release(tmp_pool);
return PJ_SUCCESS;
on_error:
+ pj_pool_release(tmp_pool);
app_destroy();
return status;
}
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app.h b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app.h
index 568fa76..a9c627b 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app.h
+++ b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app.h
@@ -1,4 +1,4 @@
-/* $Id: pjsua_app.h 4489 2013-04-23 07:53:25Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_cli.c b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_cli.c
index 9d727a5..4247de0 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_cli.c
+++ b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_cli.c
@@ -1,4 +1,4 @@
-/* $Id: pjsua_app_cli.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -2108,9 +2108,11 @@
static pj_status_t cmd_show_account_video()
{
pjsua_acc_config acc_cfg;
+ pj_pool_t *pool = pjsua_pool_create("tmp-pjsua", 1000, 1000);
- pjsua_acc_get_config(current_acc, &acc_cfg);
+ pjsua_acc_get_config(current_acc, pool, &acc_cfg);
app_config_show_video(current_acc, &acc_cfg);
+ pj_pool_release(pool);
return PJ_SUCCESS;
}
@@ -2118,10 +2120,11 @@
{
pjsua_acc_config acc_cfg;
pj_cli_cmd_id cmd_id = pj_cli_get_cmd_id(cval->cmd);
+ pj_pool_t *pool = pjsua_pool_create("tmp-pjsua", 1000, 1000);
CHECK_PJSUA_RUNNING();
- pjsua_acc_get_config(current_acc, &acc_cfg);
+ pjsua_acc_get_config(current_acc, pool, &acc_cfg);
switch(cmd_id) {
case CMD_VIDEO_ACC_AUTORX:
@@ -2148,6 +2151,7 @@
break;
}
modify_video_account(&acc_cfg);
+ pj_pool_release(pool);
return PJ_SUCCESS;
}
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_common.c b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_common.c
index e95d765..2f79cae 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_common.c
+++ b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_common.c
@@ -1,4 +1,4 @@
-/* $Id: pjsua_app_common.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_common.h b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_common.h
index 996ed06..3d2ebc4 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_common.h
+++ b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_common.h
@@ -1,4 +1,4 @@
-/* $Id: pjsua_app_common.h 4489 2013-04-23 07:53:25Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_config.c b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_config.c
index ce06d49..f7450d0 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_config.c
+++ b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_config.c
@@ -1,4 +1,4 @@
-/* $Id: pjsua_app_config.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_config.h b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_config.h
index 216757f..40a24ed 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_config.h
+++ b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_config.h
@@ -1,4 +1,4 @@
-/* $Id: pjsua_app_config.h 4492 2013-04-23 10:59:52Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2013 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_legacy.c b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_legacy.c
index 487236e..30725b5 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_legacy.c
+++ b/jni/pjproject-android/pjsip-apps/src/pjsua/pjsua_app_legacy.c
@@ -1,4 +1,4 @@
-/* $Id: pjsua_app_legacy.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -312,8 +312,9 @@
} else if (strcmp(argv[1], "acc")==0) {
pjsua_acc_config acc_cfg;
pj_bool_t changed = PJ_FALSE;
+ pj_pool_t *tmp_pool = pjsua_pool_create("tmp-pjsua", 1000, 1000);
- pjsua_acc_get_config(current_acc, &acc_cfg);
+ pjsua_acc_get_config(current_acc, tmp_pool, &acc_cfg);
if (argc == 3 && strcmp(argv[2], "show")==0) {
app_config_show_video(current_acc, &acc_cfg);
@@ -334,6 +335,7 @@
acc_cfg.vid_rend_dev = dev;
changed = PJ_TRUE;
} else {
+ pj_pool_release(tmp_pool);
goto on_error;
}
@@ -343,6 +345,7 @@
PJ_PERROR(1,(THIS_FILE, status, "Error modifying account %d",
current_acc));
}
+ pj_pool_release(tmp_pool);
} else if (strcmp(argv[1], "call")==0) {
pjsua_call_vid_strm_op_param param;
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsua/wm/main_wm.c b/jni/pjproject-android/pjsip-apps/src/pjsua/wm/main_wm.c
index d9c2139..311ca77 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsua/wm/main_wm.c
+++ b/jni/pjproject-android/pjsip-apps/src/pjsua/wm/main_wm.c
@@ -1,4 +1,4 @@
-/* $Id: main_wm.c 4492 2013-04-23 10:59:52Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2013 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsystest/gui.h b/jni/pjproject-android/pjsip-apps/src/pjsystest/gui.h
index ae7d8f4..5d3631d 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsystest/gui.h
+++ b/jni/pjproject-android/pjsip-apps/src/pjsystest/gui.h
@@ -1,4 +1,4 @@
-/* $Id: gui.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsystest/main_console.c b/jni/pjproject-android/pjsip-apps/src/pjsystest/main_console.c
index 02aa3f2..6c1aa6e 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsystest/main_console.c
+++ b/jni/pjproject-android/pjsip-apps/src/pjsystest/main_console.c
@@ -1,4 +1,4 @@
-/* $Id: main_console.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsystest/main_wm.c b/jni/pjproject-android/pjsip-apps/src/pjsystest/main_wm.c
index aaaac1e..debe8dd 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsystest/main_wm.c
+++ b/jni/pjproject-android/pjsip-apps/src/pjsystest/main_wm.c
@@ -1,4 +1,4 @@
-/* $Id: main_wm.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsystest/systest.c b/jni/pjproject-android/pjsip-apps/src/pjsystest/systest.c
index b90ce8f..a8ce753 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsystest/systest.c
+++ b/jni/pjproject-android/pjsip-apps/src/pjsystest/systest.c
@@ -1,4 +1,4 @@
-/* $Id: systest.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/pjsystest/systest.h b/jni/pjproject-android/pjsip-apps/src/pjsystest/systest.h
index 9b5aadb..5fe792a 100644
--- a/jni/pjproject-android/pjsip-apps/src/pjsystest/systest.h
+++ b/jni/pjproject-android/pjsip-apps/src/pjsystest/systest.h
@@ -1,4 +1,4 @@
-/* $Id: systest.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/py_pjsua/pjsua_app.py b/jni/pjproject-android/pjsip-apps/src/py_pjsua/pjsua_app.py
index a0fd56c..093b96e 100644
--- a/jni/pjproject-android/pjsip-apps/src/py_pjsua/pjsua_app.py
+++ b/jni/pjproject-android/pjsip-apps/src/py_pjsua/pjsua_app.py
@@ -1,4 +1,4 @@
-# $Id: pjsua_app.py 1438 2007-09-17 15:44:47Z bennylp $
+# $Id$
#
# Sample and simple Python script to make and receive calls, and do
# presence and instant messaging/IM using PJSUA-API binding for Python.
diff --git a/jni/pjproject-android/pjsip-apps/src/py_pjsua/py_pjsua.c b/jni/pjproject-android/pjsip-apps/src/py_pjsua/py_pjsua.c
index 9d22133..2766d17 100644
--- a/jni/pjproject-android/pjsip-apps/src/py_pjsua/py_pjsua.c
+++ b/jni/pjproject-android/pjsip-apps/src/py_pjsua/py_pjsua.c
@@ -1,4 +1,4 @@
-/* $Id: py_pjsua.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/py_pjsua/py_pjsua.h b/jni/pjproject-android/pjsip-apps/src/py_pjsua/py_pjsua.h
index 4068635..43296b9 100644
--- a/jni/pjproject-android/pjsip-apps/src/py_pjsua/py_pjsua.h
+++ b/jni/pjproject-android/pjsip-apps/src/py_pjsua/py_pjsua.h
@@ -1,4 +1,4 @@
-/* $Id: py_pjsua.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/python/_pjsua.c b/jni/pjproject-android/pjsip-apps/src/python/_pjsua.c
index 953a60b..91d8604 100644
--- a/jni/pjproject-android/pjsip-apps/src/python/_pjsua.c
+++ b/jni/pjproject-android/pjsip-apps/src/python/_pjsua.c
@@ -1,4 +1,4 @@
-/* $Id: _pjsua.c 4422 2013-03-06 06:00:18Z ming $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/python/_pjsua.h b/jni/pjproject-android/pjsip-apps/src/python/_pjsua.h
index f2ed780..2ada85b 100644
--- a/jni/pjproject-android/pjsip-apps/src/python/_pjsua.h
+++ b/jni/pjproject-android/pjsip-apps/src/python/_pjsua.h
@@ -1,4 +1,4 @@
-/* $Id: _pjsua.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -1327,6 +1327,12 @@
unsigned port;
PyObject *public_addr;
PyObject *bound_addr;
+ pj_qos_type qos_type;
+ pj_uint8_t qos_params_flags;
+ pj_uint8_t qos_params_dscp_val;
+ pj_uint8_t qos_params_so_prio;
+ pj_qos_wmm_prio qos_params_wmm_prio;
+
} PyObj_pjsua_transport_config;
@@ -1337,7 +1343,7 @@
static void PyObj_pjsua_transport_config_delete(PyObj_pjsua_transport_config* self)
{
Py_XDECREF(self->public_addr);
- Py_XDECREF(self->bound_addr);
+ Py_XDECREF(self->bound_addr);
self->ob_type->tp_free((PyObject*)self);
}
@@ -1349,7 +1355,11 @@
cfg->public_addr = PyString_ToPJ(obj->public_addr);
cfg->bound_addr = PyString_ToPJ(obj->bound_addr);
cfg->port = obj->port;
-
+ cfg->qos_type = obj->qos_type;
+ cfg->qos_params.flags = obj->qos_params_flags;
+ cfg->qos_params.dscp_val = obj->qos_params_dscp_val;
+ cfg->qos_params.so_prio = obj->qos_params_so_prio;
+ cfg->qos_params.wmm_prio = obj->qos_params_wmm_prio;
}
static void PyObj_pjsua_transport_config_import(PyObj_pjsua_transport_config *obj,
@@ -1361,7 +1371,13 @@
Py_XDECREF(obj->bound_addr);
obj->bound_addr = PyString_FromPJ(&cfg->bound_addr);
- obj->port = cfg->port;
+ obj->port = cfg->port;
+ obj->qos_type = cfg->qos_type;
+ obj->qos_params_flags = cfg->qos_params.flags;
+ obj->qos_params_dscp_val = cfg->qos_params.dscp_val;
+ obj->qos_params_so_prio = cfg->qos_params.so_prio;
+ obj->qos_params_wmm_prio = cfg->qos_params.wmm_prio;
+
}
@@ -1381,7 +1397,7 @@
self = (PyObj_pjsua_transport_config *)type->tp_alloc(type, 0);
if (self != NULL) {
self->public_addr = PyString_FromString("");
- self->bound_addr = PyString_FromString("");
+ self->bound_addr = PyString_FromString("");
}
return (PyObject *)self;
@@ -1419,6 +1435,56 @@
"published address of a transport (the public_addr field should be "
"used for that purpose)."
},
+ {
+ "qos_type", T_INT,
+ offsetof(PyObj_pjsua_transport_config, qos_type), 0,
+ "High level traffic classification."
+ "Enumerator:"
+ " 0: PJ_QOS_TYPE_BEST_EFFORT"
+ " Best effort traffic (default value). Any QoS function calls with "
+ " specifying this value are effectively no-op"
+ " 1: PJ_QOS_TYPE_BACKGROUND"
+ " Background traffic."
+ " 2: PJ_QOS_TYPE_VIDEO"
+ " Video traffic."
+ " 3: PJ_QOS_TYPE_VOICE"
+ " Voice traffic."
+ " 4: PJ_QOS_TYPE_CONTROL"
+ " Control traffic."
+ },
+ {
+ "qos_params_flags", T_INT,
+ offsetof(PyObj_pjsua_transport_config, qos_params_flags), 0,
+ "Determines which values to set, bitmask of pj_qos_flag."
+ " PJ_QOS_PARAM_HAS_DSCP = 1"
+ " PJ_QOS_PARAM_HAS_SO_PRIO = 2"
+ " PJ_QOS_PARAM_HAS_WMM = 4"
+ },
+ {
+ "qos_params_dscp_val", T_INT,
+ offsetof(PyObj_pjsua_transport_config, qos_params_dscp_val), 0,
+ "The 6 bits DSCP value to set."
+ "Example: 46=EF, 26=AF31, 24=CS3..."
+ },
+ {
+ "qos_params_so_prio", T_INT,
+ offsetof(PyObj_pjsua_transport_config, qos_params_so_prio), 0,
+ "Socket SO_PRIORITY value."
+ },
+ {
+ "qos_params_wmm_prio", T_INT,
+ offsetof(PyObj_pjsua_transport_config, qos_params_wmm_prio), 0,
+ "Standard WMM priorities."
+ "Enumerator:"
+ " 0: PJ_QOS_WMM_PRIO_BULK_EFFORT"
+ " Bulk effort priority"
+ " 1: PJ_QOS_WMM_PRIO_BULK"
+ " Bulk priority."
+ " 2: PJ_QOS_WMM_PRIO_VIDEO"
+ " Video priority"
+ " 3: PJ_QOS_WMM_PRIO_VOICE"
+ " Voice priority."
+ },
{NULL} /* Sentinel */
};
@@ -1675,6 +1741,7 @@
PyObject *ka_data;
unsigned use_srtp;
unsigned srtp_secure_signaling;
+ PyObject *rtp_transport_cfg;
} PyObj_pjsua_acc_config;
@@ -1694,6 +1761,7 @@
Py_XDECREF(self->contact_params);
Py_XDECREF(self->contact_uri_params);
Py_XDECREF(self->ka_data);
+ Py_XDECREF(self->rtp_transport_cfg);
self->ob_type->tp_free((PyObject*)self);
}
@@ -1727,7 +1795,7 @@
obj->cred_info = (PyListObject *)PyList_New(0);
for (i=0; i<cfg->cred_count; ++i) {
PyObj_pjsip_cred_info * ci;
-
+
ci = (PyObj_pjsip_cred_info *)
PyObj_pjsip_cred_info_new(&PyTyp_pjsip_cred_info,NULL,NULL);
PyObj_pjsip_cred_info_import(ci, &cfg->cred_info[i]);
@@ -1755,6 +1823,12 @@
obj->ka_data = PyString_FromPJ(&cfg->ka_data);
obj->use_srtp = cfg->use_srtp;
obj->srtp_secure_signaling = cfg->srtp_secure_signaling;
+
+ Py_XDECREF(obj->rtp_transport_cfg);
+ PyObj_pjsua_transport_config *tconf;
+ tconf = (PyObj_pjsua_transport_config*) PyObj_pjsua_transport_config_new(&PyTyp_pjsua_transport_config,NULL, NULL);
+ PyObj_pjsua_transport_config_import(tconf, &cfg->rtp_cfg);
+ obj->rtp_transport_cfg = (PyObject *) tconf;
}
static void PyObj_pjsua_acc_config_export(pjsua_acc_config *cfg,
@@ -1784,8 +1858,8 @@
if (cfg->cred_count > PJ_ARRAY_SIZE(cfg->cred_info))
cfg->cred_count = PJ_ARRAY_SIZE(cfg->cred_info);
for (i = 0; i < cfg->cred_count; i++) {
- PyObj_pjsip_cred_info *ci;
- ci = (PyObj_pjsip_cred_info*)
+ PyObj_pjsip_cred_info *ci;
+ ci = (PyObj_pjsip_cred_info*)
PyList_GetItem((PyObject *)obj->cred_info, i);
PyObj_pjsip_cred_info_export(&cfg->cred_info[i], ci);
}
@@ -1805,6 +1879,10 @@
cfg->ka_data = PyString_ToPJ(obj->ka_data);
cfg->use_srtp = obj->use_srtp;
cfg->srtp_secure_signaling = obj->srtp_secure_signaling;
+
+ PyObj_pjsua_transport_config *tconf;
+ tconf = (PyObj_pjsua_transport_config*) obj->rtp_transport_cfg;
+ PyObj_pjsua_transport_config_export(&cfg->rtp_cfg, tconf);
}
@@ -1997,6 +2075,11 @@
offsetof(PyObj_pjsua_acc_config, srtp_secure_signaling), 0,
"Specify if SRTP requires secure signaling to be used."
},
+ {
+ "rtp_transport_cfg", T_OBJECT_EX,
+ offsetof(PyObj_pjsua_acc_config, rtp_transport_cfg), 0,
+ "Transport configuration for RTP."
+ },
{NULL} /* Sentinel */
};
diff --git a/jni/pjproject-android/pjsip-apps/src/python/pjsua.py b/jni/pjproject-android/pjsip-apps/src/python/pjsua.py
index 183ce0e..3ed3bf8 100644
--- a/jni/pjproject-android/pjsip-apps/src/python/pjsua.py
+++ b/jni/pjproject-android/pjsip-apps/src/python/pjsua.py
@@ -1,4 +1,4 @@
-# $Id: pjsua.py 2976 2009-10-29 08:16:46Z bennylp $
+# $Id$
#
# Object oriented PJSUA wrapper.
#
@@ -474,10 +474,43 @@
transport. If empty, the default behavior is to get
the public address from STUN or from the selected
local interface. Format is "host:port".
+ qos_type -- High level traffic classification.
+ Enumerator:
+ 0: PJ_QOS_TYPE_BEST_EFFORT
+ Best effort traffic (default value). Any QoS function calls with
+ specifying this value are effectively no-op
+ 1: PJ_QOS_TYPE_BACKGROUND
+ Background traffic.
+ 2: PJ_QOS_TYPE_VIDEO
+ Video traffic.
+ 3: PJ_QOS_TYPE_VOICE
+ Voice traffic.
+ 4: PJ_QOS_TYPE_CONTROL
+ Control traffic.
+ qos_params_flags -- Determines which values to set, bitmask of pj_qos_flag.
+ PJ_QOS_PARAM_HAS_DSCP = 1
+ PJ_QOS_PARAM_HAS_SO_PRIO = 2
+ PJ_QOS_PARAM_HAS_WMM = 4
+ qos_params_dscp_val -- The 6 bits DSCP value to set.
+ qos_params_so_prio -- Socket SO_PRIORITY value.
+ qos_params_wmm_prio -- Standard WMM priorities.
+ Enumerator:
+ 0: PJ_QOS_WMM_PRIO_BULK_EFFORT: Bulk effort priority
+ 1: PJ_QOS_WMM_PRIO_BULK: Bulk priority.
+ 2: PJ_QOS_WMM_PRIO_VIDEO: Video priority
+ 3: PJ_QOS_WMM_PRIO_VOICE: Voice priority.
"""
port = 0
bound_addr = ""
public_addr = ""
+
+ qos_type = 0
+ qos_params_flags = 0
+ qos_params_dscp_val = 0
+ qos_params_so_prio = 0
+ qos_params_wmm_prio = 0
+
+
def __init__(self, port=0,
bound_addr="", public_addr=""):
@@ -485,11 +518,27 @@
self.bound_addr = bound_addr
self.public_addr = public_addr
+ def _cvt_from_pjsua(self, cfg):
+ self.port = cfg.port
+ self.bound_addr = cfg.bound_addr
+ self.public_addr = cfg.public_addr
+ self.qos_type = cfg.qos_type
+ self.qos_params_flags = cfg.qos_params_flags
+ self.qos_params_dscp_val = cfg.qos_params_dscp_val
+ self.qos_params_so_prio = cfg.qos_params_so_prio
+ self.qos_params_wmm_prio = cfg.qos_params_wmm_prio
+
def _cvt_to_pjsua(self):
cfg = _pjsua.transport_config_default()
cfg.port = self.port
cfg.bound_addr = self.bound_addr
cfg.public_addr = self.public_addr
+ cfg.qos_type = self.qos_type
+ cfg.qos_params_flags = self.qos_params_flags
+ cfg.qos_params_dscp_val = self.qos_params_dscp_val
+ cfg.qos_params_so_prio = self.qos_params_so_prio
+ cfg.qos_params_wmm_prio = self.qos_params_wmm_prio
+
return cfg
@@ -704,6 +753,8 @@
transport is required, 1=hop-by-hop secure
transport such as TLS is required, 2=end-to-
end secure transport is required (i.e. "sips").
+ rtp_transport_cfg -- the rtp-transport-configuration that is usede, when
+ a rtp-connection is being established.
"""
priority = 0
id = ""
@@ -723,6 +774,7 @@
ka_data = "\r\n"
use_srtp = 0
srtp_secure_signaling = 1
+ rtp_transport_cfg = None
def __init__(self, domain="", username="", password="",
display="", registrar="", proxy=""):
@@ -748,9 +800,10 @@
if domain!="":
self.build_config(domain, username, password,
display, registrar, proxy)
+ self.rtp_transport_cfg = _pjsua.transport_config_default()
def build_config(self, domain, username, password, display="",
- registrar="", proxy=""):
+ registrar="", proxy="", rtp_transport_cfg = None):
"""
Construct account config. If domain argument is specified,
a typical configuration will be built.
@@ -784,6 +837,11 @@
self.proxy.append(proxy)
if username != "":
self.auth_cred.append(AuthCred("*", username, password))
+
+ if (rtp_transport_cfg is not None):
+ self.rtp_transport_cfg = rtp_transport_cfg
+ else:
+ self.rtp_transport_cfg = _pjsua.Transport_Config()
def _cvt_from_pjsua(self, cfg):
self.priority = cfg.priority
@@ -807,6 +865,8 @@
self.ka_data = cfg.ka_data
self.use_srtp = cfg.use_srtp
self.srtp_secure_signaling = cfg.srtp_secure_signaling
+ if (self.rtp_transport_cfg is not None):
+ self.rtp_transport_cfg._cvt_from_pjsua(cfg.rtp_transport_cfg)
def _cvt_to_pjsua(self):
cfg = _pjsua.acc_config_default()
@@ -827,6 +887,7 @@
c.data_type = cred.passwd_type
c.data = cred.passwd
cfg.cred_info.append(c)
+
cfg.auth_initial_send = self.auth_initial_send
cfg.auth_initial_algorithm = self.auth_initial_algorithm
cfg.transport_id = self.transport_id
@@ -835,6 +896,9 @@
cfg.ka_data = self.ka_data
cfg.use_srtp = self.use_srtp
cfg.srtp_secure_signaling = self.srtp_secure_signaling
+
+ cfg.rtp_transport_cfg = self.rtp_transport_cfg._cvt_to_pjsua()
+
return cfg
diff --git a/jni/pjproject-android/pjsip-apps/src/python/samples/call.py b/jni/pjproject-android/pjsip-apps/src/python/samples/call.py
index 60f9065..89cbb1c 100644
--- a/jni/pjproject-android/pjsip-apps/src/python/samples/call.py
+++ b/jni/pjproject-android/pjsip-apps/src/python/samples/call.py
@@ -1,4 +1,4 @@
-# $Id: call.py 2171 2008-07-24 09:01:33Z bennylp $
+# $Id$
#
# SIP call sample.
#
diff --git a/jni/pjproject-android/pjsip-apps/src/python/samples/presence.py b/jni/pjproject-android/pjsip-apps/src/python/samples/presence.py
index afeaeab..a9ee8dd 100644
--- a/jni/pjproject-android/pjsip-apps/src/python/samples/presence.py
+++ b/jni/pjproject-android/pjsip-apps/src/python/samples/presence.py
@@ -1,4 +1,4 @@
-# $Id: presence.py 2171 2008-07-24 09:01:33Z bennylp $
+# $Id$
#
# Presence and instant messaging
#
diff --git a/jni/pjproject-android/pjsip-apps/src/python/samples/registration.py b/jni/pjproject-android/pjsip-apps/src/python/samples/registration.py
index 06670da..6c07e96 100644
--- a/jni/pjproject-android/pjsip-apps/src/python/samples/registration.py
+++ b/jni/pjproject-android/pjsip-apps/src/python/samples/registration.py
@@ -1,4 +1,4 @@
-# $Id: registration.py 2171 2008-07-24 09:01:33Z bennylp $
+# $Id$
#
# SIP account and registration sample. In this sample, the program
# will block to wait until registration is complete
diff --git a/jni/pjproject-android/pjsip-apps/src/python/samples/simplecall.py b/jni/pjproject-android/pjsip-apps/src/python/samples/simplecall.py
index 40ac28f..4b5cd71 100644
--- a/jni/pjproject-android/pjsip-apps/src/python/samples/simplecall.py
+++ b/jni/pjproject-android/pjsip-apps/src/python/samples/simplecall.py
@@ -1,4 +1,4 @@
-# $Id: simplecall.py 2171 2008-07-24 09:01:33Z bennylp $
+# $Id$
#
# SIP account and registration sample. In this sample, the program
# will block to wait until registration is complete
diff --git a/jni/pjproject-android/pjsip-apps/src/python/setup-vc.py b/jni/pjproject-android/pjsip-apps/src/python/setup-vc.py
index cab1498..82c5475 100644
--- a/jni/pjproject-android/pjsip-apps/src/python/setup-vc.py
+++ b/jni/pjproject-android/pjsip-apps/src/python/setup-vc.py
@@ -1,4 +1,4 @@
-# $Id: setup-vc.py 4122 2012-05-14 11:04:46Z bennylp $
+# $Id$
#
# pjsua Setup script for Visual Studio
#
diff --git a/jni/pjproject-android/pjsip-apps/src/python/setup.py b/jni/pjproject-android/pjsip-apps/src/python/setup.py
index 9eaed9d..69a9859 100644
--- a/jni/pjproject-android/pjsip-apps/src/python/setup.py
+++ b/jni/pjproject-android/pjsip-apps/src/python/setup.py
@@ -1,4 +1,4 @@
-# $Id: setup.py 4232 2012-08-20 06:01:41Z ming $
+# $Id$
#
# pjsua Setup script.
#
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/aectest.c b/jni/pjproject-android/pjsip-apps/src/samples/aectest.c
index 8991fec..645fd88 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/aectest.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/aectest.c
@@ -1,4 +1,4 @@
-/* $Id: aectest.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/auddemo.c b/jni/pjproject-android/pjsip-apps/src/samples/auddemo.c
index c4e3562..48bcad4 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/auddemo.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/auddemo.c
@@ -1,4 +1,4 @@
-/* $Id: auddemo.c 3664 2011-07-19 03:42:28Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/aviplay.c b/jni/pjproject-android/pjsip-apps/src/samples/aviplay.c
index 018a308..35b0504 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/aviplay.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/aviplay.c
@@ -1,4 +1,4 @@
-/* $Id: aviplay.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2010-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/confbench.c b/jni/pjproject-android/pjsip-apps/src/samples/confbench.c
index b91aebb..84305f6 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/confbench.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/confbench.c
@@ -1,4 +1,4 @@
-/* $Id: confbench.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/confsample.c b/jni/pjproject-android/pjsip-apps/src/samples/confsample.c
index 79b3a9a..de9c29f 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/confsample.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/confsample.c
@@ -1,4 +1,4 @@
-/* $Id: confsample.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/debug.c b/jni/pjproject-android/pjsip-apps/src/samples/debug.c
index 1d38f9a..6f79d9f 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/debug.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/debug.c
@@ -1,4 +1,4 @@
-/* $Id: debug.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/encdec.c b/jni/pjproject-android/pjsip-apps/src/samples/encdec.c
index 9ded990..117497b 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/encdec.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/encdec.c
@@ -1,4 +1,4 @@
-/* $Id: encdec.c 3664 2011-07-19 03:42:28Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/footprint.c b/jni/pjproject-android/pjsip-apps/src/samples/footprint.c
index 241ba1e..9b66687 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/footprint.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/footprint.c
@@ -1,4 +1,4 @@
-/* $Id: footprint.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/httpdemo.c b/jni/pjproject-android/pjsip-apps/src/samples/httpdemo.c
index 6b2bf8e..a119011 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/httpdemo.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/httpdemo.c
@@ -1,4 +1,4 @@
-/* $Id: httpdemo.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/icedemo.c b/jni/pjproject-android/pjsip-apps/src/samples/icedemo.c
index e851fef..4cb9f22 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/icedemo.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/icedemo.c
@@ -1,4 +1,4 @@
-/* $Id: icedemo.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/invtester.c b/jni/pjproject-android/pjsip-apps/src/samples/invtester.c
index a1eb413..f1f5a20 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/invtester.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/invtester.c
@@ -1,4 +1,4 @@
-/* $Id: invtester.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/jbsim.c b/jni/pjproject-android/pjsip-apps/src/samples/jbsim.c
index 510f67c..27b1128 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/jbsim.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/jbsim.c
@@ -1,4 +1,4 @@
-/* $Id: jbsim.c 3664 2011-07-19 03:42:28Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/latency.c b/jni/pjproject-android/pjsip-apps/src/samples/latency.c
index fdade1f..c9192b5 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/latency.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/latency.c
@@ -1,4 +1,4 @@
-/* $Id: latency.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/level.c b/jni/pjproject-android/pjsip-apps/src/samples/level.c
index 59bbb96..6bba3fe 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/level.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/level.c
@@ -1,4 +1,4 @@
-/* $Id: level.c 3664 2011-07-19 03:42:28Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/mix.c b/jni/pjproject-android/pjsip-apps/src/samples/mix.c
index c8e224f..cc139f7 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/mix.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/mix.c
@@ -1,4 +1,4 @@
-/* $Id: mix.c 3664 2011-07-19 03:42:28Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/pcaputil.c b/jni/pjproject-android/pjsip-apps/src/samples/pcaputil.c
index 3eb1603..bb23112 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/pcaputil.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/pcaputil.c
@@ -1,4 +1,4 @@
-/* $Id: pcaputil.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/pjsip-perf.c b/jni/pjproject-android/pjsip-apps/src/samples/pjsip-perf.c
index 51023d6..2a435cf 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/pjsip-perf.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/pjsip-perf.c
@@ -1,4 +1,4 @@
-/* $Id: pjsip-perf.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/playfile.c b/jni/pjproject-android/pjsip-apps/src/samples/playfile.c
index 778b3e5..10116ff 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/playfile.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/playfile.c
@@ -1,4 +1,4 @@
-/* $Id: playfile.c 3664 2011-07-19 03:42:28Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/playsine.c b/jni/pjproject-android/pjsip-apps/src/samples/playsine.c
index 03d8946..92491f1 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/playsine.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/playsine.c
@@ -1,4 +1,4 @@
-/* $Id: playsine.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/proxy.h b/jni/pjproject-android/pjsip-apps/src/samples/proxy.h
index 257fd1f..93be0a8 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/proxy.h
+++ b/jni/pjproject-android/pjsip-apps/src/samples/proxy.h
@@ -1,4 +1,4 @@
-/* $Id: proxy.h 4370 2013-02-26 05:30:00Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/recfile.c b/jni/pjproject-android/pjsip-apps/src/samples/recfile.c
index fedd5c6..60ca4e4 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/recfile.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/recfile.c
@@ -1,4 +1,4 @@
-/* $Id: recfile.c 3664 2011-07-19 03:42:28Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/resampleplay.c b/jni/pjproject-android/pjsip-apps/src/samples/resampleplay.c
index c73b2e3..5a40e30 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/resampleplay.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/resampleplay.c
@@ -1,4 +1,4 @@
-/* $Id: resampleplay.c 3664 2011-07-19 03:42:28Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/simple_pjsua.c b/jni/pjproject-android/pjsip-apps/src/samples/simple_pjsua.c
index 7716f7f..5cd0ce1 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/simple_pjsua.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/simple_pjsua.c
@@ -1,4 +1,4 @@
-/* $Id: simple_pjsua.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/simpleua.c b/jni/pjproject-android/pjsip-apps/src/samples/simpleua.c
index 2906323..68c50b9 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/simpleua.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/simpleua.c
@@ -1,4 +1,4 @@
-/* $Id: simpleua.c 4051 2012-04-13 08:16:30Z ming $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/sipecho.c b/jni/pjproject-android/pjsip-apps/src/samples/sipecho.c
index dce4534..6c5244d 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/sipecho.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/sipecho.c
@@ -1,4 +1,4 @@
-/* $Id: sipecho.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/siprtp.c b/jni/pjproject-android/pjsip-apps/src/samples/siprtp.c
index b60473e..f783b6a 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/siprtp.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/siprtp.c
@@ -1,4 +1,4 @@
-/* $Id: siprtp.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/siprtp_report.c b/jni/pjproject-android/pjsip-apps/src/samples/siprtp_report.c
index 6643f9d..79cd75b 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/siprtp_report.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/siprtp_report.c
@@ -1,4 +1,4 @@
-/* $Id: siprtp_report.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/sipstateless.c b/jni/pjproject-android/pjsip-apps/src/samples/sipstateless.c
index 0de89a6..5e939ab 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/sipstateless.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/sipstateless.c
@@ -1,4 +1,4 @@
-/* $Id: sipstateless.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/stateful_proxy.c b/jni/pjproject-android/pjsip-apps/src/samples/stateful_proxy.c
index 0d84353..3e87036 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/stateful_proxy.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/stateful_proxy.c
@@ -1,4 +1,4 @@
-/* $Id: stateful_proxy.c 4420 2013-03-05 11:59:54Z bennylp $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/stateless_proxy.c b/jni/pjproject-android/pjsip-apps/src/samples/stateless_proxy.c
index 826385c..c1047c3 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/stateless_proxy.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/stateless_proxy.c
@@ -1,4 +1,4 @@
-/* $Id: stateless_proxy.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/stereotest.c b/jni/pjproject-android/pjsip-apps/src/samples/stereotest.c
index 8931270..ab552f9 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/stereotest.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/stereotest.c
@@ -1,4 +1,4 @@
-/* $Id: stereotest.c 3664 2011-07-19 03:42:28Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/streamutil.c b/jni/pjproject-android/pjsip-apps/src/samples/streamutil.c
index c899c2a..ee357b3 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/streamutil.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/streamutil.c
@@ -1,4 +1,4 @@
-/* $Id: streamutil.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/strerror.c b/jni/pjproject-android/pjsip-apps/src/samples/strerror.c
index b03e8c1..e6d94f1 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/strerror.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/strerror.c
@@ -1,4 +1,4 @@
-/* $Id: strerror.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/tonegen.c b/jni/pjproject-android/pjsip-apps/src/samples/tonegen.c
index ea9480b..efd4a31 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/tonegen.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/tonegen.c
@@ -1,4 +1,4 @@
-/* $Id: tonegen.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/util.h b/jni/pjproject-android/pjsip-apps/src/samples/util.h
index e68056f..4529fad 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/util.h
+++ b/jni/pjproject-android/pjsip-apps/src/samples/util.h
@@ -1,4 +1,4 @@
-/* $Id: util.h 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/samples/vid_streamutil.c b/jni/pjproject-android/pjsip-apps/src/samples/vid_streamutil.c
index 6b250b9..f9f0a0d 100644
--- a/jni/pjproject-android/pjsip-apps/src/samples/vid_streamutil.c
+++ b/jni/pjproject-android/pjsip-apps/src/samples/vid_streamutil.c
@@ -1,4 +1,4 @@
-/* $Id: vid_streamutil.c 4537 2013-06-19 06:47:43Z riza $ */
+/* $Id$ */
/*
* Copyright (C) 2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/symsndtest/app_main.cpp b/jni/pjproject-android/pjsip-apps/src/symsndtest/app_main.cpp
index d4f5523..aaa9512 100644
--- a/jni/pjproject-android/pjsip-apps/src/symsndtest/app_main.cpp
+++ b/jni/pjproject-android/pjsip-apps/src/symsndtest/app_main.cpp
@@ -1,4 +1,4 @@
-/* $Id: app_main.cpp 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/symsndtest/main_symbian.cpp b/jni/pjproject-android/pjsip-apps/src/symsndtest/main_symbian.cpp
index d160a6c..6f29915 100644
--- a/jni/pjproject-android/pjsip-apps/src/symsndtest/main_symbian.cpp
+++ b/jni/pjproject-android/pjsip-apps/src/symsndtest/main_symbian.cpp
@@ -1,4 +1,4 @@
-/* $Id: main_symbian.cpp 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id$ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjsip-apps/src/vidgui/vidgui.cpp b/jni/pjproject-android/pjsip-apps/src/vidgui/vidgui.cpp
index 9e1d540..4a0b4d7 100644
--- a/jni/pjproject-android/pjsip-apps/src/vidgui/vidgui.cpp
+++ b/jni/pjproject-android/pjsip-apps/src/vidgui/vidgui.cpp
@@ -1,4 +1,4 @@
-/* $Id: vidgui.cpp 4060 2012-04-17 09:55:30Z ming $ */
+/* $Id$ */
/*
* Copyright (C) 2011-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/vidgui/vidgui.h b/jni/pjproject-android/pjsip-apps/src/vidgui/vidgui.h
index 7b7ce7b..1cc2746 100644
--- a/jni/pjproject-android/pjsip-apps/src/vidgui/vidgui.h
+++ b/jni/pjproject-android/pjsip-apps/src/vidgui/vidgui.h
@@ -1,4 +1,4 @@
-/* $Id: vidgui.h 3926 2011-12-27 12:50:17Z bennylp $ */
+/* $Id$ */
/*
* Copyright (C) 2011-2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/vidgui/vidwin.cpp b/jni/pjproject-android/pjsip-apps/src/vidgui/vidwin.cpp
index 1caee89..3e38b6c 100644
--- a/jni/pjproject-android/pjsip-apps/src/vidgui/vidwin.cpp
+++ b/jni/pjproject-android/pjsip-apps/src/vidgui/vidwin.cpp
@@ -1,4 +1,4 @@
-/* $Id: vidwin.cpp 4060 2012-04-17 09:55:30Z ming $ */
+/* $Id$ */
/*
* Copyright (C) 2011 Teluu Inc. (http://www.teluu.com)
*
diff --git a/jni/pjproject-android/pjsip-apps/src/vidgui/vidwin.h b/jni/pjproject-android/pjsip-apps/src/vidgui/vidwin.h
index 3ab10b2..8ab4a76 100644
--- a/jni/pjproject-android/pjsip-apps/src/vidgui/vidwin.h
+++ b/jni/pjproject-android/pjsip-apps/src/vidgui/vidwin.h
@@ -1,4 +1,4 @@
-/* $Id: vidwin.h 4060 2012-04-17 09:55:30Z ming $ */
+/* $Id$ */
/*
* Copyright (C) 2011 Teluu Inc. (http://www.teluu.com)
*