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

for bug #241, simplify the merged read config macros.

This commit is contained in:
winlin 2014-12-04 15:33:17 +08:00
parent 310f51e6a1
commit 4b09531e2f
6 changed files with 20 additions and 83 deletions

View file

@ -147,8 +147,6 @@ private:
// for mr(merged read),
// @see https://github.com/winlinvip/simple-rtmp-server/issues/241
int mr_fd;
int mr_small_bytes;
int mr_sleep_ms;
// the recv thread error code.
int recv_error_code;
SrsRtmpConn* _conn;
@ -184,7 +182,6 @@ public:
public:
#ifdef SRS_PERF_MERGED_READ
virtual void on_read(ssize_t nread);
virtual void on_buffer_change(int nb_buffer);
#endif
};