From 7bfb648bd89ccb93690ad35688febda0e58371d1 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 19 Jan 2017 15:51:34 +0800
Subject: [PATCH] refine the meta cache name

---
 trunk/src/app/srs_app_source.cpp | 34 ++++++++++++++++----------------
 trunk/src/app/srs_app_source.hpp | 11 ++++++-----
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp
index 24df9acb8..921052fd0 100755
--- a/trunk/src/app/srs_app_source.cpp
+++ b/trunk/src/app/srs_app_source.cpp
@@ -1396,7 +1396,7 @@ void SrsOriginHub::destroy_forwarders()
 
 SrsMetaCache::SrsMetaCache()
 {
-    cache_metadata = cache_sh_video = cache_sh_audio = NULL;
+    meta = video = audio = NULL;
 }
 
 SrsMetaCache::~SrsMetaCache()
@@ -1406,24 +1406,24 @@ SrsMetaCache::~SrsMetaCache()
 
 void SrsMetaCache::dispose()
 {
-    srs_freep(cache_metadata);
-    srs_freep(cache_sh_video);
-    srs_freep(cache_sh_audio);
+    srs_freep(meta);
+    srs_freep(video);
+    srs_freep(audio);
 }
 
 SrsSharedPtrMessage* SrsMetaCache::data()
 {
-    return cache_metadata;
+    return meta;
 }
 
 SrsSharedPtrMessage* SrsMetaCache::vsh()
 {
-    return cache_sh_video;
+    return video;
 }
 
 SrsSharedPtrMessage* SrsMetaCache::ash()
 {
-    return cache_sh_audio;
+    return audio;
 }
 
 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;
     
     // 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);
         return ret;
     }
@@ -1440,13 +1440,13 @@ int SrsMetaCache::dumps(SrsConsumer* consumer, bool atc, SrsRtmpJitterAlgorithm
     // copy sequence header
     // copy audio sequence first, for hls to fast parse the "right" audio codec.
     // @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);
         return ret;
     }
     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);
         return ret;
     }
@@ -1509,13 +1509,13 @@ int SrsMetaCache::update_data(SrsMessageHeader* header, SrsOnMetaDataPacket* met
     }
     
     // create a shared ptr message.
-    srs_freep(cache_metadata);
-    cache_metadata = new SrsSharedPtrMessage();
+    srs_freep(meta);
+    meta = new SrsSharedPtrMessage();
     updated = true;
     
     // dump message to shared ptr message.
     // 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);
         return ret;
     }
@@ -1526,14 +1526,14 @@ int SrsMetaCache::update_data(SrsMessageHeader* header, SrsOnMetaDataPacket* met
 
 void SrsMetaCache::update_ash(SrsSharedPtrMessage* msg)
 {
-    srs_freep(cache_sh_audio);
-    cache_sh_audio = msg->copy();
+    srs_freep(audio);
+    audio = msg->copy();
 }
 
 void SrsMetaCache::update_vsh(SrsSharedPtrMessage* msg)
 {
-    srs_freep(cache_sh_video);
-    cache_sh_video = msg->copy();
+    srs_freep(video);
+    video = msg->copy();
 }
 
 std::map<std::string, SrsSource*> SrsSource::pool;
diff --git a/trunk/src/app/srs_app_source.hpp b/trunk/src/app/srs_app_source.hpp
index bf9af897d..4e27c054c 100644
--- a/trunk/src/app/srs_app_source.hpp
+++ b/trunk/src/app/srs_app_source.hpp
@@ -497,11 +497,12 @@ private:
 class SrsMetaCache
 {
 private:
-    SrsSharedPtrMessage* cache_metadata;
-    // the cached video sequence header.
-    SrsSharedPtrMessage* cache_sh_video;
-    // the cached audio sequence header.
-    SrsSharedPtrMessage* cache_sh_audio;
+    // The cached metadata, FLV script data tag.
+    SrsSharedPtrMessage* meta;
+    // The cached video sequence header, for example, sps/pps for h.264.
+    SrsSharedPtrMessage* video;
+    // The cached audio sequence header, for example, asc for aac.
+    SrsSharedPtrMessage* audio;
 public:
     SrsMetaCache();
     virtual ~SrsMetaCache();