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

Revert "for bug #241, merge big chunks for publish, no use."

This reverts commit 6b57597718.
This commit is contained in:
winlin 2014-12-02 22:26:20 +08:00
parent 6b57597718
commit 565f29ed6c
10 changed files with 21 additions and 90 deletions

View file

@ -288,16 +288,10 @@ void SrsPublishRecvThread::on_thread_start()
{
// we donot set the auto response to false,
// for the main thread never send message.
// notice the protocol stack to merge chunks to big buffer.
// for example, the buffer is 64KB=512kb, it's 1s buffer for 500kbps video stream.
// so we can use read_fullly(64KB) to merge all chunks in 1s.
// @see https://github.com/winlinvip/simple-rtmp-server/issues/241
rtmp->set_merge_chunks(true);
}
void SrsPublishRecvThread::on_thread_stop()
{
// revert state
rtmp->set_merge_chunks(false);
// we donot set the auto response to true,
// for we donot set to false yet.
}