mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
rename SrsStream to SrsBuffer
This commit is contained in:
winlin
parent
ca3577e11b
commit
0e52fc6d5b
42 changed files with 440 additions and 440 deletions
|
|
@ -41,7 +41,7 @@ SrsRawH264Stream::~SrsRawH264Stream()
|
|||
{
|
||||
}
|
||||
|
||||
int SrsRawH264Stream::annexb_demux(SrsStream* stream, char** pframe, int* pnb_frame)
|
||||
int SrsRawH264Stream::annexb_demux(SrsBuffer* stream, char** pframe, int* pnb_frame)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -160,7 +160,7 @@ int SrsRawH264Stream::mux_sequence_header(string sps, string pps, u_int32_t dts,
|
|||
SrsAutoFree(char, packet);
|
||||
|
||||
// use stream to generate the h264 packet.
|
||||
SrsStream stream;
|
||||
SrsBuffer stream;
|
||||
if ((ret = stream.initialize(packet, nb_packet)) != ERROR_SUCCESS) {
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -239,7 +239,7 @@ int SrsRawH264Stream::mux_ipb_frame(char* frame, int nb_frame, string& ibp)
|
|||
SrsAutoFree(char, packet);
|
||||
|
||||
// use stream to generate the h264 packet.
|
||||
SrsStream stream;
|
||||
SrsBuffer stream;
|
||||
if ((ret = stream.initialize(packet, nb_packet)) != ERROR_SUCCESS) {
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -310,7 +310,7 @@ SrsRawAacStream::~SrsRawAacStream()
|
|||
{
|
||||
}
|
||||
|
||||
int SrsRawAacStream::adts_demux(SrsStream* stream, char** pframe, int* pnb_frame, SrsRawAacStreamCodec& codec)
|
||||
int SrsRawAacStream::adts_demux(SrsBuffer* stream, char** pframe, int* pnb_frame, SrsRawAacStreamCodec& codec)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
||||
#include <srs_kernel_codec.hpp>
|
||||
|
||||
class SrsStream;
|
||||
class SrsBuffer;
|
||||
|
||||
/**
|
||||
* the raw h.264 stream, in annexb.
|
||||
|
|
@ -51,7 +51,7 @@ public:
|
|||
* @param pframe the output h.264 frame in stream. user should never free it.
|
||||
* @param pnb_frame the output h.264 frame size.
|
||||
*/
|
||||
virtual int annexb_demux(SrsStream* stream, char** pframe, int* pnb_frame);
|
||||
virtual int annexb_demux(SrsBuffer* stream, char** pframe, int* pnb_frame);
|
||||
/**
|
||||
* whether the frame is sps or pps.
|
||||
*/
|
||||
|
|
@ -123,7 +123,7 @@ public:
|
|||
* @param pnb_frame the output aac frame size.
|
||||
* @param codec the output codec info.
|
||||
*/
|
||||
virtual int adts_demux(SrsStream* stream, char** pframe, int* pnb_frame, SrsRawAacStreamCodec& codec);
|
||||
virtual int adts_demux(SrsBuffer* stream, char** pframe, int* pnb_frame, SrsRawAacStreamCodec& codec);
|
||||
/**
|
||||
* aac raw data to aac packet, without flv payload header.
|
||||
* mux the aac specific config to flv sequence header packet.
|
||||
|
|
|
|||
|
|
@ -379,7 +379,7 @@ SrsAmf0Any* SrsAmf0Any::date(int64_t value)
|
|||
return new SrsAmf0Date(value);
|
||||
}
|
||||
|
||||
int SrsAmf0Any::discovery(SrsStream* stream, SrsAmf0Any** ppvalue)
|
||||
int SrsAmf0Any::discovery(SrsBuffer* stream, SrsAmf0Any** ppvalue)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -586,7 +586,7 @@ int SrsAmf0ObjectEOF::total_size()
|
|||
return SrsAmf0Size::object_eof();
|
||||
}
|
||||
|
||||
int SrsAmf0ObjectEOF::read(SrsStream* stream)
|
||||
int SrsAmf0ObjectEOF::read(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -624,7 +624,7 @@ int SrsAmf0ObjectEOF::read(SrsStream* stream)
|
|||
|
||||
return ret;
|
||||
}
|
||||
int SrsAmf0ObjectEOF::write(SrsStream* stream)
|
||||
int SrsAmf0ObjectEOF::write(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -686,7 +686,7 @@ int SrsAmf0Object::total_size()
|
|||
return size;
|
||||
}
|
||||
|
||||
int SrsAmf0Object::read(SrsStream* stream)
|
||||
int SrsAmf0Object::read(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -741,7 +741,7 @@ int SrsAmf0Object::read(SrsStream* stream)
|
|||
return ret;
|
||||
}
|
||||
|
||||
int SrsAmf0Object::write(SrsStream* stream)
|
||||
int SrsAmf0Object::write(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -880,7 +880,7 @@ int SrsAmf0EcmaArray::total_size()
|
|||
return size;
|
||||
}
|
||||
|
||||
int SrsAmf0EcmaArray::read(SrsStream* stream)
|
||||
int SrsAmf0EcmaArray::read(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -945,7 +945,7 @@ int SrsAmf0EcmaArray::read(SrsStream* stream)
|
|||
|
||||
return ret;
|
||||
}
|
||||
int SrsAmf0EcmaArray::write(SrsStream* stream)
|
||||
int SrsAmf0EcmaArray::write(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1092,7 +1092,7 @@ int SrsAmf0StrictArray::total_size()
|
|||
return size;
|
||||
}
|
||||
|
||||
int SrsAmf0StrictArray::read(SrsStream* stream)
|
||||
int SrsAmf0StrictArray::read(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1139,7 +1139,7 @@ int SrsAmf0StrictArray::read(SrsStream* stream)
|
|||
|
||||
return ret;
|
||||
}
|
||||
int SrsAmf0StrictArray::write(SrsStream* stream)
|
||||
int SrsAmf0StrictArray::write(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1322,12 +1322,12 @@ int SrsAmf0String::total_size()
|
|||
return SrsAmf0Size::str(value);
|
||||
}
|
||||
|
||||
int SrsAmf0String::read(SrsStream* stream)
|
||||
int SrsAmf0String::read(SrsBuffer* stream)
|
||||
{
|
||||
return srs_amf0_read_string(stream, value);
|
||||
}
|
||||
|
||||
int SrsAmf0String::write(SrsStream* stream)
|
||||
int SrsAmf0String::write(SrsBuffer* stream)
|
||||
{
|
||||
return srs_amf0_write_string(stream, value);
|
||||
}
|
||||
|
|
@ -1353,12 +1353,12 @@ int SrsAmf0Boolean::total_size()
|
|||
return SrsAmf0Size::boolean();
|
||||
}
|
||||
|
||||
int SrsAmf0Boolean::read(SrsStream* stream)
|
||||
int SrsAmf0Boolean::read(SrsBuffer* stream)
|
||||
{
|
||||
return srs_amf0_read_boolean(stream, value);
|
||||
}
|
||||
|
||||
int SrsAmf0Boolean::write(SrsStream* stream)
|
||||
int SrsAmf0Boolean::write(SrsBuffer* stream)
|
||||
{
|
||||
return srs_amf0_write_boolean(stream, value);
|
||||
}
|
||||
|
|
@ -1384,12 +1384,12 @@ int SrsAmf0Number::total_size()
|
|||
return SrsAmf0Size::number();
|
||||
}
|
||||
|
||||
int SrsAmf0Number::read(SrsStream* stream)
|
||||
int SrsAmf0Number::read(SrsBuffer* stream)
|
||||
{
|
||||
return srs_amf0_read_number(stream, value);
|
||||
}
|
||||
|
||||
int SrsAmf0Number::write(SrsStream* stream)
|
||||
int SrsAmf0Number::write(SrsBuffer* stream)
|
||||
{
|
||||
return srs_amf0_write_number(stream, value);
|
||||
}
|
||||
|
|
@ -1416,7 +1416,7 @@ int SrsAmf0Date::total_size()
|
|||
return SrsAmf0Size::date();
|
||||
}
|
||||
|
||||
int SrsAmf0Date::read(SrsStream* stream)
|
||||
int SrsAmf0Date::read(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1465,7 +1465,7 @@ int SrsAmf0Date::read(SrsStream* stream)
|
|||
|
||||
return ret;
|
||||
}
|
||||
int SrsAmf0Date::write(SrsStream* stream)
|
||||
int SrsAmf0Date::write(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1538,12 +1538,12 @@ int SrsAmf0Null::total_size()
|
|||
return SrsAmf0Size::null();
|
||||
}
|
||||
|
||||
int SrsAmf0Null::read(SrsStream* stream)
|
||||
int SrsAmf0Null::read(SrsBuffer* stream)
|
||||
{
|
||||
return srs_amf0_read_null(stream);
|
||||
}
|
||||
|
||||
int SrsAmf0Null::write(SrsStream* stream)
|
||||
int SrsAmf0Null::write(SrsBuffer* stream)
|
||||
{
|
||||
return srs_amf0_write_null(stream);
|
||||
}
|
||||
|
|
@ -1568,12 +1568,12 @@ int SrsAmf0Undefined::total_size()
|
|||
return SrsAmf0Size::undefined();
|
||||
}
|
||||
|
||||
int SrsAmf0Undefined::read(SrsStream* stream)
|
||||
int SrsAmf0Undefined::read(SrsBuffer* stream)
|
||||
{
|
||||
return srs_amf0_read_undefined(stream);
|
||||
}
|
||||
|
||||
int SrsAmf0Undefined::write(SrsStream* stream)
|
||||
int SrsAmf0Undefined::write(SrsBuffer* stream)
|
||||
{
|
||||
return srs_amf0_write_undefined(stream);
|
||||
}
|
||||
|
|
@ -1584,7 +1584,7 @@ SrsAmf0Any* SrsAmf0Undefined::copy()
|
|||
return copy;
|
||||
}
|
||||
|
||||
int srs_amf0_read_any(SrsStream* stream, SrsAmf0Any** ppvalue)
|
||||
int srs_amf0_read_any(SrsBuffer* stream, SrsAmf0Any** ppvalue)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1604,7 +1604,7 @@ int srs_amf0_read_any(SrsStream* stream, SrsAmf0Any** ppvalue)
|
|||
return ret;
|
||||
}
|
||||
|
||||
int srs_amf0_read_string(SrsStream* stream, string& value)
|
||||
int srs_amf0_read_string(SrsBuffer* stream, string& value)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1627,7 +1627,7 @@ int srs_amf0_read_string(SrsStream* stream, string& value)
|
|||
return srs_amf0_read_utf8(stream, value);
|
||||
}
|
||||
|
||||
int srs_amf0_write_string(SrsStream* stream, string value)
|
||||
int srs_amf0_write_string(SrsBuffer* stream, string value)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1644,7 +1644,7 @@ int srs_amf0_write_string(SrsStream* stream, string value)
|
|||
return srs_amf0_write_utf8(stream, value);
|
||||
}
|
||||
|
||||
int srs_amf0_read_boolean(SrsStream* stream, bool& value)
|
||||
int srs_amf0_read_boolean(SrsBuffer* stream, bool& value)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1677,7 +1677,7 @@ int srs_amf0_read_boolean(SrsStream* stream, bool& value)
|
|||
|
||||
return ret;
|
||||
}
|
||||
int srs_amf0_write_boolean(SrsStream* stream, bool value)
|
||||
int srs_amf0_write_boolean(SrsBuffer* stream, bool value)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1708,7 +1708,7 @@ int srs_amf0_write_boolean(SrsStream* stream, bool value)
|
|||
return ret;
|
||||
}
|
||||
|
||||
int srs_amf0_read_number(SrsStream* stream, double& value)
|
||||
int srs_amf0_read_number(SrsBuffer* stream, double& value)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1742,7 +1742,7 @@ int srs_amf0_read_number(SrsStream* stream, double& value)
|
|||
|
||||
return ret;
|
||||
}
|
||||
int srs_amf0_write_number(SrsStream* stream, double value)
|
||||
int srs_amf0_write_number(SrsBuffer* stream, double value)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1772,7 +1772,7 @@ int srs_amf0_write_number(SrsStream* stream, double value)
|
|||
return ret;
|
||||
}
|
||||
|
||||
int srs_amf0_read_null(SrsStream* stream)
|
||||
int srs_amf0_read_null(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1794,7 +1794,7 @@ int srs_amf0_read_null(SrsStream* stream)
|
|||
|
||||
return ret;
|
||||
}
|
||||
int srs_amf0_write_null(SrsStream* stream)
|
||||
int srs_amf0_write_null(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1811,7 +1811,7 @@ int srs_amf0_write_null(SrsStream* stream)
|
|||
return ret;
|
||||
}
|
||||
|
||||
int srs_amf0_read_undefined(SrsStream* stream)
|
||||
int srs_amf0_read_undefined(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1833,7 +1833,7 @@ int srs_amf0_read_undefined(SrsStream* stream)
|
|||
|
||||
return ret;
|
||||
}
|
||||
int srs_amf0_write_undefined(SrsStream* stream)
|
||||
int srs_amf0_write_undefined(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1853,7 +1853,7 @@ int srs_amf0_write_undefined(SrsStream* stream)
|
|||
|
||||
namespace _srs_internal
|
||||
{
|
||||
int srs_amf0_read_utf8(SrsStream* stream, string& value)
|
||||
int srs_amf0_read_utf8(SrsBuffer* stream, string& value)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1898,7 +1898,7 @@ namespace _srs_internal
|
|||
|
||||
return ret;
|
||||
}
|
||||
int srs_amf0_write_utf8(SrsStream* stream, string value)
|
||||
int srs_amf0_write_utf8(SrsBuffer* stream, string value)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1929,7 +1929,7 @@ namespace _srs_internal
|
|||
return ret;
|
||||
}
|
||||
|
||||
bool srs_amf0_is_object_eof(SrsStream* stream)
|
||||
bool srs_amf0_is_object_eof(SrsBuffer* stream)
|
||||
{
|
||||
// detect the object-eof specially
|
||||
if (stream->require(3)) {
|
||||
|
|
@ -1942,7 +1942,7 @@ namespace _srs_internal
|
|||
return false;
|
||||
}
|
||||
|
||||
int srs_amf0_write_object_eof(SrsStream* stream, SrsAmf0ObjectEOF* value)
|
||||
int srs_amf0_write_object_eof(SrsBuffer* stream, SrsAmf0ObjectEOF* value)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1971,7 +1971,7 @@ namespace _srs_internal
|
|||
return ret;
|
||||
}
|
||||
|
||||
int srs_amf0_write_any(SrsStream* stream, SrsAmf0Any* value)
|
||||
int srs_amf0_write_any(SrsBuffer* stream, SrsAmf0Any* value)
|
||||
{
|
||||
srs_assert(value != NULL);
|
||||
return value->write(stream);
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
class SrsStream;
|
||||
class SrsBuffer;
|
||||
class SrsAmf0Object;
|
||||
class SrsAmf0EcmaArray;
|
||||
class SrsAmf0StrictArray;
|
||||
|
|
@ -53,15 +53,15 @@ namespace _srs_internal
|
|||
////////////////////////////////////////////////////////////////////////
|
||||
Usages:
|
||||
|
||||
1. the bytes proxy: SrsStream
|
||||
1. the bytes proxy: SrsBuffer
|
||||
// when we got some bytes from file or network,
|
||||
// use SrsStream proxy to read/write bytes
|
||||
// use SrsBuffer proxy to read/write bytes
|
||||
|
||||
// for example, read bytes from file or network.
|
||||
char* bytes = ...;
|
||||
|
||||
// initialize the stream, proxy for bytes.
|
||||
SrsStream stream;
|
||||
SrsBuffer stream;
|
||||
stream.initialize(bytes);
|
||||
|
||||
// use stream instead.
|
||||
|
|
@ -106,7 +106,7 @@ Usages:
|
|||
|
||||
char* bytes = new char[any->total_size()];
|
||||
|
||||
SrsStream stream;
|
||||
SrsBuffer stream;
|
||||
stream.initialize(bytes);
|
||||
|
||||
any->write(&stream);
|
||||
|
|
@ -257,11 +257,11 @@ public:
|
|||
/**
|
||||
* read AMF0 instance from stream.
|
||||
*/
|
||||
virtual int read(SrsStream* stream) = 0;
|
||||
virtual int read(SrsBuffer* stream) = 0;
|
||||
/**
|
||||
* write AMF0 instance to stream.
|
||||
*/
|
||||
virtual int write(SrsStream* stream) = 0;
|
||||
virtual int write(SrsBuffer* stream) = 0;
|
||||
/**
|
||||
* copy current AMF0 instance.
|
||||
*/
|
||||
|
|
@ -328,7 +328,7 @@ public:
|
|||
* @remark, instance is created without read from stream, user must
|
||||
* use (*ppvalue)->read(stream) to get the instance.
|
||||
*/
|
||||
static int discovery(SrsStream* stream, SrsAmf0Any** ppvalue);
|
||||
static int discovery(SrsBuffer* stream, SrsAmf0Any** ppvalue);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -353,8 +353,8 @@ public:
|
|||
// serialize/deserialize to/from stream.
|
||||
public:
|
||||
virtual int total_size();
|
||||
virtual int read(SrsStream* stream);
|
||||
virtual int write(SrsStream* stream);
|
||||
virtual int read(SrsBuffer* stream);
|
||||
virtual int write(SrsBuffer* stream);
|
||||
virtual SrsAmf0Any* copy();
|
||||
/**
|
||||
* convert amf0 to json.
|
||||
|
|
@ -440,8 +440,8 @@ public:
|
|||
// serialize/deserialize to/from stream.
|
||||
public:
|
||||
virtual int total_size();
|
||||
virtual int read(SrsStream* stream);
|
||||
virtual int write(SrsStream* stream);
|
||||
virtual int read(SrsBuffer* stream);
|
||||
virtual int write(SrsBuffer* stream);
|
||||
virtual SrsAmf0Any* copy();
|
||||
/**
|
||||
* convert amf0 to json.
|
||||
|
|
@ -525,8 +525,8 @@ public:
|
|||
// serialize/deserialize to/from stream.
|
||||
public:
|
||||
virtual int total_size();
|
||||
virtual int read(SrsStream* stream);
|
||||
virtual int write(SrsStream* stream);
|
||||
virtual int read(SrsBuffer* stream);
|
||||
virtual int write(SrsBuffer* stream);
|
||||
virtual SrsAmf0Any* copy();
|
||||
/**
|
||||
* convert amf0 to json.
|
||||
|
|
@ -582,15 +582,15 @@ public:
|
|||
* @param ppvalue, the output amf0 any elem.
|
||||
* NULL if error; otherwise, never NULL and user must free it.
|
||||
*/
|
||||
extern int srs_amf0_read_any(SrsStream* stream, SrsAmf0Any** ppvalue);
|
||||
extern int srs_amf0_read_any(SrsBuffer* stream, SrsAmf0Any** ppvalue);
|
||||
|
||||
/**
|
||||
* read amf0 string from stream.
|
||||
* 2.4 String Type
|
||||
* string-type = string-marker UTF-8
|
||||
*/
|
||||
extern int srs_amf0_read_string(SrsStream* stream, std::string& value);
|
||||
extern int srs_amf0_write_string(SrsStream* stream, std::string value);
|
||||
extern int srs_amf0_read_string(SrsBuffer* stream, std::string& value);
|
||||
extern int srs_amf0_write_string(SrsBuffer* stream, std::string value);
|
||||
|
||||
/**
|
||||
* read amf0 boolean from stream.
|
||||
|
|
@ -598,32 +598,32 @@ extern int srs_amf0_write_string(SrsStream* stream, std::string value);
|
|||
* boolean-type = boolean-marker U8
|
||||
* 0 is false, <> 0 is true
|
||||
*/
|
||||
extern int srs_amf0_read_boolean(SrsStream* stream, bool& value);
|
||||
extern int srs_amf0_write_boolean(SrsStream* stream, bool value);
|
||||
extern int srs_amf0_read_boolean(SrsBuffer* stream, bool& value);
|
||||
extern int srs_amf0_write_boolean(SrsBuffer* stream, bool value);
|
||||
|
||||
/**
|
||||
* read amf0 number from stream.
|
||||
* 2.2 Number Type
|
||||
* number-type = number-marker DOUBLE
|
||||
*/
|
||||
extern int srs_amf0_read_number(SrsStream* stream, double& value);
|
||||
extern int srs_amf0_write_number(SrsStream* stream, double value);
|
||||
extern int srs_amf0_read_number(SrsBuffer* stream, double& value);
|
||||
extern int srs_amf0_write_number(SrsBuffer* stream, double value);
|
||||
|
||||
/**
|
||||
* read amf0 null from stream.
|
||||
* 2.7 null Type
|
||||
* null-type = null-marker
|
||||
*/
|
||||
extern int srs_amf0_read_null(SrsStream* stream);
|
||||
extern int srs_amf0_write_null(SrsStream* stream);
|
||||
extern int srs_amf0_read_null(SrsBuffer* stream);
|
||||
extern int srs_amf0_write_null(SrsBuffer* stream);
|
||||
|
||||
/**
|
||||
* read amf0 undefined from stream.
|
||||
* 2.8 undefined Type
|
||||
* undefined-type = undefined-marker
|
||||
*/
|
||||
extern int srs_amf0_read_undefined(SrsStream* stream);
|
||||
extern int srs_amf0_write_undefined(SrsStream* stream);
|
||||
extern int srs_amf0_read_undefined(SrsBuffer* stream);
|
||||
extern int srs_amf0_write_undefined(SrsBuffer* stream);
|
||||
|
||||
// internal objects, user should never use it.
|
||||
namespace _srs_internal
|
||||
|
|
@ -650,8 +650,8 @@ namespace _srs_internal
|
|||
virtual ~SrsAmf0String();
|
||||
public:
|
||||
virtual int total_size();
|
||||
virtual int read(SrsStream* stream);
|
||||
virtual int write(SrsStream* stream);
|
||||
virtual int read(SrsBuffer* stream);
|
||||
virtual int write(SrsBuffer* stream);
|
||||
virtual SrsAmf0Any* copy();
|
||||
};
|
||||
|
||||
|
|
@ -677,8 +677,8 @@ namespace _srs_internal
|
|||
virtual ~SrsAmf0Boolean();
|
||||
public:
|
||||
virtual int total_size();
|
||||
virtual int read(SrsStream* stream);
|
||||
virtual int write(SrsStream* stream);
|
||||
virtual int read(SrsBuffer* stream);
|
||||
virtual int write(SrsBuffer* stream);
|
||||
virtual SrsAmf0Any* copy();
|
||||
};
|
||||
|
||||
|
|
@ -703,8 +703,8 @@ namespace _srs_internal
|
|||
virtual ~SrsAmf0Number();
|
||||
public:
|
||||
virtual int total_size();
|
||||
virtual int read(SrsStream* stream);
|
||||
virtual int write(SrsStream* stream);
|
||||
virtual int read(SrsBuffer* stream);
|
||||
virtual int write(SrsBuffer* stream);
|
||||
virtual SrsAmf0Any* copy();
|
||||
};
|
||||
|
||||
|
|
@ -731,8 +731,8 @@ namespace _srs_internal
|
|||
// serialize/deserialize to/from stream.
|
||||
public:
|
||||
virtual int total_size();
|
||||
virtual int read(SrsStream* stream);
|
||||
virtual int write(SrsStream* stream);
|
||||
virtual int read(SrsBuffer* stream);
|
||||
virtual int write(SrsBuffer* stream);
|
||||
virtual SrsAmf0Any* copy();
|
||||
public:
|
||||
/**
|
||||
|
|
@ -763,8 +763,8 @@ namespace _srs_internal
|
|||
virtual ~SrsAmf0Null();
|
||||
public:
|
||||
virtual int total_size();
|
||||
virtual int read(SrsStream* stream);
|
||||
virtual int write(SrsStream* stream);
|
||||
virtual int read(SrsBuffer* stream);
|
||||
virtual int write(SrsBuffer* stream);
|
||||
virtual SrsAmf0Any* copy();
|
||||
};
|
||||
|
||||
|
|
@ -786,8 +786,8 @@ namespace _srs_internal
|
|||
virtual ~SrsAmf0Undefined();
|
||||
public:
|
||||
virtual int total_size();
|
||||
virtual int read(SrsStream* stream);
|
||||
virtual int write(SrsStream* stream);
|
||||
virtual int read(SrsBuffer* stream);
|
||||
virtual int write(SrsBuffer* stream);
|
||||
virtual SrsAmf0Any* copy();
|
||||
};
|
||||
|
||||
|
|
@ -836,8 +836,8 @@ namespace _srs_internal
|
|||
virtual ~SrsAmf0ObjectEOF();
|
||||
public:
|
||||
virtual int total_size();
|
||||
virtual int read(SrsStream* stream);
|
||||
virtual int write(SrsStream* stream);
|
||||
virtual int read(SrsBuffer* stream);
|
||||
virtual int write(SrsBuffer* stream);
|
||||
virtual SrsAmf0Any* copy();
|
||||
};
|
||||
|
||||
|
|
@ -849,13 +849,13 @@ namespace _srs_internal
|
|||
* UTF8-1 = %x00-7F
|
||||
* @remark only support UTF8-1 char.
|
||||
*/
|
||||
extern int srs_amf0_read_utf8(SrsStream* stream, std::string& value);
|
||||
extern int srs_amf0_write_utf8(SrsStream* stream, std::string value);
|
||||
extern int srs_amf0_read_utf8(SrsBuffer* stream, std::string& value);
|
||||
extern int srs_amf0_write_utf8(SrsBuffer* stream, std::string value);
|
||||
|
||||
extern bool srs_amf0_is_object_eof(SrsStream* stream);
|
||||
extern int srs_amf0_write_object_eof(SrsStream* stream, SrsAmf0ObjectEOF* value);
|
||||
extern bool srs_amf0_is_object_eof(SrsBuffer* stream);
|
||||
extern int srs_amf0_write_object_eof(SrsBuffer* stream, SrsAmf0ObjectEOF* value);
|
||||
|
||||
extern int srs_amf0_write_any(SrsStream* stream, SrsAmf0Any* value);
|
||||
extern int srs_amf0_write_any(SrsBuffer* stream, SrsAmf0Any* value);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -323,7 +323,7 @@ namespace _srs_internal
|
|||
srs_freep(random1);
|
||||
}
|
||||
|
||||
int key_block::parse(SrsStream* stream)
|
||||
int key_block::parse(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -405,7 +405,7 @@ namespace _srs_internal
|
|||
srs_freep(random1);
|
||||
}
|
||||
|
||||
int digest_block::parse(SrsStream* stream)
|
||||
int digest_block::parse(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -629,7 +629,7 @@ namespace _srs_internal
|
|||
return ret;
|
||||
}
|
||||
|
||||
void c1s1_strategy::copy_time_version(SrsStream* stream, c1s1* owner)
|
||||
void c1s1_strategy::copy_time_version(SrsBuffer* stream, c1s1* owner)
|
||||
{
|
||||
srs_assert(stream->require(8));
|
||||
|
||||
|
|
@ -639,7 +639,7 @@ namespace _srs_internal
|
|||
// 4bytes version
|
||||
stream->write_4bytes(owner->version);
|
||||
}
|
||||
void c1s1_strategy::copy_key(SrsStream* stream)
|
||||
void c1s1_strategy::copy_key(SrsBuffer* stream)
|
||||
{
|
||||
srs_assert(key.random0_size >= 0);
|
||||
srs_assert(key.random1_size >= 0);
|
||||
|
|
@ -660,7 +660,7 @@ namespace _srs_internal
|
|||
|
||||
stream->write_4bytes(key.offset);
|
||||
}
|
||||
void c1s1_strategy::copy_digest(SrsStream* stream, bool with_digest)
|
||||
void c1s1_strategy::copy_digest(SrsBuffer* stream, bool with_digest)
|
||||
{
|
||||
srs_assert(key.random0_size >= 0);
|
||||
srs_assert(key.random1_size >= 0);
|
||||
|
|
@ -710,7 +710,7 @@ namespace _srs_internal
|
|||
|
||||
srs_assert(size == 1536);
|
||||
|
||||
SrsStream stream;
|
||||
SrsBuffer stream;
|
||||
|
||||
if ((ret = stream.initialize(_c1s1 + 8, 764)) != ERROR_SUCCESS) {
|
||||
return ret;
|
||||
|
|
@ -745,7 +745,7 @@ namespace _srs_internal
|
|||
srs_assert(size == 1504);
|
||||
}
|
||||
|
||||
SrsStream stream;
|
||||
SrsBuffer stream;
|
||||
|
||||
if ((ret = stream.initialize(bytes, size)) != ERROR_SUCCESS) {
|
||||
return ret;
|
||||
|
|
@ -779,7 +779,7 @@ namespace _srs_internal
|
|||
|
||||
srs_assert(size == 1536);
|
||||
|
||||
SrsStream stream;
|
||||
SrsBuffer stream;
|
||||
|
||||
if ((ret = stream.initialize(_c1s1 + 8, 764)) != ERROR_SUCCESS) {
|
||||
return ret;
|
||||
|
|
@ -814,7 +814,7 @@ namespace _srs_internal
|
|||
srs_assert(size == 1504);
|
||||
}
|
||||
|
||||
SrsStream stream;
|
||||
SrsBuffer stream;
|
||||
|
||||
if ((ret = stream.initialize(bytes, size)) != ERROR_SUCCESS) {
|
||||
return ret;
|
||||
|
|
@ -875,7 +875,7 @@ namespace _srs_internal
|
|||
return ret;
|
||||
}
|
||||
|
||||
SrsStream stream;
|
||||
SrsBuffer stream;
|
||||
|
||||
if ((ret = stream.initialize(_c1s1, size)) != ERROR_SUCCESS) {
|
||||
return ret;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
class ISrsProtocolReaderWriter;
|
||||
class SrsComplexHandshake;
|
||||
class SrsHandshakeBytes;
|
||||
class SrsStream;
|
||||
class SrsBuffer;
|
||||
|
||||
#ifdef SRS_AUTO_SSL
|
||||
|
||||
|
|
@ -139,7 +139,7 @@ namespace _srs_internal
|
|||
// parse key block from c1s1.
|
||||
// if created, user must free it by srs_key_block_free
|
||||
// @stream contains c1s1_key_bytes the key start bytes
|
||||
int parse(SrsStream* stream);
|
||||
int parse(SrsBuffer* stream);
|
||||
private:
|
||||
// calc the offset of key,
|
||||
// the key->offset cannot be used as the offset of key.
|
||||
|
|
@ -177,7 +177,7 @@ namespace _srs_internal
|
|||
// parse digest block from c1s1.
|
||||
// if created, user must free it by srs_digest_block_free
|
||||
// @stream contains c1s1_digest_bytes the digest start bytes
|
||||
int parse(SrsStream* stream);
|
||||
int parse(SrsBuffer* stream);
|
||||
private:
|
||||
// calc the offset of digest,
|
||||
// the key->offset cannot be used as the offset of digest.
|
||||
|
|
@ -292,15 +292,15 @@ namespace _srs_internal
|
|||
/**
|
||||
* copy time and version to stream.
|
||||
*/
|
||||
virtual void copy_time_version(SrsStream* stream, c1s1* owner);
|
||||
virtual void copy_time_version(SrsBuffer* stream, c1s1* owner);
|
||||
/**
|
||||
* copy key to stream.
|
||||
*/
|
||||
virtual void copy_key(SrsStream* stream);
|
||||
virtual void copy_key(SrsBuffer* stream);
|
||||
/**
|
||||
* copy digest to stream.
|
||||
*/
|
||||
virtual void copy_digest(SrsStream* stream, bool with_digest);
|
||||
virtual void copy_digest(SrsBuffer* stream, bool with_digest);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ int SrsPacket::encode(int& psize, char*& ppayload)
|
|||
int size = get_size();
|
||||
char* payload = NULL;
|
||||
|
||||
SrsStream stream;
|
||||
SrsBuffer stream;
|
||||
|
||||
if (size > 0) {
|
||||
payload = new char[size];
|
||||
|
|
@ -169,7 +169,7 @@ int SrsPacket::encode(int& psize, char*& ppayload)
|
|||
return ret;
|
||||
}
|
||||
|
||||
int SrsPacket::decode(SrsStream* stream)
|
||||
int SrsPacket::decode(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -196,7 +196,7 @@ int SrsPacket::get_size()
|
|||
return 0;
|
||||
}
|
||||
|
||||
int SrsPacket::encode_packet(SrsStream* stream)
|
||||
int SrsPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -410,7 +410,7 @@ int SrsProtocol::decode_message(SrsCommonMessage* msg, SrsPacket** ppacket)
|
|||
srs_assert(msg->payload != NULL);
|
||||
srs_assert(msg->size > 0);
|
||||
|
||||
SrsStream stream;
|
||||
SrsBuffer stream;
|
||||
|
||||
// initialize the decode stream for all message,
|
||||
// it's ok for the initialize if fast and without memory copy.
|
||||
|
|
@ -684,7 +684,7 @@ int SrsProtocol::do_simple_send(SrsMessageHeader* mh, char* payload, int size)
|
|||
return ret;
|
||||
}
|
||||
|
||||
int SrsProtocol::do_decode_message(SrsMessageHeader& header, SrsStream* stream, SrsPacket** ppacket)
|
||||
int SrsProtocol::do_decode_message(SrsMessageHeader& header, SrsBuffer* stream, SrsPacket** ppacket)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -1852,7 +1852,7 @@ int SrsHandshakeBytes::create_c0c1()
|
|||
srs_random_generate(c0c1, 1537);
|
||||
|
||||
// plain text required.
|
||||
SrsStream stream;
|
||||
SrsBuffer stream;
|
||||
if ((ret = stream.initialize(c0c1, 9)) != ERROR_SUCCESS) {
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -1875,7 +1875,7 @@ int SrsHandshakeBytes::create_s0s1s2(const char* c1)
|
|||
srs_random_generate(s0s1s2, 3073);
|
||||
|
||||
// plain text required.
|
||||
SrsStream stream;
|
||||
SrsBuffer stream;
|
||||
if ((ret = stream.initialize(s0s1s2, 9)) != ERROR_SUCCESS) {
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -1907,7 +1907,7 @@ int SrsHandshakeBytes::create_c2()
|
|||
srs_random_generate(c2, 1536);
|
||||
|
||||
// time
|
||||
SrsStream stream;
|
||||
SrsBuffer stream;
|
||||
if ((ret = stream.initialize(c2, 8)) != ERROR_SUCCESS) {
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -3127,7 +3127,7 @@ SrsConnectAppPacket::~SrsConnectAppPacket()
|
|||
srs_freep(args);
|
||||
}
|
||||
|
||||
int SrsConnectAppPacket::decode(SrsStream* stream)
|
||||
int SrsConnectAppPacket::decode(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -3217,7 +3217,7 @@ int SrsConnectAppPacket::get_size()
|
|||
return size;
|
||||
}
|
||||
|
||||
int SrsConnectAppPacket::encode_packet(SrsStream* stream)
|
||||
int SrsConnectAppPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -3264,7 +3264,7 @@ SrsConnectAppResPacket::~SrsConnectAppResPacket()
|
|||
srs_freep(info);
|
||||
}
|
||||
|
||||
int SrsConnectAppResPacket::decode(SrsStream* stream)
|
||||
int SrsConnectAppResPacket::decode(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -3323,7 +3323,7 @@ int SrsConnectAppResPacket::get_size()
|
|||
+ SrsAmf0Size::object(props) + SrsAmf0Size::object(info);
|
||||
}
|
||||
|
||||
int SrsConnectAppResPacket::encode_packet(SrsStream* stream)
|
||||
int SrsConnectAppResPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -3372,7 +3372,7 @@ SrsCallPacket::~SrsCallPacket()
|
|||
srs_freep(arguments);
|
||||
}
|
||||
|
||||
int SrsCallPacket::decode(SrsStream* stream)
|
||||
int SrsCallPacket::decode(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -3446,7 +3446,7 @@ int SrsCallPacket::get_size()
|
|||
return size;
|
||||
}
|
||||
|
||||
int SrsCallPacket::encode_packet(SrsStream* stream)
|
||||
int SrsCallPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -3520,7 +3520,7 @@ int SrsCallResPacket::get_size()
|
|||
return size;
|
||||
}
|
||||
|
||||
int SrsCallResPacket::encode_packet(SrsStream* stream)
|
||||
int SrsCallResPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -3566,7 +3566,7 @@ SrsCreateStreamPacket::~SrsCreateStreamPacket()
|
|||
srs_freep(command_object);
|
||||
}
|
||||
|
||||
int SrsCreateStreamPacket::decode(SrsStream* stream)
|
||||
int SrsCreateStreamPacket::decode(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -3612,7 +3612,7 @@ int SrsCreateStreamPacket::get_size()
|
|||
+ SrsAmf0Size::null();
|
||||
}
|
||||
|
||||
int SrsCreateStreamPacket::encode_packet(SrsStream* stream)
|
||||
int SrsCreateStreamPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -3652,7 +3652,7 @@ SrsCreateStreamResPacket::~SrsCreateStreamResPacket()
|
|||
srs_freep(command_object);
|
||||
}
|
||||
|
||||
int SrsCreateStreamResPacket::decode(SrsStream* stream)
|
||||
int SrsCreateStreamResPacket::decode(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -3703,7 +3703,7 @@ int SrsCreateStreamResPacket::get_size()
|
|||
+ SrsAmf0Size::null() + SrsAmf0Size::number();
|
||||
}
|
||||
|
||||
int SrsCreateStreamResPacket::encode_packet(SrsStream* stream)
|
||||
int SrsCreateStreamResPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -3749,7 +3749,7 @@ SrsCloseStreamPacket::~SrsCloseStreamPacket()
|
|||
srs_freep(command_object);
|
||||
}
|
||||
|
||||
int SrsCloseStreamPacket::decode(SrsStream* stream)
|
||||
int SrsCloseStreamPacket::decode(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -3784,7 +3784,7 @@ SrsFMLEStartPacket::~SrsFMLEStartPacket()
|
|||
srs_freep(command_object);
|
||||
}
|
||||
|
||||
int SrsFMLEStartPacket::decode(SrsStream* stream)
|
||||
int SrsFMLEStartPacket::decode(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -3839,7 +3839,7 @@ int SrsFMLEStartPacket::get_size()
|
|||
+ SrsAmf0Size::null() + SrsAmf0Size::str(stream_name);
|
||||
}
|
||||
|
||||
int SrsFMLEStartPacket::encode_packet(SrsStream* stream)
|
||||
int SrsFMLEStartPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -3909,7 +3909,7 @@ SrsFMLEStartResPacket::~SrsFMLEStartResPacket()
|
|||
srs_freep(args);
|
||||
}
|
||||
|
||||
int SrsFMLEStartResPacket::decode(SrsStream* stream)
|
||||
int SrsFMLEStartResPacket::decode(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -3960,7 +3960,7 @@ int SrsFMLEStartResPacket::get_size()
|
|||
+ SrsAmf0Size::null() + SrsAmf0Size::undefined();
|
||||
}
|
||||
|
||||
int SrsFMLEStartResPacket::encode_packet(SrsStream* stream)
|
||||
int SrsFMLEStartResPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -4007,7 +4007,7 @@ SrsPublishPacket::~SrsPublishPacket()
|
|||
srs_freep(command_object);
|
||||
}
|
||||
|
||||
int SrsPublishPacket::decode(SrsStream* stream)
|
||||
int SrsPublishPacket::decode(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -4064,7 +4064,7 @@ int SrsPublishPacket::get_size()
|
|||
+ SrsAmf0Size::str(type);
|
||||
}
|
||||
|
||||
int SrsPublishPacket::encode_packet(SrsStream* stream)
|
||||
int SrsPublishPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -4118,7 +4118,7 @@ SrsPausePacket::~SrsPausePacket()
|
|||
srs_freep(command_object);
|
||||
}
|
||||
|
||||
int SrsPausePacket::decode(SrsStream* stream)
|
||||
int SrsPausePacket::decode(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -4174,7 +4174,7 @@ SrsPlayPacket::~SrsPlayPacket()
|
|||
srs_freep(command_object);
|
||||
}
|
||||
|
||||
int SrsPlayPacket::decode(SrsStream* stream)
|
||||
int SrsPlayPacket::decode(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -4275,7 +4275,7 @@ int SrsPlayPacket::get_size()
|
|||
return size;
|
||||
}
|
||||
|
||||
int SrsPlayPacket::encode_packet(SrsStream* stream)
|
||||
int SrsPlayPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -4356,7 +4356,7 @@ int SrsPlayResPacket::get_size()
|
|||
+ SrsAmf0Size::null() + SrsAmf0Size::object(desc);
|
||||
}
|
||||
|
||||
int SrsPlayResPacket::encode_packet(SrsStream* stream)
|
||||
int SrsPlayResPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -4418,7 +4418,7 @@ int SrsOnBWDonePacket::get_size()
|
|||
+ SrsAmf0Size::null();
|
||||
}
|
||||
|
||||
int SrsOnBWDonePacket::encode_packet(SrsStream* stream)
|
||||
int SrsOnBWDonePacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -4475,7 +4475,7 @@ int SrsOnStatusCallPacket::get_size()
|
|||
+ SrsAmf0Size::null() + SrsAmf0Size::object(data);
|
||||
}
|
||||
|
||||
int SrsOnStatusCallPacket::encode_packet(SrsStream* stream)
|
||||
int SrsOnStatusCallPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -4522,7 +4522,7 @@ SrsBandwidthPacket::~SrsBandwidthPacket()
|
|||
srs_freep(data);
|
||||
}
|
||||
|
||||
int SrsBandwidthPacket::decode(SrsStream *stream)
|
||||
int SrsBandwidthPacket::decode(SrsBuffer *stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -4571,7 +4571,7 @@ int SrsBandwidthPacket::get_size()
|
|||
+ SrsAmf0Size::null() + SrsAmf0Size::object(data);
|
||||
}
|
||||
|
||||
int SrsBandwidthPacket::encode_packet(SrsStream* stream)
|
||||
int SrsBandwidthPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -4759,7 +4759,7 @@ int SrsOnStatusDataPacket::get_size()
|
|||
return SrsAmf0Size::str(command_name) + SrsAmf0Size::object(data);
|
||||
}
|
||||
|
||||
int SrsOnStatusDataPacket::encode_packet(SrsStream* stream)
|
||||
int SrsOnStatusDataPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -4807,7 +4807,7 @@ int SrsSampleAccessPacket::get_size()
|
|||
+ SrsAmf0Size::boolean() + SrsAmf0Size::boolean();
|
||||
}
|
||||
|
||||
int SrsSampleAccessPacket::encode_packet(SrsStream* stream)
|
||||
int SrsSampleAccessPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -4845,7 +4845,7 @@ SrsOnMetaDataPacket::~SrsOnMetaDataPacket()
|
|||
srs_freep(metadata);
|
||||
}
|
||||
|
||||
int SrsOnMetaDataPacket::decode(SrsStream* stream)
|
||||
int SrsOnMetaDataPacket::decode(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -4910,7 +4910,7 @@ int SrsOnMetaDataPacket::get_size()
|
|||
return SrsAmf0Size::str(name) + SrsAmf0Size::object(metadata);
|
||||
}
|
||||
|
||||
int SrsOnMetaDataPacket::encode_packet(SrsStream* stream)
|
||||
int SrsOnMetaDataPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -4939,7 +4939,7 @@ SrsSetWindowAckSizePacket::~SrsSetWindowAckSizePacket()
|
|||
{
|
||||
}
|
||||
|
||||
int SrsSetWindowAckSizePacket::decode(SrsStream* stream)
|
||||
int SrsSetWindowAckSizePacket::decode(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -4970,7 +4970,7 @@ int SrsSetWindowAckSizePacket::get_size()
|
|||
return 4;
|
||||
}
|
||||
|
||||
int SrsSetWindowAckSizePacket::encode_packet(SrsStream* stream)
|
||||
int SrsSetWindowAckSizePacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -5012,7 +5012,7 @@ int SrsAcknowledgementPacket::get_size()
|
|||
return 4;
|
||||
}
|
||||
|
||||
int SrsAcknowledgementPacket::encode_packet(SrsStream* stream)
|
||||
int SrsAcknowledgementPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -5039,7 +5039,7 @@ SrsSetChunkSizePacket::~SrsSetChunkSizePacket()
|
|||
{
|
||||
}
|
||||
|
||||
int SrsSetChunkSizePacket::decode(SrsStream* stream)
|
||||
int SrsSetChunkSizePacket::decode(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -5070,7 +5070,7 @@ int SrsSetChunkSizePacket::get_size()
|
|||
return 4;
|
||||
}
|
||||
|
||||
int SrsSetChunkSizePacket::encode_packet(SrsStream* stream)
|
||||
int SrsSetChunkSizePacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -5112,7 +5112,7 @@ int SrsSetPeerBandwidthPacket::get_size()
|
|||
return 5;
|
||||
}
|
||||
|
||||
int SrsSetPeerBandwidthPacket::encode_packet(SrsStream* stream)
|
||||
int SrsSetPeerBandwidthPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -5142,7 +5142,7 @@ SrsUserControlPacket::~SrsUserControlPacket()
|
|||
{
|
||||
}
|
||||
|
||||
int SrsUserControlPacket::decode(SrsStream* stream)
|
||||
int SrsUserControlPacket::decode(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -5213,7 +5213,7 @@ int SrsUserControlPacket::get_size()
|
|||
return size;
|
||||
}
|
||||
|
||||
int SrsUserControlPacket::encode_packet(SrsStream* stream)
|
||||
int SrsUserControlPacket::encode_packet(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
class ISrsProtocolReaderWriter;
|
||||
class SrsFastBuffer;
|
||||
class SrsPacket;
|
||||
class SrsStream;
|
||||
class SrsBuffer;
|
||||
class SrsAmf0Object;
|
||||
class SrsAmf0Any;
|
||||
class SrsMessageHeader;
|
||||
|
|
@ -152,7 +152,7 @@ public:
|
|||
* subpacket must override to decode packet from stream.
|
||||
* @remark never invoke the super.decode, it always failed.
|
||||
*/
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
// encode functions for concrete packet to override.
|
||||
public:
|
||||
/**
|
||||
|
|
@ -176,7 +176,7 @@ protected:
|
|||
* subpacket can override to encode the payload to stream.
|
||||
* @remark never invoke the super.encode_packet, it always failed.
|
||||
*/
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -446,7 +446,7 @@ private:
|
|||
/**
|
||||
* imp for decode_message
|
||||
*/
|
||||
virtual int do_decode_message(SrsMessageHeader& header, SrsStream* stream, SrsPacket** ppacket);
|
||||
virtual int do_decode_message(SrsMessageHeader& header, SrsBuffer* stream, SrsPacket** ppacket);
|
||||
/**
|
||||
* recv bytes oriented RTMP message from protocol stack.
|
||||
* return error if error occur and nerver set the pmsg,
|
||||
|
|
@ -1052,14 +1052,14 @@ public:
|
|||
virtual ~SrsConnectAppPacket();
|
||||
// decode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
// encode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int get_prefer_cid();
|
||||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
/**
|
||||
* response for SrsConnectAppPacket.
|
||||
|
|
@ -1091,14 +1091,14 @@ public:
|
|||
virtual ~SrsConnectAppResPacket();
|
||||
// decode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
// encode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int get_prefer_cid();
|
||||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1134,14 +1134,14 @@ public:
|
|||
virtual ~SrsCallPacket();
|
||||
// decode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
// encode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int get_prefer_cid();
|
||||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
/**
|
||||
* response for SrsCallPacket.
|
||||
|
|
@ -1176,7 +1176,7 @@ public:
|
|||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1207,14 +1207,14 @@ public:
|
|||
virtual ~SrsCreateStreamPacket();
|
||||
// decode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
// encode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int get_prefer_cid();
|
||||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
/**
|
||||
* response for SrsCreateStreamPacket.
|
||||
|
|
@ -1244,14 +1244,14 @@ public:
|
|||
virtual ~SrsCreateStreamResPacket();
|
||||
// decode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
// encode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int get_prefer_cid();
|
||||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1278,7 +1278,7 @@ public:
|
|||
virtual ~SrsCloseStreamPacket();
|
||||
// decode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1309,14 +1309,14 @@ public:
|
|||
virtual ~SrsFMLEStartPacket();
|
||||
// decode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
// encode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int get_prefer_cid();
|
||||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
// factory method to create specified FMLE packet.
|
||||
public:
|
||||
static SrsFMLEStartPacket* create_release_stream(std::string stream);
|
||||
|
|
@ -1351,14 +1351,14 @@ public:
|
|||
virtual ~SrsFMLEStartResPacket();
|
||||
// decode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
// encode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int get_prefer_cid();
|
||||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1406,14 +1406,14 @@ public:
|
|||
virtual ~SrsPublishPacket();
|
||||
// decode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
// encode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int get_prefer_cid();
|
||||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1453,7 +1453,7 @@ public:
|
|||
virtual ~SrsPausePacket();
|
||||
// decode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1525,14 +1525,14 @@ public:
|
|||
virtual ~SrsPlayPacket();
|
||||
// decode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
// encode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int get_prefer_cid();
|
||||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1572,7 +1572,7 @@ public:
|
|||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1603,7 +1603,7 @@ public:
|
|||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1641,7 +1641,7 @@ public:
|
|||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1679,14 +1679,14 @@ public:
|
|||
virtual ~SrsBandwidthPacket();
|
||||
// decode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
// encode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int get_prefer_cid();
|
||||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
// help function for bandwidth packet.
|
||||
public:
|
||||
virtual bool is_start_play();
|
||||
|
|
@ -1741,7 +1741,7 @@ public:
|
|||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1776,7 +1776,7 @@ public:
|
|||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1801,14 +1801,14 @@ public:
|
|||
virtual ~SrsOnMetaDataPacket();
|
||||
// decode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
// encode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int get_prefer_cid();
|
||||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1825,14 +1825,14 @@ public:
|
|||
virtual ~SrsSetWindowAckSizePacket();
|
||||
// decode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
// encode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int get_prefer_cid();
|
||||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1853,7 +1853,7 @@ public:
|
|||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -1874,14 +1874,14 @@ public:
|
|||
virtual ~SrsSetChunkSizePacket();
|
||||
// decode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
// encode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int get_prefer_cid();
|
||||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
// 5.6. Set Peer Bandwidth (6)
|
||||
|
|
@ -1914,7 +1914,7 @@ public:
|
|||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
// 3.7. User Control message
|
||||
|
|
@ -2042,14 +2042,14 @@ public:
|
|||
virtual ~SrsUserControlPacket();
|
||||
// decode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
// encode functions for concrete packet to override.
|
||||
public:
|
||||
virtual int get_prefer_cid();
|
||||
virtual int get_message_type();
|
||||
protected:
|
||||
virtual int get_size();
|
||||
virtual int encode_packet(SrsStream* stream);
|
||||
virtual int encode_packet(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ void SrsRtpPacket::reap(SrsRtpPacket* src)
|
|||
src->audio_samples = NULL;
|
||||
}
|
||||
|
||||
int SrsRtpPacket::decode(SrsStream* stream)
|
||||
int SrsRtpPacket::decode(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -212,7 +212,7 @@ int SrsRtpPacket::decode(SrsStream* stream)
|
|||
return ret;
|
||||
}
|
||||
|
||||
int SrsRtpPacket::decode_97(SrsStream* stream)
|
||||
int SrsRtpPacket::decode_97(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
@ -273,7 +273,7 @@ int SrsRtpPacket::decode_97(SrsStream* stream)
|
|||
return ret;
|
||||
}
|
||||
|
||||
int SrsRtpPacket::decode_96(SrsStream* stream)
|
||||
int SrsRtpPacket::decode_96(SrsBuffer* stream)
|
||||
{
|
||||
int ret = ERROR_SUCCESS;
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
||||
#ifdef SRS_AUTO_STREAM_CASTER
|
||||
|
||||
class SrsStream;
|
||||
class SrsBuffer;
|
||||
class SrsSimpleBuffer;
|
||||
class SrsCodecSample;
|
||||
class ISrsProtocolReaderWriter;
|
||||
|
|
@ -313,10 +313,10 @@ public:
|
|||
/**
|
||||
* decode rtp packet from stream.
|
||||
*/
|
||||
virtual int decode(SrsStream* stream);
|
||||
virtual int decode(SrsBuffer* stream);
|
||||
private:
|
||||
virtual int decode_97(SrsStream* stream);
|
||||
virtual int decode_96(SrsStream* stream);
|
||||
virtual int decode_97(SrsBuffer* stream);
|
||||
virtual int decode_96(SrsBuffer* stream);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue