正在显示
8 个修改的文件
包含
13 行增加
和
12 行删除
| @@ -133,7 +133,8 @@ CORE_OBJS="${MODULE_OBJS[@]}" | @@ -133,7 +133,8 @@ CORE_OBJS="${MODULE_OBJS[@]}" | ||
| 133 | MODULE_ID="KERNEL" | 133 | MODULE_ID="KERNEL" |
| 134 | MODULE_DEPENDS=("CORE") | 134 | MODULE_DEPENDS=("CORE") |
| 135 | ModuleLibIncs=(${SRS_OBJS}) | 135 | ModuleLibIncs=(${SRS_OBJS}) |
| 136 | -MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kernel_config") | 136 | +MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kernel_config" |
| 137 | + "srs_kernel_stream") | ||
| 137 | MODULE_DIR="src/kernel" . auto/modules.sh | 138 | MODULE_DIR="src/kernel" . auto/modules.sh |
| 138 | KERNEL_OBJS="${MODULE_OBJS[@]}" | 139 | KERNEL_OBJS="${MODULE_OBJS[@]}" |
| 139 | # | 140 | # |
| @@ -145,7 +146,7 @@ MODULE_FILES=("srs_core_server" | @@ -145,7 +146,7 @@ MODULE_FILES=("srs_core_server" | ||
| 145 | "srs_core_conn" "srs_core_client" | 146 | "srs_core_conn" "srs_core_client" |
| 146 | "srs_core_rtmp" "srs_core_socket" "srs_core_buffer" | 147 | "srs_core_rtmp" "srs_core_socket" "srs_core_buffer" |
| 147 | "srs_core_protocol" "srs_core_amf0" | 148 | "srs_core_protocol" "srs_core_amf0" |
| 148 | - "srs_core_stream" "srs_core_source" "srs_core_codec" | 149 | + "srs_core_source" "srs_core_codec" |
| 149 | "srs_core_handshake" "srs_core_pithy_print" | 150 | "srs_core_handshake" "srs_core_pithy_print" |
| 150 | "srs_core_refer" | 151 | "srs_core_refer" |
| 151 | "srs_core_hls" "srs_core_forward" "srs_core_encoder" | 152 | "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. | @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 27 | 27 | ||
| 28 | #include <srs_kernel_log.hpp> | 28 | #include <srs_kernel_log.hpp> |
| 29 | #include <srs_kernel_error.hpp> | 29 | #include <srs_kernel_error.hpp> |
| 30 | -#include <srs_core_stream.hpp> | 30 | +#include <srs_kernel_stream.hpp> |
| 31 | 31 | ||
| 32 | // AMF0 marker | 32 | // AMF0 marker |
| 33 | #define RTMP_AMF0_Number 0x00 | 33 | #define RTMP_AMF0_Number 0x00 |
| @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 27 | #include <stdlib.h> | 27 | #include <stdlib.h> |
| 28 | 28 | ||
| 29 | #include <srs_kernel_error.hpp> | 29 | #include <srs_kernel_error.hpp> |
| 30 | -#include <srs_core_stream.hpp> | 30 | +#include <srs_kernel_stream.hpp> |
| 31 | #include <srs_kernel_log.hpp> | 31 | #include <srs_kernel_log.hpp> |
| 32 | #include <srs_core_autofree.hpp> | 32 | #include <srs_core_autofree.hpp> |
| 33 | 33 |
| @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 28 | #include <srs_kernel_error.hpp> | 28 | #include <srs_kernel_error.hpp> |
| 29 | #include <srs_core_socket.hpp> | 29 | #include <srs_core_socket.hpp> |
| 30 | #include <srs_core_buffer.hpp> | 30 | #include <srs_core_buffer.hpp> |
| 31 | -#include <srs_core_stream.hpp> | 31 | +#include <srs_kernel_stream.hpp> |
| 32 | #include <srs_core_autofree.hpp> | 32 | #include <srs_core_autofree.hpp> |
| 33 | 33 | ||
| 34 | using namespace std; | 34 | using namespace std; |
| @@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | @@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| 21 | CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 21 | CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | -#include <srs_core_stream.hpp> | 24 | +#include <srs_kernel_stream.hpp> |
| 25 | 25 | ||
| 26 | #include <srs_kernel_log.hpp> | 26 | #include <srs_kernel_log.hpp> |
| 27 | #include <srs_kernel_error.hpp> | 27 | #include <srs_kernel_error.hpp> |
| @@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | @@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| 21 | CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 21 | CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | -#ifndef SRS_CORE_STREAM_HPP | ||
| 25 | -#define SRS_CORE_STREAM_HPP | 24 | +#ifndef SRS_KERNEL_STREAM_HPP |
| 25 | +#define SRS_KERNEL_STREAM_HPP | ||
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | -#include <srs_core_stream.hpp> | 28 | +#include <srs_kernel_stream.hpp> |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <srs_core.hpp> | 31 | #include <srs_core.hpp> |
| @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 33 | #include <srs_kernel_error.hpp> | 33 | #include <srs_kernel_error.hpp> |
| 34 | #include <srs_core_amf0.hpp> | 34 | #include <srs_core_amf0.hpp> |
| 35 | #include <srs_core_autofree.hpp> | 35 | #include <srs_core_autofree.hpp> |
| 36 | -#include <srs_core_stream.hpp> | 36 | +#include <srs_kernel_stream.hpp> |
| 37 | 37 | ||
| 38 | #include <st.h> | 38 | #include <st.h> |
| 39 | 39 |
| @@ -18,6 +18,8 @@ file | @@ -18,6 +18,8 @@ file | ||
| 18 | ..\kernel\srs_kernel_log.cpp, | 18 | ..\kernel\srs_kernel_log.cpp, |
| 19 | ..\kernel\srs_kernel_reload.hpp, | 19 | ..\kernel\srs_kernel_reload.hpp, |
| 20 | ..\kernel\srs_kernel_reload.cpp, | 20 | ..\kernel\srs_kernel_reload.cpp, |
| 21 | + ..\kernel\srs_kernel_stream.hpp, | ||
| 22 | + ..\kernel\srs_kernel_stream.cpp, | ||
| 21 | app readonly separator, | 23 | app readonly separator, |
| 22 | ..\app\srs_core_amf0.hpp, | 24 | ..\app\srs_core_amf0.hpp, |
| 23 | ..\app\srs_core_amf0.cpp, | 25 | ..\app\srs_core_amf0.cpp, |
| @@ -57,8 +59,6 @@ file | @@ -57,8 +59,6 @@ file | ||
| 57 | ..\app\srs_core_server.cpp, | 59 | ..\app\srs_core_server.cpp, |
| 58 | ..\app\srs_core_st.hpp, | 60 | ..\app\srs_core_st.hpp, |
| 59 | ..\app\srs_core_st.cpp, | 61 | ..\app\srs_core_st.cpp, |
| 60 | - ..\app\srs_core_stream.hpp, | ||
| 61 | - ..\app\srs_core_stream.cpp, | ||
| 62 | ..\app\srs_core_socket.hpp, | 62 | ..\app\srs_core_socket.hpp, |
| 63 | ..\app\srs_core_socket.cpp, | 63 | ..\app\srs_core_socket.cpp, |
| 64 | ..\app\srs_core_source.hpp, | 64 | ..\app\srs_core_source.hpp, |
-
请 注册 或 登录 后发表评论