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 branch 'srs.master'

Browse source
This commit is contained in:
winlin 2014-11-13 17:04:51 +08:00
commit bc597ddb58
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -413,7 +413,7 @@ SrsProtocol::SrsProtocol(ISrsProtocolReaderWriter* io)
// each chunk consumers atleast 2 iovs // each chunk consumers atleast 2 iovs
srs_assert(nb_out_iovs >= 2); srs_assert(nb_out_iovs >= 2);
warned_c0c3_cry = false; warned_c0c3_cache_dry = false;
} }
SrsProtocol::~SrsProtocol() SrsProtocol::~SrsProtocol()
@ -628,10 +628,10 @@ int SrsProtocol::do_send_messages(SrsMessage** msgs, int nb_msgs)
int c0c3_left = SRS_CONSTS_C0C3_HEADERS_MAX - c0c3_cache_index; int c0c3_left = SRS_CONSTS_C0C3_HEADERS_MAX - c0c3_cache_index;
if (c0c3_left < SRS_CONSTS_RTMP_MAX_FMT0_HEADER_SIZE) { if (c0c3_left < SRS_CONSTS_RTMP_MAX_FMT0_HEADER_SIZE) {
// only warn once for a connection. // only warn once for a connection.
if (!warned_c0c3_cry) { if (!warned_c0c3_cache_dry) {
srs_warn("c0c3 cache header too small, recoment to %d", srs_warn("c0c3 cache header too small, recoment to %d",
SRS_CONSTS_C0C3_HEADERS_MAX + SRS_CONSTS_RTMP_MAX_FMT0_HEADER_SIZE); SRS_CONSTS_C0C3_HEADERS_MAX + SRS_CONSTS_RTMP_MAX_FMT0_HEADER_SIZE);
warned_c0c3_cry = true; warned_c0c3_cache_dry = true;
} }
// when c0c3 cache dry, // when c0c3 cache dry,

2
trunk/src/rtmp/srs_protocol_stack.hpp
View file

@ -226,7 +226,7 @@ private:
*/ */
char out_c0c3_caches[SRS_CONSTS_C0C3_HEADERS_MAX]; char out_c0c3_caches[SRS_CONSTS_C0C3_HEADERS_MAX];
// whether warned user to increase the c0c3 header cache. // whether warned user to increase the c0c3 header cache.
bool warned_c0c3_cry; bool warned_c0c3_cache_dry;
/** /**
* output chunk size, default to 128, set by config. * output chunk size, default to 128, set by config.
*/ */