3526 commits

Author	SHA1	Message	Date
winlin	c2a938473a	CI: Cover kernel codec	2019-02-03 22:03:15 +08:00
winlin	1df1d84766	CI: Cover kernel LB round robin	2019-02-03 21:23:06 +08:00
winlin	5b311a06b7	CI: Verify kernel aac write ADTS packet	2019-02-03 21:14:14 +08:00
winlin	917cb4a299	CI: Cover all kernel aac	2019-02-03 20:58:04 +08:00
winlin	2ae3440128	CI: Cover all kernel error	2019-02-03 12:56:29 +08:00
winlin	3cd3739433	CI: Cover all kernel error	2019-02-03 12:51:48 +08:00
winlin	8c9857ff6f	CI: Remove macros for utest	2019-02-03 12:38:07 +08:00
winlin	bfeea72eac	CI: Cover all kernel buffer	2019-02-03 12:28:18 +08:00
winlin	a2b0767874	Fix build failed.	2019-02-03 09:38:20 +08:00
winlin	c646e3f287	CI: Research support codecov	2019-02-03 09:27:08 +08:00
winlin	a25efa3764	CI: Update codecov badge	2019-02-02 21:51:08 +08:00
winlin	7243d8e7b8	CI: Support codecov	2019-02-02 21:42:03 +08:00
winlin	b4619e3393	Kbps: Remove the union for kbps slice	2019-02-02 18:20:19 +08:00
winlin	98706f793e	Support Opus audio-level	2019-01-17 16:01:43 +08:00
winlin	f1b1f78c4e	Parse Opus for tools	2019-01-17 11:35:15 +08:00
winlin	e77b570636	Add codec OPUS/HEVC to FLV	2019-01-17 09:24:17 +08:00
winlin	b2d1d84634	Change to 2019	2019-01-01 21:37:28 +08:00
winlin	66198b6f78	Add utest for RTMP protocol	2019-01-01 21:05:52 +08:00
winlin	a2d6566019	Add kernel utility utest	2019-01-01 20:19:44 +08:00
winlin	6e44aa4a4f	Cover Kbps statistic	2019-01-01 18:22:11 +08:00
winlin	6e9c7dd11e	Add utest for SrsKbps as RAW statistics	2019-01-01 17:44:39 +08:00
winlin	6234905532	Refactor ISrsKbpsDelta	2019-01-01 17:36:27 +08:00
winlin	dcebf8a31f	Refine kbps	2019-01-01 14:04:50 +08:00
winlin	aef838338c	Add utest for kbps connections	2018-12-23 21:19:17 +08:00
winlin	c26b475bae	Refine kbps, stub wall clock	2018-12-23 20:47:17 +08:00
winlin	4c40370986	Refine kbps more testable	2018-12-23 20:30:12 +08:00
winlin	16fa4c588a	Rename ISrsProtocolReaderWriter to ISrsProtocolReadWriter	2018-12-23 20:08:04 +08:00
winlin	6e75993e7f	Change public virtual to virtual public	2018-12-23 19:54:08 +08:00
winlin	5d959661e7	No sudoer	2018-12-22 20:51:57 +08:00
winlin	2e9bf2af83	Always enable SRS_StreamCaster	2018-12-22 20:45:25 +08:00
winlin	1dc95cba78	Always enable SRS_Ingest	2018-12-22 20:31:47 +08:00
winlin	aa1a5442f9	Always enable SRS_Ingest	2018-12-22 20:30:13 +08:00
winlin	c6844527fb	Always enable SRS_SSL	2018-12-22 20:23:39 +08:00
winlin	e4e6dd2169	Always enable SRS_SSL	2018-12-22 20:08:42 +08:00
winlin	0bc7fdbb35	Always enable SRS_SSL	2018-12-22 20:03:40 +08:00
winlin	8e294709b0	Always enable SRS_STAT	2018-12-22 19:58:36 +08:00
winlin	71f1ccbf90	Always enable SRS_HLS	2018-12-22 19:54:10 +08:00
winlin	f003ba9a29	Always enable SRS_DVR	2018-12-22 19:50:57 +08:00
winlin	330100769f	Always enable SRS_TRANSCODE	2018-12-22 19:48:55 +08:00
winlin	0626bc5982	Use openssl in docker	2018-12-10 14:27:55 +08:00
winlin	432a575c7a	Use docker for #1274 and #1250	2018-12-10 00:07:38 +08:00
winlin	b0e91e8fe9	Use docker for #1274 and #1250	2018-12-10 00:05:23 +08:00
winlin	f1ab8fecac	Fix build warning	2018-12-09 22:48:47 +08:00
winlin	ef3e35f173	Fix build warning	2018-12-09 21:04:43 +08:00
winlin	4d157f2148	Fix build warning	2018-12-09 21:00:38 +08:00
winlin	dcc2a73e7a	Refine kernel aac	2018-12-09 20:58:40 +08:00
winlin	572a2806c1	Refine utest	2018-12-09 20:36:31 +08:00
winlin	a8be5f8f27	Allow OSX for utest	2018-12-09 19:41:59 +08:00
winlin	f2a93755c2	Allow OSX for utest	2018-12-09 19:39:36 +08:00
winlin	f1033296bb	Upgrade to FFMPEG 4.1 and X264 157. 2.0.261	2018-12-01 20:21:35 +08:00
winlin	acaae0d5c9	Update SRS3	2018-11-27 21:45:57 +08:00
winlin	ba4ef34d27	Merge 2.0release	2018-11-27 21:24:51 +08:00
Steven Liu	78cf3d4b58	upgrade x264 and ffmpeg to newest version (#1274) ... The ffmpeg and x264 in srs is too old. Signed-off-by: Steven Liu lq@chinaffmpeg.org Signed-off-by: Steven Liu <lq@chinaffmpeg.org>	2018-11-27 21:17:42 +08:00
winlin	ff82ca1233	Merge branch 2.0release into 3.0release	2018-11-11 16:24:09 +08:00
winlin	99430d2edb	For #1250, Not support macOS 10.14	2018-11-11 16:24:00 +08:00
winlin	24f46f5085	#1261, Support _definst_ for Wowza. 3.0.44	2018-11-11 13:51:10 +08:00
winlin	99aa249f3a	#1261, Support _definst_ for Wowza. 2.0.260	2018-11-11 13:33:47 +08:00
MakarovYaroslav	e62ac29f48	add ignoring _definst_ at the end of app (#1261)	2018-11-11 13:31:29 +08:00
winlin	b2066cbf68	#1263, Fix string trim bug. 2.0.259	2018-11-11 13:30:12 +08:00
MakarovYaroslav	a2480a6c94	fix bug with for loop (#1263)	2018-11-11 13:27:33 +08:00
winlin	39f1629168	Merge from SRS2	2018-10-28 14:24:18 +08:00
winlin	58e501ee24	Fix #1250, Support build on OSX10.14 Mojave. 2.0.258	2018-10-28 14:09:55 +08:00
winlin	63ac93a642	Merge #1236 from 2.0release	2018-10-08 07:22:21 +08:00
winlin	a5b452f965	Merge #1236, Fix sleep bug in us. 2.0.257	2018-10-08 07:16:07 +08:00
RocFang	768fe68ca3	fix st_usleep param from us to ms. (#1236) ... fix st_usleep param from us to ms.	2018-10-08 07:14:14 +08:00
winlin	3f009937ee	Merge #1237 from 2.0release	2018-10-08 07:10:29 +08:00
winlin	9859fa9e6f	Merge #1237, Support param for transcoder. 2.0.256	2018-10-08 07:09:31 +08:00
Mirko Velic	70ad16ff6a	Add request stream param to encoder output format parameters. (#1237)	2018-10-08 07:01:49 +08:00
winlin	8e55ef4b60	Refine code	2018-08-26 14:29:45 +08:00
winlin	1e2cca4712	For #1093, Refine HLS encryption wiki	2018-08-25 21:59:56 +08:00
winlin	5945fb5a24	Fix #1093, Support HLS encryption. 3.0.42	2018-08-25 21:17:33 +08:00
winlin	ee068cf120	For #1109, Support without ssl for HLS key.	2018-08-25 21:15:26 +08:00
winlin	522fba99aa	Merge branch 3.0release into harlanc-3.0release	2018-08-25 18:12:39 +08:00
winlin	e73e30de3a	Fix #1051, Drop ts when republishing stream. 3.0.41	2018-08-25 18:10:55 +08:00
winlin	74d5d15c9f	Merge branch 3.0release of https://github.com/harlanc/srs into harlanc-3.0release	2018-08-25 12:43:52 +08:00
winlin	1e054d2bcc	Fix #354, Rename impl__SrsAutoFree to impl_SrsAutoFree	2018-08-25 12:20:52 +08:00
Harlan	22c5af62cf	Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release ... # Conflicts: # trunk/src/kernel/srs_kernel_utility.hpp	2018-08-15 07:37:12 +08:00
Harlan	bf12a45274	add configuration instructions for hls encryption	2018-08-12 14:18:05 +08:00
Harlan	ac6b37de4b	rewrite ff_data_to_hex	2018-08-12 14:10:18 +08:00
winlin	a9b5d65ca7	For #1202, Support auth_key param for srs player	2018-08-12 11:52:18 +08:00
winlin	728ddd133b	For #1202, Support edge/forward to Aliyun CDN. 3.0.40	2018-08-12 10:46:06 +08:00
winlin	74a87d54f2	For #1202, Support edge/forward to Aliyun CDN. 2.0.255	2018-08-12 10:44:55 +08:00
winlin	1cc72df134	Fix #910, Support HTTP FLV with HTTP callback. 3.0.39	2018-08-11 19:23:51 +08:00
winlin	1e7c12a6dd	For #910, Support HTTP FLV with HTTP callback. 2.0.254	2018-08-11 19:09:56 +08:00
winlin	928c6ab091	For #1181, Add utest	2018-08-11 13:16:59 +08:00
winlin	01d8bba455	For #1181, Refine code to write utest	2018-08-11 12:33:03 +08:00
winlin	6cea551c64	For #1110, Refine params in http callback. 2.0.253	2018-08-11 10:12:40 +08:00
winlin	d607c7f905	Refine HTTP-FLV latency, support realtime mode.3.0.38	2018-08-05 20:30:04 +08:00
winlin	03ac48f8fa	Merge 2.0, for FLV latency	2018-08-05 20:25:28 +08:00
winlin	c45f72ef7b	Refine HTTP-FLV latency, support realtime mode. 2.0.252	2018-08-05 20:23:17 +08:00
winlin	580c94c8c0	Refine code	2018-08-05 18:58:23 +08:00
winlin	31945c244d	For #1110, Refine code.	2018-08-05 11:09:48 +08:00
winlin	455a060fa5	Merge 2.0	2018-08-05 10:52:37 +08:00
winlin	ee43fc92ae	For #1110, Refine conf	2018-08-05 10:47:01 +08:00
winlin	ae99131512	Fix #1087, Ignore iface without address. 3.0.37	2018-08-05 10:41:31 +08:00
winlin	82699ff616	Refine code for librtmp	2018-08-05 10:39:52 +08:00
winlin	29b74c7220	For #1110, Support params in http callback. 3.0.36	2018-08-04 19:51:04 +08:00
winlin	85d3a5001c	For #1110, Support params in http callback. 2.0.251	2018-08-04 19:36:42 +08:00
winlin	68a1656e07	Fix #1031, Always use vhost in stream query, the unify uri. 3.0.35	2018-08-02 09:17:49 +08:00
winlin	09dbda5b18	For #1031, SRS forwarder support douyu.com.	2018-08-02 07:24:08 +08:00
winlin	a66d450ec1	For #1031, SRS edge support douyu.com. 3.0.34	2018-08-02 07:14:06 +08:00
winlin	586899a010	For #1031, SRS edge support douyu.com. 2.0.250	2018-08-02 06:59:57 +08:00
winlin	41c6e833b9	Replace hex to string to match MIT license. 3.0.33	2018-07-22 18:47:38 +08:00
winlin	84f81983aa	Replace base64 to match MIT license. 3.0.32	2018-07-22 17:56:38 +08:00
winlin	0a63448b86	Replace crc32 MPEG and IEEE by pycrc to match MIT license. 3.0.31	2018-07-22 15:21:05 +08:00
winlin	e395878916	Replace crc32 IEEE by golang to match MIT license. 3.0.30	2018-07-21 20:58:20 +08:00
winlin	dea5e5bb48	Add utest or CRC32 IEEE, refine TABs of code	2018-07-21 19:09:32 +08:00
winlin	608c88b8f2	Merge 2.0release	2018-07-21 17:52:12 +08:00
winlin	6d7c7418a8	Merge #1119, fix memory leak. 2.0.249	2018-07-21 17:49:46 +08:00
winlin	551863a7ed	Refine code	2018-07-21 17:34:31 +08:00
winlin	693194dffe	Merge 2.0release	2018-07-18 19:26:53 +08:00
winlin	d27db215df	For #1176, should not close fd when success.	2018-07-18 19:21:29 +08:00
winlin	e4742ddac7	Merge 2.0release	2018-07-17 13:59:51 +08:00
winlin	2d49b9d1a7	Merge #1176, fix scaned issues. 2.0.248	2018-07-17 13:44:01 +08:00
Hui Zhang (huzhang2)	01ed485cf3	fix #1172 #1173 #1174 #1175 ... security scan report issue	2018-07-17 10:03:13 +08:00
Harlan	e9cb8210fc	fix default value error	2018-05-15 11:20:52 +08:00
Harlan	45a57acbb4	fix bug	2018-04-06 10:05:13 +08:00
Harlan	43ebd5958d	fix bug that only one stream can be encrypted..	2018-04-03 22:00:32 +08:00
winlin	dba44c7c3f	Merge branch 'develop' into 3.0release	2018-03-25 20:00:33 +08:00
xialixin	bb4e16ae3c	fix create dir success result check (#1080)	2018-03-25 17:48:07 +08:00
xialixin	aaf2905a9d	add: hls configuration adds [duration] variable (#1083)	2018-03-25 17:47:37 +08:00
Harlan	52596a0b04	add HLS encryption feature	2018-03-25 12:05:52 +08:00
winlin	0d78b908a7	Fix client tools resolve dns failed bug	2018-03-20 19:50:46 +08:00
winlin	449c632e49	For #464: Add example for origin cluster	2018-03-03 10:01:01 +08:00
winlin	bd797ad385	Fix utest build failed for ::atoi	2018-03-03 09:33:15 +08:00
winlin	459272b94c	Merge #1077 from 2.0release	2018-02-28 14:10:09 +08:00
winlin	0fe17c3e34	Merge #1077, fix crash for edge HLS. 2.0.247	2018-02-28 13:37:30 +08:00
RocFang	fd016ed91a	use hls->initialize to set req of hls (#1077)	2018-02-28 13:35:33 +08:00
winlin	4bf5ab2044	Fix #464, support RTMP origin cluster. 3.0.29	2018-02-16 16:40:48 +08:00
winlin	c70421e656	Fix #464, support origin cluster	2018-02-16 16:39:07 +08:00
winlin	2f09ec4353	For #464, refine result of origin cluster api	2018-02-16 14:13:14 +08:00
winlin	92f2bcd878	For #464, support config origin cluster	2018-02-16 10:31:19 +08:00
winlin	55c96192e2	For #464, refine code	2018-02-16 10:19:48 +08:00
winlin	ec362b2774	For #464, query origin info and ip addresses	2018-02-16 09:37:31 +08:00
winlin	469250f850	For #464, support origin cluster api	2018-02-15 20:55:34 +08:00
winlin	d0fbf44d18	For #464, support config for origin cluster.	2018-02-14 21:52:40 +08:00
winlin	db6b8cf914	Fix #1057, switch to simple handshake. 3.0.28	2018-02-13 09:05:01 +08:00
winlin	a2cefe4dbd	For #1059, show more information from stream	2018-02-13 09:02:46 +08:00
winlin	681138d2af	Fix #1059, merge from 2.0, supports url with vhost in stream. 3.0.27	2018-02-13 08:52:57 +08:00
winlin	1721e4ea4b	Fix #1059, support vhost in stream parameters. 2.0.246	2018-02-13 08:31:25 +08:00
winlin	93d3e1464a	For #1045, revert macro for TCP keepalive detection, use system macro	2018-01-07 17:49:57 +08:00
winlin	366309ce2d	For #1045, revert macro for TCP keepalive detection, use system macro	2018-01-07 17:49:14 +08:00
winlin	049e7c82c0	Merge #1044, for #1045, set TCP SO_KEEPALIVE	2018-01-07 17:23:36 +08:00
winlin	911cd448f1	Merge #1045, for #1044, TCP connection alive detection. 2.0.245	2018-01-07 17:18:43 +08:00
juntaoliu	a6871052af	set tcp keepalive for tcp socket (#1045)	2018-01-07 17:03:13 +08:00
winlin	82457cda4b	Change date from 2017 to 2018	2018-01-07 11:00:58 +08:00
winlin	ca1395a807	Change date from 2017 to 2018	2018-01-07 10:58:53 +08:00
winlin	d9e37d2f54	Merge branch '2.0release' into 3.0release	2018-01-04 13:49:55 +08:00
RocFang	d22d7afd83	update init.d file (#1039)	2018-01-04 13:45:56 +08:00
winlin	5730bf8e43	Fix #913, support complex error. 3.0.26	2018-01-01 23:03:42 +08:00