Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-05-27 11:12:52 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
1150cde8291e97639f2b71720fdb9ee59d338f9d
1150cde8
1 parent
ca01bd40
fix the verbose build failed.
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
15 行增加
和
6 行删除
trunk/scripts/test_configure.sh
trunk/src/app/srs_app_server.cpp
trunk/src/protocol/srs_rtmp_stack.cpp
trunk/scripts/test_configure.sh
查看文件 @
1150cde
...
...
@@ -272,4 +272,13 @@ ok_msg "test \" ${item} \""
ret
=
$?
;
if
[[
$ret
-ne 0
]]
;
then
failed_msg
"test
\"
${
item
}
\"
failed. ret=
$ret
"
;
exit
$ret
;
fi
ok_msg
"test
\"
${
item
}
\"
success"
#######################################################################################################
#######################################################################################################
#######################################################################################################
item
=
"./configure --without-utest"
ok_msg
"test
\"
${
item
}
\"
"
(
$item
&&
make
$params
)
>>
$log
2>&1
ret
=
$?
;
if
[[
$ret
-ne 0
]]
;
then
failed_msg
"test
\"
${
item
}
\"
failed. ret=
$ret
"
;
exit
$ret
;
fi
ok_msg
"test
\"
${
item
}
\"
success"
echo
"success"
...
...
trunk/src/app/srs_app_server.cpp
查看文件 @
1150cde
...
...
@@ -154,9 +154,9 @@ int SrsStreamListener::listen(string i, int p)
return
ret
;
}
srs_info
(
"listen thread c
id=%d, c
urrent_cid=%d, "
srs_info
(
"listen thread current_cid=%d, "
"listen at port=%d, type=%d, fd=%d started success, ep=%s:%d"
,
pthread
->
cid
(),
_srs_context
->
get_id
(),
_port
,
_type
,
fd
,
ip
.
c_str
(),
port
);
_srs_context
->
get_id
(),
p
,
type
,
listener
->
fd
(),
i
.
c_str
(),
p
);
srs_trace
(
"%s listen at tcp://%s:%d, fd=%d"
,
srs_listener_type2string
(
type
).
c_str
(),
ip
.
c_str
(),
port
,
listener
->
fd
());
...
...
@@ -327,9 +327,9 @@ int SrsUdpStreamListener::listen(string i, int p)
return
ret
;
}
srs_info
(
"listen thread c
id=%d, c
urrent_cid=%d, "
srs_info
(
"listen thread current_cid=%d, "
"listen at port=%d, type=%d, fd=%d started success, ep=%s:%d"
,
pthread
->
cid
(),
_srs_context
->
get_id
(),
port
,
type
,
fd
,
ip
.
c_str
(),
port
);
_srs_context
->
get_id
(),
p
,
type
,
listener
->
fd
(),
i
.
c_str
(),
p
);
// notify the handler the fd changed.
if
((
ret
=
caster
->
on_stfd_change
(
listener
->
stfd
()))
!=
ERROR_SUCCESS
)
{
...
...
trunk/src/protocol/srs_rtmp_stack.cpp
查看文件 @
1150cde
...
...
@@ -961,8 +961,8 @@ int SrsProtocol::recv_interlaced_message(SrsCommonMessage** pmsg)
return
ret
;
}
srs_verbose
(
"read message header success. "
"fmt=%d, mh_size=%d, ext_time=%d, size=%d, message(type=%d, size=%d, time=%"
PRId64
", sid=%d)"
,
fmt
,
mh_size
,
chunk
->
extended_timestamp
,
(
chunk
->
msg
?
chunk
->
msg
->
size
:
0
),
chunk
->
header
.
message_type
,
"fmt=%d, ext_time=%d, size=%d, message(type=%d, size=%d, time=%"
PRId64
", sid=%d)"
,
fmt
,
chunk
->
extended_timestamp
,
(
chunk
->
msg
?
chunk
->
msg
->
size
:
0
),
chunk
->
header
.
message_type
,
chunk
->
header
.
payload_length
,
chunk
->
header
.
timestamp
,
chunk
->
header
.
stream_id
);
// read msg payload from chunk stream.
...
...
请
注册
或
登录
后发表评论