diff --git a/trunk/configure b/trunk/configure index 08e32f682..42ad4b79c 100755 --- a/trunk/configure +++ b/trunk/configure @@ -158,7 +158,7 @@ MODULE_ID="PROTOCOL" MODULE_DEPENDS=("CORE" "KERNEL") ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot}) MODULE_FILES=("srs_rtmp_amf0" "srs_rtmp_io" "srs_rtmp_stack" - "srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_protocol_buffer" + "srs_rtmp_handshake" "srs_rtmp_utility" "srs_rtmp_msg_array" "srs_protocol_stream" "srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps" "srs_protocol_json" "srs_kafka_stack") PROTOCOL_INCS="src/protocol"; MODULE_DIR=${PROTOCOL_INCS} . auto/modules.sh diff --git a/trunk/ide/srs_upp/srs_upp.upp b/trunk/ide/srs_upp/srs_upp.upp index c83695e30..ba55fe904 100755 --- a/trunk/ide/srs_upp/srs_upp.upp +++ b/trunk/ide/srs_upp/srs_upp.upp @@ -58,8 +58,8 @@ file ../../src/protocol/srs_raw_avc.cpp, ../../src/protocol/srs_rtmp_amf0.hpp, ../../src/protocol/srs_rtmp_amf0.cpp, - ../../src/protocol/srs_protocol_buffer.hpp, - ../../src/protocol/srs_protocol_buffer.cpp, + ../../src/protocol/srs_protocol_stream.hpp, + ../../src/protocol/srs_protocol_stream.cpp, ../../src/protocol/srs_protocol_json.hpp, ../../src/protocol/srs_protocol_json.cpp, ../../src/protocol/srs_rtmp_handshake.hpp, diff --git a/trunk/ide/srs_vs2010/srs.vcxproj b/trunk/ide/srs_vs2010/srs.vcxproj index ff3fd4841..c530cb062 100755 --- a/trunk/ide/srs_vs2010/srs.vcxproj +++ b/trunk/ide/srs_vs2010/srs.vcxproj @@ -122,7 +122,7 @@ - + @@ -205,7 +205,7 @@ - + diff --git a/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj b/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj index 1610d807b..6066e54e2 100644 --- a/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj +++ b/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj @@ -10,7 +10,7 @@ 3C036B551B2D0AC10078E2E0 /* srs_app_http_static.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C036B511B2D0AC10078E2E0 /* srs_app_http_static.cpp */; }; 3C036B561B2D0AC10078E2E0 /* srs_app_http_stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C036B531B2D0AC10078E2E0 /* srs_app_http_stream.cpp */; }; 3C068D6A1B10149F00AA722C /* srs_protocol_kbps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C068D681B10149F00AA722C /* srs_protocol_kbps.cpp */; }; - 3C068D6D1B10175500AA722C /* srs_protocol_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C068D6B1B10175500AA722C /* srs_protocol_buffer.cpp */; }; + 3C068D6D1B10175500AA722C /* srs_protocol_stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C068D6B1B10175500AA722C /* srs_protocol_stream.cpp */; }; 3C0D422E1B87165900C2508B /* srs_protocol_json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C0D422C1B87165900C2508B /* srs_protocol_json.cpp */; }; 3C0E1B8D1B0F5ADF003ADEF7 /* srs_http_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C0E1B8B1B0F5ADF003ADEF7 /* srs_http_stack.cpp */; }; 3C1231F61AAE652D00CE8F6C /* srs_core_autofree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1231F01AAE652C00CE8F6C /* srs_core_autofree.cpp */; }; @@ -132,8 +132,8 @@ 3C036B541B2D0AC10078E2E0 /* srs_app_http_stream.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_http_stream.hpp; path = ../../../src/app/srs_app_http_stream.hpp; sourceTree = ""; }; 3C068D681B10149F00AA722C /* srs_protocol_kbps.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_protocol_kbps.cpp; path = ../../../src/protocol/srs_protocol_kbps.cpp; sourceTree = ""; }; 3C068D691B10149F00AA722C /* srs_protocol_kbps.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_kbps.hpp; path = ../../../src/protocol/srs_protocol_kbps.hpp; sourceTree = ""; }; - 3C068D6B1B10175500AA722C /* srs_protocol_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_protocol_buffer.cpp; path = ../../../src/protocol/srs_protocol_buffer.cpp; sourceTree = ""; }; - 3C068D6C1B10175500AA722C /* srs_protocol_buffer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_buffer.hpp; path = ../../../src/protocol/srs_protocol_buffer.hpp; sourceTree = ""; }; + 3C068D6B1B10175500AA722C /* srs_protocol_stream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_protocol_stream.cpp; path = ../../../src/protocol/srs_protocol_stream.cpp; sourceTree = ""; }; + 3C068D6C1B10175500AA722C /* srs_protocol_stream.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_stream.hpp; path = ../../../src/protocol/srs_protocol_stream.hpp; sourceTree = ""; }; 3C0D422C1B87165900C2508B /* srs_protocol_json.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_protocol_json.cpp; path = ../../../src/protocol/srs_protocol_json.cpp; sourceTree = ""; }; 3C0D422D1B87165900C2508B /* srs_protocol_json.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_protocol_json.hpp; path = ../../../src/protocol/srs_protocol_json.hpp; sourceTree = ""; }; 3C0E1B8B1B0F5ADF003ADEF7 /* srs_http_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_http_stack.cpp; path = ../../../src/protocol/srs_http_stack.cpp; sourceTree = ""; }; @@ -512,8 +512,8 @@ 3C0E1B8C1B0F5ADF003ADEF7 /* srs_http_stack.hpp */, 3C82802A1BAFF8CC004A1794 /* srs_kafka_stack.cpp */, 3C82802B1BAFF8CC004A1794 /* srs_kafka_stack.hpp */, - 3C068D6B1B10175500AA722C /* srs_protocol_buffer.cpp */, - 3C068D6C1B10175500AA722C /* srs_protocol_buffer.hpp */, + 3C068D6B1B10175500AA722C /* srs_protocol_stream.cpp */, + 3C068D6C1B10175500AA722C /* srs_protocol_stream.hpp */, 3C0D422C1B87165900C2508B /* srs_protocol_json.cpp */, 3C0D422D1B87165900C2508B /* srs_protocol_json.hpp */, 3C068D681B10149F00AA722C /* srs_protocol_kbps.cpp */, @@ -955,7 +955,7 @@ 3C28EDDF1AF5C43F00A3AEAC /* srs_app_caster_flv.cpp in Sources */, 3C1232241AAE814D00CE8F6C /* srs_kernel_error.cpp in Sources */, 3C036B561B2D0AC10078E2E0 /* srs_app_http_stream.cpp in Sources */, - 3C068D6D1B10175500AA722C /* srs_protocol_buffer.cpp in Sources */, + 3C068D6D1B10175500AA722C /* srs_protocol_stream.cpp in Sources */, 3C1232441AAE81A400CE8F6C /* srs_rtmp_handshake.cpp in Sources */, 3C1232291AAE814D00CE8F6C /* srs_kernel_buffer.cpp in Sources */, 3C663F181AB0155100286D8B /* srs_play.c in Sources */, diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp index 00b93023f..ca9730762 100644 --- a/trunk/src/app/srs_app_hls.cpp +++ b/trunk/src/app/srs_app_hls.cpp @@ -46,7 +46,7 @@ using namespace std; #include #include #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_app_http_conn.cpp b/trunk/src/app/srs_app_http_conn.cpp index e06d046ee..0357b4eae 100644 --- a/trunk/src/app/srs_app_http_conn.cpp +++ b/trunk/src/app/srs_app_http_conn.cpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include using namespace std; -#include +#include #include #include #include @@ -317,7 +317,7 @@ SrsHttpResponseReader::~SrsHttpResponseReader() { } -int SrsHttpResponseReader::initialize(SrsFastBuffer* body) +int SrsHttpResponseReader::initialize(SrsFastStream* body) { int ret = ERROR_SUCCESS; @@ -512,7 +512,7 @@ SrsHttpMessage::~SrsHttpMessage() srs_freep(_http_ts_send_buffer); } -int SrsHttpMessage::update(string url, bool allow_jsonp, http_parser* header, SrsFastBuffer* body, vector& headers) +int SrsHttpMessage::update(string url, bool allow_jsonp, http_parser* header, SrsFastStream* body, vector& headers) { int ret = ERROR_SUCCESS; @@ -845,7 +845,7 @@ bool SrsHttpMessage::is_jsonp() SrsHttpParser::SrsHttpParser() { - buffer = new SrsFastBuffer(); + buffer = new SrsFastStream(); } SrsHttpParser::~SrsHttpParser() diff --git a/trunk/src/app/srs_app_http_conn.hpp b/trunk/src/app/srs_app_http_conn.hpp index aee2a91c5..64f826bc5 100644 --- a/trunk/src/app/srs_app_http_conn.hpp +++ b/trunk/src/app/srs_app_http_conn.hpp @@ -63,7 +63,7 @@ class SrsHttpHandler; class SrsMessageQueue; class SrsSharedPtrMessage; class SrsRequest; -class SrsFastBuffer; +class SrsFastStream; class SrsHttpUri; class SrsConnection; class SrsHttpMessage; @@ -122,7 +122,7 @@ class SrsHttpResponseReader : virtual public ISrsHttpResponseReader private: SrsStSocket* skt; SrsHttpMessage* owner; - SrsFastBuffer* buffer; + SrsFastStream* buffer; bool is_eof; // the left bytes in chunk. int nb_left_chunk; @@ -137,7 +137,7 @@ public: /** * initialize the response reader with buffer. */ - virtual int initialize(SrsFastBuffer* buffer); + virtual int initialize(SrsFastStream* buffer); // interface ISrsHttpResponseReader public: virtual bool eof(); @@ -215,7 +215,7 @@ public: * set the original messages, then update the message. */ virtual int update(std::string url, bool allow_jsonp, http_parser* header, - SrsFastBuffer* body, std::vector& headers + SrsFastStream* body, std::vector& headers ); public: virtual SrsConnection* connection(); @@ -303,7 +303,7 @@ private: http_parser_settings settings; http_parser parser; // the global parse buffer. - SrsFastBuffer* buffer; + SrsFastStream* buffer; // whether allow jsonp parse. bool jsonp; private: diff --git a/trunk/src/app/srs_app_http_static.cpp b/trunk/src/app/srs_app_http_static.cpp index 01c94405f..044a9e6c4 100644 --- a/trunk/src/app/srs_app_http_static.cpp +++ b/trunk/src/app/srs_app_http_static.cpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include using namespace std; -#include +#include #include #include #include diff --git a/trunk/src/app/srs_app_http_stream.cpp b/trunk/src/app/srs_app_http_stream.cpp index 3b16324b4..aeba8df0b 100644 --- a/trunk/src/app/srs_app_http_stream.cpp +++ b/trunk/src/app/srs_app_http_stream.cpp @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include using namespace std; -#include +#include #include #include #include diff --git a/trunk/src/app/srs_app_recv_thread.cpp b/trunk/src/app/srs_app_recv_thread.cpp index 1c863da03..c1e6cebeb 100644 --- a/trunk/src/app/srs_app_recv_thread.cpp +++ b/trunk/src/app/srs_app_recv_thread.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include +#include #include #include #include diff --git a/trunk/src/app/srs_app_recv_thread.hpp b/trunk/src/app/srs_app_recv_thread.hpp index f777d4eb4..bd2ae43f8 100644 --- a/trunk/src/app/srs_app_recv_thread.hpp +++ b/trunk/src/app/srs_app_recv_thread.hpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #include #include diff --git a/trunk/src/protocol/srs_protocol_buffer.cpp b/trunk/src/protocol/srs_protocol_buffer.cpp index 468f73d1e..b91181f87 100755 --- a/trunk/src/protocol/srs_protocol_buffer.cpp +++ b/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 +#include #include @@ -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; diff --git a/trunk/src/protocol/srs_protocol_buffer.hpp b/trunk/src/protocol/srs_protocol_buffer.hpp index 095e77d82..7708d0270 100644 --- a/trunk/src/protocol/srs_protocol_buffer.hpp +++ b/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 +#include */ #include @@ -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. diff --git a/trunk/src/protocol/srs_rtmp_stack.cpp b/trunk/src/protocol/srs_rtmp_stack.cpp index 3a5cebc8c..49c90ce9f 100644 --- a/trunk/src/protocol/srs_rtmp_stack.cpp +++ b/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 #include #include -#include +#include #include #include @@ -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; diff --git a/trunk/src/protocol/srs_rtmp_stack.hpp b/trunk/src/protocol/srs_rtmp_stack.hpp index cdcdd37ee..cee3780c7 100644 --- a/trunk/src/protocol/srs_rtmp_stack.hpp +++ b/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 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. */ diff --git a/trunk/src/utest/srs_utest_kernel.cpp b/trunk/src/utest/srs_utest_kernel.cpp index b0c50bff4..e619dd5e9 100644 --- a/trunk/src/utest/srs_utest_kernel.cpp +++ b/trunk/src/utest/srs_utest_kernel.cpp @@ -267,7 +267,7 @@ VOID TEST(KernelBufferTest, EraseBytes) VOID TEST(KernelFastBufferTest, Grow) { - SrsFastBuffer b; + SrsFastStream b; MockBufferReader r("winlin"); b.grow(&r, 1); diff --git a/trunk/src/utest/srs_utest_kernel.hpp b/trunk/src/utest/srs_utest_kernel.hpp index cc28e3193..411ec43e5 100644 --- a/trunk/src/utest/srs_utest_kernel.hpp +++ b/trunk/src/utest/srs_utest_kernel.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include class MockBufferReader: public ISrsBufferReader { diff --git a/trunk/src/utest/srs_utest_protocol.hpp b/trunk/src/utest/srs_utest_protocol.hpp index bc61fb1b3..24d577586 100644 --- a/trunk/src/utest/srs_utest_protocol.hpp +++ b/trunk/src/utest/srs_utest_protocol.hpp @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #ifdef SRS_AUTO_SSL using namespace _srs_internal;