From 1bd6bfd142db08a08db04c4a85c16f08a9764b72 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Tue, 18 May 2021 09:00:59 +0800
Subject: [PATCH] GB28181: Rename sip and jitter file.

---
 trunk/configure                                            | 7 ++-----
 trunk/src/app/srs_app_gb28181.cpp                          | 2 +-
 trunk/src/app/srs_app_gb28181.hpp                          | 2 +-
 ...rs_app_rtc_jitbuffer.cpp => srs_app_gb28181_jitter.cpp} | 2 +-
 ...rs_app_rtc_jitbuffer.hpp => srs_app_gb28181_jitter.hpp} | 4 ++--
 trunk/src/app/srs_app_gb28181_sip.cpp                      | 2 +-
 trunk/src/app/srs_app_gb28181_sip.hpp                      | 2 +-
 .../src/app/{srs_app_sip.cpp => srs_app_gb28181_stack.cpp} | 2 +-
 .../src/app/{srs_app_sip.hpp => srs_app_gb28181_stack.hpp} | 4 ++--
 9 files changed, 12 insertions(+), 15 deletions(-)
 rename trunk/src/app/{srs_app_rtc_jitbuffer.cpp => srs_app_gb28181_jitter.cpp} (99%)
 rename trunk/src/app/{srs_app_rtc_jitbuffer.hpp => srs_app_gb28181_jitter.hpp} (99%)
 rename trunk/src/app/{srs_app_sip.cpp => srs_app_gb28181_stack.cpp} (99%)
 rename trunk/src/app/{srs_app_sip.hpp => srs_app_gb28181_stack.hpp} (98%)

diff --git a/trunk/configure b/trunk/configure
index 3b70a76e4..f5252e42c 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -286,13 +286,10 @@ if [[ $SRS_FFMPEG_FIT == YES ]]; then
     MODULE_FILES+=("srs_app_rtc_codec")
 fi
 if [[ $SRS_GB28181 == YES ]]; then
-    MODULE_FILES+=("srs_app_gb28181" "srs_app_gb28181_sip")
-fi
-if [[ $SRS_GB28181 == YES || $SRS_RTC == YES ]]; then
-    MODULE_FILES+=("srs_app_rtc_jitbuffer")
+    MODULE_FILES+=("srs_app_gb28181" "srs_app_gb28181_sip" "srs_app_gb28181_jitter")
 fi
 if [[ $SRS_GB28181 == YES ]]; then
-    MODULE_FILES+=("srs_app_sip")
+    MODULE_FILES+=("srs_app_gb28181_stack")
     ModuleLibIncs+=(${LibIconvRoot})
 fi
 
diff --git a/trunk/src/app/srs_app_gb28181.cpp b/trunk/src/app/srs_app_gb28181.cpp
index 14bb3de45..3fd610428 100644
--- a/trunk/src/app/srs_app_gb28181.cpp
+++ b/trunk/src/app/srs_app_gb28181.cpp
@@ -50,7 +50,7 @@ using namespace std;
 #include <srs_app_rtmp_conn.hpp>
 #include <srs_protocol_utility.hpp>
 #include <srs_protocol_format.hpp>
-#include <srs_app_sip.hpp>
+#include <srs_app_gb28181_stack.hpp>
 #include <srs_app_rtc_source.hpp>
 
 //#define W_PS_FILE
diff --git a/trunk/src/app/srs_app_gb28181.hpp b/trunk/src/app/srs_app_gb28181.hpp
index 268fb895b..07bd0cfa2 100644
--- a/trunk/src/app/srs_app_gb28181.hpp
+++ b/trunk/src/app/srs_app_gb28181.hpp
@@ -39,7 +39,7 @@
 #include <srs_kernel_file.hpp>
 #include <srs_protocol_json.hpp>
 #include <srs_app_gb28181_sip.hpp>
-#include <srs_app_rtc_jitbuffer.hpp>
+#include <srs_app_gb28181_jitter.hpp>
 #include <srs_rtmp_stack.hpp>
 #include <srs_app_source.hpp>
 #include <srs_service_conn.hpp>
diff --git a/trunk/src/app/srs_app_rtc_jitbuffer.cpp b/trunk/src/app/srs_app_gb28181_jitter.cpp
similarity index 99%
rename from trunk/src/app/srs_app_rtc_jitbuffer.cpp
rename to trunk/src/app/srs_app_gb28181_jitter.cpp
index 2824d4fee..852060e17 100644
--- a/trunk/src/app/srs_app_rtc_jitbuffer.cpp
+++ b/trunk/src/app/srs_app_gb28181_jitter.cpp
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <srs_app_rtc_jitbuffer.hpp>
+#include <srs_app_gb28181_jitter.hpp>
 
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_error.hpp>
diff --git a/trunk/src/app/srs_app_rtc_jitbuffer.hpp b/trunk/src/app/srs_app_gb28181_jitter.hpp
similarity index 99%
rename from trunk/src/app/srs_app_rtc_jitbuffer.hpp
rename to trunk/src/app/srs_app_gb28181_jitter.hpp
index eef613c08..021b17cd4 100644
--- a/trunk/src/app/srs_app_rtc_jitbuffer.hpp
+++ b/trunk/src/app/srs_app_gb28181_jitter.hpp
@@ -21,8 +21,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SRS_APP_RTC_RTP_JITBUFFER_HPP
-#define SRS_APP_RTC_RTP_JITBUFFER_HPP
+#ifndef SRS_APP_GB28181_RTP_JITBUFFER_HPP
+#define SRS_APP_GB28181_RTP_JITBUFFER_HPP
 
 #include <srs_core.hpp>
 
diff --git a/trunk/src/app/srs_app_gb28181_sip.cpp b/trunk/src/app/srs_app_gb28181_sip.cpp
index 1ca695c6d..1f82f8510 100644
--- a/trunk/src/app/srs_app_gb28181_sip.cpp
+++ b/trunk/src/app/srs_app_gb28181_sip.cpp
@@ -43,7 +43,7 @@ using namespace std;
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_codec.hpp>
 #include <srs_app_pithy_print.hpp>
-#include <srs_app_sip.hpp>
+#include <srs_app_gb28181_stack.hpp>
 #include <srs_app_gb28181.hpp>
 
 
diff --git a/trunk/src/app/srs_app_gb28181_sip.hpp b/trunk/src/app/srs_app_gb28181_sip.hpp
index 23dd99c33..477610d7a 100644
--- a/trunk/src/app/srs_app_gb28181_sip.hpp
+++ b/trunk/src/app/srs_app_gb28181_sip.hpp
@@ -31,7 +31,7 @@
 #include <map>
 
 #include <srs_app_log.hpp>
-#include <srs_app_sip.hpp>
+#include <srs_app_gb28181_stack.hpp>
 #include <srs_app_gb28181.hpp>
 #include <srs_app_pithy_print.hpp>
 #include <srs_service_conn.hpp>
diff --git a/trunk/src/app/srs_app_sip.cpp b/trunk/src/app/srs_app_gb28181_stack.cpp
similarity index 99%
rename from trunk/src/app/srs_app_sip.cpp
rename to trunk/src/app/srs_app_gb28181_stack.cpp
index c7ff221f0..198a270c6 100644
--- a/trunk/src/app/srs_app_sip.cpp
+++ b/trunk/src/app/srs_app_gb28181_stack.cpp
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <srs_app_sip.hpp>
+#include <srs_app_gb28181_stack.hpp>
 
 #if !defined(SRS_EXPORT_LIBRTMP)
 
diff --git a/trunk/src/app/srs_app_sip.hpp b/trunk/src/app/srs_app_gb28181_stack.hpp
similarity index 98%
rename from trunk/src/app/srs_app_sip.hpp
rename to trunk/src/app/srs_app_gb28181_stack.hpp
index eea753797..67651e740 100644
--- a/trunk/src/app/srs_app_sip.hpp
+++ b/trunk/src/app/srs_app_gb28181_stack.hpp
@@ -21,8 +21,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef SRS_PROTOCOL_SIP_HPP
-#define SRS_PROTOCOL_SIP_HPP
+#ifndef SRS_APP_GB28181_STACK_HPP
+#define SRS_APP_GB28181_STACK_HPP
 
 #include <srs_core.hpp>