diff options
| -rw-r--r-- | build.symbian/bld.inf | 1 | ||||
| -rw-r--r-- | build.symbian/libgsmcodec.mmp | 70 | ||||
| -rw-r--r-- | build.symbian/symbian_ua.mmp | 2 | ||||
| -rw-r--r-- | pjlib/include/pj/config_site_sample.h | 4 | ||||
| -rw-r--r-- | pjsip-apps/src/symbian_ua/ua.cpp | 16 |
5 files changed, 83 insertions, 10 deletions
diff --git a/build.symbian/bld.inf b/build.symbian/bld.inf index 678d0752..8adc54c8 100644 --- a/build.symbian/bld.inf +++ b/build.symbian/bld.inf @@ -15,6 +15,7 @@ pjsip.mmp pjsip_simple.mmp pjsip_ua.mmp pjsua_lib.mmp +libgsmcodec.mmp pjlib_test.mmp symbian_ua.mmp diff --git a/build.symbian/libgsmcodec.mmp b/build.symbian/libgsmcodec.mmp new file mode 100644 index 00000000..754bceac --- /dev/null +++ b/build.symbian/libgsmcodec.mmp @@ -0,0 +1,70 @@ +#if defined(PJ_BUILD_DLL) + +TARGET libgsmcodec.dll +TARGETTYPE dll +UID 0x0 0xA000000F + +CAPABILITY None +LIBRARY pjlib.lib euser.lib estlib.lib +MACRO PJ_DLL +MACRO PJ_EXPORTING + +DEFFILE .\libgsmcodec.def + +#else + +TARGET libgsmcodec.lib +TARGETTYPE lib + +#endif + +//OPTION CW -lang c++ + +MACRO PJ_M_I386=1 +MACRO PJ_SYMBIAN=1 + +// +// GSM codec third party source +// + +SOURCEPATH ..\third_party\gsm\src + +SOURCE add.c +SOURCE code.c +SOURCE debug.c +SOURCE decode.c +SOURCE gsm_create.c +SOURCE gsm_decode.c +SOURCE gsm_destroy.c +SOURCE gsm_encode.c +SOURCE gsm_explode.c +SOURCE gsm_implode.c +SOURCE gsm_option.c +SOURCE gsm_print.c +SOURCE long_term.c +SOURCE lpc.c +SOURCE preprocess.c +SOURCE rpe.c +SOURCE short_term.c +SOURCE table.c + + +// +// GSM codec wrapper for pjmedia-codec +// + +SOURCEPATH ..\pjmedia\src\pjmedia-codec +SOURCE gsm.c + +// +// Header files +// + + +SYSTEMINCLUDE ..\pjmedia\include +SYSTEMINCLUDE ..\pjlib\include +SYSTEMINCLUDE ..\third_party\gsm\inc + +SYSTEMINCLUDE \epoc32\include +SYSTEMINCLUDE \epoc32\include\libc + diff --git a/build.symbian/symbian_ua.mmp b/build.symbian/symbian_ua.mmp index 17cdb548..edd8b59d 100644 --- a/build.symbian/symbian_ua.mmp +++ b/build.symbian/symbian_ua.mmp @@ -32,11 +32,13 @@ SYSTEMINCLUDE \epoc32\include\libc LIBRARY pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib
LIBRARY pjnath.lib pjlib_util.lib pjlib.lib
LIBRARY symbian_audio.lib
+ LIBRARY libgsmcodec.lib
#else
STATICLIBRARY pjsua_lib.lib pjsip_ua.lib
STATICLIBRARY pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib
STATICLIBRARY pjnath.lib pjlib_util.lib pjlib.lib
STATICLIBRARY symbian_audio.lib
+ STATICLIBRARY libgsmcodec.lib
#endif
#ifdef WINSCW
diff --git a/pjlib/include/pj/config_site_sample.h b/pjlib/include/pj/config_site_sample.h index 637ec5f5..b3c2f7f2 100644 --- a/pjlib/include/pj/config_site_sample.h +++ b/pjlib/include/pj/config_site_sample.h @@ -50,9 +50,9 @@ # define PJMEDIA_RESAMPLE_IMP PJMEDIA_RESAMPLE_NONE # define PJMEDIA_HAS_SPEEX_AEC 0 - /* Disable all codecs but G.711, for now */ + /* Disable all codecs but G.711 and GSM, for now */ +# define PJMEDIA_HAS_GSM_CODEC 1 # define PJMEDIA_HAS_L16_CODEC 0 -# define PJMEDIA_HAS_GSM_CODEC 0 # define PJMEDIA_HAS_ILBC_CODEC 0 # define PJMEDIA_HAS_SPEEX_CODEC 0 diff --git a/pjsip-apps/src/symbian_ua/ua.cpp b/pjsip-apps/src/symbian_ua/ua.cpp index 3e33ca48..b80055f9 100644 --- a/pjsip-apps/src/symbian_ua/ua.cpp +++ b/pjsip-apps/src/symbian_ua/ua.cpp @@ -32,15 +32,15 @@ // // Destination URI (to make call, or to subscribe presence) // -#define SIP_DST_URI "sip:user@192.168.0.11" +#define SIP_DST_URI "sip:100@pjsip.lab" // // Account // -#define HAS_SIP_ACCOUNT 0 // 0 to disable registration -#define SIP_DOMAIN "domain" -#define SIP_USER "username" -#define SIP_PASSWD "password" +#define HAS_SIP_ACCOUNT 1 // 0 to disable registration +#define SIP_DOMAIN "pjsip.lab" +#define SIP_USER "400" +#define SIP_PASSWD "400" // // Outbound proxy for all accounts @@ -53,8 +53,8 @@ // Configure nameserver if DNS SRV is to be used with both SIP // or STUN (for STUN see other settings below) // -#define NAMESERVER NULL -//#define NAMESERVER "192.168.0.1" +//#define NAMESERVER NULL +#define NAMESERVER "192.168.0.2" // // STUN server @@ -368,7 +368,7 @@ static pj_status_t app_startup() cfg.id = pj_str("sip:" SIP_USER "@" SIP_DOMAIN); cfg.reg_uri = pj_str("sip:" SIP_DOMAIN); cfg.cred_count = 1; - cfg.cred_info[0].realm = pj_str(SIP_DOMAIN); + cfg.cred_info[0].realm = pj_str("*"); cfg.cred_info[0].scheme = pj_str("digest"); cfg.cred_info[0].username = pj_str(SIP_USER); cfg.cred_info[0].data_type = PJSIP_CRED_DATA_PLAIN_PASSWD; |