胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
cbffe744 1 parent ff3f8272

add circleci

内嵌 并排对比
正在显示 4 个修改的文件 包含 23 行增加 和 139 行删除
  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 };
@@ -4643,114 +4643,6 @@ VOID TEST(ProtocolStackTest, ProtocolSendVMessage) @@ -4643,114 +4643,6 @@ VOID TEST(ProtocolStackTest, ProtocolSendVMessage)
4643 } 4643 }
4644 4644
4645 /** 4645 /**
4646 -* send a SrsConnectAppPacket packet  
4647 -*/  
4648 -VOID TEST(ProtocolStackTest, ProtocolSendSrsConnectAppPacket)  
4649 -{  
4650 - MockBufferIO bio;  
4651 - SrsProtocol proto(&bio);  
4652 -  
4653 - SrsConnectAppPacket* pkt = new SrsConnectAppPacket();  
4654 - pkt->command_object = SrsAmf0Any::object();  
4655 - pkt->args = SrsAmf0Any::object();  
4656 -  
4657 - pkt->command_object->set("version", SrsAmf0Any::str("1.0.0"));  
4658 - pkt->command_object->set("build", SrsAmf0Any::number(150));  
4659 - SrsAmf0Object* data = SrsAmf0Any::object();  
4660 - pkt->command_object->set("data", data);  
4661 -  
4662 - data->set("server", SrsAmf0Any::str("SRS"));  
4663 - data->set("signature", SrsAmf0Any::str("ossrs"));  
4664 -  
4665 - pkt->args->set("info", SrsAmf0Any::str("NetStream.Status.Info"));  
4666 - pkt->args->set("desc", SrsAmf0Any::str("connected"));  
4667 - pkt->args->set("data", SrsAmf0Any::ecma_array());  
4668 -  
4669 - EXPECT_TRUE(ERROR_SUCCESS == proto.send_and_free_packet(pkt, 0));  
4670 - char buf[] = {  
4671 - (char)0x03, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0xb2, (char)0x14,  
4672 - (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x02, (char)0x00, (char)0x07, (char)0x63,  
4673 - (char)0x6f, (char)0x6e, (char)0x6e, (char)0x65, (char)0x63, (char)0x74, (char)0x00, (char)0x3f,  
4674 - (char)0xf0, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x03,  
4675 - (char)0x00, (char)0x07, (char)0x76, (char)0x65, (char)0x72, (char)0x73, (char)0x69, (char)0x6f,  
4676 - (char)0x6e, (char)0x02, (char)0x00, (char)0x05, (char)0x31, (char)0x2e, (char)0x30, (char)0x2e,  
4677 - (char)0x30, (char)0x00, (char)0x05, (char)0x62, (char)0x75, (char)0x69, (char)0x6c, (char)0x64,  
4678 - (char)0x00, (char)0x40, (char)0x62, (char)0xc0, (char)0x00, (char)0x00, (char)0x00, (char)0x00,  
4679 - (char)0x00, (char)0x00, (char)0x04, (char)0x64, (char)0x61, (char)0x74, (char)0x61, (char)0x03,  
4680 - (char)0x00, (char)0x06, (char)0x73, (char)0x65, (char)0x72, (char)0x76, (char)0x65, (char)0x72,  
4681 - (char)0x02, (char)0x00, (char)0x03, (char)0x53, (char)0x52, (char)0x53, (char)0x00, (char)0x09,  
4682 - (char)0x73, (char)0x69, (char)0x67, (char)0x6e, (char)0x61, (char)0x74, (char)0x75, (char)0x72,  
4683 - (char)0x65, (char)0x02, (char)0x00, (char)0x12, (char)0x73, (char)0x69, (char)0x6d, (char)0x70,  
4684 - (char)0x6c, (char)0x65, (char)0x2d, (char)0x72, (char)0x74, (char)0x6d, (char)0x70, (char)0x2d,  
4685 - (char)0x73, (char)0x65, (char)0x72, (char)0x76, (char)0x65, (char)0x72, (char)0x00, (char)0x00,  
4686 - (char)0x09, (char)0x00, (char)0x00, (char)0x09, (char)0x03, (char)0x00, (char)0x04, (char)0x69,  
4687 - (char)0x6e, (char)0x66, (char)0x6f, (char)0x02, (char)0x00, (char)0x15, (char)0x4e, (char)0x65,  
4688 - (char)0x74, (char)0x53, (char)0x74, (char)0x72, (char)0xc3, (char)0x65, (char)0x61, (char)0x6d,  
4689 - (char)0x2e, (char)0x53, (char)0x74, (char)0x61, (char)0x74, (char)0x75, (char)0x73, (char)0x2e,  
4690 - (char)0x49, (char)0x6e, (char)0x66, (char)0x6f, (char)0x00, (char)0x04, (char)0x64, (char)0x65,  
4691 - (char)0x73, (char)0x63, (char)0x02, (char)0x00, (char)0x09, (char)0x63, (char)0x6f, (char)0x6e,  
4692 - (char)0x6e, (char)0x65, (char)0x63, (char)0x74, (char)0x65, (char)0x64, (char)0x00, (char)0x04,  
4693 - (char)0x64, (char)0x61, (char)0x74, (char)0x61, (char)0x08, (char)0x00, (char)0x00, (char)0x00,  
4694 - (char)0x00, (char)0x00, (char)0x00, (char)0x09, (char)0x00, (char)0x00, (char)0x09  
4695 - };  
4696 - EXPECT_TRUE(srs_bytes_equals(bio.out_buffer.bytes(), buf, sizeof(buf)));  
4697 -}  
4698 -  
4699 -/**  
4700 -* send a SrsConnectAppResPacket packet  
4701 -*/  
4702 -VOID TEST(ProtocolStackTest, ProtocolSendSrsConnectAppResPacket)  
4703 -{  
4704 - MockBufferIO bio;  
4705 - SrsProtocol proto(&bio);  
4706 -  
4707 - SrsConnectAppResPacket* pkt = new SrsConnectAppResPacket();  
4708 - pkt->props = SrsAmf0Any::object();  
4709 - pkt->info = SrsAmf0Any::object();  
4710 -  
4711 - pkt->props->set("version", SrsAmf0Any::str("1.0.0"));  
4712 - pkt->props->set("build", SrsAmf0Any::number(150));  
4713 - SrsAmf0Object* data = SrsAmf0Any::object();  
4714 - pkt->props->set("data", data);  
4715 -  
4716 - data->set("server", SrsAmf0Any::str("SRS"));  
4717 - data->set("signature", SrsAmf0Any::str("ossrs"));  
4718 -  
4719 - pkt->info->set("info", SrsAmf0Any::str("NetStream.Status.Info"));  
4720 - pkt->info->set("desc", SrsAmf0Any::str("connected"));  
4721 - pkt->info->set("data", SrsAmf0Any::ecma_array());  
4722 -  
4723 - EXPECT_TRUE(ERROR_SUCCESS == proto.send_and_free_packet(pkt, 0));  
4724 - char buf[] = {  
4725 - (char)0x03, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0xb2, (char)0x14,  
4726 - (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x02, (char)0x00, (char)0x07, (char)0x5f,  
4727 - (char)0x72, (char)0x65, (char)0x73, (char)0x75, (char)0x6c, (char)0x74, (char)0x00, (char)0x3f,  
4728 - (char)0xf0, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x03,  
4729 - (char)0x00, (char)0x07, (char)0x76, (char)0x65, (char)0x72, (char)0x73, (char)0x69, (char)0x6f,  
4730 - (char)0x6e, (char)0x02, (char)0x00, (char)0x05, (char)0x31, (char)0x2e, (char)0x30, (char)0x2e,  
4731 - (char)0x30, (char)0x00, (char)0x05, (char)0x62, (char)0x75, (char)0x69, (char)0x6c, (char)0x64,  
4732 - (char)0x00, (char)0x40, (char)0x62, (char)0xc0, (char)0x00, (char)0x00, (char)0x00, (char)0x00,  
4733 - (char)0x00, (char)0x00, (char)0x04, (char)0x64, (char)0x61, (char)0x74, (char)0x61, (char)0x03,  
4734 - (char)0x00, (char)0x06, (char)0x73, (char)0x65, (char)0x72, (char)0x76, (char)0x65, (char)0x72,  
4735 - (char)0x02, (char)0x00, (char)0x03, (char)0x53, (char)0x52, (char)0x53, (char)0x00, (char)0x09,  
4736 - (char)0x73, (char)0x69, (char)0x67, (char)0x6e, (char)0x61, (char)0x74, (char)0x75, (char)0x72,  
4737 - (char)0x65, (char)0x02, (char)0x00, (char)0x12, (char)0x73, (char)0x69, (char)0x6d, (char)0x70,  
4738 - (char)0x6c, (char)0x65, (char)0x2d, (char)0x72, (char)0x74, (char)0x6d, (char)0x70, (char)0x2d,  
4739 - (char)0x73, (char)0x65, (char)0x72, (char)0x76, (char)0x65, (char)0x72, (char)0x00, (char)0x00,  
4740 - (char)0x09, (char)0x00, (char)0x00, (char)0x09, (char)0x03, (char)0x00, (char)0x04, (char)0x69,  
4741 - (char)0x6e, (char)0x66, (char)0x6f, (char)0x02, (char)0x00, (char)0x15, (char)0x4e, (char)0x65,  
4742 - (char)0x74, (char)0x53, (char)0x74, (char)0x72, (char)0xc3, (char)0x65, (char)0x61, (char)0x6d,  
4743 - (char)0x2e, (char)0x53, (char)0x74, (char)0x61, (char)0x74, (char)0x75, (char)0x73, (char)0x2e,  
4744 - (char)0x49, (char)0x6e, (char)0x66, (char)0x6f, (char)0x00, (char)0x04, (char)0x64, (char)0x65,  
4745 - (char)0x73, (char)0x63, (char)0x02, (char)0x00, (char)0x09, (char)0x63, (char)0x6f, (char)0x6e,  
4746 - (char)0x6e, (char)0x65, (char)0x63, (char)0x74, (char)0x65, (char)0x64, (char)0x00, (char)0x04,  
4747 - (char)0x64, (char)0x61, (char)0x74, (char)0x61, (char)0x08, (char)0x00, (char)0x00, (char)0x00,  
4748 - (char)0x00, (char)0x00, (char)0x00, (char)0x09, (char)0x00, (char)0x00, (char)0x09  
4749 - };  
4750 - EXPECT_TRUE(srs_bytes_equals(bio.out_buffer.bytes(), buf, sizeof(buf)));  
4751 -}  
4752 -  
4753 -/**  
4754 * send a SrsCallPacket packet 4646 * send a SrsCallPacket packet
4755 */ 4647 */
4756 VOID TEST(ProtocolStackTest, ProtocolSendSrsCallPacket) 4648 VOID TEST(ProtocolStackTest, ProtocolSendSrsCallPacket)
@@ -4938,36 +4830,6 @@ VOID TEST(ProtocolStackTest, ProtocolSendSrsPublishPacket) @@ -4938,36 +4830,6 @@ VOID TEST(ProtocolStackTest, ProtocolSendSrsPublishPacket)
4938 } 4830 }
4939 4831
4940 /** 4832 /**
4941 -* send a SrsPlayPacket packet  
4942 -*/  
4943 -VOID TEST(ProtocolStackTest, ProtocolSendSrsPlayPacket)  
4944 -{  
4945 - MockBufferIO bio;  
4946 - SrsProtocol proto(&bio);  
4947 -  
4948 - SrsPlayPacket* pkt = new SrsPlayPacket();  
4949 - pkt->command_name = "play";  
4950 - pkt->command_object = SrsAmf0Any::null();  
4951 - pkt->stream_name = "livestream";  
4952 - pkt->start = 0;  
4953 - pkt->duration = 0;  
4954 - pkt->reset = true;  
4955 -  
4956 - EXPECT_TRUE(ERROR_SUCCESS == proto.send_and_free_packet(pkt, 0));  
4957 - char buf[] = {  
4958 - (char)0x05, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x32, (char)0x14,  
4959 - (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x02, (char)0x00, (char)0x04, (char)0x70,  
4960 - (char)0x6c, (char)0x61, (char)0x79, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,  
4961 - (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x05, (char)0x02, (char)0x00, (char)0x0a,  
4962 - (char)0x6c, (char)0x69, (char)0x76, (char)0x65, (char)0x73, (char)0x74, (char)0x72, (char)0x65,  
4963 - (char)0x61, (char)0x6d, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,  
4964 - (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,  
4965 - (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x01, (char)0x01  
4966 - };  
4967 - EXPECT_TRUE(srs_bytes_equals(bio.out_buffer.bytes(), buf, sizeof(buf)));  
4968 -}  
4969 -  
4970 -/**  
4971 * send a SrsPlayResPacket packet 4833 * send a SrsPlayResPacket packet
4972 */ 4834 */
4973 VOID TEST(ProtocolStackTest, ProtocolSendSrsPlayResPacket) 4835 VOID TEST(ProtocolStackTest, ProtocolSendSrsPlayResPacket)