94 commits

Author	SHA1	Message	Date
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
winlin	223ae194b1	fix #209, cleanup hls when stop and timeout. 2.0.173.	2015-05-30 14:41:09 +08:00
winlin	4a80a5a71e	for #209, support cleanup when srs stop.	2015-05-30 13:48:29 +08:00
winlin	d611bb6b45	for #209, server cycle to enable the hls to cleanup. do dispose	2015-05-30 10:48:02 +08:00
winlin	c1b9541b5c	support disable all	2015-05-27 07:22:44 +08:00
winlin	2f0ef87d6d	refine code, rename the sync call to common class.	2015-05-23 07:57:45 +08:00
winlin	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:38:23 +08:00
winlin	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
winlin	0acb942c3a	update on_hls, add ts_url, m3u8 and m3u8_url.	2015-04-23 12:05:24 +08:00
winlin	dcac9c69d5	fix #381, support reap hls/ts by gop or not. 2.0.160.	2015-04-13 10:32:32 +08:00
winlin	e3c6e52547	enhanced on_hls_notify, support HTTP GET when reap ts.	2015-04-10 12:01:45 +08:00
winlin	7dbc95e085	refine the hls deviation for floor algorithm.	2015-04-10 10:21:30 +08:00
winlin	546be09219	fix #375, fix hls bug, keep cc continous between ts files. 2.0.159.	2015-04-08 16:52:43 +08:00
winlin	e7fd309cb0	refine hls info, show the deviation in seconds and pieces.	2015-04-07 10:30:45 +08:00
winlin	64b065e450	for hls callback, add duration of ts.	2015-04-03 13:46:44 +08:00
winlin	8401d9ac06	fix #366, config hls to disable cleanup of ts. 2.0.154.	2015-04-02 11:52:03 +08:00
winlin	c49bc0628e	support on_hls for http hooks. 2.0.152.	2015-03-31 17:42:12 +08:00
winlin	97442c56b6	enhance hls in floor mode.	2015-03-31 17:03:14 +08:00
winlin	b9c21b1e8f	enhanced hls, warning when ts dup or jmp.	2015-03-31 15:54:05 +08:00