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-04 11:32:32 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
8423974e3bc4c89b34df9b2172a3c167185b7ca1
8423974e
1 parent
0ea8cd9e
for bug #248, rename SrsBuffer to SrsFastBuffer.
隐藏空白字符变更
内嵌
并排对比
正在显示
6 个修改的文件
包含
23 行增加
和
23 行删除
trunk/src/rtmp/srs_protocol_buffer.cpp
trunk/src/rtmp/srs_protocol_buffer.hpp
trunk/src/rtmp/srs_protocol_stack.cpp
trunk/src/rtmp/srs_protocol_stack.hpp
trunk/src/utest/srs_utest_kernel.cpp
trunk/src/utest/srs_utest_protocol.hpp
trunk/src/rtmp/srs_protocol_buffer.cpp
查看文件 @
8423974
...
...
@@ -76,7 +76,7 @@ IMergeReadHandler::~IMergeReadHandler()
{
}
Srs
Buffer
::
Srs
Buffer
()
Srs
FastBuffer
::
SrsFast
Buffer
()
{
merged_read
=
false
;
_handler
=
NULL
;
...
...
@@ -85,24 +85,24 @@ SrsBuffer::SrsBuffer()
buffer
=
new
char
[
nb_buffer
];
}
Srs
Buffer
::~
Srs
Buffer
()
Srs
FastBuffer
::~
SrsFast
Buffer
()
{
srs_freep
(
buffer
);
}
int
SrsBuffer
::
length
()
int
Srs
Fast
Buffer
::
length
()
{
int
len
=
(
int
)
data
.
size
();
srs_assert
(
len
>=
0
);
return
len
;
}
char
*
SrsBuffer
::
bytes
()
char
*
Srs
Fast
Buffer
::
bytes
()
{
return
(
length
()
==
0
)
?
NULL
:
&
data
.
at
(
0
);
}
void
SrsBuffer
::
erase
(
int
size
)
void
Srs
Fast
Buffer
::
erase
(
int
size
)
{
if
(
size
<=
0
)
{
return
;
...
...
@@ -116,14 +116,14 @@ void SrsBuffer::erase(int size)
data
.
erase
(
data
.
begin
(),
data
.
begin
()
+
size
);
}
void
SrsBuffer
::
append
(
const
char
*
bytes
,
int
size
)
void
Srs
Fast
Buffer
::
append
(
const
char
*
bytes
,
int
size
)
{
srs_assert
(
size
>
0
);
data
.
insert
(
data
.
end
(),
bytes
,
bytes
+
size
);
}
int
SrsBuffer
::
grow
(
ISrsBufferReader
*
reader
,
int
required_size
)
int
Srs
Fast
Buffer
::
grow
(
ISrsBufferReader
*
reader
,
int
required_size
)
{
int
ret
=
ERROR_SUCCESS
;
...
...
@@ -156,7 +156,7 @@ int SrsBuffer::grow(ISrsBufferReader* reader, int required_size)
return
ret
;
}
void
SrsBuffer
::
set_merge_read
(
bool
v
,
int
max_buffer
,
IMergeReadHandler
*
handler
)
void
Srs
Fast
Buffer
::
set_merge_read
(
bool
v
,
int
max_buffer
,
IMergeReadHandler
*
handler
)
{
merged_read
=
v
;
_handler
=
handler
;
...
...
@@ -173,7 +173,7 @@ void SrsBuffer::set_merge_read(bool v, int max_buffer, IMergeReadHandler* handle
}
}
void
SrsBuffer
::
on_chunk_size
(
int32_t
chunk_size
)
void
Srs
Fast
Buffer
::
on_chunk_size
(
int32_t
chunk_size
)
{
if
(
nb_buffer
>=
chunk_size
)
{
return
;
...
...
@@ -191,12 +191,12 @@ void SrsBuffer::on_chunk_size(int32_t chunk_size)
}
}
int
SrsBuffer
::
buffer_size
()
int
Srs
Fast
Buffer
::
buffer_size
()
{
return
nb_buffer
;
}
void
SrsBuffer
::
reset_buffer
(
int
size
)
void
Srs
Fast
Buffer
::
reset_buffer
(
int
size
)
{
srs_freep
(
buffer
);
...
...
trunk/src/rtmp/srs_protocol_buffer.hpp
查看文件 @
8423974
...
...
@@ -110,7 +110,7 @@ public:
* the buffer provices bytes cache for protocol. generally,
* protocol recv data from socket, put into buffer, decode to RTMP message.
*/
class
SrsBuffer
class
Srs
Fast
Buffer
{
private
:
// the merged handler
...
...
@@ -121,8 +121,8 @@ private:
char
*
buffer
;
int
nb_buffer
;
public
:
SrsBuffer
();
virtual
~
SrsBuffer
();
SrsFastBuffer
();
virtual
~
SrsFastBuffer
();
public
:
/**
* get the length of buffer. empty if zero.
...
...
trunk/src/rtmp/srs_protocol_stack.cpp
查看文件 @
8423974
...
...
@@ -404,7 +404,7 @@ SrsProtocol::AckWindowSize::AckWindowSize()
SrsProtocol
::
SrsProtocol
(
ISrsProtocolReaderWriter
*
io
)
{
in_buffer
=
new
SrsBuffer
();
in_buffer
=
new
Srs
Fast
Buffer
();
skt
=
io
;
in_chunk_size
=
SRS_CONSTS_RTMP_PROTOCOL_CHUNK_SIZE
;
...
...
trunk/src/rtmp/srs_protocol_stack.hpp
查看文件 @
8423974
...
...
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_consts.hpp>
class
ISrsProtocolReaderWriter
;
class
SrsBuffer
;
class
Srs
Fast
Buffer
;
class
SrsPacket
;
class
SrsStream
;
class
SrsAmf0Object
;
...
...
@@ -206,7 +206,7 @@ private:
/**
* bytes buffer cache, recv from skt, provide services for stream.
*/
SrsBuffer
*
in_buffer
;
Srs
Fast
Buffer
*
in_buffer
;
/**
* input chunk size, default to 128, set by peer packet.
*/
...
...
trunk/src/utest/srs_utest_kernel.cpp
查看文件 @
8423974
...
...
@@ -203,7 +203,7 @@ int MockBufferReader::read(void* buf, size_t size, ssize_t* nread)
VOID
TEST
(
KernelBufferTest
,
DefaultObject
)
{
SrsBuffer
b
;
Srs
Fast
Buffer
b
;
EXPECT_EQ
(
0
,
b
.
length
());
EXPECT_EQ
(
NULL
,
b
.
bytes
());
...
...
@@ -211,7 +211,7 @@ VOID TEST(KernelBufferTest, DefaultObject)
VOID
TEST
(
KernelBufferTest
,
AppendBytes
)
{
SrsBuffer
b
;
Srs
Fast
Buffer
b
;
char
winlin
[]
=
"winlin"
;
b
.
append
(
winlin
,
strlen
(
winlin
));
...
...
@@ -231,7 +231,7 @@ VOID TEST(KernelBufferTest, AppendBytes)
VOID
TEST
(
KernelBufferTest
,
EraseBytes
)
{
SrsBuffer
b
;
Srs
Fast
Buffer
b
;
b
.
erase
(
0
);
b
.
erase
(
-
1
);
...
...
@@ -267,7 +267,7 @@ VOID TEST(KernelBufferTest, EraseBytes)
VOID
TEST
(
KernelBufferTest
,
Grow
)
{
SrsBuffer
b
;
Srs
Fast
Buffer
b
;
MockBufferReader
r
(
"winlin"
);
b
.
grow
(
&
r
,
1
);
...
...
trunk/src/utest/srs_utest_protocol.hpp
查看文件 @
8423974
...
...
@@ -78,9 +78,9 @@ public:
int64_t
recv_bytes
;
int64_t
send_bytes
;
// data source for socket read.
SrsBuffer
in_buffer
;
Srs
Fast
Buffer
in_buffer
;
// data buffer for socket send.
SrsBuffer
out_buffer
;
Srs
Fast
Buffer
out_buffer
;
public
:
MockBufferIO
();
virtual
~
MockBufferIO
();
...
...
请
注册
或
登录
后发表评论