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-03-01 11:04:03 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
c0dbee085407656e8d9abd6a725c0bf9159e7ac2
c0dbee08
1 parent
8fea4334
move buffer to kernel. extract ISrsReader for buffer
隐藏空白字符变更
内嵌
并排对比
正在显示
6 个修改的文件
包含
29 行增加
和
14 行删除
trunk/configure
trunk/src/app/srs_core_protocol.cpp
trunk/src/app/srs_core_socket.hpp
trunk/src/app/srs_core_buffer.cpp → trunk/src/kernel/srs_kernel_buffer.cpp
trunk/src/app/srs_core_buffer.hpp → trunk/src/kernel/srs_kernel_buffer.hpp
trunk/src/srs/srs.upp
trunk/configure
查看文件 @
c0dbee0
...
...
@@ -134,7 +134,7 @@ MODULE_ID="KERNEL"
MODULE_DEPENDS
=(
"CORE"
)
ModuleLibIncs
=(
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_kernel_error"
"srs_kernel_log"
"srs_kernel_reload"
"srs_kernel_config"
"srs_kernel_stream"
)
"srs_kernel_stream"
"srs_kernel_buffer"
)
MODULE_DIR
=
"src/kernel"
. auto/modules.sh
KERNEL_OBJS
=
"
${
MODULE_OBJS
[@]
}
"
#
...
...
@@ -144,7 +144,7 @@ MODULE_DEPENDS=("CORE" "KERNEL")
ModuleLibIncs
=(
${
LibSTRoot
}
${
LibHttpParserRoot
}
${
LibSSLRoot
}
${
SRS_OBJS
}
)
MODULE_FILES
=(
"srs_core_server"
"srs_core_conn"
"srs_core_client"
"srs_core_rtmp"
"srs_core_socket"
"srs_core_buffer"
"srs_core_rtmp"
"srs_core_socket"
"srs_core_protocol"
"srs_core_amf0"
"srs_core_source"
"srs_core_codec"
"srs_core_handshake"
"srs_core_pithy_print"
...
...
trunk/src/app/srs_core_protocol.cpp
查看文件 @
c0dbee0
...
...
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_amf0.hpp>
#include <srs_kernel_error.hpp>
#include <srs_core_socket.hpp>
#include <srs_
core
_buffer.hpp>
#include <srs_
kernel
_buffer.hpp>
#include <srs_kernel_stream.hpp>
#include <srs_core_autofree.hpp>
...
...
trunk/src/app/srs_core_socket.hpp
查看文件 @
c0dbee0
...
...
@@ -31,12 +31,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp>
#include <srs_core_st.hpp>
#include <srs_kernel_buffer.hpp>
/**
* the socket provides TCP socket over st,
* that is, the sync socket mechanism.
*/
class
SrsSocket
class
SrsSocket
:
public
ISrsReader
{
private
:
int64_t
recv_timeout
;
...
...
trunk/src/
app/srs_core
_buffer.cpp → trunk/src/
kernel/srs_kernel
_buffer.cpp
查看文件 @
c0dbee0
...
...
@@ -21,14 +21,21 @@ 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
_buffer.hpp>
#include <srs_
kernel
_buffer.hpp>
#include <srs_kernel_error.hpp>
#include <srs_core_socket.hpp>
#include <srs_kernel_log.hpp>
#define SOCKET_READ_SIZE 4096
ISrsReader
::
ISrsReader
()
{
}
ISrsReader
::~
ISrsReader
()
{
}
SrsBuffer
::
SrsBuffer
()
{
}
...
...
@@ -57,7 +64,7 @@ void SrsBuffer::append(char* bytes, int size)
data
.
insert
(
data
.
end
(),
bytes
,
bytes
+
size
);
}
int
SrsBuffer
::
ensure_buffer_bytes
(
SrsSocket
*
skt
,
int
required_size
)
int
SrsBuffer
::
ensure_buffer_bytes
(
ISrsReader
*
skt
,
int
required_size
)
{
int
ret
=
ERROR_SUCCESS
;
...
...
trunk/src/
app/srs_core
_buffer.hpp → trunk/src/
kernel/srs_kernel
_buffer.hpp
查看文件 @
c0dbee0
...
...
@@ -21,18 +21,25 @@ 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_BUFFER_HPP
#define SRS_CORE_BUFFER_HPP
#ifndef SRS_KERNEL_BUFFER_HPP
#define SRS_KERNEL_BUFFER_HPP
/*
#include <srs_
core
_buffer.hpp>
#include <srs_
kernel
_buffer.hpp>
*/
#include <srs_core.hpp>
#include <vector>
class
SrsSocket
;
class
ISrsReader
{
public
:
ISrsReader
();
virtual
~
ISrsReader
();
public
:
virtual
int
read
(
const
void
*
buf
,
size_t
size
,
ssize_t
*
nread
)
=
0
;
};
/**
* the buffer provices bytes cache for protocol. generally,
...
...
@@ -53,7 +60,7 @@ public:
private
:
virtual
void
append
(
char
*
bytes
,
int
size
);
public
:
virtual
int
ensure_buffer_bytes
(
SrsSocket
*
skt
,
int
required_size
);
virtual
int
ensure_buffer_bytes
(
ISrsReader
*
skt
,
int
required_size
);
};
#endif
\ No newline at end of file
...
...
trunk/src/srs/srs.upp
查看文件 @
c0dbee0
...
...
@@ -10,6 +10,8 @@ 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_config.hpp,
..\kernel\srs_kernel_config.cpp,
..\kernel\srs_kernel_error.hpp,
...
...
@@ -25,8 +27,6 @@ file
..\app\srs_core_amf0.cpp,
..\app\srs_core_bandwidth.hpp,
..\app\srs_core_bandwidth.cpp,
..\app\srs_core_buffer.hpp,
..\app\srs_core_buffer.cpp,
..\app\srs_core_client.hpp,
..\app\srs_core_client.cpp,
..\app\srs_core_codec.hpp,
...
...
请
注册
或
登录
后发表评论