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
2016-09-12 18:21:14 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
c2cb666995c6e3607416ac13f7500f7f0e79fdd8
c2cb6669
1 parent
4e756bd0
fix fast stream error bug. 2.0.216
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
9 行增加
和
6 行删除
README.md
trunk/src/core/srs_core.hpp
trunk/src/protocol/srs_protocol_buffer.cpp
README.md
查看文件 @
c2cb666
...
...
@@ -341,6 +341,7 @@ Remark:
## History
*
v2.0, 2016-09-12, fix fast stream error bug. 2.0.216
*
<strong>
v2.0, 2016-09-09,
[
2.0 beta1(2.0.215)
][
r2.0b1
]
released. 89941 lines.
</strong>
*
v2.0, 2016-09-09, refine librtmp comments about NALUs. 2.0.215
*
v2.0, 2016-09-05, fix memory leak at source. 2.0.214
...
...
trunk/src/core/srs_core.hpp
查看文件 @
c2cb666
...
...
@@ -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 21
5
#define VERSION_REVISION 21
6
// generated by configure, only macros.
#include <srs_auto_headers.hpp>
...
...
trunk/src/protocol/srs_protocol_buffer.cpp
查看文件 @
c2cb666
...
...
@@ -146,11 +146,13 @@ int SrsFastBuffer::grow(ISrsBufferReader* reader, int required_size)
// the free space of buffer,
// buffer = consumed_bytes + exists_bytes + free_space.
int
nb_free_space
=
(
int
)(
buffer
+
nb_buffer
-
end
);
// the bytes already in buffer
int
nb_exists_bytes
=
(
int
)(
end
-
p
);
srs_assert
(
nb_exists_bytes
>=
0
);
// resize the space when no left space.
if
(
nb_free_space
<
required_size
)
{
// the bytes already in buffer
int
nb_exists_bytes
=
(
int
)(
end
-
p
);
srs_assert
(
nb_exists_bytes
>=
0
);
if
(
nb_free_space
<
required_size
-
nb_exists_bytes
)
{
srs_verbose
(
"move fast buffer %d bytes"
,
nb_exists_bytes
);
// reset or move to get more space.
...
...
@@ -168,7 +170,7 @@ int SrsFastBuffer::grow(ISrsBufferReader* reader, int required_size)
// check whether enough free space in buffer.
nb_free_space
=
(
int
)(
buffer
+
nb_buffer
-
end
);
if
(
nb_free_space
<
required_size
)
{
if
(
nb_free_space
<
required_size
-
nb_exists_bytes
)
{
ret
=
ERROR_READER_BUFFER_OVERFLOW
;
srs_error
(
"buffer overflow, required=%d, max=%d, left=%d, ret=%d"
,
required_size
,
nb_buffer
,
nb_free_space
,
ret
);
...
...
请
注册
或
登录
后发表评论