Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
506462c5
Commit
506462c5
authored
Sep 12, 2012
by
Ghislain MARY
Browse files
Fix compilation for native Win32 with Visual Studio.
parent
a832a43b
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
39 additions
and
26 deletions
+39
-26
build/win32native/basedescs.h
build/win32native/basedescs.h
+16
-0
build/win32native/mediastreamer2.vcproj
build/win32native/mediastreamer2.vcproj
+10
-2
build/win32native/voipdescs.h
build/win32native/voipdescs.h
+1
-11
include/mediastreamer2/ice.h
include/mediastreamer2/ice.h
+3
-3
src/ice.c
src/ice.c
+0
-4
src/msticker.c
src/msticker.c
+4
-2
tests/mediastream.c
tests/mediastream.c
+5
-4
No files found.
build/win32native/basedescs.h
0 → 100644
View file @
506462c5
#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
};
build/win32native/mediastreamer2.vcproj
View file @
506462c5
...
...
@@ -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=
".
\alldesc
s.h"
RelativePath=
".
.\..\include\mediastreamer2\allfilter
s.h"
>
</File>
<File
RelativePath=
".
.\..\include\mediastreamer2\allfilter
s.h"
RelativePath=
".
\basedesc
s.h"
>
</File>
<File
...
...
@@ -593,6 +597,10 @@
RelativePath=
"..\..\src\vfw-missing.h"
>
</File>
<File
RelativePath=
".\voipdescs.h"
>
</File>
<File
RelativePath=
"..\..\include\mediastreamer2\waveheader.h"
>
...
...
build/win32native/
all
descs.h
→
build/win32native/
voip
descs.h
100755 → 100644
View file @
506462c5
...
...
@@ -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
,
...
...
include/mediastreamer2/ice.h
View file @
506462c5
...
...
@@ -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.
...
...
src/ice.c
View file @
506462c5
...
...
@@ -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
);
...
...
src/msticker.c
View file @
506462c5
...
...
@@ -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
;
}
...
...
tests/mediastream.c
View file @
506462c5
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment