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
9 years ago
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
cbffe744940d9626e14467df5cc19fa1451d4f31
cbffe744
1 parent
ff3f8272
add circleci
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
23 行增加
和
139 行删除
circle.yml
trunk/src/utest/srs_utest_config.cpp
trunk/src/utest/srs_utest_kernel.cpp
trunk/src/utest/srs_utest_protocol.cpp
circle.yml
0 → 100644
查看文件 @
cbffe74
## filter branches.
general
:
branches
:
only
:
-
2.0release
-
develop
-
master
-
bms
-
/feature\/.*/
-
/hotfix\/.*/
-
/release\/.*/
-
/pull\/.*/
dependencies
:
override
:
-
sudo apt-get install -y valgrind openssl
test
:
override
:
-
(cd trunk && ./configure --use-sys-ssl && make)
-
(cd trunk && ./objs/srs_utest)
...
...
trunk/src/utest/srs_utest_config.cpp
查看文件 @
cbffe74
此 diff 太大无法显示。
trunk/src/utest/srs_utest_kernel.cpp
查看文件 @
cbffe74
...
...
@@ -410,7 +410,7 @@ VOID TEST(KernelFlvTest, FlvEncoderWriteHeader)
char
flv_header
[]
=
{
'F'
,
'L'
,
'V'
,
// Signatures "FLV"
(
char
)
0x01
,
// File version (for example, 0x01 for FLV version 1)
(
char
)
0x0
0
,
// 4, audio; 1, video; 5 audio+video.
(
char
)
0x0
5
,
// 4, audio; 1, video; 5 audio+video.
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x09
// DataOffset UI32 The length of this header in bytes
};
char
pts
[]
=
{
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
};
...
...
trunk/src/utest/srs_utest_protocol.cpp
查看文件 @
cbffe74
...
...
@@ -4643,114 +4643,6 @@ VOID TEST(ProtocolStackTest, ProtocolSendVMessage)
}
/**
* send a SrsConnectAppPacket packet
*/
VOID
TEST
(
ProtocolStackTest
,
ProtocolSendSrsConnectAppPacket
)
{
MockBufferIO
bio
;
SrsProtocol
proto
(
&
bio
);
SrsConnectAppPacket
*
pkt
=
new
SrsConnectAppPacket
();
pkt
->
command_object
=
SrsAmf0Any
::
object
();
pkt
->
args
=
SrsAmf0Any
::
object
();
pkt
->
command_object
->
set
(
"version"
,
SrsAmf0Any
::
str
(
"1.0.0"
));
pkt
->
command_object
->
set
(
"build"
,
SrsAmf0Any
::
number
(
150
));
SrsAmf0Object
*
data
=
SrsAmf0Any
::
object
();
pkt
->
command_object
->
set
(
"data"
,
data
);
data
->
set
(
"server"
,
SrsAmf0Any
::
str
(
"SRS"
));
data
->
set
(
"signature"
,
SrsAmf0Any
::
str
(
"ossrs"
));
pkt
->
args
->
set
(
"info"
,
SrsAmf0Any
::
str
(
"NetStream.Status.Info"
));
pkt
->
args
->
set
(
"desc"
,
SrsAmf0Any
::
str
(
"connected"
));
pkt
->
args
->
set
(
"data"
,
SrsAmf0Any
::
ecma_array
());
EXPECT_TRUE
(
ERROR_SUCCESS
==
proto
.
send_and_free_packet
(
pkt
,
0
));
char
buf
[]
=
{
(
char
)
0x03
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0xb2
,
(
char
)
0x14
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x02
,
(
char
)
0x00
,
(
char
)
0x07
,
(
char
)
0x63
,
(
char
)
0x6f
,
(
char
)
0x6e
,
(
char
)
0x6e
,
(
char
)
0x65
,
(
char
)
0x63
,
(
char
)
0x74
,
(
char
)
0x00
,
(
char
)
0x3f
,
(
char
)
0xf0
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x03
,
(
char
)
0x00
,
(
char
)
0x07
,
(
char
)
0x76
,
(
char
)
0x65
,
(
char
)
0x72
,
(
char
)
0x73
,
(
char
)
0x69
,
(
char
)
0x6f
,
(
char
)
0x6e
,
(
char
)
0x02
,
(
char
)
0x00
,
(
char
)
0x05
,
(
char
)
0x31
,
(
char
)
0x2e
,
(
char
)
0x30
,
(
char
)
0x2e
,
(
char
)
0x30
,
(
char
)
0x00
,
(
char
)
0x05
,
(
char
)
0x62
,
(
char
)
0x75
,
(
char
)
0x69
,
(
char
)
0x6c
,
(
char
)
0x64
,
(
char
)
0x00
,
(
char
)
0x40
,
(
char
)
0x62
,
(
char
)
0xc0
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x04
,
(
char
)
0x64
,
(
char
)
0x61
,
(
char
)
0x74
,
(
char
)
0x61
,
(
char
)
0x03
,
(
char
)
0x00
,
(
char
)
0x06
,
(
char
)
0x73
,
(
char
)
0x65
,
(
char
)
0x72
,
(
char
)
0x76
,
(
char
)
0x65
,
(
char
)
0x72
,
(
char
)
0x02
,
(
char
)
0x00
,
(
char
)
0x03
,
(
char
)
0x53
,
(
char
)
0x52
,
(
char
)
0x53
,
(
char
)
0x00
,
(
char
)
0x09
,
(
char
)
0x73
,
(
char
)
0x69
,
(
char
)
0x67
,
(
char
)
0x6e
,
(
char
)
0x61
,
(
char
)
0x74
,
(
char
)
0x75
,
(
char
)
0x72
,
(
char
)
0x65
,
(
char
)
0x02
,
(
char
)
0x00
,
(
char
)
0x12
,
(
char
)
0x73
,
(
char
)
0x69
,
(
char
)
0x6d
,
(
char
)
0x70
,
(
char
)
0x6c
,
(
char
)
0x65
,
(
char
)
0x2d
,
(
char
)
0x72
,
(
char
)
0x74
,
(
char
)
0x6d
,
(
char
)
0x70
,
(
char
)
0x2d
,
(
char
)
0x73
,
(
char
)
0x65
,
(
char
)
0x72
,
(
char
)
0x76
,
(
char
)
0x65
,
(
char
)
0x72
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x09
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x09
,
(
char
)
0x03
,
(
char
)
0x00
,
(
char
)
0x04
,
(
char
)
0x69
,
(
char
)
0x6e
,
(
char
)
0x66
,
(
char
)
0x6f
,
(
char
)
0x02
,
(
char
)
0x00
,
(
char
)
0x15
,
(
char
)
0x4e
,
(
char
)
0x65
,
(
char
)
0x74
,
(
char
)
0x53
,
(
char
)
0x74
,
(
char
)
0x72
,
(
char
)
0xc3
,
(
char
)
0x65
,
(
char
)
0x61
,
(
char
)
0x6d
,
(
char
)
0x2e
,
(
char
)
0x53
,
(
char
)
0x74
,
(
char
)
0x61
,
(
char
)
0x74
,
(
char
)
0x75
,
(
char
)
0x73
,
(
char
)
0x2e
,
(
char
)
0x49
,
(
char
)
0x6e
,
(
char
)
0x66
,
(
char
)
0x6f
,
(
char
)
0x00
,
(
char
)
0x04
,
(
char
)
0x64
,
(
char
)
0x65
,
(
char
)
0x73
,
(
char
)
0x63
,
(
char
)
0x02
,
(
char
)
0x00
,
(
char
)
0x09
,
(
char
)
0x63
,
(
char
)
0x6f
,
(
char
)
0x6e
,
(
char
)
0x6e
,
(
char
)
0x65
,
(
char
)
0x63
,
(
char
)
0x74
,
(
char
)
0x65
,
(
char
)
0x64
,
(
char
)
0x00
,
(
char
)
0x04
,
(
char
)
0x64
,
(
char
)
0x61
,
(
char
)
0x74
,
(
char
)
0x61
,
(
char
)
0x08
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x09
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x09
};
EXPECT_TRUE
(
srs_bytes_equals
(
bio
.
out_buffer
.
bytes
(),
buf
,
sizeof
(
buf
)));
}
/**
* send a SrsConnectAppResPacket packet
*/
VOID
TEST
(
ProtocolStackTest
,
ProtocolSendSrsConnectAppResPacket
)
{
MockBufferIO
bio
;
SrsProtocol
proto
(
&
bio
);
SrsConnectAppResPacket
*
pkt
=
new
SrsConnectAppResPacket
();
pkt
->
props
=
SrsAmf0Any
::
object
();
pkt
->
info
=
SrsAmf0Any
::
object
();
pkt
->
props
->
set
(
"version"
,
SrsAmf0Any
::
str
(
"1.0.0"
));
pkt
->
props
->
set
(
"build"
,
SrsAmf0Any
::
number
(
150
));
SrsAmf0Object
*
data
=
SrsAmf0Any
::
object
();
pkt
->
props
->
set
(
"data"
,
data
);
data
->
set
(
"server"
,
SrsAmf0Any
::
str
(
"SRS"
));
data
->
set
(
"signature"
,
SrsAmf0Any
::
str
(
"ossrs"
));
pkt
->
info
->
set
(
"info"
,
SrsAmf0Any
::
str
(
"NetStream.Status.Info"
));
pkt
->
info
->
set
(
"desc"
,
SrsAmf0Any
::
str
(
"connected"
));
pkt
->
info
->
set
(
"data"
,
SrsAmf0Any
::
ecma_array
());
EXPECT_TRUE
(
ERROR_SUCCESS
==
proto
.
send_and_free_packet
(
pkt
,
0
));
char
buf
[]
=
{
(
char
)
0x03
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0xb2
,
(
char
)
0x14
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x02
,
(
char
)
0x00
,
(
char
)
0x07
,
(
char
)
0x5f
,
(
char
)
0x72
,
(
char
)
0x65
,
(
char
)
0x73
,
(
char
)
0x75
,
(
char
)
0x6c
,
(
char
)
0x74
,
(
char
)
0x00
,
(
char
)
0x3f
,
(
char
)
0xf0
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x03
,
(
char
)
0x00
,
(
char
)
0x07
,
(
char
)
0x76
,
(
char
)
0x65
,
(
char
)
0x72
,
(
char
)
0x73
,
(
char
)
0x69
,
(
char
)
0x6f
,
(
char
)
0x6e
,
(
char
)
0x02
,
(
char
)
0x00
,
(
char
)
0x05
,
(
char
)
0x31
,
(
char
)
0x2e
,
(
char
)
0x30
,
(
char
)
0x2e
,
(
char
)
0x30
,
(
char
)
0x00
,
(
char
)
0x05
,
(
char
)
0x62
,
(
char
)
0x75
,
(
char
)
0x69
,
(
char
)
0x6c
,
(
char
)
0x64
,
(
char
)
0x00
,
(
char
)
0x40
,
(
char
)
0x62
,
(
char
)
0xc0
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x04
,
(
char
)
0x64
,
(
char
)
0x61
,
(
char
)
0x74
,
(
char
)
0x61
,
(
char
)
0x03
,
(
char
)
0x00
,
(
char
)
0x06
,
(
char
)
0x73
,
(
char
)
0x65
,
(
char
)
0x72
,
(
char
)
0x76
,
(
char
)
0x65
,
(
char
)
0x72
,
(
char
)
0x02
,
(
char
)
0x00
,
(
char
)
0x03
,
(
char
)
0x53
,
(
char
)
0x52
,
(
char
)
0x53
,
(
char
)
0x00
,
(
char
)
0x09
,
(
char
)
0x73
,
(
char
)
0x69
,
(
char
)
0x67
,
(
char
)
0x6e
,
(
char
)
0x61
,
(
char
)
0x74
,
(
char
)
0x75
,
(
char
)
0x72
,
(
char
)
0x65
,
(
char
)
0x02
,
(
char
)
0x00
,
(
char
)
0x12
,
(
char
)
0x73
,
(
char
)
0x69
,
(
char
)
0x6d
,
(
char
)
0x70
,
(
char
)
0x6c
,
(
char
)
0x65
,
(
char
)
0x2d
,
(
char
)
0x72
,
(
char
)
0x74
,
(
char
)
0x6d
,
(
char
)
0x70
,
(
char
)
0x2d
,
(
char
)
0x73
,
(
char
)
0x65
,
(
char
)
0x72
,
(
char
)
0x76
,
(
char
)
0x65
,
(
char
)
0x72
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x09
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x09
,
(
char
)
0x03
,
(
char
)
0x00
,
(
char
)
0x04
,
(
char
)
0x69
,
(
char
)
0x6e
,
(
char
)
0x66
,
(
char
)
0x6f
,
(
char
)
0x02
,
(
char
)
0x00
,
(
char
)
0x15
,
(
char
)
0x4e
,
(
char
)
0x65
,
(
char
)
0x74
,
(
char
)
0x53
,
(
char
)
0x74
,
(
char
)
0x72
,
(
char
)
0xc3
,
(
char
)
0x65
,
(
char
)
0x61
,
(
char
)
0x6d
,
(
char
)
0x2e
,
(
char
)
0x53
,
(
char
)
0x74
,
(
char
)
0x61
,
(
char
)
0x74
,
(
char
)
0x75
,
(
char
)
0x73
,
(
char
)
0x2e
,
(
char
)
0x49
,
(
char
)
0x6e
,
(
char
)
0x66
,
(
char
)
0x6f
,
(
char
)
0x00
,
(
char
)
0x04
,
(
char
)
0x64
,
(
char
)
0x65
,
(
char
)
0x73
,
(
char
)
0x63
,
(
char
)
0x02
,
(
char
)
0x00
,
(
char
)
0x09
,
(
char
)
0x63
,
(
char
)
0x6f
,
(
char
)
0x6e
,
(
char
)
0x6e
,
(
char
)
0x65
,
(
char
)
0x63
,
(
char
)
0x74
,
(
char
)
0x65
,
(
char
)
0x64
,
(
char
)
0x00
,
(
char
)
0x04
,
(
char
)
0x64
,
(
char
)
0x61
,
(
char
)
0x74
,
(
char
)
0x61
,
(
char
)
0x08
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x09
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x09
};
EXPECT_TRUE
(
srs_bytes_equals
(
bio
.
out_buffer
.
bytes
(),
buf
,
sizeof
(
buf
)));
}
/**
* send a SrsCallPacket packet
*/
VOID
TEST
(
ProtocolStackTest
,
ProtocolSendSrsCallPacket
)
...
...
@@ -4938,36 +4830,6 @@ VOID TEST(ProtocolStackTest, ProtocolSendSrsPublishPacket)
}
/**
* send a SrsPlayPacket packet
*/
VOID
TEST
(
ProtocolStackTest
,
ProtocolSendSrsPlayPacket
)
{
MockBufferIO
bio
;
SrsProtocol
proto
(
&
bio
);
SrsPlayPacket
*
pkt
=
new
SrsPlayPacket
();
pkt
->
command_name
=
"play"
;
pkt
->
command_object
=
SrsAmf0Any
::
null
();
pkt
->
stream_name
=
"livestream"
;
pkt
->
start
=
0
;
pkt
->
duration
=
0
;
pkt
->
reset
=
true
;
EXPECT_TRUE
(
ERROR_SUCCESS
==
proto
.
send_and_free_packet
(
pkt
,
0
));
char
buf
[]
=
{
(
char
)
0x05
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x32
,
(
char
)
0x14
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x02
,
(
char
)
0x00
,
(
char
)
0x04
,
(
char
)
0x70
,
(
char
)
0x6c
,
(
char
)
0x61
,
(
char
)
0x79
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x05
,
(
char
)
0x02
,
(
char
)
0x00
,
(
char
)
0x0a
,
(
char
)
0x6c
,
(
char
)
0x69
,
(
char
)
0x76
,
(
char
)
0x65
,
(
char
)
0x73
,
(
char
)
0x74
,
(
char
)
0x72
,
(
char
)
0x65
,
(
char
)
0x61
,
(
char
)
0x6d
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x00
,
(
char
)
0x01
,
(
char
)
0x01
};
EXPECT_TRUE
(
srs_bytes_equals
(
bio
.
out_buffer
.
bytes
(),
buf
,
sizeof
(
buf
)));
}
/**
* send a SrsPlayResPacket packet
*/
VOID
TEST
(
ProtocolStackTest
,
ProtocolSendSrsPlayResPacket
)
...
...
请
注册
或
登录
后发表评论