Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-12-03 18:56:09 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ea0e837cd606aff0cd752083982091ea4776f8ad
ea0e837c
1 parent
2fdf9943
move the srs_kernel_buffer to srs_protocol_buffer.
显示空白字符变更
内嵌
并排对比
正在显示
8 个修改的文件
包含
10 行增加
和
10 行删除
trunk/configure
trunk/src/app/srs_app_hls.cpp
trunk/src/kernel/srs_kernel_buffer.cpp → trunk/src/rtmp/srs_protocol_buffer.cpp
trunk/src/kernel/srs_kernel_buffer.hpp → trunk/src/rtmp/srs_protocol_buffer.hpp
trunk/src/rtmp/srs_protocol_io.hpp
trunk/src/srs/srs.upp
trunk/src/utest/srs_utest_kernel.hpp
trunk/src/utest/srs_utest_protocol.hpp
trunk/configure
查看文件 @
ea0e837
...
...
@@ -363,7 +363,7 @@ CORE_OBJS="${MODULE_OBJS[@]}"
MODULE_ID
=
"KERNEL"
MODULE_DEPENDS
=(
"CORE"
)
ModuleLibIncs
=(
${
SRS_OBJS_DIR
}
)
MODULE_FILES
=(
"srs_kernel_error"
"srs_kernel_log"
"srs_kernel_stream"
"srs_kernel_buffer"
MODULE_FILES
=(
"srs_kernel_error"
"srs_kernel_log"
"srs_kernel_stream"
"srs_kernel_utility"
"srs_kernel_flv"
"srs_kernel_codec"
"srs_kernel_file"
"srs_kernel_consts"
)
KERNEL_INCS
=
"src/kernel"
;
MODULE_DIR
=
${
KERNEL_INCS
}
. auto/modules.sh
...
...
@@ -374,7 +374,7 @@ MODULE_ID="RTMP"
MODULE_DEPENDS
=(
"CORE"
"KERNEL"
)
ModuleLibIncs
=(
${
SRS_OBJS_DIR
}
${
LibSSLRoot
}
)
MODULE_FILES
=(
"srs_protocol_amf0"
"srs_protocol_io"
"srs_protocol_stack"
"srs_protocol_rtmp"
"srs_protocol_handshake"
"srs_protocol_utility"
"srs_protocol_msg_array"
)
"srs_protocol_handshake"
"srs_protocol_utility"
"srs_protocol_msg_array"
"srs_protocol_buffer"
)
RTMP_INCS
=
"src/rtmp"
;
MODULE_DIR
=
${
RTMP_INCS
}
. auto/modules.sh
RTMP_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
...
...
trunk/src/app/srs_app_hls.cpp
查看文件 @
ea0e837
...
...
@@ -68,7 +68,7 @@ using namespace std;
#include <srs_kernel_utility.hpp>
#include <srs_app_avc_aac.hpp>
#include <srs_kernel_file.hpp>
#include <srs_
kerne
l_buffer.hpp>
#include <srs_
protoco
l_buffer.hpp>
// max PES packets size to flush the video.
#define SRS_AUTO_HLS_AUDIO_CACHE_SIZE 1024 * 1024
...
...
trunk/src/
kernel/srs_kerne
l_buffer.cpp → trunk/src/
rtmp/srs_protoco
l_buffer.cpp
查看文件 @
ea0e837
...
...
@@ -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_
kerne
l_buffer.hpp>
#include <srs_
protoco
l_buffer.hpp>
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
...
...
trunk/src/
kernel/srs_kerne
l_buffer.hpp → trunk/src/
rtmp/srs_protoco
l_buffer.hpp
查看文件 @
ea0e837
...
...
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_KERNEL_BUFFER_HPP
/*
#include <srs_
kerne
l_buffer.hpp>
#include <srs_
protoco
l_buffer.hpp>
*/
#include <srs_core.hpp>
...
...
trunk/src/rtmp/srs_protocol_io.hpp
查看文件 @
ea0e837
...
...
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <sys/uio.h>
#endif
#include <srs_
kerne
l_buffer.hpp>
#include <srs_
protoco
l_buffer.hpp>
/**
* the system io reader/writer architecture:
...
...
trunk/src/srs/srs.upp
查看文件 @
ea0e837
...
...
@@ -16,8 +16,6 @@ file
..\core\srs_core_autofree.hpp,
..\core\srs_core_autofree.cpp,
kernel readonly separator,
..\kernel\srs_kernel_buffer.hpp,
..\kernel\srs_kernel_buffer.cpp,
..\kernel\srs_kernel_codec.hpp,
..\kernel\srs_kernel_codec.cpp,
..\kernel\srs_kernel_consts.hpp,
...
...
@@ -37,6 +35,8 @@ file
rtmp-protocol readonly separator,
..\rtmp\srs_protocol_amf0.hpp,
..\rtmp\srs_protocol_amf0.cpp,
..\rtmp\srs_protocol_buffer.hpp,
..\rtmp\srs_protocol_buffer.cpp,
..\rtmp\srs_protocol_handshake.hpp,
..\rtmp\srs_protocol_handshake.cpp,
..\rtmp\srs_protocol_io.hpp,
...
...
trunk/src/utest/srs_utest_kernel.hpp
查看文件 @
ea0e837
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <string>
#include <srs_kernel_file.hpp>
#include <srs_
kerne
l_buffer.hpp>
#include <srs_
protoco
l_buffer.hpp>
class
MockBufferReader
:
public
ISrsBufferReader
{
...
...
trunk/src/utest/srs_utest_protocol.hpp
查看文件 @
ea0e837
...
...
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_protocol_rtmp.hpp>
#include <srs_protocol_handshake.hpp>
#include <srs_
kerne
l_buffer.hpp>
#include <srs_
protoco
l_buffer.hpp>
#ifdef SRS_AUTO_SSL
using
namespace
_srs_internal
;
...
...
请
注册
或
登录
后发表评论