2429 commits

Author	SHA1	Message	Date
winlin	3209ad29e0	for #738, refine code for DVR mp4.	2017-02-06 20:58:52 +08:00
winlin	0a054cd6bd	for #738, remove the dvr plan append for it's no use	2017-02-06 20:22:07 +08:00
winlin	8c01f52372	for #738, refine the dvr segmenter.	2017-02-06 18:33:26 +08:00
winlin	31191f2650	for #738, support srs ingest mp4	2017-02-05 21:22:07 +08:00
winlin	4fe79a1025	for #738, fix the audio sample offset error.	2017-02-05 20:27:37 +08:00
winlin	733252dc21	for #738, remove test code	2017-02-05 09:23:38 +08:00
winlin	733ba73d54	for #738, write mp4 samples.	2017-02-05 09:15:46 +08:00
winlin	e24674e9cf	for #738, refine build mp4 samples from moov.	2017-02-04 22:45:52 +08:00
winlin	3025aebf42	for #738, mp4 build samples from moov.	2017-02-04 22:25:03 +08:00
winlin	253ac40312	for #738, parse avcc/sps/pps/asc from mp4.	2017-02-04 14:57:07 +08:00
winlin	9d21a8bb33	for #738, use reader and seeker for mp4 demuxer to seek for general mp4(ftyp-mdat-moov).	2017-02-03 22:49:19 +08:00
winlin	bbee16e4db	for #738, parse moov, get the h.264/avcC and aac/asc	2017-02-03 21:03:26 +08:00
winlin	e8eb050bf2	update readme	2017-02-03 14:57:28 +08:00
winlin	ac7ee10b60	fix #751,#756, refine code	2017-02-03 11:56:02 +08:00
Chengdong Zhang	80540e4dc1	change TAB space ... change TAB space for line 794	2017-02-03 10:58:32 +08:00
eagle-zhang	7b02e3543f	Clients Api support start and count ... Clients Api support start and count line 794~810 && line 830	2017-02-03 10:49:06 +08:00
winlin	7ee1df33d1	for #738, parse mp4 udta(user data) box.	2017-02-02 22:20:33 +08:00
winlin	ffe0a4426d	for #738, parse mp4 moov boxes.	2017-02-02 22:02:39 +08:00
winlin	96f2e18d3a	for #738, demux the aac mp4a and esds	2017-02-02 19:05:08 +08:00
winlin	128a1fd3db	for #738, decode mp4 video track boxes.	2017-02-02 15:10:11 +08:00
winlin	5a84b6ca94	for #738, complete all mp4 boxes codec.	2017-02-02 12:36:48 +08:00
winlin	2ad265bd5a	for #738, implements boxes codec	2017-02-01 21:57:32 +08:00
winlin	858951da49	for #738, add srs ingest mp4	2017-01-31 21:36:51 +08:00
winlin	34a8eb6113	for #738, add srs ingest mp4 tool	2017-01-31 20:43:48 +08:00
winlin	33ba6cdee2	change utest when demuxer use io interface.	2017-01-30 20:58:32 +08:00
winlin	01d401c270	for #738, refine flv codec to use io interface.	2017-01-30 20:12:36 +08:00
winlin	d3bb8b6a86	for #742, refine the io interfaces.	2017-01-30 19:59:59 +08:00
winlin	eaa222f034	for #742, refine the file reader and writer interface.	2017-01-30 19:35:04 +08:00
winlin	bb5bd0ee1c	include for uintxx_t	2017-01-30 17:38:30 +08:00
winlin	b16ab038ce	for #742, refine the u_intxx_t to uintxx_t	2017-01-30 17:32:18 +08:00
winlin	011ac4f6a9	for #738, add mp4 demuxer to librtmp	2017-01-30 17:19:07 +08:00
winlin	3f3e98e9db	for #738, major boxes from isom	2017-01-29 17:16:20 +08:00
winlin	b09183010b	for #738, add isom boxes.	2017-01-29 15:45:27 +08:00
winlin	ca02aaa7b3	for #738, add doc, moov box.	2017-01-28 19:32:43 +08:00
winlin	6b6ac9a054	for #738, add box and fullbox.	2017-01-27 20:54:05 +08:00
winlin	91a3989372	for #738, add mp4 demuxer files to kernel.	2017-01-27 11:27:02 +08:00
winlin	136a7ef488	for #299, refine docs.	2017-01-26 17:28:49 +08:00
winlin	38a683fe14	disable glibc memory check	2017-01-23 18:06:30 +08:00
winlin	7057bb1ef5	for #742, always enable http utilities.	2017-01-23 17:55:52 +08:00
winlin	a1fcf66f32	for #742, always enable http utilities.	2017-01-23 17:43:59 +08:00
winlin	79def81792	for #742, refine the rtmp conn, use info as data cluster.	2017-01-23 17:12:04 +08:00
winlin	39aee2b318	for #742, fix publish recv thread bug.	2017-01-23 16:44:42 +08:00
winlin	954bb186c1	identify the flash and fmle for recv thread.	2017-01-23 16:43:43 +08:00
winlin	4583a63789	for #742, refine code for recv thread.	2017-01-23 16:38:23 +08:00
winlin	a07986f4ee	for #742, refine code	2017-01-22 17:07:55 +08:00
winlin	5c959fc781	merge from srs2, for kbps free io	2017-01-22 13:16:05 +08:00
winlin	6706bda42c	for #752, release the io then free it for kbps. 2.0.232	2017-01-22 13:12:56 +08:00
winlin	a3ea83f504	directly free the transport, not need to close for maybe NULL	2017-01-20 12:11:52 +08:00
winlin	99c13fb1c1	convert ms to us for st	2017-01-19 15:51:55 +08:00
winlin	7bfb648bd8	refine the meta cache name	2017-01-19 15:51:34 +08:00
winlin	4cff49afd2	for #742, refine source, meta and origin hub. 3.0.16	2017-01-19 12:38:55 +08:00
winlin	8acb99f96c	refine comments for librtmp	2017-01-18 16:59:19 +08:00
winlin	0e6f7e66f0	add srs_rtmp_free_packet for srs-librtmp	2017-01-18 16:31:41 +08:00
winlin	7acc3aca16	refine hijack io for srslibrtmp	2017-01-18 16:23:59 +08:00
winlin	e8c48ac8f8	merge srs2, use specific error code for dns resolve	2017-01-18 16:05:33 +08:00
winlin	60be29f324	fix #750, use specific error code for dns resolve. 2.0.231	2017-01-18 16:03:57 +08:00
winlin	310032d8d8	merge srs2, timestamp overflow for ATC.	2017-01-18 11:48:31 +08:00
winlin	d76419e3bb	fix #749, timestamp overflow for ATC. 2.0.230	2017-01-18 11:47:43 +08:00
winlin	2ef1ef06e9	increase the nb_samples because some large video may overflow.	2017-01-18 11:11:36 +08:00
cenxinwei	762d7a8884	fix publish_normal_timeout 配置读取错误	2017-01-17 15:11:40 +08:00
winlin	3fe338d1c5	for #742, use ms for application clock tbn.	2017-01-17 12:25:30 +08:00
winlin	dca9749f37	for #742, refine the object live cycle. 3.0.15	2017-01-17 10:44:13 +08:00
winlin	f4c0af8bfc	refine code remove dup api for #742	2017-01-16 16:20:34 +08:00
winlin	1ed5118246	refine the spaces, no TABS	2017-01-16 15:47:26 +08:00
winlin	750f4413c8	merge srs2 for #536	2017-01-16 12:47:48 +08:00
winlin	142a9733b2	refine encoder code for #536.	2017-01-16 12:42:25 +08:00
winlin	ccb250f3bc	merge srs2. convert ts aac audio private stream 1 to common.	2017-01-11 17:43:29 +08:00
winlin	e6eafd3b97	fix #740, convert ts aac audio private stream 1 to common. 2.0.229	2017-01-11 17:42:34 +08:00
winlin	f92db0f87e	merge srs2 for kbps	2017-01-11 11:46:50 +08:00
winlin	6a8c232c5b	fix #588, kbps interface error. 2.0.228	2017-01-11 11:37:26 +08:00
winlin	c58dbe4d14	fix #588, kbps interface error. 2.0.228	2017-01-11 11:22:16 +08:00
winlin	7fe60b5bbf	fix #735 config transform refer_publish invalid. 3.0.14	2017-01-11 09:45:22 +08:00
winlin	7bbb3bae42	merge srs2	2017-01-11 09:33:26 +08:00
winlin	e3aa34ec5f	fix #736, recovery the hls dispose. 2.0.227	2017-01-11 09:25:48 +08:00
Himer	afa704bca5	Update srs_app_source.cpp ... enabled 为true才进行转发实例创建	2017-01-10 21:16:49 +08:00
winlin	df983cc9ec	fix typo	2017-01-10 18:14:06 +08:00
winlin	a1ae48f4ac	Merge branch '2.0release' into develop	2017-01-10 18:07:52 +08:00
winlin	6fbda2ae3f	for #635, refine hls open/close gop.	2017-01-10 18:07:46 +08:00
winlin	07871a442e	fix typo	2017-01-10 17:18:22 +08:00
winlin	ae1920e91a	Merge branch '2.0release' into develop	2017-01-10 17:17:31 +08:00
winlin	4104f25069	for #635, support IDR and NonIDR(open-gop).	2017-01-10 17:17:23 +08:00
winlin	1dd877c0d6	merge srs2	2017-01-10 11:17:37 +08:00
winlin	c9a71b7fb2	fix #635, hls support NonIDR(open gop). 2.0.226	2017-01-10 11:14:20 +08:00
winlin	d49f195bbf	fix #734, log format error.	2017-01-10 09:36:51 +08:00
winlin	c46e925be5	add utest for avc uev	2017-01-09 18:14:25 +08:00
winlin	517812dbe2	remove test code for #730	2017-01-06 15:19:27 +08:00
winlin	1b175b1107	for #730, support config in/out ack size. 3.0.13	2017-01-06 14:57:54 +08:00
winlin	bbbc40f9c2	Merge branch '2.0release' into develop	2017-01-06 14:32:07 +08:00
winlin	aa2b7afb44	refine code, print protocol level info.	2017-01-06 14:32:01 +08:00
winlin	e434c09dc0	for #730, merge srs2	2017-01-06 14:13:19 +08:00
winlin	c67036d52e	for #730, reset ack follow flash player rules. 2.0.225	2017-01-06 14:04:34 +08:00
winlin	dc1f227aeb	for #730, refine code to decode the acknowledge message	2017-01-06 13:16:25 +08:00
winlin	4709d0214c	for #711, support prefile for transcode. 3.0.12	2017-01-06 10:39:37 +08:00
winlin	f9a159cd21	patch ST for valgrind and ARM. 3.0.11	2017-01-05 10:45:41 +08:00
winlin	8bdf50b14d	update feature list	2017-01-05 09:29:12 +08:00
winlin	f2efa96015	for #324, always enable hstrs. 3.0.10	2017-01-05 09:08:56 +08:00
winlin	7ac932cfa0	update to 2013-2017	2016-12-16 11:57:25 +08:00
winlin	b231550c32	fix #717, #691, http api/static/stream support cors. 3.0.9	2016-12-15 16:22:04 +08:00
winlin	f6661989af	fix typo for #513, #691	2016-12-15 15:00:08 +08:00
winlin	664844b5f5	merge from srs2. for #513.	2016-12-15 14:54:09 +08:00