rename SrsSimpleBuffer to SrsSimpleStream

trunk/src/app/srs_app_hls.hpp

@@ -46,7 +46,7 @@ class SrsRequest;
 class SrsPithyPrint;
 class SrsSource;
 class SrsFileWriter;
-class SrsSimpleBuffer;
+class SrsSimpleStream;
 class SrsTsAacJitter;
 class SrsTsCache;
 class SrsHlsSegment;

trunk/src/app/srs_app_mpegts_udp.cpp

@@ -128,7 +128,7 @@ SrsMpegtsOverUdp::SrsMpegtsOverUdp(SrsConfDirective* c)
 {
     stream = new SrsBuffer();
     context = new SrsTsContext();
-    buffer = new SrsSimpleBuffer();
+    buffer = new SrsSimpleStream();
     output = _srs_config->get_stream_caster_output(c);
     
     req = NULL;

trunk/src/app/srs_app_mpegts_udp.hpp

@@ -39,7 +39,7 @@ struct sockaddr_in;
 class SrsBuffer;
 class SrsTsContext;
 class SrsConfDirective;
-class SrsSimpleBuffer;
+class SrsSimpleStream;
 class SrsRtmpClient;
 class SrsStSocket;
 class SrsRequest;
@@ -82,7 +82,7 @@ class SrsMpegtsOverUdp : virtual public ISrsTsHandler
 private:
     SrsBuffer* stream;
     SrsTsContext* context;
-    SrsSimpleBuffer* buffer;
+    SrsSimpleStream* buffer;
     std::string output;
 private:
     SrsRequest* req;

trunk/src/app/srs_app_rtsp.hpp

@@ -54,7 +54,7 @@ class SrsRawAacStream;
 struct SrsRawAacStreamCodec;
 class SrsSharedPtrMessage;
 class SrsCodecSample;
-class SrsSimpleBuffer;
+class SrsSimpleStream;
 class SrsPithyPrint;
 
 /**
@@ -87,7 +87,7 @@ struct SrsRtspAudioCache
 {
     int64_t dts;
     SrsCodecSample* audio_samples;
-    SrsSimpleBuffer* payload;
+    SrsSimpleStream* payload;
 
     SrsRtspAudioCache();
     virtual ~SrsRtspAudioCache();

trunk/src/kernel/srs_kernel_stream.cpp

@@ -28,27 +28,27 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_kernel_utility.hpp>
 #include <srs_core_performance.hpp>
 
-SrsSimpleBuffer::SrsSimpleBuffer()
+SrsSimpleStream::SrsSimpleStream()
 {
 }
 
-SrsSimpleBuffer::~SrsSimpleBuffer()
+SrsSimpleStream::~SrsSimpleStream()
 {
 }
 
-int SrsSimpleBuffer::length()
+int SrsSimpleStream::length()
 {
     int len = (int)data.size();
     srs_assert(len >= 0);
     return len;
 }
 
-char* SrsSimpleBuffer::bytes()
+char* SrsSimpleStream::bytes()
 {
     return (length() == 0)? NULL : &data.at(0);
 }
 
-void SrsSimpleBuffer::erase(int size)
+void SrsSimpleStream::erase(int size)
 {
     if (size <= 0) {
         return;
@@ -62,7 +62,7 @@ void SrsSimpleBuffer::erase(int size)
     data.erase(data.begin(), data.begin() + size);
 }
 
-void SrsSimpleBuffer::append(const char* bytes, int size)
+void SrsSimpleStream::append(const char* bytes, int size)
 {
     srs_assert(size > 0);
 

trunk/src/kernel/srs_kernel_stream.hpp

@@ -36,13 +36,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 * the simple buffer use vector to append bytes,
 * it's for hls and http, and need to be refined in future.
 */
-class SrsSimpleBuffer
+class SrsSimpleStream
 {
 private:
     std::vector<char> data;
 public:
-    SrsSimpleBuffer();
+    SrsSimpleStream();
-    virtual ~SrsSimpleBuffer();
+    virtual ~SrsSimpleStream();
 public:
     /**
     * get the length of buffer. empty if zero.

trunk/src/kernel/srs_kernel_ts.cpp

@@ -95,7 +95,7 @@ SrsTsMessage::SrsTsMessage(SrsTsChannel* c, SrsTsPacket* p)
     sid = (SrsTsPESStreamId)0x00;
     continuity_counter = 0;
     PES_packet_length = 0;
-    payload = new SrsSimpleBuffer();
+    payload = new SrsSimpleStream();
     is_discontinuity = false;
 
     start_pts = 0;

trunk/src/kernel/srs_kernel_ts.hpp

@@ -42,7 +42,7 @@ class SrsFileWriter;
 class SrsFileReader;
 class SrsAvcAacCodec;
 class SrsCodecSample;
-class SrsSimpleBuffer;
+class SrsSimpleStream;
 class SrsTsAdaptationField;
 class SrsTsPayload;
 class SrsTsMessage;
@@ -273,7 +273,7 @@ public:
     // the chunk id.
     u_int8_t continuity_counter;
     // the payload bytes.
-    SrsSimpleBuffer* payload;
+    SrsSimpleStream* payload;
 public:
     SrsTsMessage(SrsTsChannel* c = NULL, SrsTsPacket* p = NULL);
     virtual ~SrsTsMessage();

trunk/src/protocol/srs_rtsp_stack.cpp

@@ -133,7 +133,7 @@ SrsRtpPacket::SrsRtpPacket()
     timestamp = 0;
     ssrc = 0;
 
-    payload = new SrsSimpleBuffer();
+    payload = new SrsSimpleStream();
     audio_samples = new SrsCodecSample();
     chunked = false;
     completed = false;
@@ -829,7 +829,7 @@ int SrsRtspSetupResponse::encode_header(stringstream& ss)
 
 SrsRtspStack::SrsRtspStack(ISrsProtocolReaderWriter* s)
 {
-    buf = new SrsSimpleBuffer();
+    buf = new SrsSimpleStream();
     skt = s;
 }
 

trunk/src/protocol/srs_rtsp_stack.hpp

@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifdef SRS_AUTO_STREAM_CASTER
 
 class SrsBuffer;
-class SrsSimpleBuffer;
+class SrsSimpleStream;
 class SrsCodecSample;
 class ISrsProtocolReaderWriter;
 
@@ -286,7 +286,7 @@ public:
     u_int32_t ssrc; //32bits
 
     // the payload.
-    SrsSimpleBuffer* payload;
+    SrsSimpleStream* payload;
     // whether transport in chunked payload.
     bool chunked;
     // whether message is completed.
@@ -657,7 +657,7 @@ private:
     /**
     * cached bytes buffer.
     */
-    SrsSimpleBuffer* buf;
+    SrsSimpleStream* buf;
     /**
     * underlayer socket object, send/recv bytes.
     */

trunk/src/utest/srs_utest_kernel.cpp

@@ -203,7 +203,7 @@ int MockBufferReader::read(void* buf, size_t size, ssize_t* nread)
 
 VOID TEST(KernelBufferTest, DefaultObject)
 {
-    SrsSimpleBuffer b;
+    SrsSimpleStream b;
     
     EXPECT_EQ(0, b.length());
     EXPECT_EQ(NULL, b.bytes());
@@ -211,7 +211,7 @@ VOID TEST(KernelBufferTest, DefaultObject)
 
 VOID TEST(KernelBufferTest, AppendBytes)
 {
-    SrsSimpleBuffer b;
+    SrsSimpleStream b;
     
     char winlin[] = "winlin";
     b.append(winlin, strlen(winlin));
@@ -231,7 +231,7 @@ VOID TEST(KernelBufferTest, AppendBytes)
 
 VOID TEST(KernelBufferTest, EraseBytes)
 {
-    SrsSimpleBuffer b;
+    SrsSimpleStream b;
     
     b.erase(0);
     b.erase(-1);

trunk/src/utest/srs_utest_protocol.hpp

@@ -78,9 +78,9 @@ public:
     int64_t recv_bytes;
     int64_t send_bytes;
     // data source for socket read.
-    SrsSimpleBuffer in_buffer;
+    SrsSimpleStream in_buffer;
     // data buffer for socket send.
-    SrsSimpleBuffer out_buffer;
+    SrsSimpleStream out_buffer;
 public:
     MockBufferIO();
     virtual ~MockBufferIO();