for bug #248, rename SrsBuffer to SrsFastBuffer.

ossrs · Dec 4, 2014 · 8423974 · 8423974
1 parent 0ea8cd9
commit 8423974
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/trunk/src/rtmp/srs_protocol_buffer.cpp b/trunk/src/rtmp/srs_protocol_buffer.cpp
@@ -76,7 +76,7 @@ IMergeReadHandler::~IMergeReadHandler()
 {
 }
 
-SrsBuffer::SrsBuffer()
+SrsFastBuffer::SrsFastBuffer()
 {
     merged_read = false;
     _handler = NULL;
@@ -85,24 +85,24 @@ SrsBuffer::SrsBuffer()
     buffer = new char[nb_buffer];
 }
 
-SrsBuffer::~SrsBuffer()
+SrsFastBuffer::~SrsFastBuffer()
 {
     srs_freep(buffer);
 }
 
-int SrsBuffer::length()
+int SrsFastBuffer::length()
 {
     int len = (int)data.size();
     srs_assert(len >= 0);
     return len;
 }
 
-char* SrsBuffer::bytes()
+char* SrsFastBuffer::bytes()
 {
     return (length() == 0)? NULL : &data.at(0);
 }
 
-void SrsBuffer::erase(int size)
+void SrsFastBuffer::erase(int size)
 {
     if (size <= 0) {
         return;
@@ -116,14 +116,14 @@ void SrsBuffer::erase(int size)
     data.erase(data.begin(), data.begin() + size);
 }
 
-void SrsBuffer::append(const char* bytes, int size)
+void SrsFastBuffer::append(const char* bytes, int size)
 {
     srs_assert(size > 0);
 
     data.insert(data.end(), bytes, bytes + size);
 }
 
-int SrsBuffer::grow(ISrsBufferReader* reader, int required_size)
+int SrsFastBuffer::grow(ISrsBufferReader* reader, int required_size)
 {
     int ret = ERROR_SUCCESS;
 
@@ -156,7 +156,7 @@ int SrsBuffer::grow(ISrsBufferReader* reader, int required_size)
     return ret;
 }
 
-void SrsBuffer::set_merge_read(bool v, int max_buffer, IMergeReadHandler* handler)
+void SrsFastBuffer::set_merge_read(bool v, int max_buffer, IMergeReadHandler* handler)
 {
     merged_read = v;
     _handler = handler;
@@ -173,7 +173,7 @@ void SrsBuffer::set_merge_read(bool v, int max_buffer, IMergeReadHandler* handle
     }
 }
 
-void SrsBuffer::on_chunk_size(int32_t chunk_size)
+void SrsFastBuffer::on_chunk_size(int32_t chunk_size)
 {
     if (nb_buffer >= chunk_size) {
         return;
@@ -191,12 +191,12 @@ void SrsBuffer::on_chunk_size(int32_t chunk_size)
     }
 }
 
-int SrsBuffer::buffer_size()
+int SrsFastBuffer::buffer_size()
 {
     return nb_buffer;
 }
 
-void SrsBuffer::reset_buffer(int size)
+void SrsFastBuffer::reset_buffer(int size)
 {
     srs_freep(buffer);
 

diff --git a/trunk/src/rtmp/srs_protocol_buffer.hpp b/trunk/src/rtmp/srs_protocol_buffer.hpp
@@ -110,7 +110,7 @@ class IMergeReadHandler
 * the buffer provices bytes cache for protocol. generally, 
 * protocol recv data from socket, put into buffer, decode to RTMP message.
 */
-class SrsBuffer
+class SrsFastBuffer
 {
 private:
     // the merged handler
@@ -121,8 +121,8 @@ class SrsBuffer
     char* buffer;
     int nb_buffer;
 public:
-    SrsBuffer();
-    virtual ~SrsBuffer();
+    SrsFastBuffer();
+    virtual ~SrsFastBuffer();
 public:
     /**
     * get the length of buffer. empty if zero.

diff --git a/trunk/src/rtmp/srs_protocol_stack.cpp b/trunk/src/rtmp/srs_protocol_stack.cpp
@@ -404,7 +404,7 @@ SrsProtocol::AckWindowSize::AckWindowSize()
 
 SrsProtocol::SrsProtocol(ISrsProtocolReaderWriter* io)
 {
-    in_buffer = new SrsBuffer();
+    in_buffer = new SrsFastBuffer();
     skt = io;
 
     in_chunk_size = SRS_CONSTS_RTMP_PROTOCOL_CHUNK_SIZE;

diff --git a/trunk/src/rtmp/srs_protocol_stack.hpp b/trunk/src/rtmp/srs_protocol_stack.hpp
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_kernel_consts.hpp>
 
 class ISrsProtocolReaderWriter;
-class SrsBuffer;
+class SrsFastBuffer;
 class SrsPacket;
 class SrsStream;
 class SrsAmf0Object;
@@ -206,7 +206,7 @@ class SrsProtocol
     /**
     * bytes buffer cache, recv from skt, provide services for stream.
     */
-    SrsBuffer* in_buffer;
+    SrsFastBuffer* in_buffer;
     /**
     * input chunk size, default to 128, set by peer packet.
     */

diff --git a/trunk/src/utest/srs_utest_kernel.cpp b/trunk/src/utest/srs_utest_kernel.cpp
@@ -203,15 +203,15 @@ int MockBufferReader::read(void* buf, size_t size, ssize_t* nread)
 
 VOID TEST(KernelBufferTest, DefaultObject)
 {
-    SrsBuffer b;
+    SrsFastBuffer b;
 
     EXPECT_EQ(0, b.length());
     EXPECT_EQ(NULL, b.bytes());
 }
 
 VOID TEST(KernelBufferTest, AppendBytes)
 {
-    SrsBuffer b;
+    SrsFastBuffer b;
 
     char winlin[] = "winlin";
     b.append(winlin, strlen(winlin));
@@ -231,7 +231,7 @@ VOID TEST(KernelBufferTest, AppendBytes)
 
 VOID TEST(KernelBufferTest, EraseBytes)
 {
-    SrsBuffer b;
+    SrsFastBuffer b;
 
     b.erase(0);
     b.erase(-1);
@@ -267,7 +267,7 @@ VOID TEST(KernelBufferTest, EraseBytes)
 
 VOID TEST(KernelBufferTest, Grow)
 {
-    SrsBuffer b;
+    SrsFastBuffer b;
     MockBufferReader r("winlin");
 
     b.grow(&r, 1);

diff --git a/trunk/src/utest/srs_utest_protocol.hpp b/trunk/src/utest/srs_utest_protocol.hpp
@@ -78,9 +78,9 @@ class MockBufferIO : public ISrsProtocolReaderWriter
     int64_t recv_bytes;
     int64_t send_bytes;
     // data source for socket read.
-    SrsBuffer in_buffer;
+    SrsFastBuffer in_buffer;
     // data buffer for socket send.
-    SrsBuffer out_buffer;
+    SrsFastBuffer out_buffer;
 public:
     MockBufferIO();
     virtual ~MockBufferIO();