mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
move stream to kernel module
This commit is contained in:
parent
cb99de4462
commit
8fea433450
8 changed files with 13 additions and 12 deletions
5
trunk/configure
vendored
5
trunk/configure
vendored
|
@ -133,7 +133,8 @@ CORE_OBJS="${MODULE_OBJS[@]}"
|
|||
MODULE_ID="KERNEL"
|
||||
MODULE_DEPENDS=("CORE")
|
||||
ModuleLibIncs=(${SRS_OBJS})
|
||||
MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kernel_config")
|
||||
MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kernel_config"
|
||||
"srs_kernel_stream")
|
||||
MODULE_DIR="src/kernel" . auto/modules.sh
|
||||
KERNEL_OBJS="${MODULE_OBJS[@]}"
|
||||
#
|
||||
|
@ -145,7 +146,7 @@ MODULE_FILES=("srs_core_server"
|
|||
"srs_core_conn" "srs_core_client"
|
||||
"srs_core_rtmp" "srs_core_socket" "srs_core_buffer"
|
||||
"srs_core_protocol" "srs_core_amf0"
|
||||
"srs_core_stream" "srs_core_source" "srs_core_codec"
|
||||
"srs_core_source" "srs_core_codec"
|
||||
"srs_core_handshake" "srs_core_pithy_print"
|
||||
"srs_core_refer"
|
||||
"srs_core_hls" "srs_core_forward" "srs_core_encoder"
|
||||
|
|
|
@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
||||
#include <srs_kernel_log.hpp>
|
||||
#include <srs_kernel_error.hpp>
|
||||
#include <srs_core_stream.hpp>
|
||||
#include <srs_kernel_stream.hpp>
|
||||
|
||||
// AMF0 marker
|
||||
#define RTMP_AMF0_Number 0x00
|
||||
|
|
|
@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include <stdlib.h>
|
||||
|
||||
#include <srs_kernel_error.hpp>
|
||||
#include <srs_core_stream.hpp>
|
||||
#include <srs_kernel_stream.hpp>
|
||||
#include <srs_kernel_log.hpp>
|
||||
#include <srs_core_autofree.hpp>
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include <srs_kernel_error.hpp>
|
||||
#include <srs_core_socket.hpp>
|
||||
#include <srs_core_buffer.hpp>
|
||||
#include <srs_core_stream.hpp>
|
||||
#include <srs_kernel_stream.hpp>
|
||||
#include <srs_core_autofree.hpp>
|
||||
|
||||
using namespace std;
|
||||
|
|
|
@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <srs_core_stream.hpp>
|
||||
#include <srs_kernel_stream.hpp>
|
||||
|
||||
#include <srs_kernel_log.hpp>
|
||||
#include <srs_kernel_error.hpp>
|
|
@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef SRS_CORE_STREAM_HPP
|
||||
#define SRS_CORE_STREAM_HPP
|
||||
#ifndef SRS_KERNEL_STREAM_HPP
|
||||
#define SRS_KERNEL_STREAM_HPP
|
||||
|
||||
/*
|
||||
#include <srs_core_stream.hpp>
|
||||
#include <srs_kernel_stream.hpp>
|
||||
*/
|
||||
|
||||
#include <srs_core.hpp>
|
|
@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include <srs_kernel_error.hpp>
|
||||
#include <srs_core_amf0.hpp>
|
||||
#include <srs_core_autofree.hpp>
|
||||
#include <srs_core_stream.hpp>
|
||||
#include <srs_kernel_stream.hpp>
|
||||
|
||||
#include <st.h>
|
||||
|
||||
|
|
|
@ -18,6 +18,8 @@ file
|
|||
..\kernel\srs_kernel_log.cpp,
|
||||
..\kernel\srs_kernel_reload.hpp,
|
||||
..\kernel\srs_kernel_reload.cpp,
|
||||
..\kernel\srs_kernel_stream.hpp,
|
||||
..\kernel\srs_kernel_stream.cpp,
|
||||
app readonly separator,
|
||||
..\app\srs_core_amf0.hpp,
|
||||
..\app\srs_core_amf0.cpp,
|
||||
|
@ -57,8 +59,6 @@ file
|
|||
..\app\srs_core_server.cpp,
|
||||
..\app\srs_core_st.hpp,
|
||||
..\app\srs_core_st.cpp,
|
||||
..\app\srs_core_stream.hpp,
|
||||
..\app\srs_core_stream.cpp,
|
||||
..\app\srs_core_socket.hpp,
|
||||
..\app\srs_core_socket.cpp,
|
||||
..\app\srs_core_source.hpp,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue