external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-14 12:21:55 +00:00
Code Issues Releases Wiki Activity

add shared ptr message

Browse source
This commit is contained in:
winlin 2013-10-22 18:30:36 +08:00
parent 940d2f02eb
commit 5af377e41d
7 changed files with 35 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
trunk/src/core/srs_core.hpp
View file

@ -61,4 +61,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
} \
(void)0
// server info.
#define RTMP_SIG_SRS_NAME "srs(simple rtmp server)"
#define RTMP_SIG_SRS_URL "https://github.com/winlinvip/simple-rtmp-server"
#define RTMP_SIG_SRS_VERSION "0.1"
#endif

2
trunk/src/core/srs_core_client.cpp
View file

@ -238,7 +238,7 @@ int SrsClient::streaming_publish(SrsSource* source)
SrsPacket* pkt = msg->get_packet();
if (dynamic_cast<SrsOnMetaDataPacket*>(pkt)) {
SrsOnMetaDataPacket* metadata = dynamic_cast<SrsOnMetaDataPacket*>(pkt);
if ((ret = source->on_meta_data(metadata)) != ERROR_SUCCESS) {
if ((ret = source->on_meta_data(msg, metadata)) != ERROR_SUCCESS) {
srs_error("process onMetaData message failed. ret=%d", ret);
return ret;
}

8
trunk/src/core/srs_core_protocol.cpp
View file

@ -1089,6 +1089,14 @@ int SrsMessage::encode_packet()
return packet->encode(size, (char*&)payload);
}
SrsSharedMessage::SrsSharedMessage()
{
}
SrsSharedMessage::~SrsSharedMessage()
{
}
SrsPacket::SrsPacket()
{
}

11
trunk/src/core/srs_core_protocol.hpp
View file

@ -284,6 +284,17 @@ public:
virtual int encode_packet();
};
/**
* shared ptr message.
* for audio/video/data message that need less memory copy.
*/
class SrsSharedMessage : public SrsMessage
{
public:
SrsSharedMessage();
virtual ~SrsSharedMessage();
};
/**
* the decoded message payload.
*/

6
trunk/src/core/srs_core_rtmp.cpp
View file

@ -35,11 +35,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#define RTMP_SIG_FMS_VER "3,5,3,888"
#define RTMP_SIG_AMF0_VER 0
#define RTMP_SIG_SRS_NAME "srs(simple rtmp server)"
#define RTMP_SIG_SRS_URL "https://github.com/winlinvip/simple-rtmp-server"
#define RTMP_SIG_SRS_VERSION "0.1"
#define RTMP_SIG_CLIENT_ID "ASAICiss"
/**
* onStatus consts.
*/
#define StatusLevel "level"
#define StatusCode "code"
#define StatusDescription "description"

7
trunk/src/core/srs_core_source.cpp
View file

@ -25,6 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_log.hpp>
#include <srs_core_protocol.hpp>
#include <srs_core_amf0.hpp>
std::map<std::string, SrsSource*> SrsSource::pool;
@ -64,9 +65,13 @@ SrsSource::~SrsSource()
{
}
int SrsSource::on_meta_data(SrsOnMetaDataPacket* metadata)
int SrsSource::on_meta_data(SrsMessage* msg, SrsOnMetaDataPacket* metadata)
{
int ret = ERROR_SUCCESS;
metadata->metadata->set("server",
new SrsAmf0String(RTMP_SIG_SRS_NAME""RTMP_SIG_SRS_VERSION));
return ret;
}

2
trunk/src/core/srs_core_source.hpp
View file

@ -75,7 +75,7 @@ public:
SrsSource(std::string _stream_url);
virtual ~SrsSource();
public:
virtual int on_meta_data(SrsOnMetaDataPacket* metadata);
virtual int on_meta_data(SrsMessage* msg, SrsOnMetaDataPacket* metadata);
virtual int on_audio(SrsMessage* audio);
virtual int on_video(SrsMessage* video);
public: