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

for bug #241, simplify the buffer, donot reset when chunk size change.

Browse source
This commit is contained in:
winlin 2014-12-04 15:35:39 +08:00
parent 4b09531e2f
commit d026861e23
3 changed files with 1 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

19
trunk/src/rtmp/srs_protocol_buffer.cpp
View file

@ -200,25 +200,6 @@ void SrsFastBuffer::set_merge_read(bool v, int max_buffer, IMergeReadHandler* ha
}
#endif
void SrsFastBuffer::on_chunk_size(int32_t chunk_size)
{
if (nb_buffer >= chunk_size) {
return;
}
// limit the max buffer.
int buffer_size = srs_min(chunk_size, SRS_MR_SOCKET_BUFFER);
if (buffer_size != nb_buffer) {
reset_buffer(buffer_size);
}
}
int SrsFastBuffer::buffer_size()
{
return nb_buffer;
}
void SrsFastBuffer::reset_buffer(int size)
{
// remember the cap.

11
trunk/src/rtmp/srs_protocol_buffer.hpp
View file

@ -163,17 +163,6 @@ public:
*/
virtual void set_merge_read(bool v, int max_buffer, IMergeReadHandler* handler);
#endif
public:
/**
* when chunk size changed, the buffer should change the buffer also.
* to keep the socket buffer size always greater than chunk size.
* @see https://github.com/winlinvip/simple-rtmp-server/issues/241
*/
virtual void on_chunk_size(int32_t chunk_size);
/**
* get the size of socket buffer to read.
*/
virtual int buffer_size();
private:
virtual void reset_buffer(int size);
};

5
trunk/src/rtmp/srs_protocol_stack.cpp
View file

@ -1708,11 +1708,8 @@ int SrsProtocol::on_recv_message(SrsMessage* msg)
SRS_CONSTS_RTMP_MAX_CHUNK_SIZE);
}
int sock_buffer = in_buffer->buffer_size();
in_chunk_size = pkt->chunk_size;
in_buffer->on_chunk_size(pkt->chunk_size);
srs_trace("input chunk size to %d, sock buf %d=>%d",
pkt->chunk_size, sock_buffer, in_buffer->buffer_size());
srs_trace("input chunk size to %d", pkt->chunk_size);
break;
}