From 311cb77b36de52697aeba6d5c296a9147fa7c373 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 30 Aug 2020 09:53:10 +0800
Subject: [PATCH] Context: Refine API

---
 trunk/src/app/srs_app_recv_thread.cpp  |  2 +-
 trunk/src/app/srs_app_recv_thread.hpp  |  2 +-
 trunk/src/core/srs_core.cpp            | 11 ++++++-----
 trunk/src/core/srs_core.hpp            |  3 ++-
 trunk/src/protocol/srs_service_log.cpp |  4 ++--
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/trunk/src/app/srs_app_recv_thread.cpp b/trunk/src/app/srs_app_recv_thread.cpp
index 78ee964f0..38101ba89 100644
--- a/trunk/src/app/srs_app_recv_thread.cpp
+++ b/trunk/src/app/srs_app_recv_thread.cpp
@@ -340,7 +340,7 @@ srs_error_t SrsPublishRecvThread::error_code()
     return srs_error_copy(recv_error);
 }
 
-void SrsPublishRecvThread::set_cid(std::string v)
+void SrsPublishRecvThread::set_cid(SrsContextId v)
 {
     ncid = v;
 }
diff --git a/trunk/src/app/srs_app_recv_thread.hpp b/trunk/src/app/srs_app_recv_thread.hpp
index 1d46f58d3..98546f091 100644
--- a/trunk/src/app/srs_app_recv_thread.hpp
+++ b/trunk/src/app/srs_app_recv_thread.hpp
@@ -180,7 +180,7 @@ public:
     virtual int64_t nb_msgs();
     virtual uint64_t nb_video_frames();
     virtual srs_error_t error_code();
-    virtual void set_cid(std::string v);
+    virtual void set_cid(SrsContextId v);
     virtual SrsContextId get_cid();
 public:
     virtual srs_error_t start();
diff --git a/trunk/src/core/srs_core.cpp b/trunk/src/core/srs_core.cpp
index 539f4e267..9ec0f1060 100644
--- a/trunk/src/core/srs_core.cpp
+++ b/trunk/src/core/srs_core.cpp
@@ -27,11 +27,6 @@ _SrsContextId::_SrsContextId()
 {
 }
 
-_SrsContextId::_SrsContextId(std::string v)
-{
-    v_ = v;
-}
-
 _SrsContextId::_SrsContextId(const _SrsContextId& cp)
 {
     v_ = cp.v_;
@@ -57,6 +52,12 @@ bool _SrsContextId::empty() const
     return v_.empty();
 }
 
+_SrsContextId& _SrsContextId::set_value(const std::string& v)
+{
+    v_ = v;
+    return *this;
+}
+
 int _SrsContextId::compare(const _SrsContextId& to) const
 {
     return v_.compare(to.v_);
diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
index 9fa326aff..c71b54378 100644
--- a/trunk/src/core/srs_core.hpp
+++ b/trunk/src/core/srs_core.hpp
@@ -124,13 +124,14 @@ private:
     std::string v_;
 public:
     _SrsContextId();
-    _SrsContextId(std::string v);
     _SrsContextId(const _SrsContextId& cp);
     _SrsContextId& operator=(const _SrsContextId& cp);
     virtual ~_SrsContextId();
 public:
     const char* c_str() const;
     bool empty() const;
+    // Set the value of context id.
+    _SrsContextId& set_value(const std::string& v);
     // Compare the two context id. @see http://www.cplusplus.com/reference/string/string/compare/
     //      0	They compare equal
     //      <0	Either the value of the first character that does not match is lower in the compared string, or all compared characters match but the compared string is shorter.
diff --git a/trunk/src/protocol/srs_service_log.cpp b/trunk/src/protocol/srs_service_log.cpp
index b251ff310..baf9f5f4f 100644
--- a/trunk/src/protocol/srs_service_log.cpp
+++ b/trunk/src/protocol/srs_service_log.cpp
@@ -45,8 +45,8 @@ SrsThreadContext::~SrsThreadContext()
 
 SrsContextId SrsThreadContext::generate_id()
 {
-    SrsContextId cid = SrsContextId(srs_random_str(8));
-    return cid;
+    SrsContextId cid = SrsContextId();
+    return cid.set_value(srs_random_str(8));
 }
 
 const SrsContextId& SrsThreadContext::get_id()