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-12-22 15:39:12 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
cee8c3d07d3b866e14e6144ec2ea3e5970a2883b
cee8c3d0
1 parent
69d191e5
fix #541, failed when chunk size too small. 2.0.202
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
12 行增加
和
3 行删除
README.md
trunk/src/core/srs_core.hpp
trunk/src/protocol/srs_rtmp_stack.cpp
README.md
查看文件 @
cee8c3d
...
...
@@ -337,6 +337,7 @@ Remark:
## History
*
v2.0, 2015-12-22, for
[
#541
][
bug #541
]
failed when chunk size too small. 2.0.202
*
v2.0, 2015-12-15, default hls_on_error to continue. 2.0.201
*
v2.0, 2015-11-16, for
[
#518
][
bug #518
]
fix fd leak bug when fork. 2.0.200
*
v2.0, 2015-11-05, for
[
#511
][
bug #511
]
fix bug for restart thread. 2.0.199
...
...
@@ -1207,6 +1208,7 @@ Winlin
[
bug #515
]:
https://github.com/ossrs/srs/issues/515
[
bug #511
]:
https://github.com/ossrs/srs/issues/511
[
bug #518
]:
https://github.com/ossrs/srs/issues/518
[
bug #541
]:
https://github.com/ossrs/srs/issues/541
[
bug #xxxxxxxxxx
]:
https://github.com/ossrs/srs/issues/xxxxxxxxxx
[
exo #828
]:
https://github.com/google/ExoPlayer/pull/828
...
...
trunk/src/core/srs_core.hpp
查看文件 @
cee8c3d
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 20
1
#define VERSION_REVISION 20
2
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
trunk/src/protocol/srs_rtmp_stack.cpp
查看文件 @
cee8c3d
...
...
@@ -1514,10 +1514,17 @@ int SrsProtocol::on_recv_message(SrsCommonMessage* msg)
{
srs_warn
(
"accept chunk size %d, but should in [%d, %d], "
"@see: https://github.com/ossrs/srs/issues/160"
,
pkt
->
chunk_size
,
SRS_CONSTS_RTMP_MIN_CHUNK_SIZE
,
SRS_CONSTS_RTMP_MAX_CHUNK_SIZE
);
pkt
->
chunk_size
,
SRS_CONSTS_RTMP_MIN_CHUNK_SIZE
,
SRS_CONSTS_RTMP_MAX_CHUNK_SIZE
);
}
// @see: https://github.com/ossrs/srs/issues/541
if
(
pkt
->
chunk_size
<
SRS_CONSTS_RTMP_MIN_CHUNK_SIZE
)
{
ret
=
ERROR_RTMP_CHUNK_SIZE
;
srs_error
(
"chunk size should be %d+, value=%d. ret=%d"
,
SRS_CONSTS_RTMP_MIN_CHUNK_SIZE
,
pkt
->
chunk_size
,
ret
);
return
ret
;
}
in_chunk_size
=
pkt
->
chunk_size
;
srs_trace
(
"input chunk size to %d"
,
pkt
->
chunk_size
);
...
...
请
注册
或
登录
后发表评论