rename SrsStream to SrsBuffer

trunk/src/kernel/srs_kernel_aac.cpp

@@ -42,7 +42,7 @@ SrsAacEncoder::SrsAacEncoder()
 {
     _fs = NULL;
     got_sequence_header = false;
-    tag_stream = new SrsStream();
+    tag_stream = new SrsBuffer();
     aac_object = SrsAacObjectTypeReserved;
 }
 
@@ -76,7 +76,7 @@ int SrsAacEncoder::write_audio(int64_t timestamp, char* data, int size)
     
     timestamp &= 0x7fffffff;
     
-    SrsStream* stream = tag_stream;
+    SrsBuffer* stream = tag_stream;
     if ((ret = stream->initialize(data, size)) != ERROR_SUCCESS) {
         return ret;
     }

trunk/src/kernel/srs_kernel_aac.hpp

@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_kernel_codec.hpp>
 
-class SrsStream;
+class SrsBuffer;
 class SrsFileWriter;
 class SrsFileReader;
 
@@ -50,7 +50,7 @@ private:
     int8_t aac_channels;
     bool got_sequence_header;
 private:
-    SrsStream* tag_stream;
+    SrsBuffer* tag_stream;
 public:
     SrsAacEncoder();
     virtual ~SrsAacEncoder();

trunk/src/kernel/srs_kernel_buffer.cpp

@@ -29,7 +29,7 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_utility.hpp>
 
-SrsStream::SrsStream()
+SrsBuffer::SrsBuffer()
 {
     p = bytes = NULL;
     nb_bytes = 0;
@@ -38,11 +38,11 @@ SrsStream::SrsStream()
     srs_assert(srs_is_little_endian());
 }
 
-SrsStream::~SrsStream()
+SrsBuffer::~SrsBuffer()
 {
 }
 
-int SrsStream::initialize(char* b, int nb)
+int SrsBuffer::initialize(char* b, int nb)
 {
     int ret = ERROR_SUCCESS;
     
@@ -65,48 +65,48 @@ int SrsStream::initialize(char* b, int nb)
     return ret;
 }
 
-char* SrsStream::data()
+char* SrsBuffer::data()
 {
     return bytes;
 }
 
-int SrsStream::size()
+int SrsBuffer::size()
 {
     return nb_bytes;
 }
 
-int SrsStream::pos()
+int SrsBuffer::pos()
 {
     return (int)(p - bytes);
 }
 
-bool SrsStream::empty()
+bool SrsBuffer::empty()
 {
     return !bytes || (p >= bytes + nb_bytes);
 }
 
-bool SrsStream::require(int required_size)
+bool SrsBuffer::require(int required_size)
 {
     srs_assert(required_size > 0);
     
     return required_size <= nb_bytes - (p - bytes);
 }
 
-void SrsStream::skip(int size)
+void SrsBuffer::skip(int size)
 {
     srs_assert(p);
     
     p += size;
 }
 
-int8_t SrsStream::read_1bytes()
+int8_t SrsBuffer::read_1bytes()
 {
     srs_assert(require(1));
     
     return (int8_t)*p++;
 }
 
-int16_t SrsStream::read_2bytes()
+int16_t SrsBuffer::read_2bytes()
 {
     srs_assert(require(2));
     
@@ -118,7 +118,7 @@ int16_t SrsStream::read_2bytes()
     return value;
 }
 
-int32_t SrsStream::read_3bytes()
+int32_t SrsBuffer::read_3bytes()
 {
     srs_assert(require(3));
     
@@ -131,7 +131,7 @@ int32_t SrsStream::read_3bytes()
     return value;
 }
 
-int32_t SrsStream::read_4bytes()
+int32_t SrsBuffer::read_4bytes()
 {
     srs_assert(require(4));
     
@@ -145,7 +145,7 @@ int32_t SrsStream::read_4bytes()
     return value;
 }
 
-int64_t SrsStream::read_8bytes()
+int64_t SrsBuffer::read_8bytes()
 {
     srs_assert(require(8));
     
@@ -163,7 +163,7 @@ int64_t SrsStream::read_8bytes()
     return value;
 }
 
-string SrsStream::read_string(int len)
+string SrsBuffer::read_string(int len)
 {
     srs_assert(require(len));
     
@@ -175,7 +175,7 @@ string SrsStream::read_string(int len)
     return value;
 }
 
-void SrsStream::read_bytes(char* data, int size)
+void SrsBuffer::read_bytes(char* data, int size)
 {
     srs_assert(require(size));
     
@@ -184,14 +184,14 @@ void SrsStream::read_bytes(char* data, int size)
     p += size;
 }
 
-void SrsStream::write_1bytes(int8_t value)
+void SrsBuffer::write_1bytes(int8_t value)
 {
     srs_assert(require(1));
     
     *p++ = value;
 }
 
-void SrsStream::write_2bytes(int16_t value)
+void SrsBuffer::write_2bytes(int16_t value)
 {
     srs_assert(require(2));
     
@@ -200,7 +200,7 @@ void SrsStream::write_2bytes(int16_t value)
     *p++ = pp[0];
 }
 
-void SrsStream::write_4bytes(int32_t value)
+void SrsBuffer::write_4bytes(int32_t value)
 {
     srs_assert(require(4));
     
@@ -211,7 +211,7 @@ void SrsStream::write_4bytes(int32_t value)
     *p++ = pp[0];
 }
 
-void SrsStream::write_3bytes(int32_t value)
+void SrsBuffer::write_3bytes(int32_t value)
 {
     srs_assert(require(3));
     
@@ -221,7 +221,7 @@ void SrsStream::write_3bytes(int32_t value)
     *p++ = pp[0];
 }
 
-void SrsStream::write_8bytes(int64_t value)
+void SrsBuffer::write_8bytes(int64_t value)
 {
     srs_assert(require(8));
     
@@ -236,7 +236,7 @@ void SrsStream::write_8bytes(int64_t value)
     *p++ = pp[0];
 }
 
-void SrsStream::write_string(string value)
+void SrsBuffer::write_string(string value)
 {
     srs_assert(require((int)value.length()));
     
@@ -244,7 +244,7 @@ void SrsStream::write_string(string value)
     p += value.length();
 }
 
-void SrsStream::write_bytes(char* data, int size)
+void SrsBuffer::write_bytes(char* data, int size)
 {
     srs_assert(require(size));
     
@@ -263,7 +263,7 @@ SrsBitStream::~SrsBitStream()
 {
 }
 
-int SrsBitStream::initialize(SrsStream* s) {
+int SrsBitStream::initialize(SrsBuffer* s) {
     stream = s;
     return ERROR_SUCCESS;
 }

trunk/src/kernel/srs_kernel_buffer.hpp

@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 * convert basic types to bytes,
 * build basic types from bytes.
 */
-class SrsStream
+class SrsBuffer
 {
 private:
     // current position at bytes.
@@ -48,8 +48,8 @@ private:
     // the total number of bytes.
     int nb_bytes;
 public:
-    SrsStream();
-    virtual ~SrsStream();
+    SrsBuffer();
+    virtual ~SrsBuffer();
 public:
     /**
     * initialize the stream from bytes.
@@ -164,12 +164,12 @@ class SrsBitStream
 private:
     int8_t cb;
     u_int8_t cb_left;
-    SrsStream* stream;
+    SrsBuffer* stream;
 public:
     SrsBitStream();
     virtual ~SrsBitStream();
 public:
-    virtual int initialize(SrsStream* s);
+    virtual int initialize(SrsBuffer* s);
     virtual bool empty();
     virtual int8_t read_bit();
 };

trunk/src/kernel/srs_kernel_codec.cpp

@@ -412,7 +412,7 @@ SrsAvcAacCodec::SrsAvcAacCodec()
     pictureParameterSetNALUnit  = NULL;
 
     payload_format = SrsAvcPayloadFormatGuess;
-    stream = new SrsStream();
+    stream = new SrsBuffer();
 }
 
 SrsAvcAacCodec::~SrsAvcAacCodec()
@@ -754,7 +754,7 @@ int SrsAvcAacCodec::video_avc_demux(char* data, int size, SrsCodecSample* sample
     return ret;
 }
 
-int SrsAvcAacCodec::avc_demux_sps_pps(SrsStream* stream)
+int SrsAvcAacCodec::avc_demux_sps_pps(SrsBuffer* stream)
 {
     int ret = ERROR_SUCCESS;
     
@@ -868,7 +868,7 @@ int SrsAvcAacCodec::avc_demux_sps()
         return ret;
     }
     
-    SrsStream stream;
+    SrsBuffer stream;
     if ((ret = stream.initialize(sequenceParameterSetNALUnit, sequenceParameterSetLength)) != ERROR_SUCCESS) {
         return ret;
     }
@@ -948,7 +948,7 @@ int SrsAvcAacCodec::avc_demux_sps_rbsp(char* rbsp, int nb_rbsp)
     }
     
     // reparse the rbsp.
-    SrsStream stream;
+    SrsBuffer stream;
     if ((ret = stream.initialize(rbsp, nb_rbsp)) != ERROR_SUCCESS) {
         return ret;
     }
@@ -1115,7 +1115,7 @@ int SrsAvcAacCodec::avc_demux_sps_rbsp(char* rbsp, int nb_rbsp)
     return ret;
 }
 
-int SrsAvcAacCodec::avc_demux_annexb_format(SrsStream* stream, SrsCodecSample* sample)
+int SrsAvcAacCodec::avc_demux_annexb_format(SrsBuffer* stream, SrsCodecSample* sample)
 {
     int ret = ERROR_SUCCESS;
     
@@ -1168,7 +1168,7 @@ int SrsAvcAacCodec::avc_demux_annexb_format(SrsStream* stream, SrsCodecSample* s
     return ret;
 }
 
-int SrsAvcAacCodec::avc_demux_ibmf_format(SrsStream* stream, SrsCodecSample* sample)
+int SrsAvcAacCodec::avc_demux_ibmf_format(SrsBuffer* stream, SrsCodecSample* sample)
 {
     int ret = ERROR_SUCCESS;
     

trunk/src/kernel/srs_kernel_codec.hpp

@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <string>
 
-class SrsStream;
+class SrsBuffer;
 
 // AACPacketType IF SoundFormat == 10 UI8
 // The following values are defined:
@@ -542,7 +542,7 @@ std::string srs_codec_avc_level2str(SrsAvcLevel level);
 class SrsAvcAacCodec
 {
 private:
-    SrsStream* stream;
+    SrsBuffer* stream;
 public:
     /**
     * metadata specified
@@ -644,7 +644,7 @@ private:
     * when avc packet type is SrsCodecVideoAVCTypeSequenceHeader,
     * decode the sps and pps.
     */
-    virtual int avc_demux_sps_pps(SrsStream* stream);
+    virtual int avc_demux_sps_pps(SrsBuffer* stream);
     /**
      * decode the sps rbsp stream.
      */
@@ -654,12 +654,12 @@ private:
     * demux the avc NALU in "AnnexB" 
     * from H.264-AVC-ISO_IEC_14496-10.pdf, page 211.
     */
-    virtual int avc_demux_annexb_format(SrsStream* stream, SrsCodecSample* sample);
+    virtual int avc_demux_annexb_format(SrsBuffer* stream, SrsCodecSample* sample);
     /**
     * demux the avc NALU in "ISO Base Media File Format" 
     * from H.264-AVC-ISO_IEC_14496-15.pdf, page 20
     */
-    virtual int avc_demux_ibmf_format(SrsStream* stream, SrsCodecSample* sample);
+    virtual int avc_demux_ibmf_format(SrsBuffer* stream, SrsCodecSample* sample);
 };
 
 #endif

trunk/src/kernel/srs_kernel_flv.cpp

@@ -333,7 +333,7 @@ SrsSharedPtrMessage* SrsSharedPtrMessage::copy()
 SrsFlvEncoder::SrsFlvEncoder()
 {
     reader = NULL;
-    tag_stream = new SrsStream();
+    tag_stream = new SrsBuffer();
     
 #ifdef SRS_PERF_FAST_FLV_ENCODER
     nb_tag_headers = 0;
@@ -696,7 +696,7 @@ int SrsFlvEncoder::write_tag(char* header, int header_size, char* tag, int tag_s
 SrsFlvDecoder::SrsFlvDecoder()
 {
     reader = NULL;
-    tag_stream = new SrsStream();
+    tag_stream = new SrsBuffer();
 }
 
 SrsFlvDecoder::~SrsFlvDecoder()
@@ -820,7 +820,7 @@ int SrsFlvDecoder::read_previous_tag_size(char previous_tag_size[4])
 SrsFlvVodStreamDecoder::SrsFlvVodStreamDecoder()
 {
     reader = NULL;
-    tag_stream = new SrsStream();
+    tag_stream = new SrsBuffer();
 }
 
 SrsFlvVodStreamDecoder::~SrsFlvVodStreamDecoder()

trunk/src/kernel/srs_kernel_flv.hpp

@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <sys/uio.h>
 #endif
 
-class SrsStream;
+class SrsBuffer;
 class SrsFileWriter;
 class SrsFileReader;
 
@@ -436,7 +436,7 @@ class SrsFlvEncoder
 private:
     SrsFileWriter* reader;
 private:
-    SrsStream* tag_stream;
+    SrsBuffer* tag_stream;
     char tag_header[SRS_FLV_TAG_HEADER_SIZE];
 public:
     SrsFlvEncoder();
@@ -514,7 +514,7 @@ class SrsFlvDecoder
 private:
     SrsFileReader* reader;
 private:
-    SrsStream* tag_stream;
+    SrsBuffer* tag_stream;
 public:
     SrsFlvDecoder();
     virtual ~SrsFlvDecoder();
@@ -558,7 +558,7 @@ class SrsFlvVodStreamDecoder
 private:
     SrsFileReader* reader;
 private:
-    SrsStream* tag_stream;
+    SrsBuffer* tag_stream;
 public:
     SrsFlvVodStreamDecoder();
     virtual ~SrsFlvVodStreamDecoder();

trunk/src/kernel/srs_kernel_mp3.cpp

@@ -41,7 +41,7 @@ using namespace std;
 SrsMp3Encoder::SrsMp3Encoder()
 {
     writer = NULL;
-    tag_stream = new SrsStream();
+    tag_stream = new SrsBuffer();
 }
 
 SrsMp3Encoder::~SrsMp3Encoder()
@@ -89,7 +89,7 @@ int SrsMp3Encoder::write_audio(int64_t timestamp, char* data, int size)
     
     timestamp &= 0x7fffffff;
     
-    SrsStream* stream = tag_stream;
+    SrsBuffer* stream = tag_stream;
     if ((ret = stream->initialize(data, size)) != ERROR_SUCCESS) {
         return ret;
     }

trunk/src/kernel/srs_kernel_mp3.hpp

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <string>
 
-class SrsStream;
+class SrsBuffer;
 class SrsFileWriter;
 
 /**
@@ -42,7 +42,7 @@ class SrsMp3Encoder
 private:
     SrsFileWriter* writer;
 private:
-    SrsStream* tag_stream;
+    SrsBuffer* tag_stream;
 public:
     SrsMp3Encoder();
     virtual ~SrsMp3Encoder();

trunk/src/kernel/srs_kernel_ts.cpp

@@ -107,7 +107,7 @@ SrsTsMessage::~SrsTsMessage()
     srs_freep(payload);
 }
 
-int SrsTsMessage::dump(SrsStream* stream, int* pnb_bytes)
+int SrsTsMessage::dump(SrsBuffer* stream, int* pnb_bytes)
 {
     int ret = ERROR_SUCCESS;
 
@@ -262,7 +262,7 @@ void SrsTsContext::set(int pid, SrsTsPidApply apply_pid, SrsTsStream stream)
     channel->stream = stream;
 }
 
-int SrsTsContext::decode(SrsStream* stream, ISrsTsHandler* handler)
+int SrsTsContext::decode(SrsBuffer* stream, ISrsTsHandler* handler)
 {
     int ret = ERROR_SUCCESS;
 
@@ -400,7 +400,7 @@ int SrsTsContext::encode_pat_pmt(SrsFileWriter* writer, int16_t vpid, SrsTsStrea
         srs_assert(nb_buf < SRS_TS_PACKET_SIZE);
         memset(buf + nb_buf, 0xFF, SRS_TS_PACKET_SIZE - nb_buf);
 
-        SrsStream stream;
+        SrsBuffer stream;
         if ((ret = stream.initialize(buf, nb_buf)) != ERROR_SUCCESS) {
             return ret;
         }
@@ -427,7 +427,7 @@ int SrsTsContext::encode_pat_pmt(SrsFileWriter* writer, int16_t vpid, SrsTsStrea
         srs_assert(nb_buf < SRS_TS_PACKET_SIZE);
         memset(buf + nb_buf, 0xFF, SRS_TS_PACKET_SIZE - nb_buf);
 
-        SrsStream stream;
+        SrsBuffer stream;
         if ((ret = stream.initialize(buf, nb_buf)) != ERROR_SUCCESS) {
             return ret;
         }
@@ -518,7 +518,7 @@ int SrsTsContext::encode_pes(SrsFileWriter* writer, SrsTsMessage* msg, int16_t p
         memcpy(buf + nb_buf, p, left);
         p += left;
 
-        SrsStream stream;
+        SrsBuffer stream;
         if ((ret = stream.initialize(buf, nb_buf)) != ERROR_SUCCESS) {
             return ret;
         }
@@ -557,7 +557,7 @@ SrsTsPacket::~SrsTsPacket()
     srs_freep(payload);
 }
 
-int SrsTsPacket::decode(SrsStream* stream, SrsTsMessage** ppmsg)
+int SrsTsPacket::decode(SrsBuffer* stream, SrsTsMessage** ppmsg)
 {
     int ret = ERROR_SUCCESS;
 
@@ -650,7 +650,7 @@ int SrsTsPacket::size()
     return sz;
 }
 
-int SrsTsPacket::encode(SrsStream* stream)
+int SrsTsPacket::encode(SrsBuffer* stream)
 {
     int ret = ERROR_SUCCESS;
 
@@ -925,7 +925,7 @@ SrsTsAdaptationField::~SrsTsAdaptationField()
     srs_freep(transport_private_data);
 }
 
-int SrsTsAdaptationField::decode(SrsStream* stream)
+int SrsTsAdaptationField::decode(SrsBuffer* stream)
 {
     int ret = ERROR_SUCCESS;
 
@@ -1145,7 +1145,7 @@ int SrsTsAdaptationField::size()
     return sz;
 }
 
-int SrsTsAdaptationField::encode(SrsStream* stream)
+int SrsTsAdaptationField::encode(SrsBuffer* stream)
 {
     int ret = ERROR_SUCCESS;
 
@@ -1337,7 +1337,7 @@ SrsTsPayloadPES::~SrsTsPayloadPES()
     srs_freep(PES_extension_field);
 }
 
-int SrsTsPayloadPES::decode(SrsStream* stream, SrsTsMessage** ppmsg)
+int SrsTsPayloadPES::decode(SrsBuffer* stream, SrsTsMessage** ppmsg)
 {
     int ret = ERROR_SUCCESS;
 
@@ -1808,7 +1808,7 @@ int SrsTsPayloadPES::size()
     return sz;
 }
 
-int SrsTsPayloadPES::encode(SrsStream* stream)
+int SrsTsPayloadPES::encode(SrsBuffer* stream)
 {
     int ret = ERROR_SUCCESS;
 
@@ -1969,7 +1969,7 @@ int SrsTsPayloadPES::encode(SrsStream* stream)
     return ret;
 }
 
-int SrsTsPayloadPES::decode_33bits_dts_pts(SrsStream* stream, int64_t* pv)
+int SrsTsPayloadPES::decode_33bits_dts_pts(SrsBuffer* stream, int64_t* pv)
 {
     int ret = ERROR_SUCCESS;
 
@@ -2030,7 +2030,7 @@ int SrsTsPayloadPES::decode_33bits_dts_pts(SrsStream* stream, int64_t* pv)
     return ret;
 }
 
-int SrsTsPayloadPES::encode_33bits_dts_pts(SrsStream* stream, u_int8_t fb, int64_t v)
+int SrsTsPayloadPES::encode_33bits_dts_pts(SrsBuffer* stream, u_int8_t fb, int64_t v)
 {
     int ret = ERROR_SUCCESS;
 
@@ -2071,7 +2071,7 @@ SrsTsPayloadPSI::~SrsTsPayloadPSI()
 {
 }
 
-int SrsTsPayloadPSI::decode(SrsStream* stream, SrsTsMessage** /*ppmsg*/)
+int SrsTsPayloadPSI::decode(SrsBuffer* stream, SrsTsMessage** /*ppmsg*/)
 {
     int ret = ERROR_SUCCESS;
 
@@ -2180,7 +2180,7 @@ int SrsTsPayloadPSI::size()
     return sz;
 }
 
-int SrsTsPayloadPSI::encode(SrsStream* stream)
+int SrsTsPayloadPSI::encode(SrsBuffer* stream)
 {
     int ret = ERROR_SUCCESS;
 
@@ -2253,7 +2253,7 @@ SrsTsPayloadPATProgram::~SrsTsPayloadPATProgram()
 {
 }
 
-int SrsTsPayloadPATProgram::decode(SrsStream* stream)
+int SrsTsPayloadPATProgram::decode(SrsBuffer* stream)
 {
     int ret = ERROR_SUCCESS;
 
@@ -2277,7 +2277,7 @@ int SrsTsPayloadPATProgram::size()
     return 4;
 }
 
-int SrsTsPayloadPATProgram::encode(SrsStream* stream)
+int SrsTsPayloadPATProgram::encode(SrsBuffer* stream)
 {
     int ret = ERROR_SUCCESS;
 
@@ -2311,7 +2311,7 @@ SrsTsPayloadPAT::~SrsTsPayloadPAT()
     programs.clear();
 }
 
-int SrsTsPayloadPAT::psi_decode(SrsStream* stream)
+int SrsTsPayloadPAT::psi_decode(SrsBuffer* stream)
 {
     int ret = ERROR_SUCCESS;
 
@@ -2373,7 +2373,7 @@ int SrsTsPayloadPAT::psi_size()
     return sz;
 }
 
-int SrsTsPayloadPAT::psi_encode(SrsStream* stream)
+int SrsTsPayloadPAT::psi_encode(SrsBuffer* stream)
 {
     int ret = ERROR_SUCCESS;
 
@@ -2431,7 +2431,7 @@ SrsTsPayloadPMTESInfo::~SrsTsPayloadPMTESInfo()
     srs_freep(ES_info);
 }
 
-int SrsTsPayloadPMTESInfo::decode(SrsStream* stream)
+int SrsTsPayloadPMTESInfo::decode(SrsBuffer* stream)
 {
     int ret = ERROR_SUCCESS;
 
@@ -2471,7 +2471,7 @@ int SrsTsPayloadPMTESInfo::size()
     return 5 + ES_info_length;
 }
 
-int SrsTsPayloadPMTESInfo::encode(SrsStream* stream)
+int SrsTsPayloadPMTESInfo::encode(SrsBuffer* stream)
 {
     int ret = ERROR_SUCCESS;
 
@@ -2525,7 +2525,7 @@ SrsTsPayloadPMT::~SrsTsPayloadPMT()
     infos.clear();
 }
 
-int SrsTsPayloadPMT::psi_decode(SrsStream* stream)
+int SrsTsPayloadPMT::psi_decode(SrsBuffer* stream)
 {
     int ret = ERROR_SUCCESS;
 
@@ -2619,7 +2619,7 @@ int SrsTsPayloadPMT::psi_size()
     return sz;
 }
 
-int SrsTsPayloadPMT::psi_encode(SrsStream* stream)
+int SrsTsPayloadPMT::psi_encode(SrsBuffer* stream)
 {
     int ret = ERROR_SUCCESS;
 

trunk/src/kernel/srs_kernel_ts.hpp

@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_kernel_codec.hpp>
 
-class SrsStream;
+class SrsBuffer;
 class SrsTsCache;
 class SrsTSMuxer;
 class SrsFileWriter;
@@ -282,7 +282,7 @@ public:
     /**
     * dumps all bytes in stream to ts message.
     */
-    virtual int dump(SrsStream* stream, int* pnb_bytes);
+    virtual int dump(SrsBuffer* stream, int* pnb_bytes);
     /**
     * whether ts message is completed to reap.
     * @param payload_unit_start_indicator whether new ts message start.
@@ -385,7 +385,7 @@ public:
     * @param handler the ts message handler to process the msg.
     * @remark we will consume all bytes in stream.
     */
-    virtual int decode(SrsStream* stream, ISrsTsHandler* handler);
+    virtual int decode(SrsBuffer* stream, ISrsTsHandler* handler);
 // encode methods
 public:
     /**
@@ -509,10 +509,10 @@ public:
     SrsTsPacket(SrsTsContext* c);
     virtual ~SrsTsPacket();
 public:
-    virtual int decode(SrsStream* stream, SrsTsMessage** ppmsg);
+    virtual int decode(SrsBuffer* stream, SrsTsMessage** ppmsg);
 public:
     virtual int size();
-    virtual int encode(SrsStream* stream);
+    virtual int encode(SrsBuffer* stream);
     virtual void padding(int nb_stuffings);
 public:
     static SrsTsPacket* create_pat(SrsTsContext* context, 
@@ -838,10 +838,10 @@ public:
     SrsTsAdaptationField(SrsTsPacket* pkt);
     virtual ~SrsTsAdaptationField();
 public:
-    virtual int decode(SrsStream* stream);
+    virtual int decode(SrsBuffer* stream);
 public:
     virtual int size();
-    virtual int encode(SrsStream* stream);
+    virtual int encode(SrsBuffer* stream);
 };
 
 /**
@@ -886,10 +886,10 @@ public:
     SrsTsPayload(SrsTsPacket* p);
     virtual ~SrsTsPayload();
 public:
-    virtual int decode(SrsStream* stream, SrsTsMessage** ppmsg) = 0;
+    virtual int decode(SrsBuffer* stream, SrsTsMessage** ppmsg) = 0;
 public:
     virtual int size() = 0;
-    virtual int encode(SrsStream* stream) = 0;
+    virtual int encode(SrsBuffer* stream) = 0;
 };
 
 /**
@@ -1237,13 +1237,13 @@ public:
     SrsTsPayloadPES(SrsTsPacket* p);
     virtual ~SrsTsPayloadPES();
 public:
-    virtual int decode(SrsStream* stream, SrsTsMessage** ppmsg);
+    virtual int decode(SrsBuffer* stream, SrsTsMessage** ppmsg);
 public:
     virtual int size();
-    virtual int encode(SrsStream* stream);
+    virtual int encode(SrsBuffer* stream);
 private:
-    virtual int decode_33bits_dts_pts(SrsStream* stream, int64_t* pv);
-    virtual int encode_33bits_dts_pts(SrsStream* stream, u_int8_t fb, int64_t v);
+    virtual int decode_33bits_dts_pts(SrsBuffer* stream, int64_t* pv);
+    virtual int encode_33bits_dts_pts(SrsBuffer* stream, u_int8_t fb, int64_t v);
 };
 
 /**
@@ -1304,14 +1304,14 @@ public:
     SrsTsPayloadPSI(SrsTsPacket* p);
     virtual ~SrsTsPayloadPSI();
 public:
-    virtual int decode(SrsStream* stream, SrsTsMessage** ppmsg);
+    virtual int decode(SrsBuffer* stream, SrsTsMessage** ppmsg);
 public:
     virtual int size();
-    virtual int encode(SrsStream* stream);
+    virtual int encode(SrsBuffer* stream);
 protected:
     virtual int psi_size() = 0;
-    virtual int psi_encode(SrsStream* stream) = 0;
-    virtual int psi_decode(SrsStream* stream) = 0;
+    virtual int psi_encode(SrsBuffer* stream) = 0;
+    virtual int psi_decode(SrsBuffer* stream) = 0;
 };
 
 /**
@@ -1344,10 +1344,10 @@ public:
     SrsTsPayloadPATProgram(int16_t n = 0, int16_t p = 0);
     virtual ~SrsTsPayloadPATProgram();
 public:
-    virtual int decode(SrsStream* stream);
+    virtual int decode(SrsBuffer* stream);
 public:
     virtual int size();
-    virtual int encode(SrsStream* stream);
+    virtual int encode(SrsBuffer* stream);
 };
 
 /**
@@ -1408,10 +1408,10 @@ public:
     SrsTsPayloadPAT(SrsTsPacket* p);
     virtual ~SrsTsPayloadPAT();
 protected:
-    virtual int psi_decode(SrsStream* stream);
+    virtual int psi_decode(SrsBuffer* stream);
 protected:
     virtual int psi_size();
-    virtual int psi_encode(SrsStream* stream);
+    virtual int psi_encode(SrsBuffer* stream);
 };
 
 /**
@@ -1453,10 +1453,10 @@ public:
     SrsTsPayloadPMTESInfo(SrsTsStream st = SrsTsStreamReserved, int16_t epid = 0);
     virtual ~SrsTsPayloadPMTESInfo();
 public:
-    virtual int decode(SrsStream* stream);
+    virtual int decode(SrsBuffer* stream);
 public:
     virtual int size();
-    virtual int encode(SrsStream* stream);
+    virtual int encode(SrsBuffer* stream);
 };
 
 /**
@@ -1544,10 +1544,10 @@ public:
     SrsTsPayloadPMT(SrsTsPacket* p);
     virtual ~SrsTsPayloadPMT();
 protected:
-    virtual int psi_decode(SrsStream* stream);
+    virtual int psi_decode(SrsBuffer* stream);
 protected:
     virtual int psi_size();
-    virtual int psi_encode(SrsStream* stream);
+    virtual int psi_encode(SrsBuffer* stream);
 };
 
 /**

trunk/src/kernel/srs_kernel_utility.cpp

@@ -418,7 +418,7 @@ string srs_path_basename(string path)
     return dirname;
 }
 
-bool srs_avc_startswith_annexb(SrsStream* stream, int* pnb_start_code)
+bool srs_avc_startswith_annexb(SrsBuffer* stream, int* pnb_start_code)
 {
     char* bytes = stream->data() + stream->pos();
     char* p = bytes;
@@ -447,7 +447,7 @@ bool srs_avc_startswith_annexb(SrsStream* stream, int* pnb_start_code)
     return false;
 }
 
-bool srs_aac_startswith_adts(SrsStream* stream)
+bool srs_aac_startswith_adts(SrsBuffer* stream)
 {
     char* bytes = stream->data() + stream->pos();
     char* p = bytes;

trunk/src/kernel/srs_kernel_utility.hpp

@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <string>
 #include <vector>
 
-class SrsStream;
+class SrsBuffer;
 class SrsBitStream;
 
 // compare
@@ -93,14 +93,14 @@ extern std::string srs_path_basename(std::string path);
 * @param pnb_start_code output the size of start code, must >=3. 
 *       NULL to ignore.
 */
-extern bool srs_avc_startswith_annexb(SrsStream* stream, int* pnb_start_code = NULL);
+extern bool srs_avc_startswith_annexb(SrsBuffer* stream, int* pnb_start_code = NULL);
 
 /**
 * whether stream starts with the aac ADTS 
 * from aac-mp4a-format-ISO_IEC_14496-3+2001.pdf, page 75, 1.A.2.2 ADTS.
 * start code must be '1111 1111 1111'B, that is 0xFFF
 */
-extern bool srs_aac_startswith_adts(SrsStream* stream);
+extern bool srs_aac_startswith_adts(SrsBuffer* stream);
 
 /**
 * cacl the crc32 of bytes in buf.