add miss files. fix bug #60: support aggregate message

trunk/src/kernel/srs_kernel_error.hpp

@@ -83,6 +83,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define ERROR_RTMP_EDGE_PUBLISH_STATE       321
 #define ERROR_RTMP_EDGE_PROXY_PULL          322
 #define ERROR_RTMP_EDGE_RELOAD              323
+// aggregate message parse failed.
+#define ERROR_RTMP_AGGREGATE                324
 
 #define ERROR_SYSTEM_STREAM_INIT            400
 #define ERROR_SYSTEM_PACKET_INVALID         401

trunk/src/kernel/srs_kernel_stream.cpp

@@ -23,6 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_kernel_stream.hpp>
 
+using namespace std;
+
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_error.hpp>
 
@@ -160,7 +162,7 @@ int64_t SrsStream::read_8bytes()
     return value;
 }
 
-std::string SrsStream::read_string(int len)
+string SrsStream::read_string(int len)
 {
     srs_assert(require(len));
     
@@ -172,6 +174,15 @@ std::string SrsStream::read_string(int len)
     return value;
 }
 
+void SrsStream::read_bytes(char* data, int size)
+{
+    srs_assert(require(size));
+    
+    memcpy(data, p, size);
+    
+    p += size;
+}
+
 void SrsStream::write_1bytes(int8_t value)
 {
     srs_assert(require(1));
@@ -224,7 +235,7 @@ void SrsStream::write_8bytes(int64_t value)
     *p++ = pp[0];
 }
 
-void SrsStream::write_string(std::string value)
+void SrsStream::write_string(string value)
 {
     srs_assert(require(value.length()));
     

trunk/src/kernel/srs_kernel_stream.hpp

@@ -104,6 +104,10 @@ public:
     * get string from stream, length specifies by param len.
     */
     virtual std::string read_string(int len);
+    /**
+    * get bytes from stream, length specifies by param len.
+    */
+    virtual void read_bytes(char* data, int size);
 public:
     /**
     * write 1bytes char to stream.