merge the rtmp sdk to stack.

trunk/configure

@@ -157,7 +157,7 @@ KERNEL_OBJS="${MODULE_OBJS[@]}"
 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_sdk"
+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_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps")
 PROTOCOL_INCS="src/protocol"; MODULE_DIR=${PROTOCOL_INCS} . auto/modules.sh

trunk/ide/srs_upp/srs_upp.upp

@@ -64,8 +64,6 @@ file
 	../../src/protocol/srs_rtmp_io.cpp,
 	../../src/protocol/srs_rtmp_msg_array.hpp,
 	../../src/protocol/srs_rtmp_msg_array.cpp,
-	../../src/protocol/srs_rtmp_sdk.hpp,
-	../../src/protocol/srs_rtmp_sdk.cpp,
 	../../src/protocol/srs_rtmp_stack.hpp,
 	../../src/protocol/srs_rtmp_stack.cpp,
 	../../src/protocol/srs_rtmp_utility.hpp,

trunk/ide/srs_vs2010/srs.vcxproj

@@ -125,7 +125,6 @@
     <ClInclude Include="..\..\src\protocol\srs_rtmp_handshake.hpp" />
     <ClInclude Include="..\..\src\protocol\srs_rtmp_io.hpp" />
     <ClInclude Include="..\..\src\protocol\srs_rtmp_msg_array.hpp" />
-    <ClInclude Include="..\..\src\protocol\srs_rtmp_sdk.hpp" />
     <ClInclude Include="..\..\src\protocol\srs_rtmp_stack.hpp" />
     <ClInclude Include="..\..\src\protocol\srs_rtmp_utility.hpp" />
     <ClInclude Include="..\..\src\protocol\srs_rtsp_stack.hpp" />
@@ -208,7 +207,6 @@
     <ClCompile Include="..\..\src\protocol\srs_rtmp_handshake.cpp" />
     <ClCompile Include="..\..\src\protocol\srs_rtmp_io.cpp" />
     <ClCompile Include="..\..\src\protocol\srs_rtmp_msg_array.cpp" />
-    <ClCompile Include="..\..\src\protocol\srs_rtmp_sdk.cpp" />
     <ClCompile Include="..\..\src\protocol\srs_rtmp_stack.cpp" />
     <ClCompile Include="..\..\src\protocol\srs_rtmp_utility.cpp" />
     <ClCompile Include="..\..\src\protocol\srs_rtsp_stack.cpp" />

trunk/ide/srs_vs2010/srs.vcxproj.filters

@@ -214,9 +214,6 @@
     <ClCompile Include="..\..\src\protocol\srs_rtmp_msg_array.cpp">
       <Filter>srs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\protocol\srs_rtmp_sdk.cpp">
-      <Filter>srs</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\protocol\srs_rtmp_stack.cpp">
       <Filter>srs</Filter>
     </ClCompile>
@@ -414,9 +411,6 @@
     <ClInclude Include="..\..\src\protocol\srs_rtmp_msg_array.hpp">
       <Filter>srs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\protocol\srs_rtmp_sdk.hpp">
-      <Filter>srs</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\protocol\srs_rtmp_stack.hpp">
       <Filter>srs</Filter>
     </ClInclude>
@@ -450,4 +444,4 @@
       <UniqueIdentifier>{d45a9ecb-fcbe-4400-abe3-792cddecb47e}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>

trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj

@@ -31,7 +31,6 @@
 		3C1232441AAE81A400CE8F6C /* srs_rtmp_handshake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232331AAE81A400CE8F6C /* srs_rtmp_handshake.cpp */; };
 		3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232351AAE81A400CE8F6C /* srs_rtmp_io.cpp */; };
 		3C1232461AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232371AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp */; };
-		3C1232471AAE81A400CE8F6C /* srs_rtmp_sdk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232391AAE81A400CE8F6C /* srs_rtmp_sdk.cpp */; };
 		3C1232481AAE81A400CE8F6C /* srs_rtmp_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */; };
 		3C1232491AAE81A400CE8F6C /* srs_rtmp_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12323D1AAE81A400CE8F6C /* srs_rtmp_utility.cpp */; };
 		3C12324A1AAE81A400CE8F6C /* srs_rtsp_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12323F1AAE81A400CE8F6C /* srs_rtsp_stack.cpp */; };
@@ -172,8 +171,6 @@
 		3C1232361AAE81A400CE8F6C /* srs_rtmp_io.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_io.hpp; path = ../../../src/protocol/srs_rtmp_io.hpp; sourceTree = "<group>"; };
 		3C1232371AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_msg_array.cpp; path = ../../../src/protocol/srs_rtmp_msg_array.cpp; sourceTree = "<group>"; };
 		3C1232381AAE81A400CE8F6C /* srs_rtmp_msg_array.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_msg_array.hpp; path = ../../../src/protocol/srs_rtmp_msg_array.hpp; sourceTree = "<group>"; };
-		3C1232391AAE81A400CE8F6C /* srs_rtmp_sdk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_sdk.cpp; path = ../../../src/protocol/srs_rtmp_sdk.cpp; sourceTree = "<group>"; };
-		3C12323A1AAE81A400CE8F6C /* srs_rtmp_sdk.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_sdk.hpp; path = ../../../src/protocol/srs_rtmp_sdk.hpp; sourceTree = "<group>"; };
 		3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_stack.cpp; path = ../../../src/protocol/srs_rtmp_stack.cpp; sourceTree = "<group>"; };
 		3C12323C1AAE81A400CE8F6C /* srs_rtmp_stack.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_rtmp_stack.hpp; path = ../../../src/protocol/srs_rtmp_stack.hpp; sourceTree = "<group>"; };
 		3C12323D1AAE81A400CE8F6C /* srs_rtmp_utility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_rtmp_utility.cpp; path = ../../../src/protocol/srs_rtmp_utility.cpp; sourceTree = "<group>"; };
@@ -508,8 +505,6 @@
 				3C1232361AAE81A400CE8F6C /* srs_rtmp_io.hpp */,
 				3C1232371AAE81A400CE8F6C /* srs_rtmp_msg_array.cpp */,
 				3C1232381AAE81A400CE8F6C /* srs_rtmp_msg_array.hpp */,
-				3C1232391AAE81A400CE8F6C /* srs_rtmp_sdk.cpp */,
-				3C12323A1AAE81A400CE8F6C /* srs_rtmp_sdk.hpp */,
 				3C12323B1AAE81A400CE8F6C /* srs_rtmp_stack.cpp */,
 				3C12323C1AAE81A400CE8F6C /* srs_rtmp_stack.hpp */,
 				3C12323D1AAE81A400CE8F6C /* srs_rtmp_utility.cpp */,
@@ -935,7 +930,6 @@
 				3C663F141AB0155100286D8B /* srs_flv_parser.c in Sources */,
 				3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */,
 				3C1232211AAE814D00CE8F6C /* srs_kernel_buffer.cpp in Sources */,
-				3C1232471AAE81A400CE8F6C /* srs_rtmp_sdk.cpp in Sources */,
 				3C36DB5B1ABD1CB90066CCAF /* srs_lib_bandwidth.cpp in Sources */,
 				3C12329D1AAE81D900CE8F6C /* srs_app_heartbeat.cpp in Sources */,
 				3C1232231AAE814D00CE8F6C /* srs_kernel_consts.cpp in Sources */,

trunk/src/app/srs_app_bandwidth.cpp

@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 using namespace std;
 
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_rtmp_amf0.hpp>
 #include <srs_app_config.hpp>
 #include <srs_core_autofree.hpp>

trunk/src/app/srs_app_caster_flv.cpp

@@ -36,7 +36,7 @@ using namespace std;
 #include <srs_app_http_conn.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_flv.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_rtmp_utility.hpp>
 #include <srs_app_st_socket.hpp>
 #include <srs_app_utility.hpp>

trunk/src/app/srs_app_dvr.cpp

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 using namespace std;
 
 #include <srs_app_config.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_app_http_hooks.hpp>

trunk/src/app/srs_app_edge.cpp

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 using namespace std;
 
 #include <srs_kernel_error.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_rtmp_io.hpp>
 #include <srs_app_config.hpp>
 #include <srs_rtmp_utility.hpp>

trunk/src/app/srs_app_encoder.cpp

@@ -29,7 +29,7 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_app_config.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_app_pithy_print.hpp>
 #include <srs_app_ffmpeg.hpp>
 #include <srs_kernel_utility.hpp>

trunk/src/app/srs_app_forward.cpp

@@ -36,7 +36,7 @@ using namespace std;
 #include <srs_kernel_log.hpp>
 #include <srs_app_config.hpp>
 #include <srs_app_pithy_print.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_rtmp_utility.hpp>
 #include <srs_protocol_kbps.hpp>
 #include <srs_rtmp_msg_array.hpp>

trunk/src/app/srs_app_hds.cpp

@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 using namespace std;
 
 #include <srs_app_hds.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_codec.hpp>
 #include <srs_rtmp_stack.hpp>

trunk/src/app/srs_app_hls.cpp

@@ -41,7 +41,7 @@ using namespace std;
 #include <srs_app_config.hpp>
 #include <srs_app_source.hpp>
 #include <srs_core_autofree.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_app_pithy_print.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_codec.hpp>

trunk/src/app/srs_app_http_api.cpp

@@ -36,7 +36,7 @@ using namespace std;
 #include <srs_kernel_utility.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_app_statistic.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_app_dvr.hpp>
 #include <srs_app_config.hpp>
 #include <srs_app_http_conn.hpp>

trunk/src/app/srs_app_http_conn.cpp

@@ -43,7 +43,7 @@ using namespace std;
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_file.hpp>
 #include <srs_kernel_flv.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_app_source.hpp>
 #include <srs_rtmp_msg_array.hpp>
 #include <srs_kernel_aac.hpp>

trunk/src/app/srs_app_http_hooks.cpp

@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 using namespace std;
 
 #include <srs_kernel_error.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_app_st_socket.hpp>
 #include <srs_app_json.hpp>
 #include <srs_app_dvr.hpp>

trunk/src/app/srs_app_mpegts_udp.cpp

@@ -42,7 +42,7 @@ using namespace std;
 #include <srs_kernel_file.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_app_st_socket.hpp>
 #include <srs_rtmp_utility.hpp>
 #include <srs_app_utility.hpp>

trunk/src/app/srs_app_recv_thread.cpp

@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_app_recv_thread.hpp>
 
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_rtmp_stack.hpp>
 #include <srs_app_rtmp_conn.hpp>
 #include <srs_protocol_buffer.hpp>

trunk/src/app/srs_app_rtmp_conn.cpp

@@ -33,7 +33,7 @@ using namespace std;
 
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_app_source.hpp>
 #include <srs_app_server.hpp>

trunk/src/app/srs_app_rtsp.cpp

@@ -35,7 +35,7 @@ using namespace std;
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_stream.hpp>
 #include <srs_kernel_buffer.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_rtmp_amf0.hpp>
 #include <srs_rtmp_utility.hpp>
 #include <srs_kernel_utility.hpp>

trunk/src/app/srs_app_security.hpp

@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <string>
 
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 
 class SrsConfDirective;
 

trunk/src/app/srs_app_source.cpp

@@ -35,7 +35,7 @@ using namespace std;
 #include <srs_app_forward.hpp>
 #include <srs_app_config.hpp>
 #include <srs_app_encoder.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_app_dvr.hpp>
 #include <srs_kernel_stream.hpp>
 #include <srs_app_edge.hpp>

trunk/src/app/srs_app_statistic.cpp

@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <sstream>
 using namespace std;
 
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_app_json.hpp>
 #include <srs_protocol_kbps.hpp>
 #include <srs_app_conn.hpp>

trunk/src/libs/srs_lib_bandwidth.cpp

@@ -33,7 +33,7 @@ using namespace std;
 
 #include <srs_kernel_error.hpp>
 #include <srs_rtmp_stack.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_rtmp_amf0.hpp>

trunk/src/libs/srs_librtmp.cpp

@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 using namespace std;
 
 #include <srs_kernel_error.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_lib_simple_socket.hpp>
 #include <srs_rtmp_utility.hpp>
 #include <srs_core_autofree.hpp>

trunk/src/main/srs_main_ingest_hls.cpp

@@ -34,7 +34,7 @@ using namespace std;
 #include <srs_app_config.hpp>
 #include <srs_app_log.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_kernel_buffer.hpp>
 #include <srs_kernel_stream.hpp>
 #include <srs_kernel_ts.hpp>

trunk/src/protocol/srs_rtmp_handshake.cpp

@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_kernel_log.hpp>
 #include <srs_rtmp_io.hpp>
 #include <srs_rtmp_utility.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_kernel_stream.hpp>
 
 #ifdef SRS_AUTO_SSL

trunk/src/protocol/srs_rtmp_sdk.hpp

@@ -1,571 +0,0 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2013-2015 SRS(simple-rtmp-server)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-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_RTMP_PROTOCOL_RTMP_HPP
-#define SRS_RTMP_PROTOCOL_RTMP_HPP
-
-/*
-#include <srs_rtmp_sdk.hpp>
-*/
-
-#include <srs_core.hpp>
-
-#include <string>
-
-#include <srs_rtmp_stack.hpp>
-#include <srs_core_performance.hpp>
-
-class SrsProtocol;
-class ISrsProtocolReaderWriter;
-class SrsCommonMessage;
-class SrsCreateStreamPacket;
-class SrsFMLEStartPacket;
-class SrsPublishPacket;
-class SrsOnMetaDataPacket;
-class SrsPlayPacket;
-class SrsCommonMessage;
-class SrsPacket;
-class SrsAmf0Object;
-class IMergeReadHandler;
-
-/**
- * the signature for packets to client.
- */
-#define RTMP_SIG_FMS_VER                        "3,5,3,888"
-#define RTMP_SIG_AMF0_VER                       0
-#define RTMP_SIG_CLIENT_ID                      "ASAICiss"
-
-/**
- * onStatus consts.
- */
-#define StatusLevel                             "level"
-#define StatusCode                              "code"
-#define StatusDescription                       "description"
-#define StatusDetails                           "details"
-#define StatusClientId                          "clientid"
-// status value
-#define StatusLevelStatus                       "status"
-// status error
-#define StatusLevelError                        "error"
-// code value
-#define StatusCodeConnectSuccess                "NetConnection.Connect.Success"
-#define StatusCodeConnectRejected               "NetConnection.Connect.Rejected"
-#define StatusCodeStreamReset                   "NetStream.Play.Reset"
-#define StatusCodeStreamStart                   "NetStream.Play.Start"
-#define StatusCodeStreamPause                   "NetStream.Pause.Notify"
-#define StatusCodeStreamUnpause                 "NetStream.Unpause.Notify"
-#define StatusCodePublishStart                  "NetStream.Publish.Start"
-#define StatusCodeDataStart                     "NetStream.Data.Start"
-#define StatusCodeUnpublishSuccess              "NetStream.Unpublish.Success"
-
-/**
-* the original request from client.
-*/
-class SrsRequest
-{
-public:
-    // client ip.
-    std::string ip;
-public:
-    /**
-    * tcUrl: rtmp://request_vhost:port/app/stream
-    * support pass vhost in query string, such as:
-    *    rtmp://ip:port/app?vhost=request_vhost/stream
-    *    rtmp://ip:port/app...vhost...request_vhost/stream
-    */
-    std::string tcUrl;
-    std::string pageUrl;
-    std::string swfUrl;
-    double objectEncoding;
-// data discovery from request.
-public:
-    // discovery from tcUrl and play/publish.
-    std::string schema;
-    // the vhost in tcUrl.
-    std::string vhost;
-    // the host in tcUrl.
-    std::string host;
-    // the port in tcUrl.
-    std::string port;
-    // the app in tcUrl, without param.
-    std::string app;
-    // the param in tcUrl(app).
-    std::string param;
-    // the stream in play/publish
-    std::string stream;
-    // for play live stream, 
-    // used to specified the stop when exceed the duration.
-    // @see https://github.com/simple-rtmp-server/srs/issues/45
-    // in ms.
-    double duration;
-    // the token in the connect request,
-    // used for edge traverse to origin authentication,
-    // @see https://github.com/simple-rtmp-server/srs/issues/104
-    SrsAmf0Object* args;
-public:
-    SrsRequest();
-    virtual ~SrsRequest();
-public:
-    /**
-    * deep copy the request, for source to use it to support reload,
-    * for when initialize the source, the request is valid,
-    * when reload it, the request maybe invalid, so need to copy it.
-    */
-    virtual SrsRequest* copy();
-    /**
-    * update the auth info of request,
-    * to keep the current request ptr is ok,
-    * for many components use the ptr of request.
-    */
-    virtual void update_auth(SrsRequest* req);
-    /**
-    * get the stream identify, vhost/app/stream.
-    */
-    virtual std::string get_stream_url();
-    /**
-    * strip url, user must strip when update the url.
-    */
-    virtual void strip();
-};
-
-/**
-* the response to client.
-*/
-class SrsResponse
-{
-public:
-    /**
-    * the stream id to response client createStream.
-    */
-    int stream_id;
-public:
-    SrsResponse();
-    virtual ~SrsResponse();
-};
-
-/**
-* the rtmp client type.
-*/
-enum SrsRtmpConnType
-{
-    SrsRtmpConnUnknown,
-    SrsRtmpConnPlay,
-    SrsRtmpConnFMLEPublish,
-    SrsRtmpConnFlashPublish,
-};
-std::string srs_client_type_string(SrsRtmpConnType type);
-
-/**
-* store the handshake bytes, 
-* for smart switch between complex and simple handshake.
-*/
-class SrsHandshakeBytes
-{
-public:
-    // [1+1536]
-    char* c0c1;
-    // [1+1536+1536]
-    char* s0s1s2;
-    // [1536]
-    char* c2;
-public:
-    SrsHandshakeBytes();
-    virtual ~SrsHandshakeBytes();
-public:
-    virtual int read_c0c1(ISrsProtocolReaderWriter* io);
-    virtual int read_s0s1s2(ISrsProtocolReaderWriter* io);
-    virtual int read_c2(ISrsProtocolReaderWriter* io);
-    virtual int create_c0c1();
-    virtual int create_s0s1s2(const char* c1 = NULL);
-    virtual int create_c2();
-};
-
-/**
-* implements the client role protocol.
-*/
-class SrsRtmpClient
-{
-private:
-    SrsHandshakeBytes* hs_bytes;
-protected:
-    SrsProtocol* protocol;
-    ISrsProtocolReaderWriter* io;
-public:
-    SrsRtmpClient(ISrsProtocolReaderWriter* skt);
-    virtual ~SrsRtmpClient();
-// protocol methods proxy
-public:
-    /**
-    * set the recv timeout in us.
-    * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT.
-    */
-    virtual void set_recv_timeout(int64_t timeout_us);
-    /**
-    * set the send timeout in us.
-    * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT.
-    */
-    virtual void set_send_timeout(int64_t timeout_us);
-    /**
-    * get recv/send bytes.
-    */
-    virtual int64_t get_recv_bytes();
-    virtual int64_t get_send_bytes();
-    /**
-    * recv a RTMP message, which is bytes oriented.
-    * user can use decode_message to get the decoded RTMP packet.
-    * @param pmsg, set the received message, 
-    *       always NULL if error, 
-    *       NULL for unknown packet but return success.
-    *       never NULL if decode success.
-    * @remark, drop message when msg is empty or payload length is empty.
-    */
-    virtual int recv_message(SrsCommonMessage** pmsg);
-    /**
-    * decode bytes oriented RTMP message to RTMP packet,
-    * @param ppacket, output decoded packet, 
-    *       always NULL if error, never NULL if success.
-    * @return error when unknown packet, error when decode failed.
-    */
-    virtual int decode_message(SrsCommonMessage* msg, SrsPacket** ppacket);
-    /**
-    * send the RTMP message and always free it.
-    * user must never free or use the msg after this method,
-    * for it will always free the msg.
-    * @param msg, the msg to send out, never be NULL.
-    * @param stream_id, the stream id of packet to send over, 0 for control message.
-    */
-    virtual int send_and_free_message(SrsSharedPtrMessage* msg, int stream_id);
-    /**
-    * send the RTMP message and always free it.
-    * user must never free or use the msg after this method,
-    * for it will always free the msg.
-    * @param msgs, the msgs to send out, never be NULL.
-    * @param nb_msgs, the size of msgs to send out.
-    * @param stream_id, the stream id of packet to send over, 0 for control message.
-    */
-    virtual int send_and_free_messages(SrsSharedPtrMessage** msgs, int nb_msgs, int stream_id);
-    /**
-    * send the RTMP packet and always free it.
-    * user must never free or use the packet after this method,
-    * for it will always free the packet.
-    * @param packet, the packet to send out, never be NULL.
-    * @param stream_id, the stream id of packet to send over, 0 for control message.
-    */
-    virtual int send_and_free_packet(SrsPacket* packet, int stream_id);
-public:
-    /**
-    * handshake with server, try complex, then simple handshake.
-    */
-    virtual int handshake();
-    /**
-    * only use simple handshake
-    */
-    virtual int simple_handshake();
-    /**
-    * only use complex handshake
-    */
-    virtual int complex_handshake();
-    /**
-    * set req to use the original request of client:
-    *      pageUrl and swfUrl for refer antisuck.
-    *      args for edge to origin traverse auth, @see SrsRequest.args
-    */
-    virtual int connect_app(std::string app, std::string tc_url, 
-        SrsRequest* req, bool debug_srs_upnode);
-    /**
-    * connect to server, get the debug srs info.
-    * 
-    * @param app, the app to connect at.
-    * @param tc_url, the tcUrl to connect at.
-    * @param req, the optional req object, use the swfUrl/pageUrl if specified. NULL to ignore.
-    * 
-    * SRS debug info:
-    * @param srs_server_ip, debug info, server ip client connected at.
-    * @param srs_server, server info.
-    * @param srs_primary, primary authors.
-    * @param srs_authors, authors.
-    * @param srs_id, int, debug info, client id in server log.
-    * @param srs_pid, int, debug info, server pid in log.
-    */
-    virtual int connect_app2(
-        std::string app, std::string tc_url, SrsRequest* req, bool debug_srs_upnode,
-        std::string& srs_server_ip, std::string& srs_server, std::string& srs_primary, 
-        std::string& srs_authors, std::string& srs_version, int& srs_id, 
-        int& srs_pid
-    );
-    /**
-    * create a stream, then play/publish data over this stream.
-    */
-    virtual int create_stream(int& stream_id);
-    /**
-    * start play stream.
-    */
-    virtual int play(std::string stream, int stream_id);
-    /**
-    * start publish stream. use flash publish workflow:
-    *       connect-app => create-stream => flash-publish
-    */
-    virtual int publish(std::string stream, int stream_id);
-    /**
-    * start publish stream. use FMLE publish workflow:
-    *       connect-app => FMLE publish
-    */
-    virtual int fmle_publish(std::string stream, int& stream_id);
-public:
-    /**
-    * expect a specified message, drop others util got specified one.
-    * @pmsg, user must free it. NULL if not success.
-    * @ppacket, store in the pmsg, user must never free it. NULL if not success.
-    * @remark, only when success, user can use and must free the pmsg/ppacket.
-    * for example:
-             SrsCommonMessage* msg = NULL;
-            SrsConnectAppResPacket* pkt = NULL;
-            if ((ret = srs_rtmp_expect_message<SrsConnectAppResPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
-                return ret;
-            }
-            // use pkt
-    * user should never recv message and convert it, use this method instead.
-    * if need to set timeout, use set timeout of SrsProtocol.
-    */
-    template<class T>
-    int expect_message(SrsCommonMessage** pmsg, T** ppacket)
-    {
-        return protocol->expect_message<T>(pmsg, ppacket);
-    }
-};
-
-/**
-* the rtmp provices rtmp-command-protocol services,
-* a high level protocol, media stream oriented services,
-* such as connect to vhost/app, play stream, get audio/video data.
-*/
-class SrsRtmpServer
-{
-private:
-    SrsHandshakeBytes* hs_bytes;
-    SrsProtocol* protocol;
-    ISrsProtocolReaderWriter* io;
-public:
-    SrsRtmpServer(ISrsProtocolReaderWriter* skt);
-    virtual ~SrsRtmpServer();
-// protocol methods proxy
-public:
-    /**
-    * set the auto response message when recv for protocol stack.
-    * @param v, whether auto response message when recv message.
-    * @see: https://github.com/simple-rtmp-server/srs/issues/217
-    */
-    virtual void set_auto_response(bool v);
-#ifdef SRS_PERF_MERGED_READ
-    /**
-    * to improve read performance, merge some packets then read,
-    * when it on and read small bytes, we sleep to wait more data.,
-    * that is, we merge some data to read together.
-    * @param v true to ename merged read.
-    * @param handler the handler when merge read is enabled.
-    * @see https://github.com/simple-rtmp-server/srs/issues/241
-    */
-    virtual void set_merge_read(bool v, IMergeReadHandler* handler);
-    /**
-    * create buffer with specifeid size.
-    * @param buffer the size of buffer.
-    * @remark when MR(SRS_PERF_MERGED_READ) disabled, always set to 8K.
-    * @remark when buffer changed, the previous ptr maybe invalid.
-    * @see https://github.com/simple-rtmp-server/srs/issues/241
-    */
-    virtual void set_recv_buffer(int buffer_size);
-#endif
-    /**
-    * set/get the recv timeout in us.
-    * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT.
-    */
-    virtual void set_recv_timeout(int64_t timeout_us);
-    virtual int64_t get_recv_timeout();
-    /**
-    * set/get the send timeout in us.
-    * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT.
-    */
-    virtual void set_send_timeout(int64_t timeout_us);
-    virtual int64_t get_send_timeout();
-    /**
-    * get recv/send bytes.
-    */
-    virtual int64_t get_recv_bytes();
-    virtual int64_t get_send_bytes();
-    /**
-    * recv a RTMP message, which is bytes oriented.
-    * user can use decode_message to get the decoded RTMP packet.
-    * @param pmsg, set the received message, 
-    *       always NULL if error, 
-    *       NULL for unknown packet but return success.
-    *       never NULL if decode success.
-    * @remark, drop message when msg is empty or payload length is empty.
-    */
-    virtual int recv_message(SrsCommonMessage** pmsg);
-    /**
-    * decode bytes oriented RTMP message to RTMP packet,
-    * @param ppacket, output decoded packet, 
-    *       always NULL if error, never NULL if success.
-    * @return error when unknown packet, error when decode failed.
-    */
-    virtual int decode_message(SrsCommonMessage* msg, SrsPacket** ppacket);
-    /**
-    * send the RTMP message and always free it.
-    * user must never free or use the msg after this method,
-    * for it will always free the msg.
-    * @param msg, the msg to send out, never be NULL.
-    * @param stream_id, the stream id of packet to send over, 0 for control message.
-    */
-    virtual int send_and_free_message(SrsSharedPtrMessage* msg, int stream_id);
-    /**
-    * send the RTMP message and always free it.
-    * user must never free or use the msg after this method,
-    * for it will always free the msg.
-    * @param msgs, the msgs to send out, never be NULL.
-    * @param nb_msgs, the size of msgs to send out.
-    * @param stream_id, the stream id of packet to send over, 0 for control message.
-    *
-    * @remark performance issue, to support 6k+ 250kbps client,
-    *       @see https://github.com/simple-rtmp-server/srs/issues/194
-    */
-    virtual int send_and_free_messages(SrsSharedPtrMessage** msgs, int nb_msgs, int stream_id);
-    /**
-    * send the RTMP packet and always free it.
-    * user must never free or use the packet after this method,
-    * for it will always free the packet.
-    * @param packet, the packet to send out, never be NULL.
-    * @param stream_id, the stream id of packet to send over, 0 for control message.
-    */
-    virtual int send_and_free_packet(SrsPacket* packet, int stream_id);
-public:
-    /**
-    * handshake with client, try complex then simple.
-    */
-    virtual int handshake();
-    /**
-    * do connect app with client, to discovery tcUrl.
-    */
-    virtual int connect_app(SrsRequest* req);
-    /**
-    * set ack size to client, client will send ack-size for each ack window
-    */
-    virtual int set_window_ack_size(int ack_size);
-    /**
-    * @type: The sender can mark this message hard (0), soft (1), or dynamic (2)
-    * using the Limit type field.
-    */
-    virtual int set_peer_bandwidth(int bandwidth, int type);
-    /**
-    * @param server_ip the ip of server.
-    */
-    virtual int response_connect_app(SrsRequest* req, const char* server_ip = NULL);
-    /**
-    * reject the connect app request.
-    */
-    virtual void response_connect_reject(SrsRequest* req, const char* desc);
-    /**
-    * response client the onBWDone message.
-    */
-    virtual int on_bw_done();
-    /**
-    * recv some message to identify the client.
-    * @stream_id, client will createStream to play or publish by flash, 
-    *         the stream_id used to response the createStream request.
-    * @type, output the client type.
-    * @stream_name, output the client publish/play stream name. @see: SrsRequest.stream
-    * @duration, output the play client duration. @see: SrsRequest.duration
-    */
-    virtual int identify_client(int stream_id, SrsRtmpConnType& type, std::string& stream_name, double& duration);
-    /**
-    * set the chunk size when client type identified.
-    */
-    virtual int set_chunk_size(int chunk_size);
-    /**
-    * when client type is play, response with packets:
-    * StreamBegin, 
-    * onStatus(NetStream.Play.Reset), onStatus(NetStream.Play.Start).,
-    * |RtmpSampleAccess(false, false),
-    * onStatus(NetStream.Data.Start).
-    */
-    virtual int start_play(int stream_id);
-    /**
-    * when client(type is play) send pause message,
-    * if is_pause, response the following packets:
-    *     onStatus(NetStream.Pause.Notify)
-    *     StreamEOF
-    * if not is_pause, response the following packets:
-    *     onStatus(NetStream.Unpause.Notify)
-    *     StreamBegin
-    */
-    virtual int on_play_client_pause(int stream_id, bool is_pause);
-    /**
-    * when client type is publish, response with packets:
-    * releaseStream response
-    * FCPublish
-    * FCPublish response
-    * createStream response
-    * onFCPublish(NetStream.Publish.Start)
-    * onStatus(NetStream.Publish.Start)
-    */
-    virtual int start_fmle_publish(int stream_id);
-    /**
-    * process the FMLE unpublish event.
-    * @unpublish_tid the unpublish request transaction id.
-    */
-    virtual int fmle_unpublish(int stream_id, double unpublish_tid);
-    /**
-    * when client type is publish, response with packets:
-    * onStatus(NetStream.Publish.Start)
-    */
-    virtual int start_flash_publish(int stream_id);
-public:
-    /**
-    * expect a specified message, drop others util got specified one.
-    * @pmsg, user must free it. NULL if not success.
-    * @ppacket, store in the pmsg, user must never free it. NULL if not success.
-    * @remark, only when success, user can use and must free the pmsg/ppacket.
-    * for example:
-             SrsCommonMessage* msg = NULL;
-            SrsConnectAppResPacket* pkt = NULL;
-            if ((ret = srs_rtmp_expect_message<SrsConnectAppResPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
-                return ret;
-            }
-            // use pkt
-    * user should never recv message and convert it, use this method instead.
-    * if need to set timeout, use set timeout of SrsProtocol.
-    */
-    template<class T>
-    int expect_message(SrsCommonMessage** pmsg, T** ppacket)
-    {
-        return protocol->expect_message<T>(pmsg, ppacket);
-    }
-private:
-    virtual int identify_create_stream_client(SrsCreateStreamPacket* req, int stream_id, SrsRtmpConnType& type, std::string& stream_name, double& duration);
-    virtual int identify_fmle_publish_client(SrsFMLEStartPacket* req, SrsRtmpConnType& type, std::string& stream_name);
-    virtual int identify_flash_publish_client(SrsPublishPacket* req, SrsRtmpConnType& type, std::string& stream_name);
-private:
-    virtual int identify_play_client(SrsPlayPacket* req, SrsRtmpConnType& type, std::string& stream_name, double& duration);
-};
-
-#endif
-

trunk/src/protocol/srs_rtmp_stack.hpp

@@ -57,6 +57,19 @@ class SrsChunkStream;
 class SrsSharedPtrMessage;
 class IMergeReadHandler;
 
+class SrsProtocol;
+class ISrsProtocolReaderWriter;
+class SrsCommonMessage;
+class SrsCreateStreamPacket;
+class SrsFMLEStartPacket;
+class SrsPublishPacket;
+class SrsOnMetaDataPacket;
+class SrsPlayPacket;
+class SrsCommonMessage;
+class SrsPacket;
+class SrsAmf0Object;
+class IMergeReadHandler;
+
 /****************************************************************************
  *****************************************************************************
  ****************************************************************************/
@@ -78,6 +91,36 @@ class IMergeReadHandler;
 #define RTMP_AMF0_COMMAND_PUBLISH               "publish"
 #define RTMP_AMF0_DATA_SAMPLE_ACCESS            "|RtmpSampleAccess"
 
+/**
+ * the signature for packets to client.
+ */
+#define RTMP_SIG_FMS_VER                        "3,5,3,888"
+#define RTMP_SIG_AMF0_VER                       0
+#define RTMP_SIG_CLIENT_ID                      "ASAICiss"
+
+/**
+ * onStatus consts.
+ */
+#define StatusLevel                             "level"
+#define StatusCode                              "code"
+#define StatusDescription                       "description"
+#define StatusDetails                           "details"
+#define StatusClientId                          "clientid"
+// status value
+#define StatusLevelStatus                       "status"
+// status error
+#define StatusLevelError                        "error"
+// code value
+#define StatusCodeConnectSuccess                "NetConnection.Connect.Success"
+#define StatusCodeConnectRejected               "NetConnection.Connect.Rejected"
+#define StatusCodeStreamReset                   "NetStream.Play.Reset"
+#define StatusCodeStreamStart                   "NetStream.Play.Start"
+#define StatusCodeStreamPause                   "NetStream.Pause.Notify"
+#define StatusCodeStreamUnpause                 "NetStream.Unpause.Notify"
+#define StatusCodePublishStart                  "NetStream.Publish.Start"
+#define StatusCodeDataStart                     "NetStream.Data.Start"
+#define StatusCodeUnpublishSuccess              "NetStream.Unpublish.Success"
+
 /****************************************************************************
 *****************************************************************************
 ****************************************************************************/
@@ -322,20 +365,22 @@ public:
     virtual int send_and_free_packet(SrsPacket* packet, int stream_id);
 public:
     /**
-    * expect a specified message, drop others util got specified one.
+     * expect a specified message, drop others util got specified one.
-    * @pmsg, user must free it. NULL if not success.
+     * @pmsg, user must free it. NULL if not success.
-    * @ppacket, store in the pmsg, user must never free it. NULL if not success.
+     * @ppacket, user must free it, which decode from payload of message. NULL if not success.
-    * @remark, only when success, user can use and must free the pmsg/ppacket.
+     * @remark, only when success, user can use and must free the pmsg and ppacket.
-    * for example:
+     * for example:
-             SrsCommonMessage* msg = NULL;
+     *          SrsCommonMessage* msg = NULL;
-            SrsConnectAppResPacket* pkt = NULL;
+     *          SrsConnectAppResPacket* pkt = NULL;
-            if ((ret = srs_rtmp_expect_message<SrsConnectAppResPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
+     *          if ((ret = protocol->expect_message<SrsConnectAppResPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
-                return ret;
+     *              return ret;
-            }
+     *          }
-            // use pkt
+     *          // use then free msg and pkt
-    * user should never recv message and convert it, use this method instead.
+     *          srs_freep(msg);
-    * if need to set timeout, use set timeout of SrsProtocol.
+     *          srs_freep(pkt);
-    */
+     * user should never recv message and convert it, use this method instead.
+     * if need to set timeout, use set timeout of SrsProtocol.
+     */
     template<class T>
     int expect_message(SrsCommonMessage** pmsg, T** ppacket)
     {
@@ -444,43 +489,535 @@ private:
 };
 
 /**
-* incoming chunk stream maybe interlaced,
+ * incoming chunk stream maybe interlaced,
-* use the chunk stream to cache the input RTMP chunk streams.
+ * use the chunk stream to cache the input RTMP chunk streams.
-*/
+ */
 class SrsChunkStream
 {
 public:
     /**
-    * represents the basic header fmt,
+     * represents the basic header fmt,
-    * which used to identify the variant message header type.
+     * which used to identify the variant message header type.
-    */
+     */
     char fmt;
     /**
-    * represents the basic header cid,
+     * represents the basic header cid,
-    * which is the chunk stream id.
+     * which is the chunk stream id.
-    */
+     */
     int cid;
     /**
-    * cached message header
+     * cached message header
-    */
+     */
     SrsMessageHeader header;
     /**
-    * whether the chunk message header has extended timestamp.
+     * whether the chunk message header has extended timestamp.
-    */
+     */
     bool extended_timestamp;
     /**
-    * partially read message.
+     * partially read message.
-    */
+     */
     SrsCommonMessage* msg;
     /**
-    * decoded msg count, to identify whether the chunk stream is fresh.
+     * decoded msg count, to identify whether the chunk stream is fresh.
-    */
+     */
     int64_t msg_count;
 public:
     SrsChunkStream(int _cid);
     virtual ~SrsChunkStream();
 };
 
+/**
+ * the original request from client.
+ */
+class SrsRequest
+{
+public:
+    // client ip.
+    std::string ip;
+public:
+    /**
+     * tcUrl: rtmp://request_vhost:port/app/stream
+     * support pass vhost in query string, such as:
+     *    rtmp://ip:port/app?vhost=request_vhost/stream
+     *    rtmp://ip:port/app...vhost...request_vhost/stream
+     */
+    std::string tcUrl;
+    std::string pageUrl;
+    std::string swfUrl;
+    double objectEncoding;
+    // data discovery from request.
+public:
+    // discovery from tcUrl and play/publish.
+    std::string schema;
+    // the vhost in tcUrl.
+    std::string vhost;
+    // the host in tcUrl.
+    std::string host;
+    // the port in tcUrl.
+    std::string port;
+    // the app in tcUrl, without param.
+    std::string app;
+    // the param in tcUrl(app).
+    std::string param;
+    // the stream in play/publish
+    std::string stream;
+    // for play live stream,
+    // used to specified the stop when exceed the duration.
+    // @see https://github.com/simple-rtmp-server/srs/issues/45
+    // in ms.
+    double duration;
+    // the token in the connect request,
+    // used for edge traverse to origin authentication,
+    // @see https://github.com/simple-rtmp-server/srs/issues/104
+    SrsAmf0Object* args;
+public:
+    SrsRequest();
+    virtual ~SrsRequest();
+public:
+    /**
+     * deep copy the request, for source to use it to support reload,
+     * for when initialize the source, the request is valid,
+     * when reload it, the request maybe invalid, so need to copy it.
+     */
+    virtual SrsRequest* copy();
+    /**
+     * update the auth info of request,
+     * to keep the current request ptr is ok,
+     * for many components use the ptr of request.
+     */
+    virtual void update_auth(SrsRequest* req);
+    /**
+     * get the stream identify, vhost/app/stream.
+     */
+    virtual std::string get_stream_url();
+    /**
+     * strip url, user must strip when update the url.
+     */
+    virtual void strip();
+};
+
+/**
+ * the response to client.
+ */
+class SrsResponse
+{
+public:
+    /**
+     * the stream id to response client createStream.
+     */
+    int stream_id;
+public:
+    SrsResponse();
+    virtual ~SrsResponse();
+};
+
+/**
+ * the rtmp client type.
+ */
+enum SrsRtmpConnType
+{
+    SrsRtmpConnUnknown,
+    SrsRtmpConnPlay,
+    SrsRtmpConnFMLEPublish,
+    SrsRtmpConnFlashPublish,
+};
+std::string srs_client_type_string(SrsRtmpConnType type);
+
+/**
+ * store the handshake bytes,
+ * for smart switch between complex and simple handshake.
+ */
+class SrsHandshakeBytes
+{
+public:
+    // [1+1536]
+    char* c0c1;
+    // [1+1536+1536]
+    char* s0s1s2;
+    // [1536]
+    char* c2;
+public:
+    SrsHandshakeBytes();
+    virtual ~SrsHandshakeBytes();
+public:
+    virtual int read_c0c1(ISrsProtocolReaderWriter* io);
+    virtual int read_s0s1s2(ISrsProtocolReaderWriter* io);
+    virtual int read_c2(ISrsProtocolReaderWriter* io);
+    virtual int create_c0c1();
+    virtual int create_s0s1s2(const char* c1 = NULL);
+    virtual int create_c2();
+};
+
+/**
+ * implements the client role protocol.
+ */
+class SrsRtmpClient
+{
+private:
+    SrsHandshakeBytes* hs_bytes;
+protected:
+    SrsProtocol* protocol;
+    ISrsProtocolReaderWriter* io;
+public:
+    SrsRtmpClient(ISrsProtocolReaderWriter* skt);
+    virtual ~SrsRtmpClient();
+    // protocol methods proxy
+public:
+    /**
+     * set the recv timeout in us.
+     * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT.
+     */
+    virtual void set_recv_timeout(int64_t timeout_us);
+    /**
+     * set the send timeout in us.
+     * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT.
+     */
+    virtual void set_send_timeout(int64_t timeout_us);
+    /**
+     * get recv/send bytes.
+     */
+    virtual int64_t get_recv_bytes();
+    virtual int64_t get_send_bytes();
+    /**
+     * recv a RTMP message, which is bytes oriented.
+     * user can use decode_message to get the decoded RTMP packet.
+     * @param pmsg, set the received message,
+     *       always NULL if error,
+     *       NULL for unknown packet but return success.
+     *       never NULL if decode success.
+     * @remark, drop message when msg is empty or payload length is empty.
+     */
+    virtual int recv_message(SrsCommonMessage** pmsg);
+    /**
+     * decode bytes oriented RTMP message to RTMP packet,
+     * @param ppacket, output decoded packet,
+     *       always NULL if error, never NULL if success.
+     * @return error when unknown packet, error when decode failed.
+     */
+    virtual int decode_message(SrsCommonMessage* msg, SrsPacket** ppacket);
+    /**
+     * send the RTMP message and always free it.
+     * user must never free or use the msg after this method,
+     * for it will always free the msg.
+     * @param msg, the msg to send out, never be NULL.
+     * @param stream_id, the stream id of packet to send over, 0 for control message.
+     */
+    virtual int send_and_free_message(SrsSharedPtrMessage* msg, int stream_id);
+    /**
+     * send the RTMP message and always free it.
+     * user must never free or use the msg after this method,
+     * for it will always free the msg.
+     * @param msgs, the msgs to send out, never be NULL.
+     * @param nb_msgs, the size of msgs to send out.
+     * @param stream_id, the stream id of packet to send over, 0 for control message.
+     */
+    virtual int send_and_free_messages(SrsSharedPtrMessage** msgs, int nb_msgs, int stream_id);
+    /**
+     * send the RTMP packet and always free it.
+     * user must never free or use the packet after this method,
+     * for it will always free the packet.
+     * @param packet, the packet to send out, never be NULL.
+     * @param stream_id, the stream id of packet to send over, 0 for control message.
+     */
+    virtual int send_and_free_packet(SrsPacket* packet, int stream_id);
+public:
+    /**
+     * handshake with server, try complex, then simple handshake.
+     */
+    virtual int handshake();
+    /**
+     * only use simple handshake
+     */
+    virtual int simple_handshake();
+    /**
+     * only use complex handshake
+     */
+    virtual int complex_handshake();
+    /**
+     * set req to use the original request of client:
+     *      pageUrl and swfUrl for refer antisuck.
+     *      args for edge to origin traverse auth, @see SrsRequest.args
+     */
+    virtual int connect_app(std::string app, std::string tc_url, SrsRequest* req, bool debug_srs_upnode);
+    /**
+     * connect to server, get the debug srs info.
+     *
+     * @param app, the app to connect at.
+     * @param tc_url, the tcUrl to connect at.
+     * @param req, the optional req object, use the swfUrl/pageUrl if specified. NULL to ignore.
+     *
+     * SRS debug info:
+     * @param srs_server_ip, debug info, server ip client connected at.
+     * @param srs_server, server info.
+     * @param srs_primary, primary authors.
+     * @param srs_authors, authors.
+     * @param srs_id, int, debug info, client id in server log.
+     * @param srs_pid, int, debug info, server pid in log.
+     */
+    virtual int connect_app2(
+        std::string app, std::string tc_url, SrsRequest* req, bool debug_srs_upnode,
+        std::string& srs_server_ip, std::string& srs_server, std::string& srs_primary,
+        std::string& srs_authors, std::string& srs_version, int& srs_id,
+        int& srs_pid
+    );
+    /**
+     * create a stream, then play/publish data over this stream.
+     */
+    virtual int create_stream(int& stream_id);
+    /**
+     * start play stream.
+     */
+    virtual int play(std::string stream, int stream_id);
+    /**
+     * start publish stream. use flash publish workflow:
+     *       connect-app => create-stream => flash-publish
+     */
+    virtual int publish(std::string stream, int stream_id);
+    /**
+     * start publish stream. use FMLE publish workflow:
+     *       connect-app => FMLE publish
+     */
+    virtual int fmle_publish(std::string stream, int& stream_id);
+public:
+    /**
+     * expect a specified message, drop others util got specified one.
+     * @pmsg, user must free it. NULL if not success.
+     * @ppacket, user must free it, which decode from payload of message. NULL if not success.
+     * @remark, only when success, user can use and must free the pmsg and ppacket.
+     * for example:
+     *          SrsCommonMessage* msg = NULL;
+     *          SrsConnectAppResPacket* pkt = NULL;
+     *          if ((ret = client->expect_message<SrsConnectAppResPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
+     *              return ret;
+     *          }
+     *          // use then free msg and pkt
+     *          srs_freep(msg);
+     *          srs_freep(pkt);
+     * user should never recv message and convert it, use this method instead.
+     * if need to set timeout, use set timeout of SrsProtocol.
+     */
+    template<class T>
+    int expect_message(SrsCommonMessage** pmsg, T** ppacket)
+    {
+        return protocol->expect_message<T>(pmsg, ppacket);
+    }
+};
+
+/**
+ * the rtmp provices rtmp-command-protocol services,
+ * a high level protocol, media stream oriented services,
+ * such as connect to vhost/app, play stream, get audio/video data.
+ */
+class SrsRtmpServer
+{
+private:
+    SrsHandshakeBytes* hs_bytes;
+    SrsProtocol* protocol;
+    ISrsProtocolReaderWriter* io;
+public:
+    SrsRtmpServer(ISrsProtocolReaderWriter* skt);
+    virtual ~SrsRtmpServer();
+    // protocol methods proxy
+public:
+    /**
+     * set the auto response message when recv for protocol stack.
+     * @param v, whether auto response message when recv message.
+     * @see: https://github.com/simple-rtmp-server/srs/issues/217
+     */
+    virtual void set_auto_response(bool v);
+#ifdef SRS_PERF_MERGED_READ
+    /**
+     * to improve read performance, merge some packets then read,
+     * when it on and read small bytes, we sleep to wait more data.,
+     * that is, we merge some data to read together.
+     * @param v true to ename merged read.
+     * @param handler the handler when merge read is enabled.
+     * @see https://github.com/simple-rtmp-server/srs/issues/241
+     */
+    virtual void set_merge_read(bool v, IMergeReadHandler* handler);
+    /**
+     * create buffer with specifeid size.
+     * @param buffer the size of buffer.
+     * @remark when MR(SRS_PERF_MERGED_READ) disabled, always set to 8K.
+     * @remark when buffer changed, the previous ptr maybe invalid.
+     * @see https://github.com/simple-rtmp-server/srs/issues/241
+     */
+    virtual void set_recv_buffer(int buffer_size);
+#endif
+    /**
+     * set/get the recv timeout in us.
+     * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT.
+     */
+    virtual void set_recv_timeout(int64_t timeout_us);
+    virtual int64_t get_recv_timeout();
+    /**
+     * set/get the send timeout in us.
+     * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT.
+     */
+    virtual void set_send_timeout(int64_t timeout_us);
+    virtual int64_t get_send_timeout();
+    /**
+     * get recv/send bytes.
+     */
+    virtual int64_t get_recv_bytes();
+    virtual int64_t get_send_bytes();
+    /**
+     * recv a RTMP message, which is bytes oriented.
+     * user can use decode_message to get the decoded RTMP packet.
+     * @param pmsg, set the received message,
+     *       always NULL if error,
+     *       NULL for unknown packet but return success.
+     *       never NULL if decode success.
+     * @remark, drop message when msg is empty or payload length is empty.
+     */
+    virtual int recv_message(SrsCommonMessage** pmsg);
+    /**
+     * decode bytes oriented RTMP message to RTMP packet,
+     * @param ppacket, output decoded packet,
+     *       always NULL if error, never NULL if success.
+     * @return error when unknown packet, error when decode failed.
+     */
+    virtual int decode_message(SrsCommonMessage* msg, SrsPacket** ppacket);
+    /**
+     * send the RTMP message and always free it.
+     * user must never free or use the msg after this method,
+     * for it will always free the msg.
+     * @param msg, the msg to send out, never be NULL.
+     * @param stream_id, the stream id of packet to send over, 0 for control message.
+     */
+    virtual int send_and_free_message(SrsSharedPtrMessage* msg, int stream_id);
+    /**
+     * send the RTMP message and always free it.
+     * user must never free or use the msg after this method,
+     * for it will always free the msg.
+     * @param msgs, the msgs to send out, never be NULL.
+     * @param nb_msgs, the size of msgs to send out.
+     * @param stream_id, the stream id of packet to send over, 0 for control message.
+     *
+     * @remark performance issue, to support 6k+ 250kbps client,
+     *       @see https://github.com/simple-rtmp-server/srs/issues/194
+     */
+    virtual int send_and_free_messages(SrsSharedPtrMessage** msgs, int nb_msgs, int stream_id);
+    /**
+     * send the RTMP packet and always free it.
+     * user must never free or use the packet after this method,
+     * for it will always free the packet.
+     * @param packet, the packet to send out, never be NULL.
+     * @param stream_id, the stream id of packet to send over, 0 for control message.
+     */
+    virtual int send_and_free_packet(SrsPacket* packet, int stream_id);
+public:
+    /**
+     * handshake with client, try complex then simple.
+     */
+    virtual int handshake();
+    /**
+     * do connect app with client, to discovery tcUrl.
+     */
+    virtual int connect_app(SrsRequest* req);
+    /**
+     * set ack size to client, client will send ack-size for each ack window
+     */
+    virtual int set_window_ack_size(int ack_size);
+    /**
+     * @type: The sender can mark this message hard (0), soft (1), or dynamic (2)
+     * using the Limit type field.
+     */
+    virtual int set_peer_bandwidth(int bandwidth, int type);
+    /**
+     * @param server_ip the ip of server.
+     */
+    virtual int response_connect_app(SrsRequest* req, const char* server_ip = NULL);
+    /**
+     * reject the connect app request.
+     */
+    virtual void response_connect_reject(SrsRequest* req, const char* desc);
+    /**
+     * response client the onBWDone message.
+     */
+    virtual int on_bw_done();
+    /**
+     * recv some message to identify the client.
+     * @stream_id, client will createStream to play or publish by flash,
+     *         the stream_id used to response the createStream request.
+     * @type, output the client type.
+     * @stream_name, output the client publish/play stream name. @see: SrsRequest.stream
+     * @duration, output the play client duration. @see: SrsRequest.duration
+     */
+    virtual int identify_client(int stream_id, SrsRtmpConnType& type, std::string& stream_name, double& duration);
+    /**
+     * set the chunk size when client type identified.
+     */
+    virtual int set_chunk_size(int chunk_size);
+    /**
+     * when client type is play, response with packets:
+     * StreamBegin,
+     * onStatus(NetStream.Play.Reset), onStatus(NetStream.Play.Start).,
+     * |RtmpSampleAccess(false, false),
+     * onStatus(NetStream.Data.Start).
+     */
+    virtual int start_play(int stream_id);
+    /**
+     * when client(type is play) send pause message,
+     * if is_pause, response the following packets:
+     *     onStatus(NetStream.Pause.Notify)
+     *     StreamEOF
+     * if not is_pause, response the following packets:
+     *     onStatus(NetStream.Unpause.Notify)
+     *     StreamBegin
+     */
+    virtual int on_play_client_pause(int stream_id, bool is_pause);
+    /**
+     * when client type is publish, response with packets:
+     * releaseStream response
+     * FCPublish
+     * FCPublish response
+     * createStream response
+     * onFCPublish(NetStream.Publish.Start)
+     * onStatus(NetStream.Publish.Start)
+     */
+    virtual int start_fmle_publish(int stream_id);
+    /**
+     * process the FMLE unpublish event.
+     * @unpublish_tid the unpublish request transaction id.
+     */
+    virtual int fmle_unpublish(int stream_id, double unpublish_tid);
+    /**
+     * when client type is publish, response with packets:
+     * onStatus(NetStream.Publish.Start)
+     */
+    virtual int start_flash_publish(int stream_id);
+public:
+    /**
+     * expect a specified message, drop others util got specified one.
+     * @pmsg, user must free it. NULL if not success.
+     * @ppacket, user must free it, which decode from payload of message. NULL if not success.
+     * @remark, only when success, user can use and must free the pmsg and ppacket.
+     * for example:
+     *          SrsCommonMessage* msg = NULL;
+     *          SrsConnectAppResPacket* pkt = NULL;
+     *          if ((ret = server->expect_message<SrsConnectAppResPacket>(protocol, &msg, &pkt)) != ERROR_SUCCESS) {
+     *              return ret;
+     *          }
+     *          // use then free msg and pkt
+     *          srs_freep(msg);
+     *          srs_freep(pkt);
+     * user should never recv message and convert it, use this method instead.
+     * if need to set timeout, use set timeout of SrsProtocol.
+     */
+    template<class T>
+    int expect_message(SrsCommonMessage** pmsg, T** ppacket)
+    {
+        return protocol->expect_message<T>(pmsg, ppacket);
+    }
+private:
+    virtual int identify_create_stream_client(SrsCreateStreamPacket* req, int stream_id, SrsRtmpConnType& type, std::string& stream_name, double& duration);
+    virtual int identify_fmle_publish_client(SrsFMLEStartPacket* req, SrsRtmpConnType& type, std::string& stream_name);
+    virtual int identify_flash_publish_client(SrsPublishPacket* req, SrsRtmpConnType& type, std::string& stream_name);
+private:
+    virtual int identify_play_client(SrsPlayPacket* req, SrsRtmpConnType& type, std::string& stream_name, double& duration);
+};
+
 /**
 * 4.1.1. connect
 * The client sends the connect command to the server to request

trunk/src/utest/srs_utest_protocol.cpp

@@ -32,7 +32,7 @@ using namespace std;
 #include <srs_kernel_utility.hpp>
 #include <srs_app_st.hpp>
 #include <srs_rtmp_amf0.hpp>
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 
 MockEmptyIO::MockEmptyIO()
 {

trunk/src/utest/srs_utest_protocol.hpp

@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <string>
 #include <srs_rtmp_utility.hpp>
 
-#include <srs_rtmp_sdk.hpp>
+#include <srs_rtmp_stack.hpp>
 #include <srs_rtmp_handshake.hpp>
 #include <srs_protocol_buffer.hpp>