正在显示
8 个修改的文件
包含
10 行增加
和
10 行删除
| @@ -363,7 +363,7 @@ CORE_OBJS="${MODULE_OBJS[@]}" | @@ -363,7 +363,7 @@ CORE_OBJS="${MODULE_OBJS[@]}" | ||
| 363 | MODULE_ID="KERNEL" | 363 | MODULE_ID="KERNEL" |
| 364 | MODULE_DEPENDS=("CORE") | 364 | MODULE_DEPENDS=("CORE") |
| 365 | ModuleLibIncs=(${SRS_OBJS_DIR}) | 365 | ModuleLibIncs=(${SRS_OBJS_DIR}) |
| 366 | -MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream" "srs_kernel_buffer" | 366 | +MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream" |
| 367 | "srs_kernel_utility" "srs_kernel_flv" "srs_kernel_codec" "srs_kernel_file" | 367 | "srs_kernel_utility" "srs_kernel_flv" "srs_kernel_codec" "srs_kernel_file" |
| 368 | "srs_kernel_consts") | 368 | "srs_kernel_consts") |
| 369 | KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh | 369 | KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh |
| @@ -374,7 +374,7 @@ MODULE_ID="RTMP" | @@ -374,7 +374,7 @@ MODULE_ID="RTMP" | ||
| 374 | MODULE_DEPENDS=("CORE" "KERNEL") | 374 | MODULE_DEPENDS=("CORE" "KERNEL") |
| 375 | ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot}) | 375 | ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSSLRoot}) |
| 376 | MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_stack" "srs_protocol_rtmp" | 376 | MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_stack" "srs_protocol_rtmp" |
| 377 | - "srs_protocol_handshake" "srs_protocol_utility" "srs_protocol_msg_array") | 377 | + "srs_protocol_handshake" "srs_protocol_utility" "srs_protocol_msg_array" "srs_protocol_buffer") |
| 378 | RTMP_INCS="src/rtmp"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh | 378 | RTMP_INCS="src/rtmp"; MODULE_DIR=${RTMP_INCS} . auto/modules.sh |
| 379 | RTMP_OBJS="${MODULE_OBJS[@]}" | 379 | RTMP_OBJS="${MODULE_OBJS[@]}" |
| 380 | # | 380 | # |
| @@ -68,7 +68,7 @@ using namespace std; | @@ -68,7 +68,7 @@ using namespace std; | ||
| 68 | #include <srs_kernel_utility.hpp> | 68 | #include <srs_kernel_utility.hpp> |
| 69 | #include <srs_app_avc_aac.hpp> | 69 | #include <srs_app_avc_aac.hpp> |
| 70 | #include <srs_kernel_file.hpp> | 70 | #include <srs_kernel_file.hpp> |
| 71 | -#include <srs_kernel_buffer.hpp> | 71 | +#include <srs_protocol_buffer.hpp> |
| 72 | 72 | ||
| 73 | // max PES packets size to flush the video. | 73 | // max PES packets size to flush the video. |
| 74 | #define SRS_AUTO_HLS_AUDIO_CACHE_SIZE 1024 * 1024 | 74 | #define SRS_AUTO_HLS_AUDIO_CACHE_SIZE 1024 * 1024 |
| @@ -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_kernel_buffer.hpp> | 24 | +#include <srs_protocol_buffer.hpp> |
| 25 | 25 | ||
| 26 | #include <srs_kernel_error.hpp> | 26 | #include <srs_kernel_error.hpp> |
| 27 | #include <srs_kernel_log.hpp> | 27 | #include <srs_kernel_log.hpp> |
| @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 25 | #define SRS_KERNEL_BUFFER_HPP | 25 | #define SRS_KERNEL_BUFFER_HPP |
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | -#include <srs_kernel_buffer.hpp> | 28 | +#include <srs_protocol_buffer.hpp> |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <srs_core.hpp> | 31 | #include <srs_core.hpp> |
| @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 35 | #include <sys/uio.h> | 35 | #include <sys/uio.h> |
| 36 | #endif | 36 | #endif |
| 37 | 37 | ||
| 38 | -#include <srs_kernel_buffer.hpp> | 38 | +#include <srs_protocol_buffer.hpp> |
| 39 | 39 | ||
| 40 | /** | 40 | /** |
| 41 | * the system io reader/writer architecture: | 41 | * the system io reader/writer architecture: |
| @@ -16,8 +16,6 @@ file | @@ -16,8 +16,6 @@ file | ||
| 16 | ..\core\srs_core_autofree.hpp, | 16 | ..\core\srs_core_autofree.hpp, |
| 17 | ..\core\srs_core_autofree.cpp, | 17 | ..\core\srs_core_autofree.cpp, |
| 18 | kernel readonly separator, | 18 | kernel readonly separator, |
| 19 | - ..\kernel\srs_kernel_buffer.hpp, | ||
| 20 | - ..\kernel\srs_kernel_buffer.cpp, | ||
| 21 | ..\kernel\srs_kernel_codec.hpp, | 19 | ..\kernel\srs_kernel_codec.hpp, |
| 22 | ..\kernel\srs_kernel_codec.cpp, | 20 | ..\kernel\srs_kernel_codec.cpp, |
| 23 | ..\kernel\srs_kernel_consts.hpp, | 21 | ..\kernel\srs_kernel_consts.hpp, |
| @@ -37,6 +35,8 @@ file | @@ -37,6 +35,8 @@ file | ||
| 37 | rtmp-protocol readonly separator, | 35 | rtmp-protocol readonly separator, |
| 38 | ..\rtmp\srs_protocol_amf0.hpp, | 36 | ..\rtmp\srs_protocol_amf0.hpp, |
| 39 | ..\rtmp\srs_protocol_amf0.cpp, | 37 | ..\rtmp\srs_protocol_amf0.cpp, |
| 38 | + ..\rtmp\srs_protocol_buffer.hpp, | ||
| 39 | + ..\rtmp\srs_protocol_buffer.cpp, | ||
| 40 | ..\rtmp\srs_protocol_handshake.hpp, | 40 | ..\rtmp\srs_protocol_handshake.hpp, |
| 41 | ..\rtmp\srs_protocol_handshake.cpp, | 41 | ..\rtmp\srs_protocol_handshake.cpp, |
| 42 | ..\rtmp\srs_protocol_io.hpp, | 42 | ..\rtmp\srs_protocol_io.hpp, |
| @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 31 | 31 | ||
| 32 | #include <string> | 32 | #include <string> |
| 33 | #include <srs_kernel_file.hpp> | 33 | #include <srs_kernel_file.hpp> |
| 34 | -#include <srs_kernel_buffer.hpp> | 34 | +#include <srs_protocol_buffer.hpp> |
| 35 | 35 | ||
| 36 | class MockBufferReader: public ISrsBufferReader | 36 | class MockBufferReader: public ISrsBufferReader |
| 37 | { | 37 | { |
| @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 34 | 34 | ||
| 35 | #include <srs_protocol_rtmp.hpp> | 35 | #include <srs_protocol_rtmp.hpp> |
| 36 | #include <srs_protocol_handshake.hpp> | 36 | #include <srs_protocol_handshake.hpp> |
| 37 | -#include <srs_kernel_buffer.hpp> | 37 | +#include <srs_protocol_buffer.hpp> |
| 38 | 38 | ||
| 39 | #ifdef SRS_AUTO_SSL | 39 | #ifdef SRS_AUTO_SSL |
| 40 | using namespace _srs_internal; | 40 | using namespace _srs_internal; |
-
请 注册 或 登录 后发表评论