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
2013-11-16 12:54:48 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ff565c4d9bf79dea3a85a3ee927bf10a2563e2d2
ff565c4d
1 parent
bf1113da
fix bug of amf0 decode
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
6 行增加
和
4 行删除
trunk/conf/srs.conf
trunk/src/core/srs_core_amf0.cpp
trunk/src/core/srs_core_protocol.cpp
trunk/src/core/srs_core_source.cpp
trunk/conf/srs.conf
查看文件 @
ff565c4
# the listen ports, split by space.
listen
193
5
;
listen
193
7
;
# the default chunk size is 128, max is 65536,
# some client does not support chunk size change,
# however, most clients supports it and it can improve
...
...
trunk/src/core/srs_core_amf0.cpp
查看文件 @
ff565c4
...
...
@@ -734,10 +734,12 @@ int srs_amf0_read_any(SrsStream* stream, SrsAmf0Any*& value)
return
ret
;
}
case
RTMP_AMF0_Null
:
{
stream
->
skip
(
1
);
value
=
new
SrsAmf0Null
();
return
ret
;
}
case
RTMP_AMF0_Undefined
:
{
stream
->
skip
(
1
);
value
=
new
SrsAmf0Undefined
();
return
ret
;
}
...
...
trunk/src/core/srs_core_protocol.cpp
查看文件 @
ff565c4
...
...
@@ -538,7 +538,7 @@ int SrsProtocol::on_recv_message(SrsCommonMessage* msg)
srs_assert
(
msg
!=
NULL
);
// acknowledgement
if
(
skt
->
get_recv_bytes
()
-
in_ack_size
.
acked_size
>
in_ack_size
.
ack_window_size
)
{
if
(
in_ack_size
.
ack_window_size
>
0
&&
skt
->
get_recv_bytes
()
-
in_ack_size
.
acked_size
>
in_ack_size
.
ack_window_size
)
{
if
((
ret
=
response_acknowledgement_message
())
!=
ERROR_SUCCESS
)
{
return
ret
;
}
...
...
trunk/src/core/srs_core_source.cpp
查看文件 @
ff565c4
...
...
@@ -359,7 +359,7 @@ int SrsSource::on_audio(SrsCommonMessage* audio)
if
(
codec
->
audio_is_sequence_header
(
msg
->
payload
,
msg
->
size
))
{
srs_freep
(
cache_sh_audio
);
cache_sh_audio
=
msg
->
copy
();
srs_trace
(
"update audio sequence header success.
"
);
srs_trace
(
"update audio sequence header success.
size=%d"
,
msg
->
header
.
payload_length
);
return
ret
;
}
...
...
@@ -404,7 +404,7 @@ int SrsSource::on_video(SrsCommonMessage* video)
if
(
codec
->
video_is_sequence_header
(
msg
->
payload
,
msg
->
size
))
{
srs_freep
(
cache_sh_video
);
cache_sh_video
=
msg
->
copy
();
srs_trace
(
"update video sequence header success.
"
);
srs_trace
(
"update video sequence header success.
size=%d"
,
msg
->
header
.
payload_length
);
return
ret
;
}
...
...
请
注册
或
登录
后发表评论