external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge SRS2

Browse source
This commit is contained in:
winlin 2017-04-18 11:42:11 +08:00
commit 9a2a6ab95f
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -215,6 +215,7 @@ Please select your language:
### V2 changes ### V2 changes
* v2.0, 2017-04-18, Fix [#848][bug #848], crash at HTTP fast buffer grow 2.0.239
* v2.0, 2017-04-15, Fix [#844][bug #844], support Haivision encoder. 2.0.238 * v2.0, 2017-04-15, Fix [#844][bug #844], support Haivision encoder. 2.0.238
* v2.0, 2017-04-15, Merge [#846][bug #846], fix fd leak for FLV stream caster. 2.0.237 * v2.0, 2017-04-15, Merge [#846][bug #846], fix fd leak for FLV stream caster. 2.0.237
* v2.0, 2017-04-15, Merge [#841][bug #841], avoid the duplicated sps/pps in ts. 2.0.236 * v2.0, 2017-04-15, Merge [#841][bug #841], avoid the duplicated sps/pps in ts. 2.0.236
@ -1394,6 +1395,7 @@ Winlin
[bug #841]: https://github.com/ossrs/srs/issues/841 [bug #841]: https://github.com/ossrs/srs/issues/841
[bug #846]: https://github.com/ossrs/srs/issues/846 [bug #846]: https://github.com/ossrs/srs/issues/846
[bug #844]: https://github.com/ossrs/srs/issues/844 [bug #844]: https://github.com/ossrs/srs/issues/844
[bug #848]: https://github.com/ossrs/srs/issues/848
[bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
[bug #735]: https://github.com/ossrs/srs/issues/735 [bug #735]: https://github.com/ossrs/srs/issues/735

5
trunk/src/protocol/srs_protocol_stream.cpp
View file

@ -160,9 +160,10 @@ int SrsFastStream::grow(ISrsReader* reader, int required_size)
// reset when buffer is empty. // reset when buffer is empty.
p = end = buffer; p = end = buffer;
srs_verbose("all consumed, reset fast buffer"); srs_verbose("all consumed, reset fast buffer");
} else { } else if (nb_exists_bytes < nb_buffer && p > buffer) {
// move the left bytes to start of buffer. // move the left bytes to start of buffer.
srs_assert(nb_exists_bytes < nb_buffer); // @remark Only move memory when space is enough, or failed at next check.
// @see https://github.com/ossrs/srs/issues/848
buffer = (char*)memmove(buffer, p, nb_exists_bytes); buffer = (char*)memmove(buffer, p, nb_exists_bytes);
p = buffer; p = buffer;
end = p + nb_exists_bytes; end = p + nb_exists_bytes;