winlin

refine code, move the ISrsBufferReader to srs_protocol_io

@@ -36,6 +36,7 @@ using namespace std; @@ -36,6 +36,7 @@ using namespace std;
36 #include <srs_app_http_conn.hpp> 36 #include <srs_app_http_conn.hpp>
37 #include <srs_app_json.hpp> 37 #include <srs_app_json.hpp>
38 #include <srs_kernel_utility.hpp> 38 #include <srs_kernel_utility.hpp>
  39 +#include <srs_protocol_buffer.hpp>
39 40
40 #define SRS_DEFAULT_HTTP_PORT 80 41 #define SRS_DEFAULT_HTTP_PORT 80
41 42
@@ -34,14 +34,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -34,14 +34,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
34 // @see https://github.com/winlinvip/simple-rtmp-server/issues/241 34 // @see https://github.com/winlinvip/simple-rtmp-server/issues/241
35 #define SOCKET_READ_SIZE 4096 35 #define SOCKET_READ_SIZE 4096
36 36
37 -ISrsBufferReader::ISrsBufferReader()  
38 -{  
39 -}  
40 -  
41 -ISrsBufferReader::~ISrsBufferReader()  
42 -{  
43 -}  
44 -  
45 SrsBuffer::SrsBuffer() 37 SrsBuffer::SrsBuffer()
46 { 38 {
47 buffer = new char[SOCKET_READ_SIZE]; 39 buffer = new char[SOCKET_READ_SIZE];
@@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 */ 22 */
23 23
24 -#ifndef SRS_KERNEL_BUFFER_HPP  
25 -#define SRS_KERNEL_BUFFER_HPP 24 +#ifndef SRS_PROTOCOL_BUFFER_HPP
  25 +#define SRS_PROTOCOL_BUFFER_HPP
26 26
27 /* 27 /*
28 #include <srs_protocol_buffer.hpp> 28 #include <srs_protocol_buffer.hpp>
@@ -32,18 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -32,18 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
32 32
33 #include <vector> 33 #include <vector>
34 34
35 -/**  
36 -* the reader for the buffer to read from whatever channel.  
37 -*/  
38 -class ISrsBufferReader  
39 -{  
40 -public:  
41 - ISrsBufferReader();  
42 - virtual ~ISrsBufferReader();  
43 -// for protocol/amf0/msg-codec  
44 -public:  
45 - virtual int read(void* buf, size_t size, ssize_t* nread) = 0;  
46 -}; 35 +#include <srs_protocol_io.hpp>
47 36
48 /** 37 /**
49 * the buffer provices bytes cache for protocol. generally, 38 * the buffer provices bytes cache for protocol. generally,
@@ -23,6 +23,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -23,6 +23,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23 23
24 #include <srs_protocol_io.hpp> 24 #include <srs_protocol_io.hpp>
25 25
  26 +ISrsBufferReader::ISrsBufferReader()
  27 +{
  28 +}
  29 +
  30 +ISrsBufferReader::~ISrsBufferReader()
  31 +{
  32 +}
  33 +
26 ISrsBufferWriter::ISrsBufferWriter() 34 ISrsBufferWriter::ISrsBufferWriter()
27 { 35 {
28 } 36 }
@@ -35,8 +35,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -35,8 +35,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
35 #include <sys/uio.h> 35 #include <sys/uio.h>
36 #endif 36 #endif
37 37
38 -#include <srs_protocol_buffer.hpp>  
39 -  
40 /** 38 /**
41 * the system io reader/writer architecture: 39 * the system io reader/writer architecture:
42 +---------------+ +--------------------+ +---------------+ 40 +---------------+ +--------------------+ +---------------+
@@ -63,6 +61,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -63,6 +61,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
63 */ 61 */
64 62
65 /** 63 /**
  64 +* the reader for the buffer to read from whatever channel.
  65 +*/
  66 +class ISrsBufferReader
  67 +{
  68 +public:
  69 + ISrsBufferReader();
  70 + virtual ~ISrsBufferReader();
  71 +// for protocol/amf0/msg-codec
  72 +public:
  73 + virtual int read(void* buf, size_t size, ssize_t* nread) = 0;
  74 +};
  75 +
  76 +/**
66 * the writer for the buffer to write to whatever channel. 77 * the writer for the buffer to write to whatever channel.
67 */ 78 */
68 class ISrsBufferWriter 79 class ISrsBufferWriter
@@ -28,6 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -28,6 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
28 #include <srs_kernel_stream.hpp> 28 #include <srs_kernel_stream.hpp>
29 #include <srs_core_autofree.hpp> 29 #include <srs_core_autofree.hpp>
30 #include <srs_kernel_utility.hpp> 30 #include <srs_kernel_utility.hpp>
  31 +#include <srs_protocol_buffer.hpp>
31 32
32 #include <stdlib.h> 33 #include <stdlib.h>
33 using namespace std; 34 using namespace std;