winlin

refine code, rename ISrsReader to ISrsBufferReader

@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
37 * the socket provides TCP socket over st, 37 * the socket provides TCP socket over st,
38 * that is, the sync socket mechanism. 38 * that is, the sync socket mechanism.
39 */ 39 */
40 -class SrsSocket : public ISrsReader 40 +class SrsSocket : public ISrsBufferReader
41 { 41 {
42 private: 42 private:
43 int64_t recv_timeout; 43 int64_t recv_timeout;
@@ -28,11 +28,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -28,11 +28,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
28 28
29 #define SOCKET_READ_SIZE 4096 29 #define SOCKET_READ_SIZE 4096
30 30
31 -ISrsReader::ISrsReader() 31 +ISrsBufferReader::ISrsBufferReader()
32 { 32 {
33 } 33 }
34 34
35 -ISrsReader::~ISrsReader() 35 +ISrsBufferReader::~ISrsBufferReader()
36 { 36 {
37 } 37 }
38 38
@@ -64,7 +64,7 @@ void SrsBuffer::append(char* bytes, int size) @@ -64,7 +64,7 @@ void SrsBuffer::append(char* bytes, int size)
64 data.insert(data.end(), bytes, bytes + size); 64 data.insert(data.end(), bytes, bytes + size);
65 } 65 }
66 66
67 -int SrsBuffer::ensure_buffer_bytes(ISrsReader* skt, int required_size) 67 +int SrsBuffer::ensure_buffer_bytes(ISrsBufferReader* skt, int required_size)
68 { 68 {
69 int ret = ERROR_SUCCESS; 69 int ret = ERROR_SUCCESS;
70 70
@@ -32,11 +32,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -32,11 +32,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
32 32
33 #include <vector> 33 #include <vector>
34 34
35 -class ISrsReader 35 +/**
  36 +* the reader for the buffer to read from whatever channel.
  37 +*/
  38 +class ISrsBufferReader
36 { 39 {
37 public: 40 public:
38 - ISrsReader();  
39 - virtual ~ISrsReader(); 41 + ISrsBufferReader();
  42 + virtual ~ISrsBufferReader();
40 public: 43 public:
41 virtual int read(const void* buf, size_t size, ssize_t* nread) = 0; 44 virtual int read(const void* buf, size_t size, ssize_t* nread) = 0;
42 }; 45 };
@@ -60,7 +63,7 @@ public: @@ -60,7 +63,7 @@ public:
60 private: 63 private:
61 virtual void append(char* bytes, int size); 64 virtual void append(char* bytes, int size);
62 public: 65 public:
63 - virtual int ensure_buffer_bytes(ISrsReader* skt, int required_size); 66 + virtual int ensure_buffer_bytes(ISrsBufferReader* skt, int required_size);
64 }; 67 };
65 68
66 #endif 69 #endif