rename SrsFastBuffer to SrsFastStream

trunk/src/protocol/srs_protocol_buffer.cpp

@@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <srs_protocol_buffer.hpp>
+#include <srs_protocol_stream.hpp>
 
 #include <stdlib.h>
 
@@ -52,7 +52,7 @@ IMergeReadHandler::~IMergeReadHandler()
 }
 #endif
 
-SrsFastBuffer::SrsFastBuffer()
+SrsFastStream::SrsFastStream()
 {
 #ifdef SRS_PERF_MERGED_READ
     merged_read = false;
@@ -64,23 +64,23 @@ SrsFastBuffer::SrsFastBuffer()
     p = end = buffer;
 }
 
-SrsFastBuffer::~SrsFastBuffer()
+SrsFastStream::~SrsFastStream()
 {
     free(buffer);
     buffer = NULL;
 }
 
-int SrsFastBuffer::size()
+int SrsFastStream::size()
 {
     return (int)(end - p);
 }
 
-char* SrsFastBuffer::bytes()
+char* SrsFastStream::bytes()
 {
     return p;
 }
 
-void SrsFastBuffer::set_buffer(int buffer_size)
+void SrsFastStream::set_buffer(int buffer_size)
 {
     // never exceed the max size.
     if (buffer_size > SRS_MAX_SOCKET_BUFFER) {
@@ -106,13 +106,13 @@ void SrsFastBuffer::set_buffer(int buffer_size)
     end = p + nb_bytes;
 }
 
-char SrsFastBuffer::read_1byte()
+char SrsFastStream::read_1byte()
 {
     srs_assert(end - p >= 1);
     return *p++;
 }
 
-char* SrsFastBuffer::read_slice(int size)
+char* SrsFastStream::read_slice(int size)
 {
     srs_assert(size >= 0);
     srs_assert(end - p >= size);
@@ -124,14 +124,14 @@ char* SrsFastBuffer::read_slice(int size)
     return ptr;
 }
 
-void SrsFastBuffer::skip(int size)
+void SrsFastStream::skip(int size)
 {
     srs_assert(end - p >= size);
     srs_assert(p + size >= buffer);
     p += size;
 }
 
-int SrsFastBuffer::grow(ISrsBufferReader* reader, int required_size)
+int SrsFastStream::grow(ISrsBufferReader* reader, int required_size)
 {
     int ret = ERROR_SUCCESS;
 
@@ -205,7 +205,7 @@ int SrsFastBuffer::grow(ISrsBufferReader* reader, int required_size)
 }
 
 #ifdef SRS_PERF_MERGED_READ
-void SrsFastBuffer::set_merge_read(bool v, IMergeReadHandler* handler)
+void SrsFastStream::set_merge_read(bool v, IMergeReadHandler* handler)
 {
     merged_read = v;
     _handler = handler;

trunk/src/protocol/srs_protocol_buffer.hpp

@@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#ifndef SRS_PROTOCOL_BUFFER_HPP
-#define SRS_PROTOCOL_BUFFER_HPP
+#ifndef SRS_PROTOCOL_STREAM_HPP
+#define SRS_PROTOCOL_STREAM_HPP
 
 /*
-#include <srs_protocol_buffer.hpp>
+#include <srs_protocol_stream.hpp>
 */
 
 #include <srs_core.hpp>
@@ -61,13 +61,13 @@ public:
 * protocol recv data from socket, put into buffer, decode to RTMP message.
 * Usage:
 *       ISrsBufferReader* r = ......;
-*       SrsFastBuffer* fb = ......;
+*       SrsFastStream* fb = ......;
 *       fb->grow(r, 1024);
 *       char* header = fb->read_slice(100);
 *       char* payload = fb->read_payload(924);
 */
 // TODO: FIXME: add utest for it.
-class SrsFastBuffer
+class SrsFastStream
 {
 private:
 #ifdef SRS_PERF_MERGED_READ
@@ -88,8 +88,8 @@ private:
     // the size of buffer.
     int nb_buffer;
 public:
-    SrsFastBuffer();
-    virtual ~SrsFastBuffer();
+    SrsFastStream();
+    virtual ~SrsFastStream();
 public:
     /**
     * get the size of current bytes in buffer.

trunk/src/protocol/srs_rtmp_stack.cpp

@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_kernel_buffer.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_protocol_buffer.hpp>
+#include <srs_protocol_stream.hpp>
 #include <srs_rtmp_utility.hpp>
 #include <srs_rtmp_handshake.hpp>
 
@@ -216,7 +216,7 @@ SrsProtocol::AckWindowSize::AckWindowSize()
 
 SrsProtocol::SrsProtocol(ISrsProtocolReaderWriter* io)
 {
-    in_buffer = new SrsFastBuffer();
+    in_buffer = new SrsFastStream();
     skt = io;
     
     in_chunk_size = SRS_CONSTS_RTMP_PROTOCOL_CHUNK_SIZE;

trunk/src/protocol/srs_rtmp_stack.hpp

@@ -46,7 +46,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_kernel_flv.hpp>
 
 class ISrsProtocolReaderWriter;
-class SrsFastBuffer;
+class SrsFastStream;
 class SrsPacket;
 class SrsBuffer;
 class SrsAmf0Object;
@@ -222,7 +222,7 @@ private:
     /**
     * bytes buffer cache, recv from skt, provide services for stream.
     */
-    SrsFastBuffer* in_buffer;
+    SrsFastStream* in_buffer;
     /**
     * input chunk size, default to 128, set by peer packet.
     */