* #27232: jni: added pjproject checkout as regular git content

We will remove it once the next release of pjsip (with Android support)
comes out and is merged into SFLphone.
diff --git a/jni/pjproject-android/.svn/pristine/ec/ec486f15350c0604f018c88779ba4296a3598d67.svn-base b/jni/pjproject-android/.svn/pristine/ec/ec486f15350c0604f018c88779ba4296a3598d67.svn-base
new file mode 100644
index 0000000..a0ddaf7
--- /dev/null
+++ b/jni/pjproject-android/.svn/pristine/ec/ec486f15350c0604f018c88779ba4296a3598d67.svn-base
@@ -0,0 +1,12 @@
+# $Id$
+#
+from inc_cfg import *
+
+# Different number of ICE components
+test_param = TestParam(
+		"Callee=use ICE, caller=use ICE",
+		[
+			InstanceParam("callee", "--null-audio --use-ice --max-calls=1", enable_buffer=True),
+			InstanceParam("caller", "--null-audio --use-ice --max-calls=1 --ice-no-rtcp", enable_buffer=True)
+		]
+		)
diff --git a/jni/pjproject-android/.svn/pristine/ec/ec735e640275bfa08d71893d644362ebc5100ad2.svn-base b/jni/pjproject-android/.svn/pristine/ec/ec735e640275bfa08d71893d644362ebc5100ad2.svn-base
new file mode 100644
index 0000000..0f8de07
--- /dev/null
+++ b/jni/pjproject-android/.svn/pristine/ec/ec735e640275bfa08d71893d644362ebc5100ad2.svn-base
@@ -0,0 +1,85 @@
+
+                      HOW TO ACTIVATE LIBSAMPLERATE 
+                      (a.k.a SRC/Secret Rabbit Code)
+                AS PJMEDIA'S SAMPLE RATE CONVERSION BACKEND
+
+                                   by
+                              Benny Prijono
+                                  PJSIP
+
+Background
+----------
+   Secret Rabbit Code (aka libsamplerate) is a sample rate conversion
+   library, available from http://www.mega-nerd.com/SRC/index.html.
+   It is licensed under dual license, GPL and proprietary.
+
+   
+Supported Platforms
+-------------------
+   libsamplerate is available for Win32 with Visual Studio and the
+   Makefile based targets (such as Linux, MacOS X, *nix, etc.).
+
+   It's not supported for WinCE/Windows Mobile and Symbian since it is
+   a floating point based implementation.
+
+   
+Installation
+------------
+   - Download libsamplerate from http://www.mega-nerd.com/SRC/index.html
+
+   - Untar libsamplerate-0.1.2.tar.gz into third_party directory
+       cd third_party
+       tar xzf libsamplerate-0.1.2.tar.gz
+
+   - Rename libsamplerate-0.1.2 directory name to libsamplerate
+       On Windows:
+          ren libsamplerate-0.1.2 libsamplerate
+
+       On Linux/Unix/MacOS X:
+          mv libsamplerate-0.1.2 libsamplerate
+
+
+Visual Studio Build
+-------------------
+   For Visual Studio projects, only static linkage is supported 
+   by PJMEDIA build system. If dynamic linking is desired, edit
+   pjmedia/src/pjmedia/resample_libresample.c to prevent it from
+   linking with the static library, and configure your project
+   to link with libsamplerate DLL library.
+ 
+   To build libresample static library with Visual Studio:
+
+      - Open third_party/build/samplerate/libsamplerate_static.dsp
+      - Build the project for both Debug and Release build
+
+
+   libresample dynamic library can be produced by following the
+   instructions in libresample source directory.
+   
+
+Makefile build
+--------------
+   - Build and install libsamplerate (configure && make && make install).
+     Please follow the instructions in libsamplerate documentation.
+
+   - Re-run PJSIP's "configure" script with this option:
+
+       ./configure --enable-libsamplerate
+
+     this will detect the presence of libsamplerate library and add it
+     to the input library list.
+
+
+Enabling libsamplerate for PJMEDIA's resample
+---------------------------------------------
+    For both Visual Studio and Makefile based build system, add this in 
+    config_site.h:
+
+      #define PJMEDIA_RESAMPLE_IMP PJMEDIA_RESAMPLE_LIBSAMPLERATE
+
+
+Limitations
+-----------
+Sample rate 22050 Hz is only supported with 20ms ptime, and sample rate 11025 Hz is only supported with 40ms ptime. This is the limitation of PJMEDIA rather than libsamplerate.
+
+
diff --git a/jni/pjproject-android/.svn/pristine/ec/ec8909a2a0eb1a85655212e7b11cd83f8c191c67.svn-base b/jni/pjproject-android/.svn/pristine/ec/ec8909a2a0eb1a85655212e7b11cd83f8c191c67.svn-base
new file mode 100644
index 0000000..f2e7c2c
--- /dev/null
+++ b/jni/pjproject-android/.svn/pristine/ec/ec8909a2a0eb1a85655212e7b11cd83f8c191c67.svn-base
@@ -0,0 +1,93 @@
+/*
+ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ * Universitaet Berlin.  See the accompanying file "COPYRIGHT" for
+ * details.  THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+ */
+
+/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm2cod.c,v 1.1 1994/10/21 20:52:11 jutta Exp $*/
+
+#include <stdio.h>
+#include <assert.h>
+
+#include	"gsm.h"
+#include	"proto.h"
+
+char  * pname;
+
+int	debug      = 0;
+int	verbosity  = 0;
+int	error      = 0;
+
+usage P0()
+{
+	fprintf(stderr, "Usage: %s [files...]\n", pname);
+	exit(1);
+}
+
+void process P2((f, filename), FILE * f, char * filename)
+{
+	gsm_frame	buf;
+	gsm_signal	source[76];
+
+	int		cc;
+	gsm		r;
+	int		nr=0;
+
+	(void)memset(source, 0, sizeof(source));
+
+	if (!(r = gsm_create())) {
+		perror("gsm_create");
+		error = 1;
+		return ;
+	}
+	gsm_option(r, GSM_OPT_VERBOSE, &verbosity);
+	for (;;) {
+		cc = fread((char *)buf, sizeof(buf), 1, f);
+		if (cc == 0) {
+			gsm_destroy(r);
+			return;
+		}
+		if (cc != 1) {
+			error = 1;
+			fprintf(stderr,
+				"%s: %s -- trailing bytes ignored\n",
+				pname, filename);
+			gsm_destroy(r);
+			return;
+		}
+
+		gsm_explode(r, buf, source);
+		if (write(1, (char *)source, sizeof(source))!= sizeof(source)) {
+
+			perror("write");
+			error = 1;
+			gsm_destroy(r);
+			return;
+		}
+	}
+}
+
+main P2((ac, av), int ac, char ** av)
+{
+	int 		opt;
+	extern char   * optarg;
+	extern int	optind;
+
+	FILE		* f;
+
+	if (!(pname = av[0])) pname = "gsm2cod";
+
+	ac--;
+	av++;
+
+	if (!ac) process(stdin, "*stdin*");
+	else for (; *av; av++) {
+		if (!(f = fopen(*av, "r"))) perror(*av);
+		else {
+			process(f, *av);
+			fclose(f);
+		}
+	}
+
+	exit(error);
+}
diff --git a/jni/pjproject-android/.svn/pristine/ec/ec90e66ec51a4003f6312467870bc48f01c91816.svn-base b/jni/pjproject-android/.svn/pristine/ec/ec90e66ec51a4003f6312467870bc48f01c91816.svn-base
new file mode 100644
index 0000000..fe7c880
--- /dev/null
+++ b/jni/pjproject-android/.svn/pristine/ec/ec90e66ec51a4003f6312467870bc48f01c91816.svn-base
@@ -0,0 +1,31 @@
+/* $Id$ */
+/* 
+ * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
+#ifndef __PJMEDIA_VIDEODEV_H__
+#define __PJMEDIA_VIDEODEV_H__
+
+/**
+ * @file pjmedia_videodev.h
+ * @brief PJMEDIA main header file.
+ */
+
+#include <pjmedia-videodev/videodev.h>
+#include <pjmedia-videodev/videodev_imp.h>
+#include <pjmedia-videodev/avi_dev.h>
+
+#endif	/* __PJMEDIA_VIDEODEV_H__ */
diff --git a/jni/pjproject-android/.svn/pristine/ec/ecadc462764879b3806e9f73b80283b90e1e5e2b.svn-base b/jni/pjproject-android/.svn/pristine/ec/ecadc462764879b3806e9f73b80283b90e1e5e2b.svn-base
new file mode 100644
index 0000000..6c304d2
--- /dev/null
+++ b/jni/pjproject-android/.svn/pristine/ec/ecadc462764879b3806e9f73b80283b90e1e5e2b.svn-base
@@ -0,0 +1,146 @@
+/* $Id$ */
+/* This file has now become GPL. */
+/* Declarations for pj_getopt.
+   Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef __PJ_GETOPT_H__
+#define __PJ_GETOPT_H__ 1
+
+/**
+ * @file getopt.h
+ * @brief Compile time settings
+ */
+
+/**
+ * @defgroup PJLIB_UTIL_GETOPT Getopt
+ * @ingroup PJLIB_TEXT
+ * @{
+ */
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/* For communication from `pj_getopt' to the caller.
+   When `pj_getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+extern char *pj_optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `pj_getopt'.
+
+   On entry to `pj_getopt', zero means this is the first call; initialize.
+
+   When `pj_getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `pj_optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+extern int pj_optind;
+
+/* Set to an option character which was unrecognized.  */
+
+extern int pj_optopt;
+
+/* Describe the long-named options requested by the application.
+   The LONG_OPTIONS argument to pj_getopt_long or pj_getopt_long_only is a vector
+   of `struct pj_getopt_option' terminated by an element containing a name which is
+   zero.
+
+   The field `has_arg' is:
+   no_argument		(or 0) if the option does not take an argument,
+   required_argument	(or 1) if the option requires an argument,
+   optional_argument 	(or 2) if the option takes an optional argument.
+
+   If the field `flag' is not NULL, it points to a variable that is set
+   to the value given in the field `val' when the option is found, but
+   left unchanged if the option is not found.
+
+   To have a long-named option do something other than set an `int' to
+   a compiled-in constant, such as set a value from `pj_optarg', set the
+   option's `flag' field to zero and its `val' field to a nonzero
+   value (the equivalent single-letter option character, if there is
+   one).  For long options that have a zero `flag' field, `pj_getopt'
+   returns the contents of the `val' field.  */
+
+struct pj_getopt_option
+{
+  const char *name;
+  /* has_arg can't be an enum because some compilers complain about
+     type mismatches in all the code that assumes it is an int.  */
+  int has_arg;
+  int *flag;
+  int val;
+};
+
+/* Names for the values of the `has_arg' field of `struct pj_getopt_option'.  */
+
+# define no_argument		0
+# define required_argument	1
+# define optional_argument	2
+
+
+/* Get definitions and prototypes for functions to process the
+   arguments in ARGV (ARGC of them, minus the program name) for
+   options given in OPTS.
+
+   Return the option character from OPTS just read.  Return -1 when
+   there are no more options.  For unrecognized options, or options
+   missing arguments, `pj_optopt' is set to the option letter, and '?' is
+   returned.
+
+   The OPTS string is a list of characters which are recognized option
+   letters, optionally followed by colons, specifying that that letter
+   takes an argument, to be placed in `pj_optarg'.
+
+   If a letter in OPTS is followed by two colons, its argument is
+   optional.  This behavior is specific to the GNU `pj_getopt'.
+
+   The argument `--' causes premature termination of argument
+   scanning, explicitly telling `pj_getopt' that there are no more
+   options.
+
+   If OPTS begins with `--', then non-option arguments are treated as
+   arguments to the option '\0'.  This behavior is specific to the GNU
+   `pj_getopt'.  */
+
+int pj_getopt (int argc, char *const *argv, const char *shortopts);
+
+int pj_getopt_long (int argc, char *const *argv, const char *options,
+		        const struct pj_getopt_option *longopts, int *longind);
+int pj_getopt_long_only (int argc, char *const *argv,
+			     const char *shortopts,
+		             const struct pj_getopt_option *longopts, int *longind);
+
+
+#ifdef	__cplusplus
+}
+#endif
+
+/**
+ * @}
+ */
+
+#endif /* pj_getopt.h */
+
diff --git a/jni/pjproject-android/.svn/pristine/ec/ecce2f05e47751034ea0c5bda2222bcb75e95b98.svn-base b/jni/pjproject-android/.svn/pristine/ec/ecce2f05e47751034ea0c5bda2222bcb75e95b98.svn-base
new file mode 100644
index 0000000..a65981a
--- /dev/null
+++ b/jni/pjproject-android/.svn/pristine/ec/ecce2f05e47751034ea0c5bda2222bcb75e95b98.svn-base
@@ -0,0 +1,105 @@
+// These part may be overwritten by automated test
+// =BEGIN
+#define SND_HAS_APS	0
+#define SND_HAS_VAS	0
+#define SND_HAS_MDA	1
+// =END
+
+TARGET			pjsua.exe
+UID			0x100039CE 0xE44C2D02
+VENDORID	  	0
+TARGETTYPE		exe
+EPOCSTACKSIZE	 	0x5000
+
+SYSTEMINCLUDE 		\epoc32\include \epoc32\include\variant \epoc32\include\ecom
+USERINCLUDE	   	..\inc ..\data
+
+SOURCEPATH		..\data
+START RESOURCE		pjsua.rss
+HEADER
+TARGETPATH 		resource\apps
+END //RESOURCE
+
+START RESOURCE		pjsua_reg.rss
+TARGETPATH 	  	\private\10003a3f\apps
+END //RESOURCE
+
+LIBRARY			euser.lib apparc.lib cone.lib eikcore.lib avkon.lib
+LIBRARY			commonengine.lib efsrv.lib estor.lib eikcoctl.lib eikdlg.lib 
+LIBRARY			eikctl.lib bafl.lib fbscli.lib aknnotify.lib aknicon.lib
+LIBRARY			etext.lib gdi.lib egul.lib insock.lib
+LIBRARY			ecom.lib InetProtUtil.lib http.lib esock.lib
+
+LANG 				01
+
+START BITMAP pjsua.mbm
+	HEADER
+	TARGETPATH \resource\apps
+	SOURCEPATH ..\gfx
+	SOURCE c12,1 list_icon.bmp list_icon_mask.bmp
+	SOURCE c24 pjsua.bmp
+END
+
+SOURCEPATH		..\src
+
+#ifdef ENABLE_ABIV2_MODE
+DEBUGGABLE_UDEBONLY
+#endif
+
+SOURCE pjsuaContainer.cpp PjsuaContainerView.cpp pjsuaApplication.cpp pjsuaDocument.cpp pjsuaAppUi.cpp
+
+
+/* PJSIP library dependencies */
+
+MACRO			PJ_M_I386=1
+MACRO			PJ_SYMBIAN=1
+
+SYSTEMINCLUDE		..\..\..\..\..\pjlib\include
+SYSTEMINCLUDE		..\..\..\..\..\pjlib-util\include
+SYSTEMINCLUDE		..\..\..\..\..\pjnath\include
+SYSTEMINCLUDE		..\..\..\..\..\pjmedia\include
+SYSTEMINCLUDE		..\..\..\..\..\pjsip\include
+
+SYSTEMINCLUDE		\epoc32\include\libc
+
+LIBRARY			estlib.lib charconv.lib hal.lib
+
+STATICLIBRARY		pjsua_lib.lib
+STATICLIBRARY		pjsip_ua.lib pjsip_simple.lib pjsip.lib
+STATICLIBRARY		libgsmcodec.lib libspeexcodec.lib 
+STATICLIBRARY		libg7221codec.lib libpassthroughcodec.lib
+STATICLIBRARY		pjmedia.lib
+STATICLIBRARY		pjmedia_audiodev.lib
+STATICLIBRARY		pjsdp.lib
+STATICLIBRARY		pjnath.lib
+STATICLIBRARY		pjlib_util.lib pjlib.lib
+STATICLIBRARY		libsrtp.lib
+STATICLIBRARY		libresample.lib
+
+/* Sound device (APS/VAS/MDA) library & capability settings */
+#if SND_HAS_APS
+	LIBRARY		APSSession2.lib
+#endif
+
+#if SND_HAS_VAS
+	LIBRARY		VoIPAudioIntfc.lib		
+#endif
+
+#if SND_HAS_MDA
+	LIBRARY 	mediaclientaudiostream.lib
+	LIBRARY 	mediaclientaudioinputstream.lib
+#endif
+
+#if SND_HAS_APS || SND_HAS_VAS
+	CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD
+#else
+	CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment
+#endif
+
+
+/* PJSUA APP */
+
+SOURCEPATH		..\..
+
+SOURCE 			pjsua_app_cli.c pjsua_app_legacy.c
+SOURCE 			pjsua_app.c pjsua_app_common.c pjsua_app_config.c