Commit 506462c5 authored by Ghislain MARY's avatar Ghislain MARY

Fix compilation for native Win32 with Visual Studio.

parent a832a43b
#include "mediastreamer2/msfilter.h"
extern MSFilterDesc ms_tee_desc;
extern MSFilterDesc ms_join_desc;
extern MSFilterDesc ms_void_sink_desc;
extern MSFilterDesc ms_itc_source_desc;
extern MSFilterDesc ms_itc_sink_desc;
MSFilterDesc * ms_base_filter_descs[]={
&ms_tee_desc,
&ms_join_desc,
&ms_void_sink_desc,
&ms_itc_source_desc,
NULL
};
......@@ -371,6 +371,10 @@
RelativePath="..\..\src\msvideo.c"
>
</File>
<File
RelativePath="..\..\src\msvoip.c"
>
</File>
<File
RelativePath="..\..\src\msvolume.c"
>
......@@ -462,11 +466,11 @@
>
</File>
<File
RelativePath=".\alldescs.h"
RelativePath="..\..\include\mediastreamer2\allfilters.h"
>
</File>
<File
RelativePath="..\..\include\mediastreamer2\allfilters.h"
RelativePath=".\basedescs.h"
>
</File>
<File
......@@ -593,6 +597,10 @@
RelativePath="..\..\src\vfw-missing.h"
>
</File>
<File
RelativePath=".\voipdescs.h"
>
</File>
<File
RelativePath="..\..\include\mediastreamer2\waveheader.h"
>
......
......@@ -14,8 +14,6 @@ extern MSFilterDesc ms_speex_enc_desc;
extern MSFilterDesc ms_gsm_dec_desc;
extern MSFilterDesc ms_gsm_enc_desc;
extern MSFilterDesc ms_speex_ec_desc;
extern MSFilterDesc ms_tee_desc;
extern MSFilterDesc ms_void_sink_desc;
extern MSFilterDesc ms_conf_desc;
extern MSFilterDesc ms_v4w_desc;
extern MSFilterDesc ms_video_out_desc;
......@@ -34,7 +32,6 @@ extern MSFilterDesc ms_mjpeg_enc_desc;
extern MSFilterDesc ms_mjpeg_dec_desc;
extern MSFilterDesc ms_size_conv_desc;
extern MSFilterDesc ms_pix_conv_desc;
extern MSFilterDesc ms_join_desc;
extern MSFilterDesc ms_resample_desc;
extern MSFilterDesc ms_volume_desc;
extern MSFilterDesc ms_static_image_desc;
......@@ -42,8 +39,6 @@ extern MSFilterDesc ms_mire_desc;
extern MSFilterDesc ms_vfw_desc;
extern MSFilterDesc ms_equalizer_desc;
extern MSFilterDesc ms_dd_display_desc;
extern MSFilterDesc ms_itc_source_desc;
extern MSFilterDesc ms_itc_sink_desc;
extern MSFilterDesc ms_audio_mixer_desc;
extern MSFilterDesc ms_ext_display_desc;
extern MSFilterDesc ms_jpeg_writer_desc;
......@@ -55,7 +50,7 @@ extern MSFilterDesc ms_l16_dec_desc;
extern MSFilterDesc ms_g722_enc_desc;
extern MSFilterDesc ms_g722_dec_desc;
MSFilterDesc * ms_filter_descs[]={
MSFilterDesc * ms_voip_filter_descs[]={
&ms_alaw_dec_desc,
&ms_alaw_enc_desc,
&ms_ulaw_dec_desc,
......@@ -70,8 +65,6 @@ MSFilterDesc * ms_filter_descs[]={
&ms_gsm_dec_desc,
&ms_gsm_enc_desc,
&ms_speex_ec_desc,
&ms_tee_desc,
&ms_void_sink_desc,
&ms_conf_desc,
&ms_h263_old_enc_desc,
&ms_h263_old_dec_desc,
......@@ -88,7 +81,6 @@ MSFilterDesc * ms_filter_descs[]={
&ms_mjpeg_dec_desc,
&ms_size_conv_desc,
&ms_pix_conv_desc,
&ms_join_desc,
#ifndef NORESAMPLE
&ms_resample_desc,
#endif
......@@ -97,8 +89,6 @@ MSFilterDesc * ms_filter_descs[]={
&ms_mire_desc,
&ms_equalizer_desc,
&ms_dd_display_desc,
&ms_itc_source_desc,
&ms_itc_sink_desc,
&ms_audio_mixer_desc,
&ms_ext_display_desc,
&ms_tone_detector_desc,
......
......@@ -322,7 +322,7 @@ MS2_PUBLIC void ice_session_set_role(IceSession *session, IceRole role);
* This function SHOULD not be used. However, it is used by mediastream for testing purpose to
* apply the same credentials for local and remote agents because the SDP exchange is bypassed.
*/
void ice_session_set_local_credentials(IceSession *session, const char *ufrag, const char *pwd);
MS2_PUBLIC void ice_session_set_local_credentials(IceSession *session, const char *ufrag, const char *pwd);
/**
* Tell if remote credentials of an ICE session have changed or not.
......@@ -634,7 +634,7 @@ MS2_PUBLIC int ice_session_nb_losing_pairs(const IceSession *session);
* work around the fact that it does not use candidates gathering.
* It is to be called automatically when the gathering process finishes.
*/
void ice_session_set_base_for_srflx_candidates(IceSession *session);
MS2_PUBLIC void ice_session_set_base_for_srflx_candidates(IceSession *session);
/**
* Compute the foundations of the local candidates of an ICE session.
......@@ -673,7 +673,7 @@ MS2_PUBLIC void ice_session_choose_default_candidates(IceSession *session);
* when creating them with ice_add_remote_candidate().
* However, this function is used by mediastream for testing purpose.
*/
void ice_session_choose_default_remote_candidates(IceSession *session);
MS2_PUBLIC void ice_session_choose_default_remote_candidates(IceSession *session);
/**
* Pair the local and the remote candidates for an ICE session and start sending connectivity checks.
......
......@@ -111,10 +111,6 @@ typedef struct _LosingRemoteCandidate_InProgress_Failed {
} LosingRemoteCandidate_InProgress_Failed;
// WARNING: We need this function to push events in the rtp event queue but it should not be made public in oRTP.
extern void rtp_session_dispatch_event(RtpSession *session, OrtpEvent *ev);
static char * ice_inet_ntoa(struct sockaddr *addr, int addrlen, char *dest, int destlen);
static void transactionID2string(const UInt96 *tr_id, char *tr_id_str);
static void ice_send_stun_server_binding_request(ortp_socket_t sock, const struct sockaddr *server, socklen_t addrlen, UInt96 *transactionID, uint8_t nb_transmissions, int id);
......
......@@ -503,13 +503,15 @@ MSTickerSynchronizer* ms_ticker_synchronizer_new(void) {
}
double ms_ticker_synchronizer_set_external_time(MSTickerSynchronizer* ts, const MSTimeSpec *time) {
int64_t sound_time;
int64_t diff;
uint64_t wc = get_wallclock_ms();
uint64_t ms = get_ms(time);
if (ts->offset == 0) {
ts->offset = wc - ms;
}
int64_t sound_time = ts->offset + ms;
int64_t diff = wc - sound_time;
sound_time = ts->offset + ms;
diff = wc - sound_time;
ts->av_skew = (ts->av_skew * (1.0 - clock_coef)) + ((double) diff * clock_coef);
return ts->av_skew;
}
......
......@@ -503,6 +503,7 @@ bool_t parse_args(int argc, char** argv, MediastreamDatas* out) {
void setup_media_streams(MediastreamDatas* args) {
/*create the rtp session */
OrtpNetworkSimulatorParams params={0};
#ifdef VIDEO_ENABLED
MSWebCam *cam=NULL;
#endif
......@@ -677,6 +678,10 @@ void setup_media_streams(MediastreamDatas* args) {
}
}else{
#ifdef VIDEO_ENABLED
float zoom[] = {
args->zoom,
args->zoom_cx, args->zoom_cy };
if (args->eq){
ms_fatal("Cannot put an audio equalizer in a video stream !");
exit(-1);
......@@ -708,9 +713,6 @@ void setup_media_streams(MediastreamDatas* args) {
);
args->session=args->video->session;
float zoom[] = {
args->zoom,
args->zoom_cx, args->zoom_cy };
ms_filter_call_method(args->video->output,MS_VIDEO_DISPLAY_ZOOM, zoom);
if (args->enable_srtp) {
ms_message("SRTP enabled: %d",
......@@ -730,7 +732,6 @@ void setup_media_streams(MediastreamDatas* args) {
ice_session_choose_default_remote_candidates(args->ice_session);
ice_session_start_connectivity_checks(args->ice_session);
OrtpNetworkSimulatorParams params={0};
if (args->netsim_bw>0){
params.enabled=TRUE;
params.max_bandwidth=args->netsim_bw;
......
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