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

refine the meta cache name

Browse source
This commit is contained in:
winlin 2017-01-19 15:51:34 +08:00
parent 4cff49afd2
commit 7bfb648bd8
2 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1396,7 +1396,7 @@ void SrsOriginHub::destroy_forwarders()
SrsMetaCache::SrsMetaCache() SrsMetaCache::SrsMetaCache()
{ {
cache_metadata = cache_sh_video = cache_sh_audio = NULL; meta = video = audio = NULL;
} }
SrsMetaCache::~SrsMetaCache() SrsMetaCache::~SrsMetaCache()
@ -1406,24 +1406,24 @@ SrsMetaCache::~SrsMetaCache()
void SrsMetaCache::dispose() void SrsMetaCache::dispose()
{ {
srs_freep(cache_metadata); srs_freep(meta);
srs_freep(cache_sh_video); srs_freep(video);
srs_freep(cache_sh_audio); srs_freep(audio);
} }
SrsSharedPtrMessage* SrsMetaCache::data() SrsSharedPtrMessage* SrsMetaCache::data()
{ {
return cache_metadata; return meta;
} }
SrsSharedPtrMessage* SrsMetaCache::vsh() SrsSharedPtrMessage* SrsMetaCache::vsh()
{ {
return cache_sh_video; return video;
} }
SrsSharedPtrMessage* SrsMetaCache::ash() SrsSharedPtrMessage* SrsMetaCache::ash()
{ {
return cache_sh_audio; return audio;
} }
int SrsMetaCache::dumps(SrsConsumer* consumer, bool atc, SrsRtmpJitterAlgorithm ag, bool dm, bool ds) int SrsMetaCache::dumps(SrsConsumer* consumer, bool atc, SrsRtmpJitterAlgorithm ag, bool dm, bool ds)
@ -1431,7 +1431,7 @@ int SrsMetaCache::dumps(SrsConsumer* consumer, bool atc, SrsRtmpJitterAlgorithm
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
// copy metadata. // copy metadata.
if (dm && cache_metadata && (ret = consumer->enqueue(cache_metadata, atc, ag)) != ERROR_SUCCESS) { if (dm && meta && (ret = consumer->enqueue(meta, atc, ag)) != ERROR_SUCCESS) {
srs_error("dispatch metadata failed. ret=%d", ret); srs_error("dispatch metadata failed. ret=%d", ret);
return ret; return ret;
} }
@ -1440,13 +1440,13 @@ int SrsMetaCache::dumps(SrsConsumer* consumer, bool atc, SrsRtmpJitterAlgorithm
// copy sequence header // copy sequence header
// copy audio sequence first, for hls to fast parse the "right" audio codec. // copy audio sequence first, for hls to fast parse the "right" audio codec.
// @see https://github.com/ossrs/srs/issues/301 // @see https://github.com/ossrs/srs/issues/301
if (ds && cache_sh_audio && (ret = consumer->enqueue(cache_sh_audio, atc, ag)) != ERROR_SUCCESS) { if (ds && audio && (ret = consumer->enqueue(audio, atc, ag)) != ERROR_SUCCESS) {
srs_error("dispatch audio sequence header failed. ret=%d", ret); srs_error("dispatch audio sequence header failed. ret=%d", ret);
return ret; return ret;
} }
srs_info("dispatch audio sequence header success"); srs_info("dispatch audio sequence header success");
if (ds && cache_sh_video && (ret = consumer->enqueue(cache_sh_video, atc, ag)) != ERROR_SUCCESS) { if (ds && video && (ret = consumer->enqueue(video, atc, ag)) != ERROR_SUCCESS) {
srs_error("dispatch video sequence header failed. ret=%d", ret); srs_error("dispatch video sequence header failed. ret=%d", ret);
return ret; return ret;
} }
@ -1509,13 +1509,13 @@ int SrsMetaCache::update_data(SrsMessageHeader* header, SrsOnMetaDataPacket* met
} }
// create a shared ptr message. // create a shared ptr message.
srs_freep(cache_metadata); srs_freep(meta);
cache_metadata = new SrsSharedPtrMessage(); meta = new SrsSharedPtrMessage();
updated = true; updated = true;
// dump message to shared ptr message. // dump message to shared ptr message.
// the payload/size managed by cache_metadata, user should not free it. // the payload/size managed by cache_metadata, user should not free it.
if ((ret = cache_metadata->create(header, payload, size)) != ERROR_SUCCESS) { if ((ret = meta->create(header, payload, size)) != ERROR_SUCCESS) {
srs_error("initialize the cache metadata failed. ret=%d", ret); srs_error("initialize the cache metadata failed. ret=%d", ret);
return ret; return ret;
} }
@ -1526,14 +1526,14 @@ int SrsMetaCache::update_data(SrsMessageHeader* header, SrsOnMetaDataPacket* met
void SrsMetaCache::update_ash(SrsSharedPtrMessage* msg) void SrsMetaCache::update_ash(SrsSharedPtrMessage* msg)
{ {
srs_freep(cache_sh_audio); srs_freep(audio);
cache_sh_audio = msg->copy(); audio = msg->copy();
} }
void SrsMetaCache::update_vsh(SrsSharedPtrMessage* msg) void SrsMetaCache::update_vsh(SrsSharedPtrMessage* msg)
{ {
srs_freep(cache_sh_video); srs_freep(video);
cache_sh_video = msg->copy(); video = msg->copy();
} }
std::map<std::string, SrsSource*> SrsSource::pool; std::map<std::string, SrsSource*> SrsSource::pool;

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

@ -497,11 +497,12 @@ private:
class SrsMetaCache class SrsMetaCache
{ {
private: private:
SrsSharedPtrMessage* cache_metadata; // The cached metadata, FLV script data tag.
// the cached video sequence header. SrsSharedPtrMessage* meta;
SrsSharedPtrMessage* cache_sh_video; // The cached video sequence header, for example, sps/pps for h.264.
// the cached audio sequence header. SrsSharedPtrMessage* video;
SrsSharedPtrMessage* cache_sh_audio; // The cached audio sequence header, for example, asc for aac.
SrsSharedPtrMessage* audio;
public: public:
SrsMetaCache(); SrsMetaCache();
virtual ~SrsMetaCache(); virtual ~SrsMetaCache();