Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
6b5b1a3d
提交
6b5b1a3d
authored
10月 26, 2015
作者:
Mike Jerris
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-8389: [build] Fix msvc 2015 build warnings
上级
37263d47
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
26 行增加
和
19 行删除
+26
-19
switch_utils.h
src/include/switch_utils.h
+2
-2
conference_video.c
src/mod/applications/mod_conference/conference_video.c
+1
-1
mod_opus.c
src/mod/codecs/mod_opus/mod_opus.c
+7
-6
mod_skypopen.2015.vcxproj
src/mod/endpoints/mod_skypopen/mod_skypopen.2015.vcxproj
+12
-6
sofia.c
src/mod/endpoints/mod_sofia/sofia.c
+1
-1
mod_local_stream.c
src/mod/formats/mod_local_stream/mod_local_stream.c
+3
-3
没有找到文件。
src/include/switch_utils.h
浏览文件 @
6b5b1a3d
...
@@ -859,7 +859,7 @@ static inline switch_bool_t switch_strstr(char *s, char *q)
...
@@ -859,7 +859,7 @@ static inline switch_bool_t switch_strstr(char *s, char *q)
S
=
strdup
(
s
);
S
=
strdup
(
s
);
assert
(
S
!=
NULL
);
switch_
assert
(
S
!=
NULL
);
for
(
p
=
S
;
p
&&
*
p
;
p
++
)
{
for
(
p
=
S
;
p
&&
*
p
;
p
++
)
{
*
p
=
(
char
)
switch_toupper
(
*
p
);
*
p
=
(
char
)
switch_toupper
(
*
p
);
...
@@ -871,7 +871,7 @@ static inline switch_bool_t switch_strstr(char *s, char *q)
...
@@ -871,7 +871,7 @@ static inline switch_bool_t switch_strstr(char *s, char *q)
}
}
Q
=
strdup
(
q
);
Q
=
strdup
(
q
);
assert
(
Q
!=
NULL
);
switch_
assert
(
Q
!=
NULL
);
for
(
p
=
Q
;
p
&&
*
p
;
p
++
)
{
for
(
p
=
Q
;
p
&&
*
p
;
p
++
)
{
*
p
=
(
char
)
switch_toupper
(
*
p
);
*
p
=
(
char
)
switch_toupper
(
*
p
);
...
...
src/mod/applications/mod_conference/conference_video.c
浏览文件 @
6b5b1a3d
...
@@ -1483,7 +1483,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_write_thread_run(switch_thread_
...
@@ -1483,7 +1483,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_write_thread_run(switch_thread_
switch_time_t
now
=
switch_time_now
();
switch_time_t
now
=
switch_time_now
();
if
(
last
)
{
if
(
last
)
{
int
delta
=
now
-
last
;
int
delta
=
(
int
)(
now
-
last
)
;
if
(
delta
>
member
->
conference
->
video_fps
.
ms
*
5000
)
{
if
(
delta
>
member
->
conference
->
video_fps
.
ms
*
5000
)
{
switch_core_session_request_video_refresh
(
member
->
session
);
switch_core_session_request_video_refresh
(
member
->
session
);
}
}
...
...
src/mod/codecs/mod_opus/mod_opus.c
浏览文件 @
6b5b1a3d
...
@@ -858,8 +858,9 @@ static switch_status_t switch_opus_encode_repacketize(switch_codec_t *codec,
...
@@ -858,8 +858,9 @@ static switch_status_t switch_opus_encode_repacketize(switch_codec_t *codec,
int16_t
*
dec_ptr_buf
=
decoded_data
;
int16_t
*
dec_ptr_buf
=
decoded_data
;
/* work inside the available buffer to avoid other buffer allocations. *encoded_data_len will be SWITCH_RECOMMENDED_BUFFER_SIZE */
/* work inside the available buffer to avoid other buffer allocations. *encoded_data_len will be SWITCH_RECOMMENDED_BUFFER_SIZE */
unsigned
char
*
enc_ptr_buf
=
(
unsigned
char
*
)
encoded_data
+
(
len
/
2
);
unsigned
char
*
enc_ptr_buf
=
(
unsigned
char
*
)
encoded_data
+
(
len
/
2
);
int
nb_frames
=
codec
->
implementation
->
microseconds_per_packet
/
20000
;
/* requested ptime: 20 ms * nb_frames */
uint32_t
nb_frames
=
codec
->
implementation
->
microseconds_per_packet
/
20000
;
/* requested ptime: 20 ms * nb_frames */
int
frame_size
,
i
,
bytes
=
0
,
want_fec
=
0
,
toggle_fec
=
0
;
uint32_t
frame_size
,
i
;
int
bytes
=
0
,
want_fec
=
0
,
toggle_fec
=
0
;
opus_int32
ret
=
0
;
opus_int32
ret
=
0
;
opus_int32
total_len
=
0
;
opus_int32
total_len
=
0
;
switch_status_t
status
=
SWITCH_STATUS_SUCCESS
;
switch_status_t
status
=
SWITCH_STATUS_SUCCESS
;
...
@@ -879,7 +880,7 @@ static switch_status_t switch_opus_encode_repacketize(switch_codec_t *codec,
...
@@ -879,7 +880,7 @@ static switch_status_t switch_opus_encode_repacketize(switch_codec_t *codec,
}
}
frame_size
=
(
decoded_data_len
/
2
)
/
nb_frames
;
frame_size
=
(
decoded_data_len
/
2
)
/
nb_frames
;
if
((
frame_size
*
nb_frames
)
!=
context
->
enc_frame_size
)
{
if
((
frame_size
*
nb_frames
)
!=
context
->
enc_frame_size
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"Encoder Error: Decoded Datalen %u Number of frames: %
d Encoder frame size: %d
\n
"
,
decoded_data_len
,
nb_frames
,
context
->
enc_frame_size
);
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"Encoder Error: Decoded Datalen %u Number of frames: %
u Encoder frame size: %u
\n
"
,
decoded_data_len
,
nb_frames
,
context
->
enc_frame_size
);
switch_goto_status
(
SWITCH_STATUS_GENERR
,
end
);
switch_goto_status
(
SWITCH_STATUS_GENERR
,
end
);
}
}
opus_repacketizer_init
(
rp
);
opus_repacketizer_init
(
rp
);
...
@@ -1080,13 +1081,13 @@ static switch_status_t switch_opus_control(switch_codec_t *codec,
...
@@ -1080,13 +1081,13 @@ static switch_status_t switch_opus_control(switch_codec_t *codec,
switch
(
cmd
)
{
switch
(
cmd
)
{
case
SCC_CODEC_SPECIFIC
:
case
SCC_CODEC_SPECIFIC
:
{
{
const
char
*
c
m
d
=
(
const
char
*
)
cmd_data
;
const
char
*
c
omman
d
=
(
const
char
*
)
cmd_data
;
const
char
*
arg
=
(
const
char
*
)
cmd_arg
;
const
char
*
arg
=
(
const
char
*
)
cmd_arg
;
switch_codec_control_type_t
reply_type
=
SCCT_STRING
;
switch_codec_control_type_t
reply_type
=
SCCT_STRING
;
const
char
*
reply
=
"ERROR INVALID COMMAND"
;
const
char
*
reply
=
"ERROR INVALID COMMAND"
;
if
(
!
zstr
(
c
m
d
))
{
if
(
!
zstr
(
c
omman
d
))
{
if
(
!
strcasecmp
(
c
m
d
,
"jb_lookahead"
))
{
if
(
!
strcasecmp
(
c
omman
d
,
"jb_lookahead"
))
{
if
(
!
zstr
(
arg
))
{
if
(
!
zstr
(
arg
))
{
context
->
use_jb_lookahead
=
switch_true
(
arg
);
context
->
use_jb_lookahead
=
switch_true
(
arg
);
}
}
...
...
src/mod/endpoints/mod_skypopen/mod_skypopen.2015.vcxproj
浏览文件 @
6b5b1a3d
...
@@ -130,9 +130,12 @@
...
@@ -130,9 +130,12 @@
</ItemDefinitionGroup>
</ItemDefinitionGroup>
<ItemGroup>
<ItemGroup>
<ClCompile
Include=
"mod_skypopen.c"
>
<ClCompile
Include=
"mod_skypopen.c"
>
<AdditionalOptions
Condition=
"'$(Configuration)|$(Platform)'=='Debug|Win32'"
>
/analyze:stacksize65535
</AdditionalOptions>
<AdditionalOptions
Condition=
"'$(Configuration)|$(Platform)'=='Debug|Win32'"
>
<AdditionalOptions
Condition=
"'$(Configuration)|$(Platform)'=='Release|Win32'"
>
/analyze:stacksize65535
</AdditionalOptions>
</AdditionalOptions>
<AdditionalOptions
Condition=
"'$(Configuration)|$(Platform)'=='Debug|x64'"
>
/analyze:stacksize65535
</AdditionalOptions>
<AdditionalOptions
Condition=
"'$(Configuration)|$(Platform)'=='Release|Win32'"
>
</AdditionalOptions>
<AdditionalOptions
Condition=
"'$(Configuration)|$(Platform)'=='Debug|x64'"
>
</AdditionalOptions>
<AdditionalOptions
Condition=
"'$(Configuration)|$(Platform)'=='Release|x64'"
>
<AdditionalOptions
Condition=
"'$(Configuration)|$(Platform)'=='Release|x64'"
>
</AdditionalOptions>
</AdditionalOptions>
</ClCompile>
</ClCompile>
...
@@ -141,9 +144,12 @@
...
@@ -141,9 +144,12 @@
<DisableSpecificWarnings
Condition=
"'$(Configuration)|$(Platform)'=='Release|Win32'"
>
4305;4306;28193;4244;4267;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)
</DisableSpecificWarnings>
<DisableSpecificWarnings
Condition=
"'$(Configuration)|$(Platform)'=='Release|Win32'"
>
4305;4306;28193;4244;4267;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)
</DisableSpecificWarnings>
<DisableSpecificWarnings
Condition=
"'$(Configuration)|$(Platform)'=='Debug|x64'"
>
4305;4306;28193;4244;4267;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)
</DisableSpecificWarnings>
<DisableSpecificWarnings
Condition=
"'$(Configuration)|$(Platform)'=='Debug|x64'"
>
4305;4306;28193;4244;4267;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)
</DisableSpecificWarnings>
<DisableSpecificWarnings
Condition=
"'$(Configuration)|$(Platform)'=='Release|x64'"
>
4305;4306;28193;4244;4267;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)
</DisableSpecificWarnings>
<DisableSpecificWarnings
Condition=
"'$(Configuration)|$(Platform)'=='Release|x64'"
>
4305;4306;28193;4244;4267;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)
</DisableSpecificWarnings>
<AdditionalOptions
Condition=
"'$(Configuration)|$(Platform)'=='Debug|Win32'"
>
/analyze:stacksize32768
</AdditionalOptions>
<AdditionalOptions
Condition=
"'$(Configuration)|$(Platform)'=='Debug|Win32'"
>
<AdditionalOptions
Condition=
"'$(Configuration)|$(Platform)'=='Release|Win32'"
>
/analyze:stacksize32768
</AdditionalOptions>
</AdditionalOptions>
<AdditionalOptions
Condition=
"'$(Configuration)|$(Platform)'=='Debug|x64'"
>
/analyze:stacksize32768
</AdditionalOptions>
<AdditionalOptions
Condition=
"'$(Configuration)|$(Platform)'=='Release|Win32'"
>
</AdditionalOptions>
<AdditionalOptions
Condition=
"'$(Configuration)|$(Platform)'=='Debug|x64'"
>
</AdditionalOptions>
<AdditionalOptions
Condition=
"'$(Configuration)|$(Platform)'=='Release|x64'"
>
<AdditionalOptions
Condition=
"'$(Configuration)|$(Platform)'=='Release|x64'"
>
</AdditionalOptions>
</AdditionalOptions>
</ClCompile>
</ClCompile>
...
...
src/mod/endpoints/mod_sofia/sofia.c
浏览文件 @
6b5b1a3d
...
@@ -5850,7 +5850,7 @@ static void sofia_handle_sip_r_options(switch_core_session_t *session, int statu
...
@@ -5850,7 +5850,7 @@ static void sofia_handle_sip_r_options(switch_core_session_t *session, int statu
int
ping_time
=
0
;
int
ping_time
=
0
;
if
(
sofia_private
&&
sofia_private
->
ping_sent
)
{
if
(
sofia_private
&&
sofia_private
->
ping_sent
)
{
ping_time
=
switch_time_now
()
-
sofia_private
->
ping_sent
;
ping_time
=
(
int
)(
switch_time_now
()
-
sofia_private
->
ping_sent
)
;
}
}
sip_user_status
.
status
=
ping_status
;
sip_user_status
.
status
=
ping_status
;
...
...
src/mod/formats/mod_local_stream/mod_local_stream.c
浏览文件 @
6b5b1a3d
...
@@ -493,7 +493,7 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void
...
@@ -493,7 +493,7 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void
break
;
break
;
}
}
source
->
prebuf
=
source
->
samples
*
2
*
source
->
channels
;
source
->
prebuf
=
(
uint32_t
)(
source
->
samples
*
2
*
source
->
channels
)
;
if
(
!
source
->
total
)
{
if
(
!
source
->
total
)
{
flush_video_queue
(
source
->
video_q
);
flush_video_queue
(
source
->
video_q
);
...
@@ -806,8 +806,8 @@ static switch_status_t local_stream_file_read_video(switch_file_handle_t *handle
...
@@ -806,8 +806,8 @@ static switch_status_t local_stream_file_read_video(switch_file_handle_t *handle
local_stream_context_t
*
context
=
handle
->
private_info
;
local_stream_context_t
*
context
=
handle
->
private_info
;
switch_status_t
status
;
switch_status_t
status
;
switch_time_t
now
;
switch_time_t
now
;
int
fps
=
(
int
)
ceil
(
handle
->
mm
.
fps
);
unsigned
int
fps
=
(
unsigned
int
)
ceil
(
handle
->
mm
.
fps
);
int
min_qsize
=
fps
;
unsigned
int
min_qsize
=
fps
;
if
(
!
(
context
->
ready
&&
context
->
source
->
ready
))
{
if
(
!
(
context
->
ready
&&
context
->
source
->
ready
))
{
return
SWITCH_STATUS_FALSE
;
return
SWITCH_STATUS_FALSE
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论