diff --git a/linphone/build/wince/liblinphone.ncb b/linphone/build/wince/liblinphone.ncb index 3d66f0c3d..4c503ac99 100644 Binary files a/linphone/build/wince/liblinphone.ncb and b/linphone/build/wince/liblinphone.ncb differ diff --git a/linphone/build/wince/liblinphone.sln b/linphone/build/wince/liblinphone.sln index a30c61c20..fe4efff27 100644 --- a/linphone/build/wince/liblinphone.sln +++ b/linphone/build/wince/liblinphone.sln @@ -3,24 +3,44 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblinphone", "liblinphone.vcproj", "{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linphonec", "linphonec\linphonec.vcproj", "{92574924-BF59-4DAA-994B-9978B80E5797}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|Windows Mobile 6 Professional SDK (ARMV4I) = Debug|Windows Mobile 6 Professional SDK (ARMV4I) Debug|Windows Mobile 6 Standard SDK (ARMV4I) = Debug|Windows Mobile 6 Standard SDK (ARMV4I) Release|Win32 = Release|Win32 + Release|Windows Mobile 6 Professional SDK (ARMV4I) = Release|Windows Mobile 6 Professional SDK (ARMV4I) Release|Windows Mobile 6 Standard SDK (ARMV4I) = Release|Windows Mobile 6 Standard SDK (ARMV4I) EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Win32.ActiveCfg = Debug|Win32 {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Win32.Build.0 = Debug|Win32 + {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I) + {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I) + {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I) {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Standard SDK (ARMV4I) {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Standard SDK (ARMV4I) {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Standard SDK (ARMV4I) {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Win32.ActiveCfg = Release|Win32 {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Win32.Build.0 = Release|Win32 + {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I) + {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I) + {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I) {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Standard SDK (ARMV4I) {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I) {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Standard SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I) + {92574924-BF59-4DAA-994B-9978B80E5797}.Debug|Win32.ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I) + {92574924-BF59-4DAA-994B-9978B80E5797}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I) + {92574924-BF59-4DAA-994B-9978B80E5797}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I) + {92574924-BF59-4DAA-994B-9978B80E5797}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I) + {92574924-BF59-4DAA-994B-9978B80E5797}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I) + {92574924-BF59-4DAA-994B-9978B80E5797}.Release|Win32.ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I) + {92574924-BF59-4DAA-994B-9978B80E5797}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I) + {92574924-BF59-4DAA-994B-9978B80E5797}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I) + {92574924-BF59-4DAA-994B-9978B80E5797}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I) + {92574924-BF59-4DAA-994B-9978B80E5797}.Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I) EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/linphone/build/wince/liblinphone.suo b/linphone/build/wince/liblinphone.suo index e292791d3..3a11acc31 100644 Binary files a/linphone/build/wince/liblinphone.suo and b/linphone/build/wince/liblinphone.suo differ diff --git a/linphone/build/wince/liblinphone.vcproj b/linphone/build/wince/liblinphone.vcproj index d1fc3fc67..f7de5758a 100644 --- a/linphone/build/wince/liblinphone.vcproj +++ b/linphone/build/wince/liblinphone.vcproj @@ -15,6 +15,9 @@ + @@ -119,7 +122,7 @@ AdditionalOptions=" " Optimization="0" AdditionalIncludeDirectories="..\..\oRTP\include;..\..\mediastreamer2\include;"..\..\..\..\linphone-builder\speex\include";"..\..\..\..\linphone-builder\eXosip\include";"..\..\..\..\linphone-builder\osip\include"" - PreprocessorDefinitions="ORTP_INET6;ORTP_EXPORT;_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);_DEBUG;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);LIBLINPHONE_EXPORTS;OSIP_MT;ENABLE_TRACE;LOG_DOMAIN=\"LinphoneCore\";ORTP_STATIC;IN_LINPHONE" + PreprocessorDefinitions="ORTP_INET6;ORTP_EXPORT;_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);_DEBUG;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);LIBLINPHONE_EXPORTS;OSIP_MT;ENABLE_TRACE;LOG_DOMAIN=\"LinphoneCore\";IN_LINPHONE;LINPHONE_PLUGINS_DIR=\"\";LINPHONE_VERSION=\"3.1.2\"" MinimalRebuild="true" RuntimeLibrary="3" UsePrecompiledHeader="0" @@ -136,7 +139,88 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -381,10 +542,6 @@ RelativePath="..\..\coreapi\exevents.c" > - - @@ -397,10 +554,6 @@ RelativePath="..\..\coreapi\linphonecore.c" > - - diff --git a/linphone/build/wince/linphonec/linphonec.vcproj b/linphone/build/wince/linphonec/linphonec.vcproj new file mode 100644 index 000000000..b62ce3290 --- /dev/null +++ b/linphone/build/wince/linphonec/linphonec.vcproj @@ -0,0 +1,236 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/linphone/coreapi/enum.c b/linphone/coreapi/enum.c index 7bded2299..deb8caff3 100644 --- a/linphone/coreapi/enum.c +++ b/linphone/coreapi/enum.c @@ -19,7 +19,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /* enum lookup code */ +#ifndef _WIN32_WCE #include +#endif + #include #include "enum.h" diff --git a/linphone/coreapi/friend.c b/linphone/coreapi/friend.c index 6ee1c42db..8f84f8d2b 100644 --- a/linphone/coreapi/friend.c +++ b/linphone/coreapi/friend.c @@ -667,7 +667,7 @@ void linphone_core_remove_friend(LinphoneCore *lc, LinphoneFriend* fl){ } } -#define key_compare(key, word) strncasecmp((key),(word),strlen(key)) +#define key_compare(key, word) strcasecmp((key),(word)) LinphoneSubscribePolicy __policy_str_to_enum(const char* pol){ if (key_compare("accept",pol)==0){ diff --git a/linphone/coreapi/linphonecore.c b/linphone/coreapi/linphonecore.c index ed7aa718d..6cad30647 100644 --- a/linphone/coreapi/linphonecore.c +++ b/linphone/coreapi/linphonecore.c @@ -1629,12 +1629,13 @@ static void post_configure_audio_streams(LinphoneCore *lc){ void linphone_core_start_media_streams(LinphoneCore *lc, LinphoneCall *call){ osip_from_t *me=linphone_core_get_primary_contact_parsed(lc); const char *tool="linphone-" LINPHONE_VERSION; + char *cname; /* adjust rtp jitter compensation. It must be at least the latency of the sound card */ int jitt_comp=MAX(lc->sound_conf.latency,lc->rtp_conf.audio_jitt_comp); if (call->media_start_time==0) call->media_start_time=time(NULL); - char *cname=ortp_strdup_printf("%s@%s",me->url->username,me->url->host); + cname=ortp_strdup_printf("%s@%s",me->url->username,me->url->host); { StreamParams *audio_params=&call->audio_params; if (!lc->use_files){ @@ -2377,12 +2378,12 @@ unsigned long linphone_core_get_native_video_window_id(const LinphoneCore *lc){ } static MSVideoSizeDef supported_resolutions[]={ - { MS_VIDEO_SIZE_SVGA , "svga" }, - { MS_VIDEO_SIZE_4CIF , "4cif" }, - { MS_VIDEO_SIZE_VGA , "vga" }, - { MS_VIDEO_SIZE_CIF , "cif" }, - { MS_VIDEO_SIZE_QVGA , "qvga" }, - { MS_VIDEO_SIZE_QCIF , "qcif" }, + { {MS_VIDEO_SIZE_SVGA_W,MS_VIDEO_SIZE_SVGA_H} , "svga" }, + { {MS_VIDEO_SIZE_4CIF_W,MS_VIDEO_SIZE_4CIF_H} , "4cif" }, + { {MS_VIDEO_SIZE_VGA_W,MS_VIDEO_SIZE_VGA_H} , "vga" }, + { {MS_VIDEO_SIZE_CIF_W,MS_VIDEO_SIZE_CIF_H} , "cif" }, + { {MS_VIDEO_SIZE_QVGA_W,MS_VIDEO_SIZE_QVGA_H} , "qvga" }, + { {MS_VIDEO_SIZE_QCIF_W,MS_VIDEO_SIZE_QVGA_H} , "qcif" }, { {0,0} , NULL } }; @@ -2392,13 +2393,14 @@ const MSVideoSizeDef *linphone_core_get_supported_video_sizes(LinphoneCore *lc){ static MSVideoSize video_size_get_by_name(const char *name){ MSVideoSizeDef *pdef=supported_resolutions; + MSVideoSize null_vsize={0,0}; for(;pdef->name!=NULL;pdef++){ if (strcasecmp(name,pdef->name)==0){ return pdef->vsize; } } ms_warning("Video resolution %s is not supported in linphone.",name); - return (MSVideoSize){0,0}; + return null_vsize; } const char *video_size_get_name(MSVideoSize vsize){ @@ -2433,8 +2435,9 @@ void linphone_core_set_preferred_video_size(LinphoneCore *lc, MSVideoSize vsize) void linphone_core_set_preferred_video_size_by_name(LinphoneCore *lc, const char *name){ MSVideoSize vsize=video_size_get_by_name(name); + MSVideoSize default_vsize={MS_VIDEO_SIZE_CIF_W,MS_VIDEO_SIZE_CIF_H}; if (vsize.width!=0) linphone_core_set_preferred_video_size(lc,vsize); - else linphone_core_set_preferred_video_size(lc,MS_VIDEO_SIZE_CIF); + else linphone_core_set_preferred_video_size(lc,default_vsize); } MSVideoSize linphone_core_get_preferred_video_size(LinphoneCore *lc){ diff --git a/linphone/coreapi/linphonecore.h b/linphone/coreapi/linphonecore.h index cd81fc2cc..a3181d82b 100644 --- a/linphone/coreapi/linphonecore.h +++ b/linphone/coreapi/linphonecore.h @@ -265,7 +265,7 @@ LinphoneProxyConfig *linphone_proxy_config_new(void); int linphone_proxy_config_set_server_addr(LinphoneProxyConfig *obj, const char *server_addr); void linphone_proxy_config_set_identity(LinphoneProxyConfig *obj, const char *identity); void linphone_proxy_config_set_route(LinphoneProxyConfig *obj, const char *route); -void linphone_proxy_config_expires(LinphoneProxyConfig *obj, const int expires); +void linphone_proxy_config_expires(LinphoneProxyConfig *obj, int expires); void linphone_proxy_config_enable_register(LinphoneProxyConfig *obj, bool_t val); #define linphone_proxy_config_enableregister linphone_proxy_config_enable_register void linphone_proxy_config_edit(LinphoneProxyConfig *obj); diff --git a/linphone/coreapi/lpconfig.c b/linphone/coreapi/lpconfig.c index 044f02267..dbd1c8007 100644 --- a/linphone/coreapi/lpconfig.c +++ b/linphone/coreapi/lpconfig.c @@ -32,9 +32,11 @@ #include #if !defined(_WIN32_WCE) #include -#endif /*_WIN32_WCE*/ #include #include +#endif /*_WIN32_WCE*/ + + #define lp_new0(type,n) (type*)calloc(sizeof(type),n) diff --git a/linphone/coreapi/misc.c b/linphone/coreapi/misc.c index 68fa5569e..f10762f31 100644 --- a/linphone/coreapi/misc.c +++ b/linphone/coreapi/misc.c @@ -25,13 +25,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifdef HAVE_SIGHANDLER_T #include #endif /*HAVE_SIGHANDLER_T*/ + +#include +#if !defined(_WIN32_WCE) +#include #include #include #include #include -#include -#if !defined(_WIN32_WCE) -#include #endif /*_WIN32_WCE*/ #undef snprintf @@ -102,6 +103,7 @@ char *int2str(int number) void check_sound_device(LinphoneCore *lc) { +#ifdef _linux int fd=0; int len; int a; @@ -110,9 +112,8 @@ void check_sound_device(LinphoneCore *lc) char *snd_pcm_oss=NULL; char *snd_mixer_oss=NULL; char *snd_pcm=NULL; -#if !defined(_WIN32_WCE) fd=open("/proc/modules",O_RDONLY); -#endif /*_WIN32_WCE*/ + if (fd>0){ /* read the entire /proc/modules file and check if sound conf seems correct */ /*a=fstat(fd,&statbuf); @@ -145,9 +146,8 @@ void check_sound_device(LinphoneCore *lc) } } }else { -#ifdef __linux + ms_warning("Could not open /proc/modules."); -#endif } /* now check general volume. Some user forget to rise it and then complain that linphone is not working */ @@ -162,9 +162,8 @@ void check_sound_device(LinphoneCore *lc) */ end: if (file!=NULL) ms_free(file); -#if !defined(_WIN32_WCE) if (fd>0) close(fd); -#endif /*_WIN32_WCE*/ +#endif } #define UDP_HDR_SZ 8 diff --git a/linphone/coreapi/private.h b/linphone/coreapi/private.h index 84fbbbbfa..6bba0f355 100644 --- a/linphone/coreapi/private.h +++ b/linphone/coreapi/private.h @@ -40,10 +40,6 @@ #define PACKAGE_SOUND_DIR "." #endif -#ifdef WIN32 -#include /* for access() */ -#endif - #ifdef HAVE_GETTEXT #include #ifndef _ diff --git a/linphone/coreapi/siplogin.c b/linphone/coreapi/siplogin.c index 78455ae86..fb05eed7b 100644 --- a/linphone/coreapi/siplogin.c +++ b/linphone/coreapi/siplogin.c @@ -86,6 +86,9 @@ static int sip_login_do_logout(SipSetupContext * ctx){ } /* a simple SipSetup built-in plugin to allow specify the user/password for proxy config at runtime*/ + +#ifndef _MSC_VER + SipSetup linphone_sip_login={ .name="SipLogin", .capabilities=SIP_SETUP_CAP_LOGIN, @@ -94,3 +97,29 @@ SipSetup linphone_sip_login={ .logout_account=sip_login_do_logout }; +#else +SipSetup linphone_sip_login={ + "SipLogin", + SIP_SETUP_CAP_LOGIN, + 0, + NULL, + NULL, + sip_login_init_instance, + NULL, + NULL, + NULL, + sip_login_do_login, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + sip_login_do_logout +}; + + + +#endif diff --git a/linphone/mediastreamer2/build/wince/mediastreamer2.def b/linphone/mediastreamer2/build/wince/mediastreamer2.def index 56df94c9e..13c94d82a 100644 --- a/linphone/mediastreamer2/build/wince/mediastreamer2.def +++ b/linphone/mediastreamer2/build/wince/mediastreamer2.def @@ -1,66 +1,112 @@ -LIBRARY mediastreamer2 - -EXPORTS - - ms_init - ms_exit - - ms_filter_new - ms_filter_new_from_desc - ms_filter_destroy - ms_filter_create_encoder - ms_filter_create_decoder - ms_filter_call_method - ms_filter_call_method_noarg - ms_filter_link - ms_filter_unlink - ms_filter_preprocess - ms_filter_postprocess - ms_filter_codec_supported - ms_filter_register - ms_filter_new_from_name - ms_filter_set_notify_callback - - ms_snd_card_new - ms_snd_card_manager_destroy - ms_snd_card_manager_reload - ms_snd_card_manager_add_card - ms_snd_card_manager_register_desc - ms_snd_card_create_reader - ms_snd_card_create_writer - ms_snd_card_get_name - ms_snd_card_get_string_id - ms_snd_card_manager_get - ms_snd_card_manager_get_default_card - ms_snd_card_manager_get_default_capture_card - ms_snd_card_manager_get_default_playback_card - ms_snd_card_manager_get_card - ms_snd_card_manager_get_list - ms_snd_card_dup - ms_snd_card_destroy - ms_snd_card_set_level - ms_snd_card_get_level - ms_snd_card_set_capture - ms_snd_card_set_control - ms_snd_card_get_control - - ms_ticker_new - ms_ticker_set_name - ms_ticker_destroy - ms_ticker_attach - ms_ticker_detach - ms_ticker_set_time_func - ms_ticker_print_graphs - - - ms_bufferizer_init - ms_bufferizer_uninit - ms_bufferizer_read - ms_bufferizer_put - ms_bufferizer_put_from_queue - - ms_load_plugins - - audio_stream_start - ms_discover_mtu - ms_set_mtu +LIBRARY mediastreamer2 + +EXPORTS + + ms_init + ms_exit + + ms_filter_new + ms_filter_new_from_desc + ms_filter_destroy + ms_filter_create_encoder + ms_filter_create_decoder + ms_filter_call_method + ms_filter_call_method_noarg + ms_filter_link + ms_filter_unlink + ms_filter_preprocess + ms_filter_postprocess + ms_filter_codec_supported + ms_filter_register + ms_filter_new_from_name + ms_filter_set_notify_callback + ms_filter_get_encoder + + ms_snd_card_new + ms_snd_card_manager_destroy + ms_snd_card_manager_reload + ms_snd_card_manager_add_card + ms_snd_card_manager_register_desc + ms_snd_card_create_reader + ms_snd_card_create_writer + ms_snd_card_get_name + ms_snd_card_get_string_id + ms_snd_card_manager_get + ms_snd_card_manager_get_default_card + ms_snd_card_manager_get_default_capture_card + ms_snd_card_manager_get_default_playback_card + ms_snd_card_manager_get_card + ms_snd_card_manager_get_list + ms_snd_card_dup + ms_snd_card_destroy + ms_snd_card_set_level + ms_snd_card_get_level + ms_snd_card_set_capture + ms_snd_card_set_control + ms_snd_card_get_control + + ms_web_cam_get_string_id + ms_web_cam_manager_get_list + ms_web_cam_manager_get + ms_web_cam_manager_get_default_cam + ms_web_cam_manager_get_cam + + ms_ticker_new + ms_ticker_set_name + ms_ticker_destroy + ms_ticker_attach + ms_ticker_detach + ms_ticker_set_time_func + ms_ticker_print_graphs + + + ms_bufferizer_init + ms_bufferizer_uninit + ms_bufferizer_read + ms_bufferizer_put + ms_bufferizer_put_from_queue + + ms_load_plugins + + audio_stream_start + audio_stream_alive + audio_stream_enable_automatic_gain_control + audio_stream_set_echo_canceler_params + audio_stream_enable_gain_control + audio_stream_enable_echo_limiter + audio_stream_new + audio_stream_set_rtcp_information + audio_stream_start_with_files + audio_stream_start_now + audio_stream_set_relay_session_id + audio_stream_play_received_dtmfs + audio_stream_set_mic_gain + audio_stream_stop + audio_stream_play + audio_stream_record + ms_snd_card_get_capabilities + ring_start_with_cb + ring_start + ring_stop + audio_stream_send_dtmf + ms_discover_mtu + ms_set_mtu + + ms_list_append + ms_list_remove + ms_list_free + ms_list_for_each + ms_list_find + ms_list_for_each2 + ms_list_find_custom + ms_list_size + ms_list_nth_data + ms_list_remove_link + ms_list_index + ms_list_prepend + ms_list_position + + ms_time + ms_get_payload_max_size + + \ No newline at end of file diff --git a/linphone/mediastreamer2/build/wince/mediastreamer2.vcproj b/linphone/mediastreamer2/build/wince/mediastreamer2.vcproj index bf4c12444..910564b9d 100644 --- a/linphone/mediastreamer2/build/wince/mediastreamer2.vcproj +++ b/linphone/mediastreamer2/build/wince/mediastreamer2.vcproj @@ -327,7 +327,7 @@ Optimization="2" FavorSizeOrSpeed="1" AdditionalIncludeDirectories=".;"..\..\..\..\..\linphone-builder\speex\include";..\..;..\..\include;..\..\..\oRTP\include;..\..\..\codecs\speex\include" - PreprocessorDefinitions="__VIDEO_DISABLED__;AMD_HACK;HAVE_SPEEX_NOISE;ORTP_INET6;MEDIASTREAMER2_EXPORT;_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);_DEBUG;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);POCKETPC2003_UI_MODEL;POCKETPC2003_UI_MODEL" + PreprocessorDefinitions="__VIDEO_DISABLED__;AMD_HACK;HAVE_SPEEX_NOISE;ORTP_INET6;MEDIASTREAMER2_EXPORT;_WIN32_WCE=$(CEVER);UNDER_CE=$(CEVER);WINCE;$(PLATFORMDEFINES);_DEBUG;_USRDLL;$(ARCHFAM);$(_ARCHFAM_);POCKETPC2003_UI_MODEL" RuntimeLibrary="3" TreatWChar_tAsBuiltInType="false" UsePrecompiledHeader="0" @@ -808,6 +808,10 @@ RelativePath="..\..\src\msticker.c" > + + @@ -862,6 +866,10 @@ RelativePath="..\..\include\mediastreamer2\ice.h" > + + diff --git a/linphone/mediastreamer2/include/mediastreamer2/mediastream.h b/linphone/mediastreamer2/include/mediastreamer2/mediastream.h index 9ac669337..00fac769d 100644 --- a/linphone/mediastreamer2/include/mediastreamer2/mediastream.h +++ b/linphone/mediastreamer2/include/mediastreamer2/mediastream.h @@ -31,9 +31,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #if defined(_WIN32_WCE) -#define time ms_time time_t ms_time (time_t *t); -#endif /*_WIN32_WCE*/ +#else +#define ms_time time +#endif typedef enum EchoLimiterType{ ELInactive, diff --git a/linphone/mediastreamer2/src/audiostream.c b/linphone/mediastreamer2/src/audiostream.c index 323ec99ce..d410f5fa7 100644 --- a/linphone/mediastreamer2/src/audiostream.c +++ b/linphone/mediastreamer2/src/audiostream.c @@ -145,9 +145,9 @@ bool_t audio_stream_alive(AudioStream * stream, int timeout){ if (stats->recv!=0){ if (stats->recv!=stream->last_packet_count){ stream->last_packet_count=stats->recv; - stream->last_packet_time=time(NULL); + stream->last_packet_time=ms_time(NULL); }else{ - if (time(NULL)-stream->last_packet_time>timeout){ + if (ms_time(NULL)-stream->last_packet_time>timeout){ /* more than timeout seconds of inactivity*/ return FALSE; } diff --git a/linphone/oRTP/build/wince/ortp.def b/linphone/oRTP/build/wince/ortp.def index 39f4f32bb..e797c4d75 100644 --- a/linphone/oRTP/build/wince/ortp.def +++ b/linphone/oRTP/build/wince/ortp.def @@ -1,97 +1,102 @@ -LIBRARY ortp - -EXPORTS - - ortp_init - ortp_scheduler_init - ortp_exit - - ortp_get_scheduler - ortp_set_log_file - ortp_set_log_level_mask - ortp_logv_out - ortp_set_log_handler - ortp_strdup_printf - ortp_logv - - ortp_get_global_stats - ortp_global_stats_display - - session_set_new - session_set_select - session_set_destroy - - rtp_stats_display - rtp_session_get_stats - - rtp_session_init - rtp_session_new - - rtp_session_set_scheduling_mode - rtp_session_set_blocking_mode - rtp_session_set_profile - rtp_session_get_profile - rtp_session_set_data - - rtp_session_signal_connect - rtp_session_signal_disconnect_by_callback - rtp_session_set_ssrc - rtp_session_set_seq_number - rtp_session_get_seq_number - rtp_session_set_jitter_compensation - rtp_session_set_local_addr - rtp_session_set_remote_addr - rtp_session_enable_adaptive_jitter_compensation - rtp_session_set_recv_buf_size - - rtp_session_send_with_ts - rtp_session_sendm_with_ts - - rtp_session_set_sockets - rtp_session_get_rtp_socket - rtp_session_get_rtcp_socket - - rtp_session_set_payload_type - rtp_session_set_send_payload_type - rtp_session_get_send_payload_type - rtp_session_set_recv_payload_type - rtp_session_get_recv_payload_type - - rtp_session_recv_with_ts - rtp_session_recvm_with_ts - rtp_session_create_packet - - rtp_session_get_current_send_ts - rtp_session_get_current_recv_ts - rtp_session_reset - rtp_session_uninit - rtp_session_destroy - - rtp_add_csrc - - rtp_session_send_dtmf - - rtp_session_set_source_description - rtp_session_set_symmetric_rtp - - rtp_profile_new - rtp_profile_set_payload - rtp_profile_clone_full - rtp_profile_destroy - rtp_profile_get_payload_from_rtpmap - - payload_type_set_send_fmtp - payload_type_clone - fmtp_get_value - +LIBRARY ortp + +EXPORTS + + ortp_init + ortp_scheduler_init + ortp_exit + + ortp_get_scheduler + ortp_set_log_file + ortp_set_log_level_mask + ortp_logv_out + ortp_set_log_handler + ortp_strdup_printf + ortp_logv + + ortp_get_global_stats + ortp_global_stats_display + + session_set_new + session_set_select + session_set_destroy + + rtp_stats_display + rtp_session_get_stats + + rtp_session_init + rtp_session_new + + rtp_session_set_scheduling_mode + rtp_session_set_blocking_mode + rtp_session_set_profile + rtp_session_get_profile + rtp_session_set_data + + rtp_session_signal_connect + rtp_session_signal_disconnect_by_callback + rtp_session_set_ssrc + rtp_session_set_seq_number + rtp_session_get_seq_number + rtp_session_set_jitter_compensation + rtp_session_set_local_addr + rtp_session_set_remote_addr + rtp_session_enable_adaptive_jitter_compensation + rtp_session_set_recv_buf_size + + rtp_session_send_with_ts + rtp_session_sendm_with_ts + + rtp_session_set_sockets + rtp_session_get_rtp_socket + rtp_session_get_rtcp_socket + + rtp_session_set_payload_type + rtp_session_set_send_payload_type + rtp_session_get_send_payload_type + rtp_session_set_recv_payload_type + rtp_session_get_recv_payload_type + + rtp_session_recv_with_ts + rtp_session_recvm_with_ts + rtp_session_create_packet + + rtp_session_get_current_send_ts + rtp_session_get_current_recv_ts + rtp_session_reset + rtp_session_uninit + rtp_session_destroy + + rtp_add_csrc + + rtp_session_send_dtmf + + rtp_session_set_source_description + rtp_session_set_symmetric_rtp + + rtp_profile_new + rtp_profile_set_payload + rtp_profile_clone_full + rtp_profile_destroy + rtp_profile_get_payload_from_rtpmap + rtp_profile_get_payload_number_from_rtpmap + rtp_profile_get_payload_number_from_mime + + payload_type_new + payload_type_set_send_fmtp + payload_type_append_send_fmtp + payload_type_clone + payload_type_destroy + fmtp_get_value + ortp_free ortp_malloc ortp_strdup ortp_realloc ortp_malloc0 freemsg - dupmsg - + dupmsg + allocb getq putq @@ -105,19 +110,19 @@ EXPORTS concatb esballoc - WIN_thread_create - WIN_thread_join - WIN_cond_init - WIN_mutex_init - WIN_mutex_unlock - WIN_cond_wait - WIN_mutex_lock - WIN_cond_destroy - WIN_mutex_destroy - WIN_cond_signal - - __ortp_log_mask - + WIN_thread_create + WIN_thread_join + WIN_cond_init + WIN_mutex_init + WIN_mutex_unlock + WIN_cond_wait + WIN_mutex_lock + WIN_cond_destroy + WIN_mutex_destroy + WIN_cond_signal + + __ortp_log_mask + rtp_session_register_event_queue rtp_session_unregister_event_queue ortp_ev_queue_new @@ -142,13 +147,19 @@ EXPORTS stunCalculateIntegrity_shortterm stunCalculateIntegrity_longterm stunCalculateFingerprint - - getWinSocketError - - - rtp_session_set_dscp - rtp_session_compute_recv_bandwidth - rtp_session_compute_send_bandwidth + + getWinSocketError + close_socket + set_non_blocking_socket + ortp_strerror + gettimeofday + ortp_file_exist + + + + rtp_session_set_dscp + rtp_session_compute_recv_bandwidth + rtp_session_compute_send_bandwidth rtcp_next_packet rtcp_is_SDES rtcp_sdes_parse @@ -162,16 +173,16 @@ EXPORTS rtcp_is_BYE rtcp_BYE_get_ssrc rtcp_BYE_get_reason - rtcp_is_APP - rtcp_APP_get_subtype - rtcp_APP_get_ssrc - rtcp_APP_get_name + rtcp_is_APP + rtcp_APP_get_subtype + rtcp_APP_get_ssrc + rtcp_APP_get_name rtcp_APP_get_data rtp_session_flush_sockets rtp_session_resync rtp_session_set_remote_addr_and_port rtp_session_set_time_jump_limit - + copymsg rtp_session_enable_jitter_buffer