external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

for #354, remove the double underscore functions and variables.

Browse source
This commit is contained in:
winlin 2015-03-21 11:55:28 +08:00
parent 7065db192c
commit bbac2348db
31 changed files with 280 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

66
trunk/src/app/srs_app_dvr.cpp
View file

@ -272,11 +272,11 @@ int SrsFlvSegment::write_metadata(SrsSharedPtrMessage* metadata)
return ret;
}
int SrsFlvSegment::write_audio(SrsSharedPtrMessage* __audio)
int SrsFlvSegment::write_audio(SrsSharedPtrMessage* shared_audio)
{
int ret = ERROR_SUCCESS;
SrsSharedPtrMessage* audio = __audio->copy();
SrsSharedPtrMessage* audio = shared_audio->copy();
SrsAutoFree(SrsSharedPtrMessage, audio);
if ((jitter->correct(audio, 0, 0, jitter_algorithm)) != ERROR_SUCCESS) {
@ -297,11 +297,11 @@ int SrsFlvSegment::write_audio(SrsSharedPtrMessage* __audio)
return ret;
}
int SrsFlvSegment::write_video(SrsSharedPtrMessage* __video)
int SrsFlvSegment::write_video(SrsSharedPtrMessage* shared_video)
{
int ret = ERROR_SUCCESS;
SrsSharedPtrMessage* video = __video->copy();
SrsSharedPtrMessage* video = shared_video->copy();
SrsAutoFree(SrsSharedPtrMessage, video);
char* payload = video->payload;
@ -724,7 +724,7 @@ int64_t SrsDvrPlan::filter_timestamp(int64_t timestamp)
return timestamp;
}
int SrsDvrPlan::on_meta_data(SrsSharedPtrMessage* __metadata)
int SrsDvrPlan::on_meta_data(SrsSharedPtrMessage* shared_metadata)
{
int ret = ERROR_SUCCESS;
@ -732,10 +732,10 @@ int SrsDvrPlan::on_meta_data(SrsSharedPtrMessage* __metadata)
return ret;
}
return segment->write_metadata(__metadata);
return segment->write_metadata(shared_metadata);
}
int SrsDvrPlan::on_audio(SrsSharedPtrMessage* __audio)
int SrsDvrPlan::on_audio(SrsSharedPtrMessage* shared_audio)
{
int ret = ERROR_SUCCESS;
@ -743,14 +743,14 @@ int SrsDvrPlan::on_audio(SrsSharedPtrMessage* __audio)
return ret;
}
if ((ret = segment->write_audio(__audio)) != ERROR_SUCCESS) {
if ((ret = segment->write_audio(shared_audio)) != ERROR_SUCCESS) {
return ret;
}
return ret;
}
int SrsDvrPlan::on_video(SrsSharedPtrMessage* __video)
int SrsDvrPlan::on_video(SrsSharedPtrMessage* shared_video)
{
int ret = ERROR_SUCCESS;
@ -758,7 +758,7 @@ int SrsDvrPlan::on_video(SrsSharedPtrMessage* __video)
return ret;
}
if ((ret = segment->write_video(__video)) != ERROR_SUCCESS) {
if ((ret = segment->write_video(shared_video)) != ERROR_SUCCESS) {
return ret;
}
@ -876,30 +876,30 @@ void SrsDvrAppendPlan::on_unpublish()
{
}
int SrsDvrAppendPlan::on_audio(SrsSharedPtrMessage* __audio)
int SrsDvrAppendPlan::on_audio(SrsSharedPtrMessage* shared_audio)
{
int ret = ERROR_SUCCESS;
if ((ret = update_duration(__audio)) != ERROR_SUCCESS) {
if ((ret = update_duration(shared_audio)) != ERROR_SUCCESS) {
return ret;
}
if ((ret = SrsDvrPlan::on_audio(__audio)) != ERROR_SUCCESS) {
if ((ret = SrsDvrPlan::on_audio(shared_audio)) != ERROR_SUCCESS) {
return ret;
}
return ret;
}
int SrsDvrAppendPlan::on_video(SrsSharedPtrMessage* __video)
int SrsDvrAppendPlan::on_video(SrsSharedPtrMessage* shared_video)
{
int ret = ERROR_SUCCESS;
if ((ret = update_duration(__video)) != ERROR_SUCCESS) {
if ((ret = update_duration(shared_video)) != ERROR_SUCCESS) {
return ret;
}
if ((ret = SrsDvrPlan::on_video(__video)) != ERROR_SUCCESS) {
if ((ret = SrsDvrPlan::on_video(shared_video)) != ERROR_SUCCESS) {
return ret;
}
@ -991,54 +991,54 @@ void SrsDvrSegmentPlan::on_unpublish()
{
}
int SrsDvrSegmentPlan::on_meta_data(SrsSharedPtrMessage* __metadata)
int SrsDvrSegmentPlan::on_meta_data(SrsSharedPtrMessage* shared_metadata)
{
int ret = ERROR_SUCCESS;
srs_freep(metadata);
metadata = __metadata->copy();
metadata = shared_metadata->copy();
if ((ret = SrsDvrPlan::on_meta_data(__metadata)) != ERROR_SUCCESS) {
if ((ret = SrsDvrPlan::on_meta_data(shared_metadata)) != ERROR_SUCCESS) {
return ret;
}
return ret;
}
int SrsDvrSegmentPlan::on_audio(SrsSharedPtrMessage* __audio)
int SrsDvrSegmentPlan::on_audio(SrsSharedPtrMessage* shared_audio)
{
int ret = ERROR_SUCCESS;
if (SrsFlvCodec::audio_is_sequence_header(__audio->payload, __audio->size)) {
if (SrsFlvCodec::audio_is_sequence_header(shared_audio->payload, shared_audio->size)) {
srs_freep(sh_audio);
sh_audio = __audio->copy();
sh_audio = shared_audio->copy();
}
if ((ret = update_duration(__audio)) != ERROR_SUCCESS) {
if ((ret = update_duration(shared_audio)) != ERROR_SUCCESS) {
return ret;
}
if ((ret = SrsDvrPlan::on_audio(__audio)) != ERROR_SUCCESS) {
if ((ret = SrsDvrPlan::on_audio(shared_audio)) != ERROR_SUCCESS) {
return ret;
}
return ret;
}
int SrsDvrSegmentPlan::on_video(SrsSharedPtrMessage* __video)
int SrsDvrSegmentPlan::on_video(SrsSharedPtrMessage* shared_video)
{
int ret = ERROR_SUCCESS;
if (SrsFlvCodec::video_is_sequence_header(__video->payload, __video->size)) {
if (SrsFlvCodec::video_is_sequence_header(shared_video->payload, shared_video->size)) {
srs_freep(sh_video);
sh_video = __video->copy();
sh_video = shared_video->copy();
}
if ((ret = update_duration(__video)) != ERROR_SUCCESS) {
if ((ret = update_duration(shared_video)) != ERROR_SUCCESS) {
return ret;
}
if ((ret = SrsDvrPlan::on_video(__video)) != ERROR_SUCCESS) {
if ((ret = SrsDvrPlan::on_video(shared_video)) != ERROR_SUCCESS) {
return ret;
}
@ -1167,14 +1167,14 @@ int SrsDvr::on_meta_data(SrsOnMetaDataPacket* m)
return ret;
}
int SrsDvr::on_audio(SrsSharedPtrMessage* __audio)
int SrsDvr::on_audio(SrsSharedPtrMessage* shared_audio)
{
return plan->on_audio(__audio);
return plan->on_audio(shared_audio);
}
int SrsDvr::on_video(SrsSharedPtrMessage* __video)
int SrsDvr::on_video(SrsSharedPtrMessage* shared_video)
{
return plan->on_video(__video);
return plan->on_video(shared_video);
}
#endif

36
trunk/src/app/srs_app_dvr.hpp
View file

@ -141,13 +141,13 @@ public:
*/
virtual int write_metadata(SrsSharedPtrMessage* metadata);
/**
* @param __audio, directly ptr, copy it if need to save it.
* @param shared_audio, directly ptr, copy it if need to save it.
*/
virtual int write_audio(SrsSharedPtrMessage* __audio);
virtual int write_audio(SrsSharedPtrMessage* shared_audio);
/**
* @param __video, directly ptr, copy it if need to save it.
* @param shared_video, directly ptr, copy it if need to save it.
*/
virtual int write_video(SrsSharedPtrMessage* __video);
virtual int write_video(SrsSharedPtrMessage* shared_video);
/**
* update the flv metadata.
*/
@ -246,15 +246,15 @@ public:
/**
* when got metadata.
*/
virtual int on_meta_data(SrsSharedPtrMessage* __metadata);
virtual int on_meta_data(SrsSharedPtrMessage* shared_metadata);
/**
* @param __audio, directly ptr, copy it if need to save it.
* @param shared_audio, directly ptr, copy it if need to save it.
*/
virtual int on_audio(SrsSharedPtrMessage* __audio);
virtual int on_audio(SrsSharedPtrMessage* shared_audio);
/**
* @param __video, directly ptr, copy it if need to save it.
* @param shared_video, directly ptr, copy it if need to save it.
*/
virtual int on_video(SrsSharedPtrMessage* __video);
virtual int on_video(SrsSharedPtrMessage* shared_video);
protected:
virtual int on_reap_segment();
virtual int on_video_keyframe();
@ -289,8 +289,8 @@ public:
public:
virtual int on_publish();
virtual void on_unpublish();
virtual int on_audio(SrsSharedPtrMessage* __audio);
virtual int on_video(SrsSharedPtrMessage* __video);
virtual int on_audio(SrsSharedPtrMessage* shared_audio);
virtual int on_video(SrsSharedPtrMessage* shared_video);
private:
virtual int update_duration(SrsSharedPtrMessage* msg);
};
@ -313,9 +313,9 @@ public:
virtual int initialize(SrsRequest* req);
virtual int on_publish();
virtual void on_unpublish();
virtual int on_meta_data(SrsSharedPtrMessage* __metadata);
virtual int on_audio(SrsSharedPtrMessage* __audio);
virtual int on_video(SrsSharedPtrMessage* __video);
virtual int on_meta_data(SrsSharedPtrMessage* shared_metadata);
virtual int on_audio(SrsSharedPtrMessage* shared_audio);
virtual int on_video(SrsSharedPtrMessage* shared_video);
private:
virtual int update_duration(SrsSharedPtrMessage* msg);
};
@ -356,14 +356,14 @@ public:
virtual int on_meta_data(SrsOnMetaDataPacket* m);
/**
* mux the audio packets to dvr.
* @param __audio, directly ptr, copy it if need to save it.
* @param shared_audio, directly ptr, copy it if need to save it.
*/
virtual int on_audio(SrsSharedPtrMessage* __audio);
virtual int on_audio(SrsSharedPtrMessage* shared_audio);
/**
* mux the video packets to dvr.
* @param __video, directly ptr, copy it if need to save it.
* @param shared_video, directly ptr, copy it if need to save it.
*/
virtual int on_video(SrsSharedPtrMessage* __video);
virtual int on_video(SrsSharedPtrMessage* shared_video);
};
#endif

12
trunk/src/app/srs_app_forward.cpp
View file

@ -157,11 +157,11 @@ void SrsForwarder::on_unpublish()
kbps->set_io(NULL, NULL);
}
int SrsForwarder::on_meta_data(SrsSharedPtrMessage* __metadata)
int SrsForwarder::on_meta_data(SrsSharedPtrMessage* shared_metadata)
{
int ret = ERROR_SUCCESS;
SrsSharedPtrMessage* metadata = __metadata->copy();
SrsSharedPtrMessage* metadata = shared_metadata->copy();
if ((ret = jitter->correct(metadata, 0, 0, SrsRtmpJitterAlgorithmFULL)) != ERROR_SUCCESS) {
srs_freep(metadata);
@ -175,11 +175,11 @@ int SrsForwarder::on_meta_data(SrsSharedPtrMessage* __metadata)
return ret;
}
int SrsForwarder::on_audio(SrsSharedPtrMessage* __audio)
int SrsForwarder::on_audio(SrsSharedPtrMessage* shared_audio)
{
int ret = ERROR_SUCCESS;
SrsSharedPtrMessage* msg = __audio->copy();
SrsSharedPtrMessage* msg = shared_audio->copy();
if ((ret = jitter->correct(msg, 0, 0, SrsRtmpJitterAlgorithmFULL)) != ERROR_SUCCESS) {
srs_freep(msg);
@ -198,11 +198,11 @@ int SrsForwarder::on_audio(SrsSharedPtrMessage* __audio)
return ret;
}
int SrsForwarder::on_video(SrsSharedPtrMessage* __video)
int SrsForwarder::on_video(SrsSharedPtrMessage* shared_video)
{
int ret = ERROR_SUCCESS;
SrsSharedPtrMessage* msg = __video->copy();
SrsSharedPtrMessage* msg = shared_video->copy();
if ((ret = jitter->correct(msg, 0, 0, SrsRtmpJitterAlgorithmFULL)) != ERROR_SUCCESS) {
srs_freep(msg);

12
trunk/src/app/srs_app_forward.hpp
View file

@ -82,19 +82,19 @@ public:
virtual void on_unpublish();
/**
* forward the audio packet.
* @param __metadata, directly ptr, copy it if need to save it.
* @param shared_metadata, directly ptr, copy it if need to save it.
*/
virtual int on_meta_data(SrsSharedPtrMessage* __metadata);
virtual int on_meta_data(SrsSharedPtrMessage* shared_metadata);
/**
* forward the audio packet.
* @param __audio, directly ptr, copy it if need to save it.
* @param shared_audio, directly ptr, copy it if need to save it.
*/
virtual int on_audio(SrsSharedPtrMessage* __audio);
virtual int on_audio(SrsSharedPtrMessage* shared_audio);
/**
* forward the video packet.
* @param __video, directly ptr, copy it if need to save it.
* @param shared_video, directly ptr, copy it if need to save it.
*/
virtual int on_video(SrsSharedPtrMessage* __video);
virtual int on_video(SrsSharedPtrMessage* shared_video);
// interface ISrsThreadHandler.
public:
virtual int cycle();

8
trunk/src/app/srs_app_hls.cpp
View file

@ -942,7 +942,7 @@ int SrsHls::on_meta_data(SrsAmf0Object* metadata)
return ret;
}
int SrsHls::on_audio(SrsSharedPtrMessage* __audio)
int SrsHls::on_audio(SrsSharedPtrMessage* shared_audio)
{
int ret = ERROR_SUCCESS;
@ -950,7 +950,7 @@ int SrsHls::on_audio(SrsSharedPtrMessage* __audio)
return ret;
}
SrsSharedPtrMessage* audio = __audio->copy();
SrsSharedPtrMessage* audio = shared_audio->copy();
SrsAutoFree(SrsSharedPtrMessage, audio);
sample->clear();
@ -1003,7 +1003,7 @@ int SrsHls::on_audio(SrsSharedPtrMessage* __audio)
return ret;
}
int SrsHls::on_video(SrsSharedPtrMessage* __video)
int SrsHls::on_video(SrsSharedPtrMessage* shared_video)
{
int ret = ERROR_SUCCESS;
@ -1011,7 +1011,7 @@ int SrsHls::on_video(SrsSharedPtrMessage* __video)
return ret;
}
SrsSharedPtrMessage* video = __video->copy();
SrsSharedPtrMessage* video = shared_video->copy();
SrsAutoFree(SrsSharedPtrMessage, video);
sample->clear();

8
trunk/src/app/srs_app_hls.hpp
View file

@ -354,14 +354,14 @@ public:
virtual int on_meta_data(SrsAmf0Object* metadata);
/**
* mux the audio packets to ts.
* @param __audio, directly ptr, copy it if need to save it.
* @param shared_audio, directly ptr, copy it if need to save it.
*/
virtual int on_audio(SrsSharedPtrMessage* __audio);
virtual int on_audio(SrsSharedPtrMessage* shared_audio);
/**
* mux the video packets to ts.
* @param __video, directly ptr, copy it if need to save it.
* @param shared_video, directly ptr, copy it if need to save it.
*/
virtual int on_video(SrsSharedPtrMessage* __video);
virtual int on_video(SrsSharedPtrMessage* shared_video);
private:
virtual void hls_show_mux_log();
};

48
trunk/src/app/srs_app_json.cpp
View file

@ -109,75 +109,75 @@ const nx_json* nx_json_item(const nx_json* json, int idx); // get array element
#define SRS_JSON_Null 0x06
#define SRS_JSON_Array 0x07
class __SrsJsonString : public SrsJsonAny
class SrsJsonString : public SrsJsonAny
{
public:
std::string value;
__SrsJsonString(const char* _value)
SrsJsonString(const char* _value)
{
marker = SRS_JSON_String;
if (_value) {
value = _value;
}
}
virtual ~__SrsJsonString()
virtual ~SrsJsonString()
{
}
};
class __SrsJsonBoolean : public SrsJsonAny
class SrsJsonBoolean : public SrsJsonAny
{
public:
bool value;
__SrsJsonBoolean(bool _value)
SrsJsonBoolean(bool _value)
{
marker = SRS_JSON_Boolean;
value = _value;
}
virtual ~__SrsJsonBoolean()
virtual ~SrsJsonBoolean()
{
}
};
class __SrsJsonInteger : public SrsJsonAny
class SrsJsonInteger : public SrsJsonAny
{
public:
int64_t value;
__SrsJsonInteger(int64_t _value)
SrsJsonInteger(int64_t _value)
{
marker = SRS_JSON_Integer;
value = _value;
}
virtual ~__SrsJsonInteger()
virtual ~SrsJsonInteger()
{
}
};
class __SrsJsonNumber : public SrsJsonAny
class SrsJsonNumber : public SrsJsonAny
{
public:
double value;
__SrsJsonNumber(double _value)
SrsJsonNumber(double _value)
{
marker = SRS_JSON_Number;
value = _value;
}
virtual ~__SrsJsonNumber()
virtual ~SrsJsonNumber()
{
}
};
class __SrsJsonNull : public SrsJsonAny
class SrsJsonNull : public SrsJsonAny
{
public:
__SrsJsonNull() {
SrsJsonNull() {
marker = SRS_JSON_Null;
}
virtual ~__SrsJsonNull() {
virtual ~SrsJsonNull() {
}
};
@ -227,28 +227,28 @@ bool SrsJsonAny::is_null()
string SrsJsonAny::to_str()
{
__SrsJsonString* p = dynamic_cast<__SrsJsonString*>(this);
SrsJsonString* p = dynamic_cast<SrsJsonString*>(this);
srs_assert(p != NULL);
return p->value;
}
bool SrsJsonAny::to_boolean()
{
__SrsJsonBoolean* p = dynamic_cast<__SrsJsonBoolean*>(this);
SrsJsonBoolean* p = dynamic_cast<SrsJsonBoolean*>(this);
srs_assert(p != NULL);
return p->value;
}
int64_t SrsJsonAny::to_integer()
{
__SrsJsonInteger* p = dynamic_cast<__SrsJsonInteger*>(this);
SrsJsonInteger* p = dynamic_cast<SrsJsonInteger*>(this);
srs_assert(p != NULL);
return p->value;
}
double SrsJsonAny::to_number()
{
__SrsJsonNumber* p = dynamic_cast<__SrsJsonNumber*>(this);
SrsJsonNumber* p = dynamic_cast<SrsJsonNumber*>(this);
srs_assert(p != NULL);
return p->value;
}
@ -269,27 +269,27 @@ SrsJsonArray* SrsJsonAny::to_array()
SrsJsonAny* SrsJsonAny::str(const char* value)
{
return new __SrsJsonString(value);
return new SrsJsonString(value);
}
SrsJsonAny* SrsJsonAny::boolean(bool value)
{
return new __SrsJsonBoolean(value);
return new SrsJsonBoolean(value);
}
SrsJsonAny* SrsJsonAny::ingeter(int64_t value)
{
return new __SrsJsonInteger(value);
return new SrsJsonInteger(value);
}
SrsJsonAny* SrsJsonAny::number(double value)
{
return new __SrsJsonNumber(value);
return new SrsJsonNumber(value);
}
SrsJsonAny* SrsJsonAny::null()
{
return new __SrsJsonNull();
return new SrsJsonNull();
}
SrsJsonObject* SrsJsonAny::object()

14
trunk/src/app/srs_app_server.cpp
View file

@ -92,7 +92,7 @@ using namespace std;
// SRS_SYS_CYCLE_INTERVAL * SRS_SYS_NETWORK_DEVICE_RESOLUTION_TIMES
#define SRS_SYS_NETWORK_DEVICE_RESOLUTION_TIMES 9
std::string __srs_listener_type2string(SrsListenerType type)
std::string srs_listener_type2string(SrsListenerType type)
{
switch (type) {
case SrsListenerRtmpStream:
@ -154,7 +154,7 @@ int SrsStreamListener::listen(int port)
"listen at port=%d, type=%d, fd=%d started success, port=%d",
pthread->cid(), _srs_context->get_id(), _port, _type, fd, port);
srs_trace("%s listen at tcp://%d, fd=%d", __srs_listener_type2string(_type).c_str(), _port, listener->fd());
srs_trace("%s listen at tcp://%d, fd=%d", srs_listener_type2string(_type).c_str(), _port, listener->fd());
return ret;
}
@ -212,7 +212,7 @@ int SrsRtspListener::listen(int port)
"listen at port=%d, type=%d, fd=%d started success, port=%d",
pthread->cid(), _srs_context->get_id(), _port, _type, fd, port);
srs_trace("%s listen at tcp://%d, fd=%d", __srs_listener_type2string(_type).c_str(), _port, listener->fd());
srs_trace("%s listen at tcp://%d, fd=%d", srs_listener_type2string(_type).c_str(), _port, listener->fd());
return ret;
}
@ -270,7 +270,7 @@ int SrsUdpCasterListener::listen(int port)
"listen at port=%d, type=%d, fd=%d started success, port=%d",
pthread->cid(), _srs_context->get_id(), _port, _type, fd, port);
srs_trace("%s listen at udp://%d, fd=%d", __srs_listener_type2string(_type).c_str(), _port, listener->fd());
srs_trace("%s listen at udp://%d, fd=%d", srs_listener_type2string(_type).c_str(), _port, listener->fd());
return ret;
}
@ -796,10 +796,10 @@ int SrsServer::do_cycle()
int heartbeat_max_resolution = (int)(_srs_config->get_heartbeat_interval() / SRS_SYS_CYCLE_INTERVAL);
// dynamic fetch the max.
int __max = max;
__max = srs_max(__max, heartbeat_max_resolution);
int temp_max = max;
temp_max = srs_max(temp_max, heartbeat_max_resolution);
for (int i = 0; i < __max; i++) {
for (int i = 0; i < temp_max; i++) {
st_usleep(SRS_SYS_CYCLE_INTERVAL * 1000);
// for gperf heap checker,

31
trunk/src/app/srs_app_source.cpp
View file

@ -50,7 +50,7 @@ using namespace std;
// for 26ms per audio packet,
// 115 packets is 3s.
#define __SRS_PURE_AUDIO_GUESS_COUNT 115
#define SRS_PURE_AUDIO_GUESS_COUNT 115
int _srs_time_jitter_string2int(std::string time_jitter)
{
@ -463,11 +463,11 @@ int SrsConsumer::get_time()
return jitter->get_time();
}
int SrsConsumer::enqueue(SrsSharedPtrMessage* __msg, bool atc, int tba, int tbv, SrsRtmpJitterAlgorithm ag)
int SrsConsumer::enqueue(SrsSharedPtrMessage* shared_msg, bool atc, int tba, int tbv, SrsRtmpJitterAlgorithm ag)
{
int ret = ERROR_SUCCESS;
SrsSharedPtrMessage* msg = __msg->copy();
SrsSharedPtrMessage* msg = shared_msg->copy();
if (!atc) {
if ((ret = jitter->correct(msg, tba, tbv, ag)) != ERROR_SUCCESS) {
@ -594,7 +594,7 @@ void SrsGopCache::set(bool enabled)
srs_info("enable gop cache");
}
int SrsGopCache::cache(SrsSharedPtrMessage* __msg)
int SrsGopCache::cache(SrsSharedPtrMessage* shared_msg)
{
int ret = ERROR_SUCCESS;
@ -604,7 +604,7 @@ int SrsGopCache::cache(SrsSharedPtrMessage* __msg)
}
// the gop cache know when to gop it.
SrsSharedPtrMessage* msg = __msg;
SrsSharedPtrMessage* msg = shared_msg;
// disable gop cache when not h.264
if (!SrsFlvCodec::video_is_h264(msg->payload, msg->size)) {
@ -630,7 +630,7 @@ int SrsGopCache::cache(SrsSharedPtrMessage* __msg)
}
// clear gop cache when pure audio count overflow
if (audio_after_last_video_count > __SRS_PURE_AUDIO_GUESS_COUNT) {
if (audio_after_last_video_count > SRS_PURE_AUDIO_GUESS_COUNT) {
srs_warn("clear gop cache for guess pure audio overflow");
clear();
return ret;
@ -1319,14 +1319,14 @@ int SrsSource::on_meta_data(SrsCommonMessage* msg, SrsOnMetaDataPacket* metadata
return ret;
}
int SrsSource::on_audio(SrsCommonMessage* __audio)
int SrsSource::on_audio(SrsCommonMessage* shared_audio)
{
int ret = ERROR_SUCCESS;
// convert __audio to msg, user should not use __audio again.
// the payload is transfer to msg, and set to NULL in __audio.
// convert shared_audio to msg, user should not use shared_audio again.
// the payload is transfer to msg, and set to NULL in shared_audio.
SrsSharedPtrMessage msg;
if ((ret = msg.create(__audio)) != ERROR_SUCCESS) {
if ((ret = msg.create(shared_audio)) != ERROR_SUCCESS) {
srs_error("initialize the audio failed. ret=%d", ret);
return ret;
}
@ -1470,14 +1470,14 @@ int SrsSource::on_audio(SrsCommonMessage* __audio)
return ret;
}
int SrsSource::on_video(SrsCommonMessage* __video)
int SrsSource::on_video(SrsCommonMessage* shared_video)
{
int ret = ERROR_SUCCESS;
// convert __video to msg, user should not use __video again.
// the payload is transfer to msg, and set to NULL in __video.
// convert shared_video to msg, user should not use shared_video again.
// the payload is transfer to msg, and set to NULL in shared_video.
SrsSharedPtrMessage msg;
if ((ret = msg.create(__video)) != ERROR_SUCCESS) {
if ((ret = msg.create(shared_video)) != ERROR_SUCCESS) {
srs_error("initialize the video failed. ret=%d", ret);
return ret;
}
@ -1678,8 +1678,7 @@ int SrsSource::on_aggregate(SrsCommonMessage* msg)
}
// to common message.
SrsCommonMessage __o;
SrsCommonMessage& o = __o;
SrsCommonMessage o;
o.header.message_type = type;
o.header.payload_length = data_size;

8
trunk/src/app/srs_app_source.hpp
View file

@ -235,7 +235,7 @@ public:
virtual int get_time();
/**
* enqueue an shared ptr message.
* @param __msg, directly ptr, copy it if need to save it.
* @param shared_msg, directly ptr, copy it if need to save it.
* @param whether atc, donot use jitter correct if true.
* @param tba timebase of audio.
* used to calc the audio time delta if time-jitter detected.
@ -243,7 +243,7 @@ public:
* used to calc the video time delta if time-jitter detected.
* @param ag the algorithm of time jitter.
*/
virtual int enqueue(SrsSharedPtrMessage* __msg, bool atc, int tba, int tbv, SrsRtmpJitterAlgorithm ag);
virtual int enqueue(SrsSharedPtrMessage* shared_msg, bool atc, int tba, int tbv, SrsRtmpJitterAlgorithm ag);
/**
* get packets in consumer queue.
* @param msgs the msgs array to dump packets to send.
@ -317,9 +317,9 @@ public:
* only for h264 codec
* 1. cache the gop when got h264 video packet.
* 2. clear gop when got keyframe.
* @param __msg, directly ptr, copy it if need to save it.
* @param shared_msg, directly ptr, copy it if need to save it.
*/
virtual int cache(SrsSharedPtrMessage* __msg);
virtual int cache(SrsSharedPtrMessage* shared_msg);
/**
* clear the gop cache.
*/

12
trunk/src/app/srs_app_statistic.cpp
View file

@ -32,16 +32,16 @@ using namespace std;
#include <srs_app_kbps.hpp>
#include <srs_app_conn.hpp>
int64_t __srs_gvid = getpid();
int64_t srs_gvid = getpid();
int64_t __srs_generate_id()
int64_t srs_generate_id()
{
return __srs_gvid++;
return srs_gvid++;
}
SrsStatisticVhost::SrsStatisticVhost()
{
id = __srs_generate_id();
id = srs_generate_id();
kbps = new SrsKbps();
kbps->set_io(NULL, NULL);
@ -54,7 +54,7 @@ SrsStatisticVhost::~SrsStatisticVhost()
SrsStatisticStream::SrsStatisticStream()
{
id = __srs_generate_id();
id = srs_generate_id();
vhost = NULL;
has_video = false;
@ -87,7 +87,7 @@ SrsStatistic* SrsStatistic::_instance = new SrsStatistic();
SrsStatistic::SrsStatistic()
{
_server_id = __srs_generate_id();
_server_id = srs_generate_id();
kbps = new SrsKbps();
kbps->set_io(NULL, NULL);

4
trunk/src/app/srs_app_utility.hpp
View file

@ -378,7 +378,7 @@ public:
unsigned long long rd_sectors;
// Number of milliseconds spent reading.
// This is the total number of milliseconds spent by all reads
// (as measured from __make_request() to end_that_request_last()).
// (as measured from make_request() to end_that_request_last()).
// Time in queue + service for read
unsigned int rd_ticks;
//
@ -399,7 +399,7 @@ public:
unsigned long long wr_sectors;
// Number of milliseconds spent writing .
// This is the total number of milliseconds spent by all writes
// (as measured from __make_request() to end_that_request_last()).
// (as measured from make_request() to end_that_request_last()).
// Time in queue + service for write
unsigned int wr_ticks;
//