Commit 747d0843 authored by Ghislain MARY's avatar Ghislain MARY

Fix build on Windows 10.

parent 95664d68
......@@ -30,7 +30,7 @@ static void _linphone_auth_info_uninit(LinphoneAuthInfo *obj);
static void _linphone_auth_info_copy(LinphoneAuthInfo *dst, const LinphoneAuthInfo *src);
BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneAuthInfo);
BELLE_SIP_DECLARE_VPTR(LinphoneAuthInfo);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneAuthInfo);
BELLE_SIP_INSTANCIATE_VPTR(
LinphoneAuthInfo,
belle_sip_object_t,
......
......@@ -31,7 +31,7 @@ struct _LinphoneContactSearch{
};
#define LINPHONE_CONTACT_SEARCH(obj) BELLE_SIP_CAST(obj,LinphoneContactSearch)
BELLE_SIP_DECLARE_VPTR(LinphoneContactSearch)
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneContactSearch)
struct _LinphoneContactProvider {
......@@ -44,7 +44,7 @@ struct _LinphoneContactProvider {
typedef LinphoneContactSearch* (*LinphoneContactProviderStartSearchMethod)( LinphoneContactProvider* thiz, const char* predicate, ContactSearchCallback cb, void* data );
typedef unsigned int (*LinphoneContactProviderCancelSearchMethod)( LinphoneContactProvider* thiz, LinphoneContactSearch *request );
BELLE_SIP_DECLARE_CUSTOM_VPTR_BEGIN(LinphoneContactProvider,belle_sip_object_t)
BELLE_SIP_DECLARE_CUSTOM_VPTR_BEGIN_NO_EXPORT(LinphoneContactProvider,belle_sip_object_t)
const char* name; /*!< Name of the contact provider (LDAP, Google, ...) */
/* pure virtual methods: inheriting objects must implement these */
......
......@@ -93,7 +93,7 @@ struct _LpConfig{
};
BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneConfig);
BELLE_SIP_DECLARE_VPTR(LinphoneConfig);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneConfig);
char* lp_realpath(const char* file, char* name) {
......
......@@ -36,7 +36,7 @@ struct _LinphonePresenceNote {
};
BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphonePresenceNote);
BELLE_SIP_DECLARE_VPTR(LinphonePresenceNote);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphonePresenceNote);
struct _LinphonePresenceService {
belle_sip_object_t base;
......@@ -49,7 +49,7 @@ struct _LinphonePresenceService {
};
BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphonePresenceService);
BELLE_SIP_DECLARE_VPTR(LinphonePresenceService);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphonePresenceService);
struct _LinphonePresenceActivity {
belle_sip_object_t base;
......@@ -59,7 +59,7 @@ struct _LinphonePresenceActivity {
};
BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphonePresenceActivity);
BELLE_SIP_DECLARE_VPTR(LinphonePresenceActivity);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphonePresenceActivity);
struct _LinphonePresencePerson {
belle_sip_object_t base;
......@@ -72,7 +72,7 @@ struct _LinphonePresencePerson {
};
BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphonePresencePerson);
BELLE_SIP_DECLARE_VPTR(LinphonePresencePerson);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphonePresencePerson);
/**
* Represents the presence model as defined in RFC 4479 and RFC 4480.
......@@ -88,7 +88,7 @@ struct _LinphonePresenceModel {
};
BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphonePresenceModel);
BELLE_SIP_DECLARE_VPTR(LinphonePresenceModel);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphonePresenceModel);
static const char *person_prefix = "/pidf:presence/dm:person";
......
......@@ -169,7 +169,7 @@ struct _LinphoneCallParams{
bool_t encryption_mandatory;
};
BELLE_SIP_DECLARE_VPTR(LinphoneCallParams);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneCallParams);
struct _LinphoneQualityReporting{
......@@ -201,7 +201,7 @@ struct _LinphoneCallLog{
unsigned int storage_id;
};
BELLE_SIP_DECLARE_VPTR(LinphoneCallLog);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneCallLog);
typedef struct _CallCallbackObj
......@@ -219,7 +219,7 @@ struct _LinphoneChatMessageCbs {
LinphoneChatMessageCbsFileTransferProgressIndicationCb file_transfer_progress_indication; /**< Callback to indicate file transfer progress */
};
BELLE_SIP_DECLARE_VPTR(LinphoneChatMessageCbs);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneChatMessageCbs);
typedef enum _LinphoneChatMessageDir{
LinphoneChatMessageIncoming,
......@@ -268,7 +268,7 @@ struct _LinphoneChatMessage {
#endif
};
BELLE_SIP_DECLARE_VPTR(LinphoneChatMessage);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneChatMessage);
typedef struct StunCandidate{
char addr[64];
......@@ -372,7 +372,7 @@ struct _LinphoneCall{
bool_t reinvite_on_cancel_response_requested;
};
BELLE_SIP_DECLARE_VPTR(LinphoneCall);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneCall);
LinphoneCall * linphone_call_new_outgoing(struct _LinphoneCore *lc, LinphoneAddress *from, LinphoneAddress *to, const LinphoneCallParams *params, LinphoneProxyConfig *cfg);
......@@ -669,7 +669,7 @@ struct _LinphoneProxyConfig
char *sip_etag; /*publish context*/
};
BELLE_SIP_DECLARE_VPTR(LinphoneProxyConfig);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneProxyConfig);
struct _LinphoneAuthInfo
{
......@@ -716,7 +716,7 @@ typedef struct _LinphoneChatMessageCharacter {
bool_t has_been_read;
} LinphoneChatMessageCharacter;
BELLE_SIP_DECLARE_VPTR(LinphoneChatRoom);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneChatRoom);
typedef struct _LinphoneFriendPresence {
......@@ -753,7 +753,7 @@ struct _LinphoneFriend{
LinphoneSubscriptionState out_sub_state;
};
BELLE_SIP_DECLARE_VPTR(LinphoneFriend);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneFriend);
struct _LinphoneFriendListCbs {
belle_sip_object_t base;
......@@ -764,7 +764,7 @@ struct _LinphoneFriendListCbs {
LinphoneFriendListCbsSyncStateChangedCb sync_state_changed_cb;
};
BELLE_SIP_DECLARE_VPTR(LinphoneFriendListCbs);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneFriendListCbs);
struct _LinphoneFriendList {
belle_sip_object_t base;
......@@ -787,7 +787,7 @@ struct _LinphoneFriendList {
bool_t enable_subscriptions;
};
BELLE_SIP_DECLARE_VPTR(LinphoneFriendList);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneFriendList);
......@@ -1115,7 +1115,7 @@ struct _LinphoneEvent{
bool_t oneshot;
};
BELLE_SIP_DECLARE_VPTR(LinphoneEvent);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneEvent);
LinphoneTunnel *linphone_core_tunnel_new(LinphoneCore *lc);
void linphone_tunnel_destroy(LinphoneTunnel *tunnel);
......@@ -1284,7 +1284,7 @@ struct _LinphoneContent {
bool_t owned_fields;
};
BELLE_SIP_DECLARE_VPTR(LinphoneContent);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneContent);
struct _LinphoneBuffer {
belle_sip_object_t base;
......@@ -1293,7 +1293,7 @@ struct _LinphoneBuffer {
size_t size; /**< The size of the buffer content */
};
BELLE_SIP_DECLARE_VPTR(LinphoneBuffer);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneBuffer);
struct _LinphoneNatPolicy {
belle_sip_object_t base;
......@@ -1310,7 +1310,7 @@ struct _LinphoneNatPolicy {
bool_t upnp_enabled;
};
BELLE_SIP_DECLARE_VPTR(LinphoneNatPolicy);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneNatPolicy);
void linphone_nat_policy_save_to_config(const LinphoneNatPolicy *policy);
......@@ -1326,7 +1326,7 @@ struct _LinphoneImNotifPolicy {
bool_t recv_imdn_displayed;
};
BELLE_SIP_DECLARE_VPTR(LinphoneImNotifPolicy);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneImNotifPolicy);
void linphone_core_create_im_notif_policy(LinphoneCore *lc);
......@@ -1349,7 +1349,7 @@ struct _LinphoneXmlRpcRequestCbs {
LinphoneXmlRpcRequestCbsResponseCb response;
};
BELLE_SIP_DECLARE_VPTR(LinphoneXmlRpcRequestCbs);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneXmlRpcRequestCbs);
struct _LinphoneXmlRpcRequest {
belle_sip_object_t base;
......@@ -1362,7 +1362,7 @@ struct _LinphoneXmlRpcRequest {
LinphoneXmlRpcArg response;
};
BELLE_SIP_DECLARE_VPTR(LinphoneXmlRpcRequest);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneXmlRpcRequest);
struct _LinphoneXmlRpcSession {
belle_sip_object_t base;
......@@ -1372,7 +1372,7 @@ struct _LinphoneXmlRpcSession {
bool_t released;
};
BELLE_SIP_DECLARE_VPTR(LinphoneXmlRpcSession);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneXmlRpcSession);
/*****************************************************************************
......@@ -1394,7 +1394,7 @@ struct _LinphoneAccountCreatorCbs {
LinphoneAccountCreatorCbsStatusCb update_hash;
};
BELLE_SIP_DECLARE_VPTR(LinphoneAccountCreatorCbs);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneAccountCreatorCbs);
struct _LinphoneAccountCreator {
belle_sip_object_t base;
......@@ -1418,7 +1418,7 @@ struct _LinphoneAccountCreator {
char *language;
};
BELLE_SIP_DECLARE_VPTR(LinphoneAccountCreator);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneAccountCreator);
/*****************************************************************************
* CardDAV interface *
......@@ -1549,7 +1549,7 @@ struct _LinphoneImEncryptionEngineCbs {
LinphoneImEncryptionEngineCbsUploadingFileCb process_uploading_file;
};
BELLE_SIP_DECLARE_VPTR(LinphoneImEncryptionEngineCbs);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneImEncryptionEngineCbs);
LinphoneImEncryptionEngineCbs * linphone_im_encryption_engine_cbs_new(void);
......@@ -1560,7 +1560,7 @@ struct _LinphoneImEncryptionEngine {
LinphoneImEncryptionEngineCbs *callbacks;
};
BELLE_SIP_DECLARE_VPTR(LinphoneImEncryptionEngine);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneImEncryptionEngine);
LinphoneImEncryptionEngine *linphone_im_encryption_engine_new(LinphoneCore *lc);
......@@ -1717,7 +1717,7 @@ MSWebCam *get_nowebcam_device(MSFactory *f);
#endif
LinphoneLimeState linphone_core_lime_for_file_sharing_enabled(const LinphoneCore *lc);
BELLE_SIP_DECLARE_VPTR(LinphoneTunnelConfig);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneTunnelConfig);
int linphone_core_get_default_proxy_config_index(LinphoneCore *lc);
......
......@@ -80,7 +80,7 @@ static void _linphone_vcard_uninit(LinphoneVcard *vCard) {
vCard->belCard.reset();
}
BELLE_SIP_DECLARE_VPTR(LinphoneVcard);
BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphoneVcard);
BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphoneVcard);
BELLE_SIP_INSTANCIATE_VPTR(LinphoneVcard, belle_sip_object_t,
_linphone_vcard_uninit, // destroy
......
mediastreamer2 @ c05a6c72
Subproject commit 452d40be62dfa14b48fb4d2cb21123b93a4dee85
Subproject commit c05a6c72f73efe86b4bdffeb339ff1fe5550bbcb
......@@ -1910,7 +1910,7 @@ static void video_call_with_thin_congestion(void){
simparams.mode = OrtpNetworkSimulatorOutbound;
simparams.enabled = TRUE;
simparams.max_bandwidth = 400000;
simparams.max_buffer_size = simparams.max_bandwidth;
simparams.max_buffer_size = (int)simparams.max_bandwidth;
simparams.latency = 60;
linphone_core_set_network_simulator_params(marie->lc, &simparams);
......@@ -1921,14 +1921,14 @@ static void video_call_with_thin_congestion(void){
/*wait for the TMMBR*/
BC_ASSERT_TRUE(wait_for_until(marie->lc, pauline->lc, &marie->stat.last_tmmbr_value_received, 1, 10000));
BC_ASSERT_GREATER(marie->stat.last_tmmbr_value_received, 220000, float, "%f");
BC_ASSERT_LOWER(marie->stat.last_tmmbr_value_received, 300000, float, "%f");
BC_ASSERT_GREATER((float)marie->stat.last_tmmbr_value_received, 220000.f, float, "%f");
BC_ASSERT_LOWER((float)marie->stat.last_tmmbr_value_received, 300000.f, float, "%f");
first_tmmbr = marie->stat.last_tmmbr_value_received;
/*another tmmbr with a greater value is expected once the congestion is resolved*/
BC_ASSERT_TRUE(wait_for_until(marie->lc, pauline->lc, &marie->stat.last_tmmbr_value_received, first_tmmbr + 1, 15000));
BC_ASSERT_GREATER(marie->stat.last_tmmbr_value_received, 290000, float, "%f");
BC_ASSERT_GREATER(linphone_call_get_current_quality(call), 4.0, float, "%f");
BC_ASSERT_GREATER((float)marie->stat.last_tmmbr_value_received, 290000.f, float, "%f");
BC_ASSERT_GREATER(linphone_call_get_current_quality(call), 4.f, float, "%f");
end_call(marie, pauline);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment