GB28181: Rename sip and jitter file.

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")
+    MODULE_FILES+=("srs_app_gb28181" "srs_app_gb28181_sip" "srs_app_gb28181_jitter")
-fi
-if [[ $SRS_GB28181 == YES || $SRS_RTC == YES ]]; then
-    MODULE_FILES+=("srs_app_rtc_jitbuffer")
 fi
 if [[ $SRS_GB28181 == YES ]]; then
-    MODULE_FILES+=("srs_app_sip")
+    MODULE_FILES+=("srs_app_gb28181_stack")
     ModuleLibIncs+=(${LibIconvRoot})
 fi
 

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

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>

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>

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
+#ifndef SRS_APP_GB28181_RTP_JITBUFFER_HPP
-#define SRS_APP_RTC_RTP_JITBUFFER_HPP
+#define SRS_APP_GB28181_RTP_JITBUFFER_HPP
 
 #include <srs_core.hpp>
 

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>
 
 

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>

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)
 

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
+#ifndef SRS_APP_GB28181_STACK_HPP
-#define SRS_PROTOCOL_SIP_HPP
+#define SRS_APP_GB28181_STACK_HPP
 
 #include <srs_core.hpp>