胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
0fb71281 2 parents e15e07c4 9bd2ff16

add circleci

内嵌 并排对比
正在显示 5 个修改的文件 包含 26 行增加 和 140 行删除
1 #Simple-RTMP-Server 1 #Simple-RTMP-Server
2 2
  3 +[![CircleCI](https://circleci.com/gh/ossrs/srs/tree/develop.svg?style=svg)](https://circleci.com/gh/ossrs/srs/tree/develop)
  4 +[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ossrs/srs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
  5 +
3 SRS/3.0, [OuXuli][release3] 6 SRS/3.0, [OuXuli][release3]
4 7
5 [![Donation](https://www.paypalobjects.com/webstatic/en_US/btn/btn_donate_92x26.png)][donation1] 8 [![Donation](https://www.paypalobjects.com/webstatic/en_US/btn/btn_donate_92x26.png)][donation1]
6 [![Paypal](https://www.paypalobjects.com/webstatic/en_US/btn/btn_donate_pp_142x27.png)][donation2] 9 [![Paypal](https://www.paypalobjects.com/webstatic/en_US/btn/btn_donate_pp_142x27.png)][donation2]
7 -[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ossrs/srs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)  
8 [![LinkedIn](http://s.c.lnkd.licdn.com/scds/common/u/img/webpromo/btn_liprofile_blue_80x15.png)](http://cn.linkedin.com/in/winlinvip) 10 [![LinkedIn](http://s.c.lnkd.licdn.com/scds/common/u/img/webpromo/btn_liprofile_blue_80x15.png)](http://cn.linkedin.com/in/winlinvip)
9 11
10 SRS定位是运营级的互联网直播服务器集群，追求更好的概念完整性和最简单实现的代码。<br/> 12 SRS定位是运营级的互联网直播服务器集群，追求更好的概念完整性和最简单实现的代码。<br/>
  1 +## filter branches.
  2 +general:
  3 + branches:
  4 + only:
  5 + - 2.0release
  6 + - develop
  7 + - master
  8 + - bms
  9 + - /feature\/.*/
  10 + - /hotfix\/.*/
  11 + - /release\/.*/
  12 + - /pull\/.*/
  13 +
  14 +dependencies:
  15 + override:
  16 + - sudo apt-get install -y valgrind openssl
  17 +
  18 +test:
  19 + override:
  20 + - (cd trunk && ./configure --use-sys-ssl && make)
  21 + - (cd trunk && ./objs/srs_utest)
  22 +
@@ -410,7 +410,7 @@ VOID TEST(KernelFlvTest, FlvEncoderWriteHeader) @@ -410,7 +410,7 @@ VOID TEST(KernelFlvTest, FlvEncoderWriteHeader)
410 char flv_header[] = { 410 char flv_header[] = {
411 'F', 'L', 'V', // Signatures "FLV" 411 'F', 'L', 'V', // Signatures "FLV"
412 (char)0x01, // File version (for example, 0x01 for FLV version 1) 412 (char)0x01, // File version (for example, 0x01 for FLV version 1)
413 - (char)0x00, // 4, audio; 1, video; 5 audio+video. 413 + (char)0x05, // 4, audio; 1, video; 5 audio+video.
414 (char)0x00, (char)0x00, (char)0x00, (char)0x09 // DataOffset UI32 The length of this header in bytes 414 (char)0x00, (char)0x00, (char)0x00, (char)0x09 // DataOffset UI32 The length of this header in bytes
415 }; 415 };
416 char pts[] = { (char)0x00, (char)0x00, (char)0x00, (char)0x00 }; 416 char pts[] = { (char)0x00, (char)0x00, (char)0x00, (char)0x00 };
@@ -4610,114 +4610,6 @@ VOID TEST(ProtocolStackTest, ProtocolSendVMessage) @@ -4610,114 +4610,6 @@ VOID TEST(ProtocolStackTest, ProtocolSendVMessage)
4610 } 4610 }
4611 4611
4612 /** 4612 /**
4613 -* send a SrsConnectAppPacket packet  
4614 -*/  
4615 -VOID TEST(ProtocolStackTest, ProtocolSendSrsConnectAppPacket)  
4616 -{  
4617 - MockBufferIO bio;  
4618 - SrsProtocol proto(&bio);  
4619 -  
4620 - SrsConnectAppPacket* pkt = new SrsConnectAppPacket();  
4621 - pkt->command_object = SrsAmf0Any::object();  
4622 - pkt->args = SrsAmf0Any::object();  
4623 -  
4624 - pkt->command_object->set("version", SrsAmf0Any::str("1.0.0"));  
4625 - pkt->command_object->set("build", SrsAmf0Any::number(150));  
4626 - SrsAmf0Object* data = SrsAmf0Any::object();  
4627 - pkt->command_object->set("data", data);  
4628 -  
4629 - data->set("server", SrsAmf0Any::str("SRS"));  
4630 - data->set("signature", SrsAmf0Any::str("ossrs"));  
4631 -  
4632 - pkt->args->set("info", SrsAmf0Any::str("NetStream.Status.Info"));  
4633 - pkt->args->set("desc", SrsAmf0Any::str("connected"));  
4634 - pkt->args->set("data", SrsAmf0Any::ecma_array());  
4635 -  
4636 - EXPECT_TRUE(ERROR_SUCCESS == proto.send_and_free_packet(pkt, 0));  
4637 - char buf[] = {  
4638 - (char)0x03, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0xb2, (char)0x14,  
4639 - (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x02, (char)0x00, (char)0x07, (char)0x63,  
4640 - (char)0x6f, (char)0x6e, (char)0x6e, (char)0x65, (char)0x63, (char)0x74, (char)0x00, (char)0x3f,  
4641 - (char)0xf0, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x03,  
4642 - (char)0x00, (char)0x07, (char)0x76, (char)0x65, (char)0x72, (char)0x73, (char)0x69, (char)0x6f,  
4643 - (char)0x6e, (char)0x02, (char)0x00, (char)0x05, (char)0x31, (char)0x2e, (char)0x30, (char)0x2e,  
4644 - (char)0x30, (char)0x00, (char)0x05, (char)0x62, (char)0x75, (char)0x69, (char)0x6c, (char)0x64,  
4645 - (char)0x00, (char)0x40, (char)0x62, (char)0xc0, (char)0x00, (char)0x00, (char)0x00, (char)0x00,  
4646 - (char)0x00, (char)0x00, (char)0x04, (char)0x64, (char)0x61, (char)0x74, (char)0x61, (char)0x03,  
4647 - (char)0x00, (char)0x06, (char)0x73, (char)0x65, (char)0x72, (char)0x76, (char)0x65, (char)0x72,  
4648 - (char)0x02, (char)0x00, (char)0x03, (char)0x53, (char)0x52, (char)0x53, (char)0x00, (char)0x09,  
4649 - (char)0x73, (char)0x69, (char)0x67, (char)0x6e, (char)0x61, (char)0x74, (char)0x75, (char)0x72,  
4650 - (char)0x65, (char)0x02, (char)0x00, (char)0x12, (char)0x73, (char)0x69, (char)0x6d, (char)0x70,  
4651 - (char)0x6c, (char)0x65, (char)0x2d, (char)0x72, (char)0x74, (char)0x6d, (char)0x70, (char)0x2d,  
4652 - (char)0x73, (char)0x65, (char)0x72, (char)0x76, (char)0x65, (char)0x72, (char)0x00, (char)0x00,  
4653 - (char)0x09, (char)0x00, (char)0x00, (char)0x09, (char)0x03, (char)0x00, (char)0x04, (char)0x69,  
4654 - (char)0x6e, (char)0x66, (char)0x6f, (char)0x02, (char)0x00, (char)0x15, (char)0x4e, (char)0x65,  
4655 - (char)0x74, (char)0x53, (char)0x74, (char)0x72, (char)0xc3, (char)0x65, (char)0x61, (char)0x6d,  
4656 - (char)0x2e, (char)0x53, (char)0x74, (char)0x61, (char)0x74, (char)0x75, (char)0x73, (char)0x2e,  
4657 - (char)0x49, (char)0x6e, (char)0x66, (char)0x6f, (char)0x00, (char)0x04, (char)0x64, (char)0x65,  
4658 - (char)0x73, (char)0x63, (char)0x02, (char)0x00, (char)0x09, (char)0x63, (char)0x6f, (char)0x6e,  
4659 - (char)0x6e, (char)0x65, (char)0x63, (char)0x74, (char)0x65, (char)0x64, (char)0x00, (char)0x04,  
4660 - (char)0x64, (char)0x61, (char)0x74, (char)0x61, (char)0x08, (char)0x00, (char)0x00, (char)0x00,  
4661 - (char)0x00, (char)0x00, (char)0x00, (char)0x09, (char)0x00, (char)0x00, (char)0x09  
4662 - };  
4663 - EXPECT_TRUE(srs_bytes_equals(bio.out_buffer.bytes(), buf, sizeof(buf)));  
4664 -}  
4665 -  
4666 -/**  
4667 -* send a SrsConnectAppResPacket packet  
4668 -*/  
4669 -VOID TEST(ProtocolStackTest, ProtocolSendSrsConnectAppResPacket)  
4670 -{  
4671 - MockBufferIO bio;  
4672 - SrsProtocol proto(&bio);  
4673 -  
4674 - SrsConnectAppResPacket* pkt = new SrsConnectAppResPacket();  
4675 - pkt->props = SrsAmf0Any::object();  
4676 - pkt->info = SrsAmf0Any::object();  
4677 -  
4678 - pkt->props->set("version", SrsAmf0Any::str("1.0.0"));  
4679 - pkt->props->set("build", SrsAmf0Any::number(150));  
4680 - SrsAmf0Object* data = SrsAmf0Any::object();  
4681 - pkt->props->set("data", data);  
4682 -  
4683 - data->set("server", SrsAmf0Any::str("SRS"));  
4684 - data->set("signature", SrsAmf0Any::str("ossrs"));  
4685 -  
4686 - pkt->info->set("info", SrsAmf0Any::str("NetStream.Status.Info"));  
4687 - pkt->info->set("desc", SrsAmf0Any::str("connected"));  
4688 - pkt->info->set("data", SrsAmf0Any::ecma_array());  
4689 -  
4690 - EXPECT_TRUE(ERROR_SUCCESS == proto.send_and_free_packet(pkt, 0));  
4691 - char buf[] = {  
4692 - (char)0x03, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0xb2, (char)0x14,  
4693 - (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x02, (char)0x00, (char)0x07, (char)0x5f,  
4694 - (char)0x72, (char)0x65, (char)0x73, (char)0x75, (char)0x6c, (char)0x74, (char)0x00, (char)0x3f,  
4695 - (char)0xf0, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x03,  
4696 - (char)0x00, (char)0x07, (char)0x76, (char)0x65, (char)0x72, (char)0x73, (char)0x69, (char)0x6f,  
4697 - (char)0x6e, (char)0x02, (char)0x00, (char)0x05, (char)0x31, (char)0x2e, (char)0x30, (char)0x2e,  
4698 - (char)0x30, (char)0x00, (char)0x05, (char)0x62, (char)0x75, (char)0x69, (char)0x6c, (char)0x64,  
4699 - (char)0x00, (char)0x40, (char)0x62, (char)0xc0, (char)0x00, (char)0x00, (char)0x00, (char)0x00,  
4700 - (char)0x00, (char)0x00, (char)0x04, (char)0x64, (char)0x61, (char)0x74, (char)0x61, (char)0x03,  
4701 - (char)0x00, (char)0x06, (char)0x73, (char)0x65, (char)0x72, (char)0x76, (char)0x65, (char)0x72,  
4702 - (char)0x02, (char)0x00, (char)0x03, (char)0x53, (char)0x52, (char)0x53, (char)0x00, (char)0x09,  
4703 - (char)0x73, (char)0x69, (char)0x67, (char)0x6e, (char)0x61, (char)0x74, (char)0x75, (char)0x72,  
4704 - (char)0x65, (char)0x02, (char)0x00, (char)0x12, (char)0x73, (char)0x69, (char)0x6d, (char)0x70,  
4705 - (char)0x6c, (char)0x65, (char)0x2d, (char)0x72, (char)0x74, (char)0x6d, (char)0x70, (char)0x2d,  
4706 - (char)0x73, (char)0x65, (char)0x72, (char)0x76, (char)0x65, (char)0x72, (char)0x00, (char)0x00,  
4707 - (char)0x09, (char)0x00, (char)0x00, (char)0x09, (char)0x03, (char)0x00, (char)0x04, (char)0x69,  
4708 - (char)0x6e, (char)0x66, (char)0x6f, (char)0x02, (char)0x00, (char)0x15, (char)0x4e, (char)0x65,  
4709 - (char)0x74, (char)0x53, (char)0x74, (char)0x72, (char)0xc3, (char)0x65, (char)0x61, (char)0x6d,  
4710 - (char)0x2e, (char)0x53, (char)0x74, (char)0x61, (char)0x74, (char)0x75, (char)0x73, (char)0x2e,  
4711 - (char)0x49, (char)0x6e, (char)0x66, (char)0x6f, (char)0x00, (char)0x04, (char)0x64, (char)0x65,  
4712 - (char)0x73, (char)0x63, (char)0x02, (char)0x00, (char)0x09, (char)0x63, (char)0x6f, (char)0x6e,  
4713 - (char)0x6e, (char)0x65, (char)0x63, (char)0x74, (char)0x65, (char)0x64, (char)0x00, (char)0x04,  
4714 - (char)0x64, (char)0x61, (char)0x74, (char)0x61, (char)0x08, (char)0x00, (char)0x00, (char)0x00,  
4715 - (char)0x00, (char)0x00, (char)0x00, (char)0x09, (char)0x00, (char)0x00, (char)0x09  
4716 - };  
4717 - EXPECT_TRUE(srs_bytes_equals(bio.out_buffer.bytes(), buf, sizeof(buf)));  
4718 -}  
4719 -  
4720 -/**  
4721 * send a SrsCallPacket packet 4613 * send a SrsCallPacket packet
4722 */ 4614 */
4723 VOID TEST(ProtocolStackTest, ProtocolSendSrsCallPacket) 4615 VOID TEST(ProtocolStackTest, ProtocolSendSrsCallPacket)
@@ -4905,36 +4797,6 @@ VOID TEST(ProtocolStackTest, ProtocolSendSrsPublishPacket) @@ -4905,36 +4797,6 @@ VOID TEST(ProtocolStackTest, ProtocolSendSrsPublishPacket)
4905 } 4797 }
4906 4798
4907 /** 4799 /**
4908 -* send a SrsPlayPacket packet  
4909 -*/  
4910 -VOID TEST(ProtocolStackTest, ProtocolSendSrsPlayPacket)  
4911 -{  
4912 - MockBufferIO bio;  
4913 - SrsProtocol proto(&bio);  
4914 -  
4915 - SrsPlayPacket* pkt = new SrsPlayPacket();  
4916 - pkt->command_name = "play";  
4917 - pkt->command_object = SrsAmf0Any::null();  
4918 - pkt->stream_name = "livestream";  
4919 - pkt->start = 0;  
4920 - pkt->duration = 0;  
4921 - pkt->reset = true;  
4922 -  
4923 - EXPECT_TRUE(ERROR_SUCCESS == proto.send_and_free_packet(pkt, 0));  
4924 - char buf[] = {  
4925 - (char)0x05, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x32, (char)0x14,  
4926 - (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x02, (char)0x00, (char)0x04, (char)0x70,  
4927 - (char)0x6c, (char)0x61, (char)0x79, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,  
4928 - (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x05, (char)0x02, (char)0x00, (char)0x0a,  
4929 - (char)0x6c, (char)0x69, (char)0x76, (char)0x65, (char)0x73, (char)0x74, (char)0x72, (char)0x65,  
4930 - (char)0x61, (char)0x6d, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,  
4931 - (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,  
4932 - (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x01, (char)0x01  
4933 - };  
4934 - EXPECT_TRUE(srs_bytes_equals(bio.out_buffer.bytes(), buf, sizeof(buf)));  
4935 -}  
4936 -  
4937 -/**  
4938 * send a SrsPlayResPacket packet 4800 * send a SrsPlayResPacket packet
4939 */ 4801 */
4940 VOID TEST(ProtocolStackTest, ProtocolSendSrsPlayResPacket) 4802 VOID TEST(ProtocolStackTest, ProtocolSendSrsPlayResPacket)