正在显示
6 个修改的文件
包含
23 行增加
和
23 行删除
| @@ -76,7 +76,7 @@ IMergeReadHandler::~IMergeReadHandler() | @@ -76,7 +76,7 @@ IMergeReadHandler::~IMergeReadHandler() | ||
| 76 | { | 76 | { |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | -SrsBuffer::SrsBuffer() | 79 | +SrsFastBuffer::SrsFastBuffer() |
| 80 | { | 80 | { |
| 81 | merged_read = false; | 81 | merged_read = false; |
| 82 | _handler = NULL; | 82 | _handler = NULL; |
| @@ -85,24 +85,24 @@ SrsBuffer::SrsBuffer() | @@ -85,24 +85,24 @@ SrsBuffer::SrsBuffer() | ||
| 85 | buffer = new char[nb_buffer]; | 85 | buffer = new char[nb_buffer]; |
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | -SrsBuffer::~SrsBuffer() | 88 | +SrsFastBuffer::~SrsFastBuffer() |
| 89 | { | 89 | { |
| 90 | srs_freep(buffer); | 90 | srs_freep(buffer); |
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | -int SrsBuffer::length() | 93 | +int SrsFastBuffer::length() |
| 94 | { | 94 | { |
| 95 | int len = (int)data.size(); | 95 | int len = (int)data.size(); |
| 96 | srs_assert(len >= 0); | 96 | srs_assert(len >= 0); |
| 97 | return len; | 97 | return len; |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | -char* SrsBuffer::bytes() | 100 | +char* SrsFastBuffer::bytes() |
| 101 | { | 101 | { |
| 102 | return (length() == 0)? NULL : &data.at(0); | 102 | return (length() == 0)? NULL : &data.at(0); |
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | -void SrsBuffer::erase(int size) | 105 | +void SrsFastBuffer::erase(int size) |
| 106 | { | 106 | { |
| 107 | if (size <= 0) { | 107 | if (size <= 0) { |
| 108 | return; | 108 | return; |
| @@ -116,14 +116,14 @@ void SrsBuffer::erase(int size) | @@ -116,14 +116,14 @@ void SrsBuffer::erase(int size) | ||
| 116 | data.erase(data.begin(), data.begin() + size); | 116 | data.erase(data.begin(), data.begin() + size); |
| 117 | } | 117 | } |
| 118 | 118 | ||
| 119 | -void SrsBuffer::append(const char* bytes, int size) | 119 | +void SrsFastBuffer::append(const char* bytes, int size) |
| 120 | { | 120 | { |
| 121 | srs_assert(size > 0); | 121 | srs_assert(size > 0); |
| 122 | 122 | ||
| 123 | data.insert(data.end(), bytes, bytes + size); | 123 | data.insert(data.end(), bytes, bytes + size); |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | -int SrsBuffer::grow(ISrsBufferReader* reader, int required_size) | 126 | +int SrsFastBuffer::grow(ISrsBufferReader* reader, int required_size) |
| 127 | { | 127 | { |
| 128 | int ret = ERROR_SUCCESS; | 128 | int ret = ERROR_SUCCESS; |
| 129 | 129 | ||
| @@ -156,7 +156,7 @@ int SrsBuffer::grow(ISrsBufferReader* reader, int required_size) | @@ -156,7 +156,7 @@ int SrsBuffer::grow(ISrsBufferReader* reader, int required_size) | ||
| 156 | return ret; | 156 | return ret; |
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | -void SrsBuffer::set_merge_read(bool v, int max_buffer, IMergeReadHandler* handler) | 159 | +void SrsFastBuffer::set_merge_read(bool v, int max_buffer, IMergeReadHandler* handler) |
| 160 | { | 160 | { |
| 161 | merged_read = v; | 161 | merged_read = v; |
| 162 | _handler = handler; | 162 | _handler = handler; |
| @@ -173,7 +173,7 @@ void SrsBuffer::set_merge_read(bool v, int max_buffer, IMergeReadHandler* handle | @@ -173,7 +173,7 @@ void SrsBuffer::set_merge_read(bool v, int max_buffer, IMergeReadHandler* handle | ||
| 173 | } | 173 | } |
| 174 | } | 174 | } |
| 175 | 175 | ||
| 176 | -void SrsBuffer::on_chunk_size(int32_t chunk_size) | 176 | +void SrsFastBuffer::on_chunk_size(int32_t chunk_size) |
| 177 | { | 177 | { |
| 178 | if (nb_buffer >= chunk_size) { | 178 | if (nb_buffer >= chunk_size) { |
| 179 | return; | 179 | return; |
| @@ -191,12 +191,12 @@ void SrsBuffer::on_chunk_size(int32_t chunk_size) | @@ -191,12 +191,12 @@ void SrsBuffer::on_chunk_size(int32_t chunk_size) | ||
| 191 | } | 191 | } |
| 192 | } | 192 | } |
| 193 | 193 | ||
| 194 | -int SrsBuffer::buffer_size() | 194 | +int SrsFastBuffer::buffer_size() |
| 195 | { | 195 | { |
| 196 | return nb_buffer; | 196 | return nb_buffer; |
| 197 | } | 197 | } |
| 198 | 198 | ||
| 199 | -void SrsBuffer::reset_buffer(int size) | 199 | +void SrsFastBuffer::reset_buffer(int size) |
| 200 | { | 200 | { |
| 201 | srs_freep(buffer); | 201 | srs_freep(buffer); |
| 202 | 202 |
| @@ -110,7 +110,7 @@ public: | @@ -110,7 +110,7 @@ public: | ||
| 110 | * the buffer provices bytes cache for protocol. generally, | 110 | * the buffer provices bytes cache for protocol. generally, |
| 111 | * protocol recv data from socket, put into buffer, decode to RTMP message. | 111 | * protocol recv data from socket, put into buffer, decode to RTMP message. |
| 112 | */ | 112 | */ |
| 113 | -class SrsBuffer | 113 | +class SrsFastBuffer |
| 114 | { | 114 | { |
| 115 | private: | 115 | private: |
| 116 | // the merged handler | 116 | // the merged handler |
| @@ -121,8 +121,8 @@ private: | @@ -121,8 +121,8 @@ private: | ||
| 121 | char* buffer; | 121 | char* buffer; |
| 122 | int nb_buffer; | 122 | int nb_buffer; |
| 123 | public: | 123 | public: |
| 124 | - SrsBuffer(); | ||
| 125 | - virtual ~SrsBuffer(); | 124 | + SrsFastBuffer(); |
| 125 | + virtual ~SrsFastBuffer(); | ||
| 126 | public: | 126 | public: |
| 127 | /** | 127 | /** |
| 128 | * get the length of buffer. empty if zero. | 128 | * get the length of buffer. empty if zero. |
| @@ -404,7 +404,7 @@ SrsProtocol::AckWindowSize::AckWindowSize() | @@ -404,7 +404,7 @@ SrsProtocol::AckWindowSize::AckWindowSize() | ||
| 404 | 404 | ||
| 405 | SrsProtocol::SrsProtocol(ISrsProtocolReaderWriter* io) | 405 | SrsProtocol::SrsProtocol(ISrsProtocolReaderWriter* io) |
| 406 | { | 406 | { |
| 407 | - in_buffer = new SrsBuffer(); | 407 | + in_buffer = new SrsFastBuffer(); |
| 408 | skt = io; | 408 | skt = io; |
| 409 | 409 | ||
| 410 | in_chunk_size = SRS_CONSTS_RTMP_PROTOCOL_CHUNK_SIZE; | 410 | in_chunk_size = SRS_CONSTS_RTMP_PROTOCOL_CHUNK_SIZE; |
| @@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 44 | #include <srs_kernel_consts.hpp> | 44 | #include <srs_kernel_consts.hpp> |
| 45 | 45 | ||
| 46 | class ISrsProtocolReaderWriter; | 46 | class ISrsProtocolReaderWriter; |
| 47 | -class SrsBuffer; | 47 | +class SrsFastBuffer; |
| 48 | class SrsPacket; | 48 | class SrsPacket; |
| 49 | class SrsStream; | 49 | class SrsStream; |
| 50 | class SrsAmf0Object; | 50 | class SrsAmf0Object; |
| @@ -206,7 +206,7 @@ private: | @@ -206,7 +206,7 @@ private: | ||
| 206 | /** | 206 | /** |
| 207 | * bytes buffer cache, recv from skt, provide services for stream. | 207 | * bytes buffer cache, recv from skt, provide services for stream. |
| 208 | */ | 208 | */ |
| 209 | - SrsBuffer* in_buffer; | 209 | + SrsFastBuffer* in_buffer; |
| 210 | /** | 210 | /** |
| 211 | * input chunk size, default to 128, set by peer packet. | 211 | * input chunk size, default to 128, set by peer packet. |
| 212 | */ | 212 | */ |
| @@ -203,7 +203,7 @@ int MockBufferReader::read(void* buf, size_t size, ssize_t* nread) | @@ -203,7 +203,7 @@ int MockBufferReader::read(void* buf, size_t size, ssize_t* nread) | ||
| 203 | 203 | ||
| 204 | VOID TEST(KernelBufferTest, DefaultObject) | 204 | VOID TEST(KernelBufferTest, DefaultObject) |
| 205 | { | 205 | { |
| 206 | - SrsBuffer b; | 206 | + SrsFastBuffer b; |
| 207 | 207 | ||
| 208 | EXPECT_EQ(0, b.length()); | 208 | EXPECT_EQ(0, b.length()); |
| 209 | EXPECT_EQ(NULL, b.bytes()); | 209 | EXPECT_EQ(NULL, b.bytes()); |
| @@ -211,7 +211,7 @@ VOID TEST(KernelBufferTest, DefaultObject) | @@ -211,7 +211,7 @@ VOID TEST(KernelBufferTest, DefaultObject) | ||
| 211 | 211 | ||
| 212 | VOID TEST(KernelBufferTest, AppendBytes) | 212 | VOID TEST(KernelBufferTest, AppendBytes) |
| 213 | { | 213 | { |
| 214 | - SrsBuffer b; | 214 | + SrsFastBuffer b; |
| 215 | 215 | ||
| 216 | char winlin[] = "winlin"; | 216 | char winlin[] = "winlin"; |
| 217 | b.append(winlin, strlen(winlin)); | 217 | b.append(winlin, strlen(winlin)); |
| @@ -231,7 +231,7 @@ VOID TEST(KernelBufferTest, AppendBytes) | @@ -231,7 +231,7 @@ VOID TEST(KernelBufferTest, AppendBytes) | ||
| 231 | 231 | ||
| 232 | VOID TEST(KernelBufferTest, EraseBytes) | 232 | VOID TEST(KernelBufferTest, EraseBytes) |
| 233 | { | 233 | { |
| 234 | - SrsBuffer b; | 234 | + SrsFastBuffer b; |
| 235 | 235 | ||
| 236 | b.erase(0); | 236 | b.erase(0); |
| 237 | b.erase(-1); | 237 | b.erase(-1); |
| @@ -267,7 +267,7 @@ VOID TEST(KernelBufferTest, EraseBytes) | @@ -267,7 +267,7 @@ VOID TEST(KernelBufferTest, EraseBytes) | ||
| 267 | 267 | ||
| 268 | VOID TEST(KernelBufferTest, Grow) | 268 | VOID TEST(KernelBufferTest, Grow) |
| 269 | { | 269 | { |
| 270 | - SrsBuffer b; | 270 | + SrsFastBuffer b; |
| 271 | MockBufferReader r("winlin"); | 271 | MockBufferReader r("winlin"); |
| 272 | 272 | ||
| 273 | b.grow(&r, 1); | 273 | b.grow(&r, 1); |
| @@ -78,9 +78,9 @@ public: | @@ -78,9 +78,9 @@ public: | ||
| 78 | int64_t recv_bytes; | 78 | int64_t recv_bytes; |
| 79 | int64_t send_bytes; | 79 | int64_t send_bytes; |
| 80 | // data source for socket read. | 80 | // data source for socket read. |
| 81 | - SrsBuffer in_buffer; | 81 | + SrsFastBuffer in_buffer; |
| 82 | // data buffer for socket send. | 82 | // data buffer for socket send. |
| 83 | - SrsBuffer out_buffer; | 83 | + SrsFastBuffer out_buffer; |
| 84 | public: | 84 | public: |
| 85 | MockBufferIO(); | 85 | MockBufferIO(); |
| 86 | virtual ~MockBufferIO(); | 86 | virtual ~MockBufferIO(); |
-
请 注册 或 登录 后发表评论