3075 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	425e69e0cd	Merge branch '2.0release' into develop	2015-04-09 18:03:55 +08:00
winlin	23b310971e	guess again when annexb change to ibmf.	2015-04-09 18:03:45 +08:00
winlin	71e1602458	merge from 2.0.159	2015-04-09 12:35:53 +08:00
winlin	bd77f995bf	ignore the unknown flv tag.	2015-04-09 12:35:17 +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	29ac4c724b	change default log tank to file.	2015-04-07 17:55:45 +08:00
winlin	cfed8e81c5	merge from 2.0.158	2015-04-07 17:44:09 +08:00
winlin	e56d7add44	fix bug of config to parse the default value. 2.0.158	2015-04-07 17:42:41 +08:00
winlin	aef97db77a	refine the config code.	2015-04-07 17:04:04 +08:00
winlin	931370e9f6	Merge branch '2.0release' into develop	2015-04-07 10:30:53 +08:00
winlin	e7fd309cb0	refine hls info, show the deviation in seconds and pieces.	2015-04-07 10:30:45 +08:00
winlin	e958305d09	Merge branch '2.0release' into develop	2015-04-04 18:24:13 +08:00
winlin	6e2d756e1b	fix the bug of h.264 bit stream demux.	2015-04-04 18:24:07 +08:00
winlin	3fcc26a499	update donation.	2015-04-04 16:24:33 +08:00
winlin	bd7db5aed6	only ignore the aud message.	2015-04-04 16:05:11 +08:00
winlin	61d5b78ae5	refine the h264 parser, one ts message should parsed to one rtmp/flv message.	2015-04-04 15:53:36 +08:00
winlin	4329366c08	for #304, do not add deviation for absolute overflow.	2015-04-04 15:00:24 +08:00
winlin	4f9df4f1a0	merge from 2.0.157, reap ts on the IDR.	2015-04-04 13:31:02 +08:00
winlin	77c29da26b	for #304, rewrite annexb mux for ts, refer to apple sample. 2.0.157.	2015-04-04 13:30:13 +08:00
winlin	70c59da1bf	enhanced avc decode, parse the sps get width+height. 2.0.156.	2015-04-03 23:17:50 +08:00
winlin	7e1749e029	refine the comments.	2015-04-03 17:20:41 +08:00
winlin	e458305f81	add utc time format.	2015-04-03 16:42:32 +08:00
winlin	90cd16aae4	Merge branch '2.0release' into develop	2015-04-03 14:36:09 +08:00
winlin	56cd373015	support hls callback with duration.	2015-04-03 14:24:47 +08:00
winlin	64b065e450	for hls callback, add duration of ts.	2015-04-03 13:46:44 +08:00
winlin	c4466a8c0c	fix crash bug for hls cleanup.	2015-04-03 12:43:40 +08:00
winlin	eb54ec25c9	fix compile errors.	2015-04-03 11:30:59 +08:00
winlin	cb148e43ee	merge from 2.0.155	2015-04-03 10:57:34 +08:00
winlin	17c0a5c470	fix #372, support transform vhost of edge 2.0.155.	2015-04-03 10:56:56 +08:00
winlin	d95e5a3f47	Merge branch '2.0release' into develop	2015-04-02 15:07:29 +08:00
winlin	4d98cbb965	add hls config in api.	2015-04-02 15:05:09 +08:00
winlin	fe5783e7a4	merge 2.0.154	2015-04-02 11:52:49 +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	2d3d628865	merge from 2.0.153	2015-03-31 18:09:13 +08:00
winlin	717d088376	support server cycle handler. 2.0.153.	2015-03-31 18:06:55 +08:00
winlin	e75b7e89d6	merge from 2.0.152	2015-03-31 17:53:32 +08:00
winlin	3b4bd194b6	refine http hooks, donot pass the known variable.	2015-03-31 17:52:49 +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	76c1957260	enhance hls, increase piece one by one.	2015-03-31 16:58:20 +08:00
winlin	ef28865991	merge from 2.0.151	2015-03-31 15:54:37 +08:00
winlin	b9c21b1e8f	enhanced hls, warning when ts dup or jmp.	2015-03-31 15:54:05 +08:00
winlin	9be7fbba7d	user smaller deviation to avoid dup ts.	2015-03-31 15:42:21 +08:00
winlin	f6e135943f	enhanced hls, support deviation for duration. 2.0.151.	2015-03-31 15:39:47 +08:00
winlin	40f186ba82	Merge branch '2.0release' into develop	2015-03-30 14:08:26 +08:00
winlin	cd682ae4be	update donations. fix hls path bug.	2015-03-30 14:08:17 +08:00
winlin	abbed8f66c	merge from 2.0release	2015-03-30 12:56:52 +08:00
winlin	692b751da8	for #351, support config the m3u8/ts path for hls. 2.0.149.	2015-03-30 12:44:04 +08:00