external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-03-18 16:50:54 +08:00
commit 4a50bf1894
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
trunk/src/protocol/srs_rtmp_buffer.cpp
View file

@ -82,17 +82,21 @@ char* SrsFastBuffer::bytes()
void SrsFastBuffer::set_buffer(int buffer_size) void SrsFastBuffer::set_buffer(int buffer_size)
{ {
// never exceed the max size.
if (buffer_size > SRS_MAX_SOCKET_BUFFER) {
srs_warn("limit the user-space buffer from %d to %d",
buffer_size, SRS_MAX_SOCKET_BUFFER);
}
// the user-space buffer size limit to a max value. // the user-space buffer size limit to a max value.
int nb_resize_buf = srs_min(buffer_size, SRS_MAX_SOCKET_BUFFER); int nb_resize_buf = srs_min(buffer_size, SRS_MAX_SOCKET_BUFFER);
if (buffer_size > SRS_MAX_SOCKET_BUFFER) {
srs_warn("limit the user-space buffer from %d to %d", buffer_size, SRS_MAX_SOCKET_BUFFER);
}
// only realloc when buffer changed bigger // only realloc when buffer changed bigger
if (nb_resize_buf <= nb_buffer) { if (nb_resize_buf <= nb_buffer) {
return; return;
} }
// realloc for buffer change bigger.
int start = p - buffer; int start = p - buffer;
int nb_bytes = end - p; int nb_bytes = end - p;
@ -148,6 +152,7 @@ int SrsFastBuffer::grow(ISrsBufferReader* reader, int required_size)
srs_assert(nb_exists_bytes >= 0); srs_assert(nb_exists_bytes >= 0);
srs_verbose("move fast buffer %d bytes", nb_exists_bytes); srs_verbose("move fast buffer %d bytes", nb_exists_bytes);
// reset or move to get more space.
if (!nb_exists_bytes) { if (!nb_exists_bytes) {
// reset when buffer is empty. // reset when buffer is empty.
p = end = buffer; p = end = buffer;
@ -159,15 +164,15 @@ int SrsFastBuffer::grow(ISrsBufferReader* reader, int required_size)
p = buffer; p = buffer;
end = p + nb_exists_bytes; end = p + nb_exists_bytes;
} }
}
// check whether enough free space in buffer.
// check whether enough free space in buffer. nb_free_space = buffer + nb_buffer - end;
nb_free_space = buffer + nb_buffer - end; if (nb_free_space < required_size) {
if (nb_free_space < required_size) { ret = ERROR_READER_BUFFER_OVERFLOW;
ret = ERROR_READER_BUFFER_OVERFLOW; srs_error("buffer overflow, required=%d, max=%d, left=%d, ret=%d",
srs_error("buffer overflow, required=%d, max=%d, left=%d, ret=%d", required_size, nb_buffer, nb_free_space, ret);
required_size, nb_buffer, nb_free_space, ret); return ret;
return ret; }
} }
// buffer is ok, read required size of bytes. // buffer is ok, read required size of bytes.