[pull] develop from ossrs:develop

README.md

@@ -29,10 +29,10 @@ or [Chinese](https://ossrs.net/lts/zh-cn/docs/v5/doc/getting-started). We highly
 
 ```bash
 docker run --rm -it -p 1935:1935 -p 1985:1985 -p 8080:8080 \
-    -p 8000:8000/udp -p 10080:10080/udp ossrs/srs:5
+    -p 8000:8000/udp -p 10080:10080/udp ossrs/srs:6
 ```
 
-> Tips: If you're in China, use this image `registry.cn-hangzhou.aliyuncs.com/ossrs/srs:5` for faster speed.
+> Tips: If you're in China, use this image `registry.cn-hangzhou.aliyuncs.com/ossrs/srs:6` for faster speed.
 
 Open [http://localhost:8080/](http://localhost:8080/) to verify, and then stream using the following
 [FFmpeg](https://ffmpeg.org/download.html) command:

trunk/configure

@@ -250,7 +250,9 @@ MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_buffer"
         "srs_kernel_utility" "srs_kernel_flv" "srs_kernel_codec" "srs_kernel_io"
         "srs_kernel_consts" "srs_kernel_aac" "srs_kernel_mp3" "srs_kernel_ts" "srs_kernel_ps"
         "srs_kernel_stream" "srs_kernel_balance" "srs_kernel_mp4" "srs_kernel_file"
-        "srs_kernel_kbps" "srs_kernel_rtc_rtp" "srs_kernel_rtc_rtcp" "srs_kernel_packet")
+        "srs_kernel_kbps" "srs_kernel_rtc_rtp" "srs_kernel_rtc_rtcp" "srs_kernel_packet"
+        "srs_kernel_uuid" "srs_kernel_st" "srs_kernel_factory" "srs_kernel_hourglass"
+        "srs_kernel_pithy_print" "srs_kernel_rtc_queue" "srs_kernel_resource")
 KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . $SRS_WORKDIR/auto/modules.sh
 KERNEL_OBJS="${MODULE_OBJS[@]}"
 #
@@ -260,15 +262,15 @@ MODULE_DEPENDS=("CORE" "KERNEL")
 ModuleLibIncs=(${SRS_OBJS} ${LibSTRoot} ${LibSSLRoot})
 MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_conn" "srs_protocol_rtmp_handshake"
         "srs_protocol_rtmp_stack" "srs_protocol_utility" "srs_protocol_rtmp_msg_array" "srs_protocol_stream"
-        "srs_protocol_raw_avc" "srs_protocol_http_stack" "srs_protocol_kbps" "srs_protocol_json"
+        "srs_protocol_raw_avc" "srs_protocol_http_stack" "srs_protocol_json"
         "srs_protocol_format" "srs_protocol_log" "srs_protocol_st" "srs_protocol_http_client"
         "srs_protocol_http_conn" "srs_protocol_rtmp_conn" "srs_protocol_protobuf"
         "srs_protocol_http_stack_llhttp" "srs_protocol_http_stack_llhttpapi" 
         "srs_protocol_http_stack_llhttpadapter" "srs_protocol_http_stack_llhttphttp")
 # Always include SRT protocol
 MODULE_FILES+=("srs_protocol_srt")
 ModuleLibIncs+=(${LibSRTRoot})
-MODULE_FILES+=("srs_protocol_rtc_stun" "srs_protocol_rtp")
+MODULE_FILES+=("srs_protocol_rtc_stun" "srs_protocol_rtp" "srs_protocol_sdp")
 if [[ $SRS_RTSP == YES ]]; then
     MODULE_FILES+=("srs_protocol_rtsp_stack")
 fi
@@ -286,22 +288,22 @@ fi
 if [[ $SRS_FFMPEG_FIT == YES ]]; then
     ModuleLibIncs+=("${LibFfmpegRoot[*]}")
 fi
-MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_source"
+MODULE_FILES=("srs_app_server" "srs_app_rtmp_conn" "srs_app_rtmp_source"
         "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" "srs_app_http_stream"
         "srs_app_st" "srs_app_log" "srs_app_config" "srs_app_stream_bridge"
-        "srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" "srs_app_http_conn" "srs_app_http_hooks"
+        "srs_app_reload" "srs_app_http_api" "srs_app_http_conn" "srs_app_http_hooks"
         "srs_app_ingest" "srs_app_ffmpeg" "srs_app_utility" "srs_app_edge"
-        "srs_app_heartbeat" "srs_app_empty" "srs_app_http_client" "srs_app_http_static"
+        "srs_app_heartbeat" "srs_app_http_client" "srs_app_http_static"
         "srs_app_recv_thread" "srs_app_security" "srs_app_statistic" "srs_app_hds"
         "srs_app_mpegts_udp" "srs_app_listener" "srs_app_async_call"
-        "srs_app_caster_flv" "srs_app_latest_version" "srs_app_uuid" "srs_app_process" "srs_app_ng_exec"
-        "srs_app_hourglass" "srs_app_dash" "srs_app_fragment" "srs_app_dvr"
-        "srs_app_coworkers" "srs_app_circuit_breaker"
+        "srs_app_caster_flv" "srs_app_latest_version" "srs_app_process" "srs_app_ng_exec"
+        "srs_app_dash" "srs_app_fragment" "srs_app_dvr"
+        "srs_app_coworkers" "srs_app_circuit_breaker" "srs_app_factory"
         "srs_app_stream_token")
 # Always include SRT app modules
-MODULE_FILES+=("srs_app_srt_server" "srs_app_srt_listener" "srs_app_srt_conn" "srs_app_srt_utility" "srs_app_srt_source")
-MODULE_FILES+=("srs_app_rtc_conn" "srs_app_rtc_dtls" "srs_app_rtc_sdp" "srs_app_rtc_network"
-    "srs_app_rtc_queue" "srs_app_rtc_server" "srs_app_rtc_source" "srs_app_rtc_api")
+MODULE_FILES+=("srs_app_srt_server" "srs_app_srt_listener" "srs_app_srt_conn" "srs_app_srt_source")
+MODULE_FILES+=("srs_app_rtc_conn" "srs_app_rtc_dtls" "srs_app_rtc_network"
+    "srs_app_rtc_server" "srs_app_rtc_source" "srs_app_rtc_api")
 if [[ $SRS_RTSP == YES ]]; then
     MODULE_FILES+=("srs_app_rtsp_source" "srs_app_rtsp_conn")
 fi

trunk/doc/CHANGELOG.md

@@ -7,6 +7,7 @@ The changelog for SRS.
 <a name="v7-changes"></a>
 
 ## SRS 7.0 Changelog
+* v7.0, 2025-09-13, Merge [#4486](https://github.com/ossrs/srs/pull/4486): Move some app files to kernel. v7.0.86 (#4486)
 * v7.0, 2025-09-12, Merge [#4485](https://github.com/ossrs/srs/pull/4485): AI: Fix naming problem for app module. v7.0.85 (#4485)
 * v7.0, 2025-09-09, Merge [#4446](https://github.com/ossrs/srs/pull/4446): SRT2RTMP: fix srt bridge hevc to rtmp error. v7.0.84 (#4446)
 * v7.0, 2025-09-09, Merge [#4482](https://github.com/ossrs/srs/pull/4482): AI: Fix naming issue for protocol module. v7.0.83 (#4482)

trunk/src/app/srs_app_async_call.hpp

@@ -41,7 +41,7 @@ class ISrsAsyncCallTask
 class SrsAsyncCallWorker : public ISrsCoroutineHandler
 {
 private:
-    SrsCoroutine *trd_;
+    ISrsCoroutine *trd_;
 
 protected:
     std::vector<ISrsAsyncCallTask *> tasks_;

trunk/src/app/srs_app_caster_flv.cpp

@@ -11,14 +11,14 @@ using namespace std;
 
 #include <srs_app_config.hpp>
 #include <srs_app_http_conn.hpp>
-#include <srs_app_pithy_print.hpp>
 #include <srs_app_rtmp_conn.hpp>
 #include <srs_app_st.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_flv.hpp>
 #include <srs_kernel_log.hpp>
+#include <srs_kernel_pithy_print.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_protocol_rtmp_stack.hpp>

trunk/src/app/srs_app_caster_flv.hpp

@@ -24,11 +24,11 @@ class SrsTcpClient;
 class SrsSimpleRtmpClient;
 class SrsAppCasterFlv;
 
-#include <srs_app_conn.hpp>
 #include <srs_app_http_conn.hpp>
 #include <srs_app_listener.hpp>
 #include <srs_app_st.hpp>
 #include <srs_kernel_file.hpp>
+#include <srs_protocol_conn.hpp>
 
 // A TCP listener, for flv stream server.
 class SrsHttpFlvListener : public ISrsTcpHandler, public ISrsListener

trunk/src/app/srs_app_circuit_breaker.cpp

@@ -7,9 +7,9 @@
 #include <srs_app_circuit_breaker.hpp>
 
 #include <srs_app_config.hpp>
-#include <srs_app_hourglass.hpp>
 #include <srs_app_server.hpp>
 #include <srs_app_utility.hpp>
+#include <srs_kernel_hourglass.hpp>
 #include <srs_kernel_kbps.hpp>
 #include <srs_kernel_utility.hpp>
 

trunk/src/app/srs_app_circuit_breaker.hpp

@@ -9,7 +9,7 @@
 
 #include <srs_core.hpp>
 
-#include <srs_app_hourglass.hpp>
+#include <srs_kernel_hourglass.hpp>
 
 // Interface for circuit breaker functionality to protect server in high load conditions.
 // The circuit breaker monitors CPU usage and enables different levels of protection:

trunk/src/app/srs_app_config.cpp

@@ -26,7 +26,7 @@
 using namespace std;
 
 #include <srs_app_http_hooks.hpp>
-#include <srs_app_source.hpp>
+#include <srs_app_rtmp_source.hpp>
 #include <srs_app_statistic.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_core_autofree.hpp>

trunk/src/app/srs_app_config.hpp

@@ -18,6 +18,7 @@
 #include <srs_app_async_call.hpp>
 #include <srs_app_reload.hpp>
 #include <srs_app_st.hpp>
+#include <srs_kernel_factory.hpp>
 
 class ISrsRequest;
 class SrsFileWriter;
@@ -278,7 +279,7 @@ enum SrsReloadState {
 // that is, never save the SrsConfDirective* get by any api of config,
 // For it maybe free in the reload st-thread cycle.
 // You could keep it before st-thread switch, or simply never keep it.
-class SrsConfig
+class SrsConfig : public ISrsConfig
 {
     friend class SrsConfDirective;
     // user command