112 commits

Author	SHA1	Message	Date
winlin	8a0c2e01f8	Log: Change cid from int to string	2020-06-18 11:45:43 +08:00
winlin	857c783efc	For #1509, release coroutine when source is idle. 3.0.98	2020-01-15 19:51:33 +08:00
winlin	d783a12f89	Happy 2020	2019-12-30 10:10:35 +08:00
winlin	b4870a6d6f	Fix #1506, support directly turn FLV timestamp to TS DTS. 3.0.68	2019-12-05 20:47:23 +08:00
winlin	ffe391aa49	Fix HLS no PMT/PAT bug.	2019-05-07 07:40:19 +08:00
winlin	aac8a13f42	Refine typo in app.	2019-04-28 09:08:05 +08:00
winlin	1626942d29	Fix SrsHlsMuxer::segment_close bug, reopen segment when close failed.	2019-04-18 09:28:08 +08:00
winlin	6380e8f1c0	Fix HLS segment close bug	2019-04-16 09:32:26 +08:00
winlin	917f6d066d	Refine get_hls_window in time unit	2019-04-16 08:20:32 +08:00
winlin	ca705a6f62	Refine get_hls_fragment in time unit	2019-04-16 08:14:12 +08:00
winlin	980c32aee6	Refine on_hls duration in time unit	2019-04-15 07:53:29 +08:00
winlin	5f3d09c8a0	Refine hls muxer duration in time duration.	2019-04-15 07:47:37 +08:00
winlin	53357e92fe	Refine headers	2019-04-11 09:27:16 +08:00
winlin	6c12aa0eca	Refine srs_update_system_time in time unit	2019-04-10 09:07:03 +08:00
winlin	b2d1d84634	Change to 2019	2019-01-01 21:37:28 +08:00
winlin	ee068cf120	For #1109, Support without ssl for HLS key.	2018-08-25 21:15:26 +08:00
Harlan	43ebd5958d	fix bug that only one stream can be encrypted..	2018-04-03 22:00:32 +08:00
Harlan	52596a0b04	add HLS encryption feature	2018-03-25 12:05:52 +08:00
winlin	ca1395a807	Change date from 2017 to 2018	2018-01-07 10:58:53 +08:00
winlin	abcaba33ee	For #913: TS/HLS/MPEGTS support complex error	2017-09-22 21:50:54 +08:00
winlin	20a42599f3	For #913, http callback use complex error	2017-09-22 19:54:50 +08:00
winlin	7cac35a289	For #913, source cycle error	2017-06-11 09:40:07 +08:00
winlin	a98c9e04e3	Fix #547, support HLS audio in TS. 3.0.22	2017-04-16 21:33:39 +08:00
winlin	0a57a46016	Refine LICENSE	2017-03-25 21:29:29 +08:00
winlin	f32aab3d92	For #299, refine code.	2017-03-25 17:21:39 +08:00
winlin	da4c390d69	For #299, extract fragment and fragment window for hls	2017-03-18 21:29:08 +08:00
winlin	ede1c34a25	for #299, refine the signature of api for hls/dash	2017-02-19 21:48:32 +08:00
winlin	2fcd3972c1	for #299, refine the encoder object name	2017-02-12 21:50:02 +08:00
winlin	2a4f57a587	Fix #301, User must config the codec in right way for HLS. 3.0.18	2017-02-12 20:55:35 +08:00
winlin	caf69f193d	for #299, refine the codec object name	2017-02-12 20:38:39 +08:00
winlin	d7458c4e72	For #299, refine the codec to format-frame-sample chain.	2017-02-12 18:18:18 +08:00
winlin	c4a510b834	For #299, refine the codec info structure.	2017-02-11 23:09:23 +08:00
winlin	5e419c66f8	For #299, add dash files.	2017-02-11 21:14:28 +08:00
winlin	8e5d4dc73d	always enable http and hls	2017-02-11 13:29:53 +08:00
winlin	3209ad29e0	for #738, refine code for DVR mp4.	2017-02-06 20:58:52 +08:00
winlin	4cff49afd2	for #742, refine source, meta and origin hub. 3.0.16	2017-01-19 12:38:55 +08:00
winlin	7ac932cfa0	update to 2013-2017	2016-12-16 11:57:25 +08:00
winlin	664844b5f5	merge from srs2. for #513.	2016-12-15 14:54:09 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	2015-11-11 10:45:45 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	1d57e53910	merge from 2.0release	2015-10-27 17:45:14 +08:00
winlin	3683f06e4d	for #512, write audio frame by frame for video+audio hls.	2015-10-27 16:20:02 +08:00
winlin	4f3d2c8607	rename SrsSimpleBuffer to SrsSimpleStream	2015-09-22 08:59:52 +08:00
winlin	2a1b2b69a0	for #459, dvr support apply filter for ng-control dvr module.	2015-09-15 15:58:57 +08:00
winlin	511627abab	fix #474, config to donot parse width/height from sps. 2.0.189	2015-09-14 18:36:44 +08:00
winlin	83a9ff9f5d	for #474, refine the hls publish, donot fetch from source when publish	2015-09-14 15:49:25 +08:00
winlin	0d57ef9373	fix #458, http hooks use source thread cid. 2.0.188	2015-09-14 13:47:25 +08:00
winlin	40c264a316	always reset the max target duration for hls.	2015-07-14 10:31:42 +08:00
winlin	26b76c0e4c	fix #420, remove ts for hls ram mode.	2015-06-05 20:38:01 +08:00