diff --git a/libs/srtp/libsrtp.2015.vcxproj b/libs/srtp/libsrtp.2015.vcxproj index f3cb9ebf65..3605317109 100644 --- a/libs/srtp/libsrtp.2015.vcxproj +++ b/libs/srtp/libsrtp.2015.vcxproj @@ -148,7 +148,7 @@ false Level4 false - 4305;4100;4244;4389;4018;4013;%(DisableSpecificWarnings) + 4389;4013;4018;4702;4305;4100;4244;4389;4018;4013;%(DisableSpecificWarnings) @@ -169,7 +169,7 @@ Default Level4 false - 4305;4100;4244;%(DisableSpecificWarnings) + 4389;4013;4018;4702;4305;4100;4244;%(DisableSpecificWarnings) @@ -184,7 +184,7 @@ Default Level4 false - 4305;4100;4244;4389;4018;4013;%(DisableSpecificWarnings) + 4389;4013;4018;4702;4305;4100;4244;4389;4018;4013;%(DisableSpecificWarnings) @@ -202,7 +202,7 @@ Default Level4 false - 4305;4100;4244;%(DisableSpecificWarnings) + 4389;4013;4018;4702;4305;4100;4244;%(DisableSpecificWarnings) @@ -232,7 +232,7 @@ Level4 false EditAndContinue - 4305;%(DisableSpecificWarnings) + 4389;4013;4018;4702;4305;%(DisableSpecificWarnings) Ws2_32.lib;%(AdditionalDependencies) @@ -275,7 +275,7 @@ Level4 false ProgramDatabase - 4305;%(DisableSpecificWarnings) + 4389;4013;4018;4702;4305;%(DisableSpecificWarnings) Ws2_32.lib;%(AdditionalDependencies) @@ -313,7 +313,7 @@ Level4 false ProgramDatabase - 4305;%(DisableSpecificWarnings) + 4389;4013;4018;4702;4305;%(DisableSpecificWarnings) Ws2_32.lib;%(AdditionalDependencies) @@ -348,7 +348,7 @@ Level4 false ProgramDatabase - 4305;%(DisableSpecificWarnings) + 4389;4013;4018;4702;4305;%(DisableSpecificWarnings) Ws2_32.lib;%(AdditionalDependencies) diff --git a/libs/win32/Download PCRE.2015.vcxproj b/libs/win32/Download PCRE.2015.vcxproj index 34e2ba97fe..8c31b2c549 100644 --- a/libs/win32/Download PCRE.2015.vcxproj +++ b/libs/win32/Download PCRE.2015.vcxproj @@ -15,6 +15,7 @@ {B1E7E876-347F-4DC9-9BEA-D1AFBD9DFF8A} Download PCRE Win32Proj + 8.1 @@ -40,8 +41,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\CURL\$(Configuration)\ - $(PlatformName)\CURL\$(Configuration)\ + $(PlatformName)\PCRE\$(Configuration)\ + $(PlatformName)\PCRE\$(Configuration)\ diff --git a/libs/win32/Download SPEEX.2015.vcxproj b/libs/win32/Download SPEEX.2015.vcxproj index 5cfa69db82..751b919cac 100644 --- a/libs/win32/Download SPEEX.2015.vcxproj +++ b/libs/win32/Download SPEEX.2015.vcxproj @@ -15,6 +15,7 @@ {1BDAB935-27DC-47E3-95EA-17E024D39C31} Download SPEEX Win32Proj + 8.1 @@ -40,8 +41,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\CURL\$(Configuration)\ - $(PlatformName)\CURL\$(Configuration)\ + $(PlatformName)\SPEEX\$(Configuration)\ + $(PlatformName)\SPEEX\$(Configuration)\ diff --git a/libs/win32/Download SQLITE.2015.vcxproj b/libs/win32/Download SQLITE.2015.vcxproj index cc864b3014..e1e0eee570 100644 --- a/libs/win32/Download SQLITE.2015.vcxproj +++ b/libs/win32/Download SQLITE.2015.vcxproj @@ -15,6 +15,7 @@ {97D25665-34CD-4E0C-96E7-88F0795B8883} Download SQLITE Win32Proj + 8.1 @@ -40,8 +41,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(PlatformName)\CURL\$(Configuration)\ - $(PlatformName)\CURL\$(Configuration)\ + $(PlatformName)\SQLITE\$(Configuration)\ + $(PlatformName)\SQLITE\$(Configuration)\ diff --git a/libs/win32/apr/libapr.2015.vcxproj b/libs/win32/apr/libapr.2015.vcxproj index 6656552275..d2e6efd656 100644 --- a/libs/win32/apr/libapr.2015.vcxproj +++ b/libs/win32/apr/libapr.2015.vcxproj @@ -121,7 +121,7 @@ xcopy "$(ProjectDir)..\..\apr\include\*.h" "$(ProjectDir)..\..\include\" /C /D / MultiThreadedDebugDLL Level3 true - 4311;4313;4477;4244;4018;4267;4090;4133;%(DisableSpecificWarnings) + 4311;4312;4313;4477;4244;4018;4267;4090;4133;%(DisableSpecificWarnings) _DEBUG;APR_VERSION_ONLY;%(PreprocessorDefinitions) @@ -194,7 +194,7 @@ xcopy "$(ProjectDir)..\..\apr\include\*.h" "$(ProjectDir)..\..\include\" /C /D / true Level3 true - 4311;4313;4477;4244;4018;4267;4090;4133;%(DisableSpecificWarnings) + 4311;4312;4313;4477;4244;4018;4267;4090;4133;%(DisableSpecificWarnings) NDEBUG;APR_VERSION_ONLY;%(PreprocessorDefinitions) diff --git a/libs/win32/libcbt/libcbt.2015.vcxproj b/libs/win32/libcbt/libcbt.2015.vcxproj index c39686a933..1f6f67d5c0 100644 --- a/libs/win32/libcbt/libcbt.2015.vcxproj +++ b/libs/win32/libcbt/libcbt.2015.vcxproj @@ -90,7 +90,7 @@ _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;%(PreprocessorDefinitions) true $(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include - 4800;4101;4267;%(DisableSpecificWarnings) + 4311;4302;4800;4101;4267;%(DisableSpecificWarnings) Windows @@ -108,7 +108,7 @@ _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;%(PreprocessorDefinitions) true $(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include - 4800;4101;4267;%(DisableSpecificWarnings) + 4311;4302;4800;4101;4267;%(DisableSpecificWarnings) Windows @@ -128,7 +128,7 @@ _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true $(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include - 4800;4101;4267;%(DisableSpecificWarnings) + 4311;4302;4800;4101;4267;%(DisableSpecificWarnings) Windows @@ -150,7 +150,7 @@ _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true $(SolutionDir)src\mod\endpoints\mod_gsmopen\libctb-0.16\include - 4800;4101;4267;%(DisableSpecificWarnings) + 4311;4302;4800;4101;4267;%(DisableSpecificWarnings) Windows diff --git a/libs/win32/libshout/shout/shout.h b/libs/win32/libshout/shout/shout.h index 1c2b4c7f63..30473e6f8d 100644 --- a/libs/win32/libshout/shout/shout.h +++ b/libs/win32/libshout/shout/shout.h @@ -36,7 +36,7 @@ #endif #endif // VC8+ # endif -#ifndef __MINGW32__ +#if !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER < 1900) #define va_copy(ap1, ap2) memcpy(&ap1, &ap2, sizeof(va_list)) #endif diff --git a/libs/win32/mpg123/libmpg123.2015.vcxproj b/libs/win32/mpg123/libmpg123.2015.vcxproj index 2f92ca7650..44ce7db15b 100644 --- a/libs/win32/mpg123/libmpg123.2015.vcxproj +++ b/libs/win32/mpg123/libmpg123.2015.vcxproj @@ -247,7 +247,7 @@ Level3 ProgramDatabase CompileAsC - 4028;4334;4267;4996;%(DisableSpecificWarnings) + 4477;4028;4334;4267;4996;%(DisableSpecificWarnings) @@ -265,7 +265,7 @@ Level3 ProgramDatabase CompileAsC - 4028;4334;4267;4996;%(DisableSpecificWarnings) + 4477;4028;4334;4267;4996;%(DisableSpecificWarnings) @@ -289,7 +289,7 @@ Level3 ProgramDatabase CompileAsC - 4028;4334;4267;4996;%(DisableSpecificWarnings) + 4477;4028;4334;4267;4996;%(DisableSpecificWarnings) @@ -313,7 +313,7 @@ Level3 ProgramDatabase CompileAsC - 4028;4334;4267;4996;%(DisableSpecificWarnings) + 4477;4028;4334;4267;4996;%(DisableSpecificWarnings) @@ -332,7 +332,7 @@ false ProgramDatabase CompileAsC - 4028;4334;4267;4996;%(DisableSpecificWarnings) + 4477;4028;4334;4267;4996;%(DisableSpecificWarnings) $(ProjectDir)Debug\$(ProjectName).dll @@ -359,7 +359,7 @@ false ProgramDatabase CompileAsC - 4028;4334;4267;4996;%(DisableSpecificWarnings) + 4477;4028;4334;4267;4996;%(DisableSpecificWarnings) $(ProjectDir)Debug\$(ProjectName).dll @@ -392,7 +392,7 @@ false ProgramDatabase CompileAsC - 4028;4334;4267;4996;%(DisableSpecificWarnings) + 4477;4028;4334;4267;4996;%(DisableSpecificWarnings) $(ProjectDir)Release\$(ProjectName).dll @@ -423,7 +423,7 @@ false ProgramDatabase CompileAsC - 4028;4334;4267;4996;%(DisableSpecificWarnings) + 4477;4028;4334;4267;4996;%(DisableSpecificWarnings) $(ProjectDir)Release\$(ProjectName).dll @@ -447,7 +447,7 @@ Level3 ProgramDatabase CompileAsC - 4028;4334;4267;4996;%(DisableSpecificWarnings) + 4477;4028;4334;4267;4996;%(DisableSpecificWarnings) cl /I "..\.." /EP /TC "$(ProjectDir)..\libmpg123\src\libmpg123\dct36_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct36_3dnow.asm" @@ -534,7 +534,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\ Level3 ProgramDatabase CompileAsC - 4028;4334;4267;4996;%(DisableSpecificWarnings) + 4477;4028;4334;4267;4996;%(DisableSpecificWarnings) cl /I "..\.." /EP /TC "$(ProjectDir)..\libmpg123\src\libmpg123\dct36_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct36_3dnow.asm" @@ -627,7 +627,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\ Level3 ProgramDatabase CompileAsC - 4028;4334;4267;4996;%(DisableSpecificWarnings) + 4477;4028;4334;4267;4996;%(DisableSpecificWarnings) cl /I "..\.." /EP /TC "$(ProjectDir)..\libmpg123\src\libmpg123\dct36_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct36_3dnow.asm" @@ -720,7 +720,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\ Level3 ProgramDatabase CompileAsC - 4028;4334;4267;4996;%(DisableSpecificWarnings) + 4477;4028;4334;4267;4996;%(DisableSpecificWarnings) cl /I "..\.." /EP /TC "$(ProjectDir)..\libmpg123\src\libmpg123\dct36_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct36_3dnow.asm" @@ -809,7 +809,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\ false ProgramDatabase CompileAsC - 4028;4334;4267;4996;%(DisableSpecificWarnings) + 4477;4028;4334;4267;4996;%(DisableSpecificWarnings) cl /I "..\.." /EP /TC "$(ProjectDir)..\libmpg123\src\libmpg123\dct36_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct36_3dnow.asm" @@ -903,7 +903,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\ false ProgramDatabase CompileAsC - 4028;4334;4267;4996;%(DisableSpecificWarnings) + 4477;4028;4334;4267;4996;%(DisableSpecificWarnings) cl /I "..\.." /EP /TC "$(ProjectDir)..\libmpg123\src\libmpg123\dct36_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Debug\dct36_3dnow.asm" @@ -1006,7 +1006,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\ false ProgramDatabase CompileAsC - 4028;4334;4267;4996;%(DisableSpecificWarnings) + 4477;4028;4334;4267;4996;%(DisableSpecificWarnings) cl /I "..\.." /EP /TC "$(ProjectDir)..\..\libmpg123\src\libmpg123\dct36_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct36_3dnow.asm" @@ -1112,7 +1112,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(ProjectDir)..\libmpg123\ false ProgramDatabase CompileAsC - 4028;4334;4267;4996;%(DisableSpecificWarnings) + 4477;4028;4334;4267;4996;%(DisableSpecificWarnings) cl /I "..\.." /EP /TC "$(ProjectDir)..\..\libmpg123\src\libmpg123\dct36_3dnow.S" /nologo > "$(ProjectDir)..\libmpg123\Release\dct36_3dnow.asm" diff --git a/libs/win32/portaudio/portaudio.2015.vcxproj b/libs/win32/portaudio/portaudio.2015.vcxproj index 823119132f..22f74ecbfa 100644 --- a/libs/win32/portaudio/portaudio.2015.vcxproj +++ b/libs/win32/portaudio/portaudio.2015.vcxproj @@ -140,7 +140,7 @@ true Level3 true - 4267;%(DisableSpecificWarnings) + 4496;4312;4267;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) @@ -167,7 +167,7 @@ true Level3 true - 4267;%(DisableSpecificWarnings) + 4496;4312;4267;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) @@ -193,7 +193,7 @@ MultiThreadedDebugDLL Level3 true - 4267;%(DisableSpecificWarnings) + 4496;4312;4267;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) @@ -219,7 +219,7 @@ MultiThreadedDebugDLL Level3 true - 4267;%(DisableSpecificWarnings) + 4496;4312;4267;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) @@ -245,7 +245,7 @@ MultiThreadedDebugDLL Level3 true - 4267;%(DisableSpecificWarnings) + 4496;4312;4267;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) @@ -271,7 +271,7 @@ MultiThreadedDebugDLL Level3 true - 4267;%(DisableSpecificWarnings) + 4496;4312;4267;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) @@ -298,7 +298,7 @@ true Level3 true - 4267;%(DisableSpecificWarnings) + 4496;4312;4267;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) @@ -325,7 +325,7 @@ true Level3 true - 4267;%(DisableSpecificWarnings) + 4496;4312;4267;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) diff --git a/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj b/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj index 52cab1670b..61ef7d83f5 100644 --- a/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj +++ b/libs/win32/sofia/libsofia_sip_ua_static.2015.vcxproj @@ -279,7 +279,6 @@ if not exist "$(ProjectDir)$(IntDir)\auth_client.obj" "autogen.cmd" - diff --git a/libs/win32/speex/libspeexdsp.2015.vcxproj b/libs/win32/speex/libspeexdsp.2015.vcxproj index b230af8b49..b30ea4e3d2 100644 --- a/libs/win32/speex/libspeexdsp.2015.vcxproj +++ b/libs/win32/speex/libspeexdsp.2015.vcxproj @@ -38,6 +38,7 @@ {03207781-0D1C-4DB3-A71D-45C608F28DBD} Win32Proj libspeexdsp + 8.1 @@ -129,13 +130,25 @@ <_ProjectFileVersion>10.0.30319.1 $(Configuration)\ - $(Configuration)\ + $(Platform)\$(Configuration)\$(ProjectName)\ $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(ProjectName)\ $(Configuration)\ - $(Configuration)\ + $(Platform)\$(Configuration)\$(ProjectName)\ $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\$(ProjectName)\ + + + $(Platform)\$(Configuration)\$(ProjectName)\ + + + $(Platform)\$(Configuration)\$(ProjectName)\ + + + $(Platform)\$(Configuration)\$(ProjectName)\ + + + $(Platform)\$(Configuration)\$(ProjectName)\ diff --git a/libs/xmlrpc-c/lib/abyss/src/socket_win.c b/libs/xmlrpc-c/lib/abyss/src/socket_win.c index 187c307583..58aca939de 100644 --- a/libs/xmlrpc-c/lib/abyss/src/socket_win.c +++ b/libs/xmlrpc-c/lib/abyss/src/socket_win.c @@ -277,7 +277,7 @@ channelRead(TChannel * const channelP, *bytesReceivedP = rc; if (ChannelTraceIsActive) - fprintf(stderr, "Abyss channel: read %u bytes: '%.*s'\n", bytesReceivedP, (int)(*bytesReceivedP), buffer); + fprintf(stderr, "Abyss channel: read %u bytes: '%.*s'\n", *bytesReceivedP, (int)(*bytesReceivedP), buffer); } } } diff --git a/libs/xmlrpc-c/lib/libutil/sleep.c b/libs/xmlrpc-c/lib/libutil/sleep.c index 15b515075a..213dae5c66 100644 --- a/libs/xmlrpc-c/lib/libutil/sleep.c +++ b/libs/xmlrpc-c/lib/libutil/sleep.c @@ -1,6 +1,3 @@ -#include "bool.h" - -#include "xmlrpc-c/sleep_int.h" #ifdef WIN32 #include @@ -8,6 +5,9 @@ #else #include #endif +#include "bool.h" + +#include "xmlrpc-c/sleep_int.h" void diff --git a/src/mod/applications/mod_commands/mod_commands.2015.vcxproj b/src/mod/applications/mod_commands/mod_commands.2015.vcxproj index 73a8b20e00..639fe0ac48 100644 --- a/src/mod/applications/mod_commands/mod_commands.2015.vcxproj +++ b/src/mod/applications/mod_commands/mod_commands.2015.vcxproj @@ -89,6 +89,7 @@ false + 4457;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -104,6 +105,7 @@ false + 4457;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -117,6 +119,7 @@ false + 4457;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -132,6 +135,7 @@ false + 4457;6340;6246;6011;6387;%(DisableSpecificWarnings) false diff --git a/src/mod/applications/mod_conference/conference_api.c b/src/mod/applications/mod_conference/conference_api.c index 844bb24548..574d139256 100644 --- a/src/mod/applications/mod_conference/conference_api.c +++ b/src/mod/applications/mod_conference/conference_api.c @@ -1002,7 +1002,8 @@ switch_status_t conference_api_sub_volume_out(conference_member_t *member, switc switch_status_t conference_api_sub_vid_bandwidth(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv) { - int32_t i, video_write_bandwidth; + uint32_t i; + int32_t video_write_bandwidth; int x = 0; if (!conference_utils_test_flag(conference, CFLAG_MINIMIZE_VIDEO_ENCODING)) { @@ -1088,7 +1089,7 @@ switch_status_t conference_api_sub_vid_fps(conference_obj_t *conference, switch_ return SWITCH_STATUS_SUCCESS; } - fps = atof(argv[2]); + fps = (float)atof(argv[2]); if (conference_video_set_fps(conference, fps)) { stream->write_function(stream, "FPS set to [%s]\n", argv[2]); @@ -1134,7 +1135,7 @@ switch_status_t conference_api_sub_write_png(conference_obj_t *conference, switc switch_status_t conference_api_sub_vid_layout(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv) { video_layout_t *vlayout = NULL; - int idx = 0; + uint32_t idx = 0; if (!argv[2]) { stream->write_function(stream, "Invalid input\n"); @@ -1932,7 +1933,7 @@ switch_status_t conference_api_sub_relate(conference_obj_t *conference, switch_s switch_mutex_lock(conference->mutex); if (conference->relationship_total) { - int member_id = 0; + uint32_t member_id = 0; if (argc == 3) member_id = atoi(argv[2]); diff --git a/src/mod/applications/mod_conference/conference_member.c b/src/mod/applications/mod_conference/conference_member.c index 0a05b7c9f0..bae690f061 100644 --- a/src/mod/applications/mod_conference/conference_member.c +++ b/src/mod/applications/mod_conference/conference_member.c @@ -733,7 +733,7 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m conference_video_check_avatar(member, SWITCH_FALSE); if ((var = switch_channel_get_variable_dup(member->channel, "video_initial_canvas", SWITCH_FALSE, -1))) { - int id = atoi(var) - 1; + uint32_t id = atoi(var) - 1; if (id < conference->canvas_count) { member->canvas_id = id; member->layer_timeout = DEFAULT_LAYER_TIMEOUT; @@ -741,7 +741,7 @@ switch_status_t conference_member_add(conference_obj_t *conference, conference_m } if ((var = switch_channel_get_variable_dup(member->channel, "video_initial_watching_canvas", SWITCH_FALSE, -1))) { - int id = atoi(var) - 1; + uint32_t id = atoi(var) - 1; if (id == 0) { id = conference->canvas_count; @@ -1560,16 +1560,16 @@ int conference_member_get_canvas_id(conference_member_t *member, const char *val } if (watching) { - if (index > member->conference->canvas_count || !member->conference->canvases[index]) { - index = 0; - } else if (index < 0) { + if (index < 0) { index = member->conference->canvas_count; + } else if ((uint32_t)index > member->conference->canvas_count || !member->conference->canvases[index]) { + index = 0; } } else { - if (index >= member->conference->canvas_count || !member->conference->canvases[index]) { - index = 0; - } else if (index < 0) { + if (index < 0) { index = member->conference->canvas_count; + } else if ((uint32_t)index >= member->conference->canvas_count || !member->conference->canvases[index]) { + index = 0; } } @@ -1578,11 +1578,11 @@ int conference_member_get_canvas_id(conference_member_t *member, const char *val } if (member->conference->canvas_count > 1) { - if (index > member->conference->canvas_count) { + if ((uint32_t)index > member->conference->canvas_count) { return -1; } } else { - if (index >= member->conference->canvas_count) { + if ((uint32_t)index >= member->conference->canvas_count) { return -1; } } diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c index 6e1c1d0d2f..7ea4378349 100644 --- a/src/mod/applications/mod_conference/conference_video.c +++ b/src/mod/applications/mod_conference/conference_video.c @@ -59,7 +59,7 @@ static struct conference_fps FPS_VALS[] = { int conference_video_set_fps(conference_obj_t *conference, float fps) { - int i = 0, j = 0; + uint32_t i = 0, j = 0; for (i = 0; FPS_VALS[i].ms; i++) { if (FPS_VALS[i].fps == fps) { @@ -223,10 +223,10 @@ void conference_video_parse_layouts(conference_obj_t *conference, int WIDTH, int if (auto_3d || audio_position) { if (auto_3d || !strcasecmp(audio_position, "auto")) { - int x_pos = WIDTH * x / VIDEO_LAYOUT_SCALE; - int y_pos = HEIGHT * y / VIDEO_LAYOUT_SCALE; - int width = WIDTH * scale / VIDEO_LAYOUT_SCALE; - int height = HEIGHT * hscale / VIDEO_LAYOUT_SCALE; + int x_pos = (int)(WIDTH * x / VIDEO_LAYOUT_SCALE); + int y_pos = (int)(HEIGHT * y / VIDEO_LAYOUT_SCALE); + int width = (int)(WIDTH * scale / VIDEO_LAYOUT_SCALE); + int height = (int)(HEIGHT * hscale / VIDEO_LAYOUT_SCALE); int center_x = x_pos + width / 2; int center_y = y_pos + height / 2; int half_x = WIDTH / 2; @@ -240,9 +240,9 @@ void conference_video_parse_layouts(conference_obj_t *conference, int WIDTH, int } if (center_y > half_y) { - yv = -1 - ((center_y - half_y) / half_y) * -1; + yv = -1.0f - ((center_y - half_y) / half_y) * -1.0f; } else { - yv = center_y / half_y; + yv = (float)center_y / half_y; } vlayout->images[vlayout->layers].audio_position = switch_core_sprintf(conference->pool, "%02f:0.0:%02f", xv, yv); @@ -383,14 +383,14 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg, } if (layer->geometry.scale) { - int img_w = 0, img_h = 0; + uint32_t img_w = 0, img_h = 0; double screen_aspect = 0, img_aspect = 0; int x_pos = layer->x_pos; int y_pos = layer->y_pos; switch_size_t img_addr = 0; - img_w = layer->screen_w = IMG->d_w * layer->geometry.scale / VIDEO_LAYOUT_SCALE; - img_h = layer->screen_h = IMG->d_h * layer->geometry.hscale / VIDEO_LAYOUT_SCALE; + img_w = layer->screen_w = (uint32_t)(IMG->d_w * layer->geometry.scale / VIDEO_LAYOUT_SCALE); + img_h = layer->screen_h = (uint32_t)(IMG->d_h * layer->geometry.hscale / VIDEO_LAYOUT_SCALE); screen_aspect = (double) layer->screen_w / layer->screen_h; @@ -400,28 +400,28 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg, if (layer->last_img_addr != img_addr && layer->geometry.zoom) { if (screen_aspect < img_aspect) { - int cropsize = 0; + unsigned int cropsize = 0; double scale = 1; if (img->d_h != layer->screen_h) { scale = (double)layer->screen_h / img->d_h; } - cropsize = ((img->d_w )-((double)layer->screen_w/scale)) / 2; + cropsize = (unsigned int)(((img->d_w )-((double)layer->screen_w/scale)) / 2); if (cropsize) { - switch_img_set_rect(img, cropsize, 0, layer->screen_w/scale, layer->screen_h/scale); + switch_img_set_rect(img, cropsize, 0, (unsigned int)(layer->screen_w/scale), (unsigned int)(layer->screen_h/scale)); img_aspect = (double) img->d_w / img->d_h; } } else if (screen_aspect > img_aspect) { - int cropsize = 0; + unsigned int cropsize = 0; double scale = 1; if (img->d_w != layer->screen_w) { scale = (double)layer->screen_w / img->d_w; } - cropsize = ceil(((img->d_h )-((double)layer->screen_h/scale)) / 2); + cropsize = (int)ceil(((img->d_h )-((double)layer->screen_h/scale)) / 2); if (cropsize) { - switch_img_set_rect(img, 0, cropsize, layer->screen_w/scale, layer->screen_h/scale); + switch_img_set_rect(img, 0, cropsize, (unsigned int)(layer->screen_w/scale), (unsigned int)(layer->screen_h/scale)); img_aspect = (double) img->d_w / img->d_h; } } @@ -432,10 +432,10 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg, } if (screen_aspect > img_aspect) { - img_w = ceil((double)img_aspect * layer->screen_h); + img_w = (uint32_t)ceil((double)img_aspect * layer->screen_h); x_pos += (layer->screen_w - img_w) / 2; } else if (screen_aspect < img_aspect) { - img_h = ceil((double)layer->screen_w / img_aspect); + img_h = (uint32_t)ceil((double)layer->screen_w / img_aspect); y_pos += (layer->screen_h - img_h) / 2; } @@ -748,7 +748,7 @@ void conference_video_layer_set_banner(conference_member_t *member, mcu_layer_t { switch_rgb_color_t fgcolor, bgcolor; int font_scale = 4; - int font_size = 0; + uint16_t font_size = 0; const char *fg = "#cccccc"; const char *bg = "#142e55"; char *parsed = NULL; @@ -823,9 +823,9 @@ void conference_video_layer_set_banner(conference_member_t *member, mcu_layer_t } if (layer->screen_h < layer->screen_w) { - font_size = (double)(font_scale / 100.0f) * layer->screen_h; + font_size = (uint16_t)((double)(font_scale / 100.0f) * layer->screen_h); } else { - font_size = (double)(font_scale / 100.0f) * layer->screen_w; + font_size = (uint16_t)((double)(font_scale / 100.0f) * layer->screen_w); } switch_color_set_rgb(&fgcolor, fg); @@ -1020,14 +1020,14 @@ void conference_video_init_canvas_layers(conference_obj_t *conference, mcu_canva layer->refresh = 1; - layer->screen_w = canvas->img->d_w * layer->geometry.scale / VIDEO_LAYOUT_SCALE; - layer->screen_h = canvas->img->d_h * layer->geometry.hscale / VIDEO_LAYOUT_SCALE; + layer->screen_w = (uint32_t)(canvas->img->d_w * layer->geometry.scale / VIDEO_LAYOUT_SCALE); + layer->screen_h = (uint32_t)(canvas->img->d_h * layer->geometry.hscale / VIDEO_LAYOUT_SCALE); // if (layer->screen_w % 2) layer->screen_w++; // round to even // if (layer->screen_h % 2) layer->screen_h++; // round to even - layer->x_pos = canvas->img->d_w * layer->geometry.x / VIDEO_LAYOUT_SCALE; - layer->y_pos = canvas->img->d_h * layer->geometry.y / VIDEO_LAYOUT_SCALE; + layer->x_pos = (int)(canvas->img->d_w * layer->geometry.x / VIDEO_LAYOUT_SCALE); + layer->y_pos = (int)(canvas->img->d_h * layer->geometry.y / VIDEO_LAYOUT_SCALE); if (layer->geometry.floor) { @@ -1835,7 +1835,7 @@ void conference_video_check_auto_bitrate(conference_member_t *member, mcu_layer_ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "%s auto-setting bitrate to %dkps because user's image is not visible\n", switch_channel_get_name(member->channel), kps); } else { - kps = switch_calc_bitrate(w, h, 2, member->conference->video_fps.fps); + kps = switch_calc_bitrate(w, h, 2, (int)(member->conference->video_fps.fps)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "%s auto-setting bitrate to %dkps to accomodate %dx%d resolution\n", switch_channel_get_name(member->channel), kps, layer->screen_w, layer->screen_h); } @@ -2711,7 +2711,8 @@ void *SWITCH_THREAD_FUNC conference_video_super_muxing_thread_run(switch_thread_ switch_time_t now; int min_members = 0; int count_changed = 0; - int layer_idx = 0, j = 0; + int layer_idx = 0; + uint32_t j = 0; switch_image_t *img = NULL; int used_canvases = 0; diff --git a/src/mod/applications/mod_conference/mod_conference.2015.vcxproj b/src/mod/applications/mod_conference/mod_conference.2015.vcxproj index c62be0c0fd..7fe1465936 100644 --- a/src/mod/applications/mod_conference/mod_conference.2015.vcxproj +++ b/src/mod/applications/mod_conference/mod_conference.2015.vcxproj @@ -93,6 +93,7 @@ false + 4456;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -108,6 +109,7 @@ false + 4456;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -121,6 +123,7 @@ false + 4456;6340;6246;6011;6387;%(DisableSpecificWarnings) false @@ -137,6 +140,7 @@ false $(ProjectDir);%(AdditionalIncludeDirectories) + 4456;6340;6246;6011;6387;%(DisableSpecificWarnings) false diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 1dd7e4d9a1..b0be87268d 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -2565,7 +2565,7 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co } else if (!strcasecmp(var, "video-canvas-size") && !zstr(val)) { video_canvas_size = val; } else if (!strcasecmp(var, "video-fps") && !zstr(val)) { - fps = atof(val); + fps = (float)atof(val); } else if (!strcasecmp(var, "video-codec-bandwidth") && !zstr(val)) { video_codec_bandwidth = val; } else if (!strcasecmp(var, "video-no-video-avatar") && !zstr(val)) { @@ -2846,7 +2846,7 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co if (video_codec_bandwidth) { if (!strcasecmp(video_codec_bandwidth, "auto")) { - conference->video_codec_settings.video.bandwidth = switch_calc_bitrate(canvas_w, canvas_h, 2, conference->video_fps.fps); + conference->video_codec_settings.video.bandwidth = switch_calc_bitrate(canvas_w, canvas_h, 2, (int)conference->video_fps.fps); } else { conference->video_codec_settings.video.bandwidth = switch_parse_bandwidth_string(video_codec_bandwidth); } diff --git a/src/mod/applications/mod_conference/mod_conference.h b/src/mod/applications/mod_conference/mod_conference.h index 9cb8b38569..b1c78a210e 100644 --- a/src/mod/applications/mod_conference/mod_conference.h +++ b/src/mod/applications/mod_conference/mod_conference.h @@ -430,8 +430,8 @@ typedef struct mcu_layer_s { int idx; int tagged; int bugged; - int screen_w; - int screen_h; + uint32_t screen_w; + uint32_t screen_h; int x_pos; int y_pos; int banner_patched; @@ -645,7 +645,7 @@ typedef struct conference_obj { conference_record_t *rec_node_head; int last_speech_channels; mcu_canvas_t *canvases[MAX_CANVASES+1]; - int canvas_count; + uint32_t canvas_count; int super_canvas_label_layers; int super_canvas_show_all_layers; int canvas_running_count; diff --git a/src/mod/codecs/mod_opus/mod_opus.c b/src/mod/codecs/mod_opus/mod_opus.c index bac1f9d54e..1dc732aece 100644 --- a/src/mod/codecs/mod_opus/mod_opus.c +++ b/src/mod/codecs/mod_opus/mod_opus.c @@ -209,7 +209,7 @@ static switch_status_t switch_opus_fmtp_parse(const char *fmtp, switch_codec_fmt static char *gen_fmtp(opus_codec_settings_t *settings, switch_memory_pool_t *pool) { - char buf[256] = ""; + char buf[256] = { 0 }; if (settings->useinbandfec) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "useinbandfec=1; "); @@ -317,7 +317,7 @@ static switch_status_t switch_opus_init(switch_codec_t *codec, switch_codec_flag struct opus_context *context = NULL; int encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); int decoding = (flags & SWITCH_CODEC_FLAG_DECODE); - switch_codec_fmtp_t codec_fmtp,codec_fmtp_only_remote; + switch_codec_fmtp_t codec_fmtp, codec_fmtp_only_remote; opus_codec_settings_t opus_codec_settings = { 0 }; opus_codec_settings_t opus_codec_settings_remote = { 0 }; @@ -375,11 +375,11 @@ static switch_status_t switch_opus_init(switch_codec_t *codec, switch_codec_flag * maxplaybackrate=R3,sprop-maxcapturerate=R4 * then it should start the encoder at sample rate: min(R1, R4) and the decoder at sample rate: min(R3, R2)*/ if (codec_fmtp.private_info) { - opus_codec_settings_t *codec_settings = codec_fmtp_only_remote.private_info; - if (opus_codec_settings.sprop_maxcapturerate || codec_settings->maxplaybackrate) { + opus_codec_settings_t *settings = codec_fmtp_only_remote.private_info; + if (opus_codec_settings.sprop_maxcapturerate || settings->maxplaybackrate) { enc_samplerate = opus_codec_settings.sprop_maxcapturerate; /*R4*/ - if (codec_settings->maxplaybackrate < enc_samplerate && codec_settings->maxplaybackrate) { - enc_samplerate = codec_settings->maxplaybackrate; /*R1*/ + if (settings->maxplaybackrate < enc_samplerate && settings->maxplaybackrate) { + enc_samplerate = settings->maxplaybackrate; /*R1*/ context->enc_frame_size = enc_samplerate * (codec->implementation->microseconds_per_packet / 1000) / 1000; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opus encoder will be created at sample rate %d hz\n",enc_samplerate); } else { @@ -461,11 +461,11 @@ static switch_status_t switch_opus_init(switch_codec_t *codec, switch_codec_flag if (opus_prefs.asymmetric_samplerates) { if (codec_fmtp.private_info) { - opus_codec_settings_t *codec_settings = codec_fmtp_only_remote.private_info; - if (opus_codec_settings.maxplaybackrate || codec_settings->sprop_maxcapturerate ) { + opus_codec_settings_t *settings = codec_fmtp_only_remote.private_info; + if (opus_codec_settings.maxplaybackrate || settings->sprop_maxcapturerate ) { dec_samplerate = opus_codec_settings.maxplaybackrate; /* R3 */ - if (dec_samplerate > codec_settings->sprop_maxcapturerate && codec_settings->sprop_maxcapturerate){ - dec_samplerate = codec_settings->sprop_maxcapturerate; /* R2 */ + if (dec_samplerate > settings->sprop_maxcapturerate && settings->sprop_maxcapturerate){ + dec_samplerate = settings->sprop_maxcapturerate; /* R2 */ context->dec_frame_size = dec_samplerate*(codec->implementation->microseconds_per_packet / 1000) / 1000; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opus decoder will be created at sample rate %d hz\n",dec_samplerate); } else { @@ -731,7 +731,7 @@ static switch_status_t switch_opus_keep_fec_enabled(switch_codec_t *codec) uint32_t LBRR_threshold_bitrate,LBRR_rate_thres_bps,real_target_bitrate ; opus_int32 a32,b32; uint32_t fs = context->enc_frame_size * 1000 / (codec->implementation->microseconds_per_packet / 1000); - float frame_rate = 1000 / (codec->implementation->microseconds_per_packet / 1000); + float frame_rate =(float)(1000 / (codec->implementation->microseconds_per_packet / 1000)); uint32_t step = (codec->implementation->microseconds_per_packet / 1000) != 60 ? 8000 / (codec->implementation->microseconds_per_packet / 1000 ) : 134 ; opus_encoder_ctl(context->encoder_object, OPUS_GET_BITRATE(¤t_bitrate)); @@ -748,7 +748,7 @@ static switch_status_t switch_opus_keep_fec_enabled(switch_codec_t *codec) LBRR_rate_thres_bps = 16000; /*LBRR_WB_MIN_RATE_BPS*/ } /*see opus-1.1/src/opus_encoder.c , opus_encode_native() */ - real_target_bitrate = 8 * (current_bitrate * context->enc_frame_size / ( fs * 8 ) - 1) * frame_rate ; + real_target_bitrate = (uint32_t)(8 * (current_bitrate * context->enc_frame_size / ( fs * 8 ) - 1) * frame_rate ); /*check if the internally used bitrate is above the threshold defined in opus-1.1/silk/control_codec.c */ a32 = LBRR_rate_thres_bps * (125 -(((current_loss) < (25)) ? (current_loss) : (25))); b32 = ((opus_int32)((0.01) * ((opus_int64)1 << (16)) + 0.5)); @@ -767,7 +767,7 @@ static switch_status_t switch_opus_keep_fec_enabled(switch_codec_t *codec) } else { while (real_target_bitrate <= LBRR_threshold_bitrate) { current_bitrate += step; - real_target_bitrate = 8 * (current_bitrate * context->enc_frame_size / ( fs * 8 ) - 1) * frame_rate ; + real_target_bitrate = (uint32_t)(8 * (current_bitrate * context->enc_frame_size / ( fs * 8 ) - 1) * frame_rate); } opus_encoder_ctl(context->encoder_object,OPUS_SET_BITRATE(current_bitrate)); if (globals.debug) diff --git a/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj b/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj index dcac8e44ee..d696a1973d 100644 --- a/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj +++ b/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj @@ -96,7 +96,7 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) - 4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings) + 4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings) false @@ -114,7 +114,7 @@ _DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) - 4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings) + 4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings) false @@ -132,7 +132,7 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) - 4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings) + 4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings) false @@ -149,7 +149,7 @@ NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) - 4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings) + 4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings) false diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.2015.vcxproj b/src/mod/endpoints/mod_skinny/mod_skinny.2015.vcxproj index e64da4474f..ed6e63a786 100644 --- a/src/mod/endpoints/mod_skinny/mod_skinny.2015.vcxproj +++ b/src/mod/endpoints/mod_skinny/mod_skinny.2015.vcxproj @@ -92,7 +92,7 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) - 4245;4267;4389;4244;6011;4100;4101;%(DisableSpecificWarnings) + 4456;4245;4267;4389;4244;6011;4100;4101;%(DisableSpecificWarnings) false @@ -109,7 +109,7 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) - 4245;4267;4389;4244;6011;4100;4101;%(DisableSpecificWarnings) + 4456;4245;4267;4389;4244;6011;4100;4101;%(DisableSpecificWarnings) false @@ -126,7 +126,7 @@ %(PreprocessorDefinitions) - 4245;4267;4389;4244;6011;4100;4101;%(DisableSpecificWarnings) + 4456;4245;4267;4389;4244;6011;4100;4101;%(DisableSpecificWarnings) false @@ -142,7 +142,7 @@ %(PreprocessorDefinitions) - 4245;4267;4389;4244;6011;4100;4101;%(DisableSpecificWarnings) + 4456;4245;4267;4389;4244;6011;4100;4101;%(DisableSpecificWarnings) false