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
2014-05-04 16:29:57 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f8e8c81e502dc142209d20fbdc190353fb2ad8a3
f8e8c81e
1 parent
7b530bf8
refine log, simplify it. to 0.9.90
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
5 行增加
和
7 行删除
trunk/src/app/srs_app_rtmp_conn.cpp
trunk/src/core/srs_core.hpp
trunk/src/app/srs_app_rtmp_conn.cpp
查看文件 @
f8e8c81
...
...
@@ -98,8 +98,7 @@ int SrsRtmpConn::do_cycle()
srs_error
(
"get peer ip failed. ret=%d"
,
ret
);
return
ret
;
}
srs_trace
(
"rtmp get peer ip success. ip=%s, send_to=%"
PRId64
"us, recv_to=%"
PRId64
"us"
,
ip
,
SRS_SEND_TIMEOUT_US
,
SRS_RECV_TIMEOUT_US
);
srs_trace
(
"serve client, peer ip=%s"
,
ip
);
rtmp
->
set_recv_timeout
(
SRS_RECV_TIMEOUT_US
);
rtmp
->
set_send_timeout
(
SRS_SEND_TIMEOUT_US
);
...
...
@@ -472,10 +471,9 @@ int SrsRtmpConn::playing(SrsSource* source)
pithy_print
.
elapse
();
// read from client.
int
ctl_msg_ret
=
ERROR_SUCCESS
;
if
(
true
)
{
SrsMessage
*
msg
=
NULL
;
ctl_msg_ret
=
ret
=
rtmp
->
recv_message
(
&
msg
);
ret
=
rtmp
->
recv_message
(
&
msg
);
srs_verbose
(
"play loop recv message. ret=%d"
,
ret
);
if
(
ret
!=
ERROR_SUCCESS
&&
ret
!=
ERROR_SOCKET_TIMEOUT
)
{
...
...
@@ -503,8 +501,8 @@ int SrsRtmpConn::playing(SrsSource* source)
// reportable
if
(
pithy_print
.
can_print
())
{
srs_trace
(
"-> "
SRS_LOG_ID_PLAY
" time=%"
PRId64
", duration=%"
PRId64
", cmr=%d, msgs=%d, obytes=%"
PRId64
", ibytes=%"
PRId64
", okbps=%d, ikbps=%d"
,
pithy_print
.
age
(),
duration
,
ctl_msg_ret
,
count
,
rtmp
->
get_send_bytes
(),
rtmp
->
get_recv_bytes
(),
" time=%"
PRId64
", duration=%"
PRId64
", msgs=%d, obytes=%"
PRId64
", ibytes=%"
PRId64
", okbps=%d, ikbps=%d"
,
pithy_print
.
age
(),
duration
,
count
,
rtmp
->
get_send_bytes
(),
rtmp
->
get_recv_bytes
(),
rtmp
->
get_send_kbps
(),
rtmp
->
get_recv_kbps
());
}
...
...
trunk/src/core/srs_core.hpp
查看文件 @
f8e8c81
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR "0"
#define VERSION_MINOR "9"
#define VERSION_REVISION "
89
"
#define VERSION_REVISION "
90
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "srs"
...
...
请
注册
或
登录
后发表评论