summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2015-03-25 03:41:21 +0000
committerNanang Izzuddin <nanang@teluu.com>2015-03-25 03:41:21 +0000
commitff540bc450f62370b1797805dfcf14e90fe9c99d (patch)
tree89ee497ab34bef1fe871ea5e8321ed53951bafc6
parent50c8b6b2dcc626f28f1b1740a6abf6f0434b6c31 (diff)
Re #1823: Video settings on sample apps:
- enabled video on pjsua CLI if video is configured - enabled video auto-rx/tx of any account on pjsua2 sample app git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5022 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjsip-apps/src/pjsua/pjsua_app_config.h5
-rw-r--r--pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java2
-rw-r--r--pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java6
3 files changed, 12 insertions, 1 deletions
diff --git a/pjsip-apps/src/pjsua/pjsua_app_config.h b/pjsip-apps/src/pjsua/pjsua_app_config.h
index 40a24edf..a010c8b5 100644
--- a/pjsip-apps/src/pjsua/pjsua_app_config.h
+++ b/pjsip-apps/src/pjsua/pjsua_app_config.h
@@ -29,13 +29,16 @@
const char *pjsua_app_def_argv[] = { "pjsua",
"--use-cli",
"--no-cli-console",
+ "--quality=4",
+#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO
+ "--video",
+#endif
#if defined(PJ_SYMBIAN) && PJ_SYMBIAN
/* Can't reuse address on E52 */
"--cli-telnet-port=0",
#else
"--cli-telnet-port=2323",
#endif
- "--quality=4",
#if defined(PJ_CONFIG_BB10) && PJ_CONFIG_BB10
"--add-buddy=sip:169.254.0.2",
#endif
diff --git a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java b/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java
index 990e0c23..3ae46338 100644
--- a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java
+++ b/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java
@@ -107,6 +107,8 @@ public class MainActivity extends Activity
accCfg = new AccountConfig();
accCfg.setIdUri("sip:localhost");
accCfg.getNatConfig().setIceEnabled(true);
+ accCfg.getVideoConfig().setAutoTransmitOutgoing(true);
+ accCfg.getVideoConfig().setAutoShowIncoming(true);
account = app.addAcc(accCfg);
} else {
account = app.accList.get(0);
diff --git a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java b/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java
index 36dbc1dd..846235d5 100644
--- a/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java
+++ b/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MyApp.java
@@ -385,6 +385,12 @@ class MyApp {
/* Create accounts. */
for (int i = 0; i < accCfgs.size(); i++) {
MyAccountConfig my_cfg = accCfgs.get(i);
+
+ /* Customize account config */
+ my_cfg.accCfg.getNatConfig().setIceEnabled(true);
+ my_cfg.accCfg.getVideoConfig().setAutoTransmitOutgoing(true);
+ my_cfg.accCfg.getVideoConfig().setAutoShowIncoming(true);
+
MyAccount acc = addAcc(my_cfg.accCfg);
if (acc == null)
continue;