1528 commits

Author	SHA1	Message	Date
winlin	6234905532	Refactor ISrsKbpsDelta	2019-01-01 17:36:27 +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	2e9bf2af83	Always enable SRS_StreamCaster	2018-12-22 20:45:25 +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	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	330100769f	Always enable SRS_TRANSCODE	2018-12-22 19:48:55 +08:00
winlin	ba4ef34d27	Merge 2.0release	2018-11-27 21:24:51 +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
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	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
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	ac6b37de4b	rewrite ff_data_to_hex	2018-08-12 14:10:18 +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	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	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
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	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	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	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
RocFang	fd016ed91a	use hls->initialize to set req of hls (#1077)	2018-02-28 13:35:33 +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