3270 commits

Author	SHA1	Message	Date
winlin	f32aab3d92	For #299, refine code.	2017-03-25 17:21:39 +08:00
winlin	62b7204514	Refine code, add mp4 parser module	2017-03-25 15:40:28 +08:00
winlin	c648fd27bf	Refine code	2017-03-25 13:07:09 +08:00
winlin	2980e7d3ef	For #813, refine code.	2017-03-25 12:52:54 +08:00
Chengdong Zhang	8ad934a8a4	srs_info use not available variable (#813) ... srs_info use not available variable. Variable has been removed or changed.	2017-03-24 23:42:37 -05:00
winlin	9ab5e6a916	For #299, fix bug of fragment url	2017-03-19 12:49:58 +08:00
winlin	c71e8fa947	For #299, fragment reap workflow	2017-03-19 12:30:02 +08:00
winlin	721a8457c2	For #299, Refine init mp4, use fragment	2017-03-19 12:29:38 +08:00
winlin	8d679a6f9a	For #299, use fragment for dvr FLV/MP4	2017-03-18 21:41:01 +08:00
winlin	da4c390d69	For #299, extract fragment and fragment window for hls	2017-03-18 21:29:08 +08:00
winlin	6da6e0511d	For #803, should refine code.	2017-03-11 16:28:18 +08:00
Chengdong Zhang	a6eebacc99	Streams API is not correct. (#800) ... HTTP API for streams is not correct. When stream stopped, API does not remove it.	2017-03-11 16:21:33 +08:00
“winlin”	1b26536253	Add SIP RFC	2017-03-06 15:15:26 +08:00
“winlin”	a48fdd9f03	Add ICE RFC	2017-03-06 15:11:02 +08:00
winlin	ce034c3556	Refine docs, add TURN/STUN rfc.	2017-03-06 10:19:19 +08:00
winlin	3ec9df6578	For #299, A/V init mp4 are fine.	2017-03-05 18:44:37 +08:00
winlin	886930c22a	For #299, refine the comments.	2017-03-05 14:17:39 +08:00
winlin	14765c2ba5	For #790, play or publish is not neccessary for bandwidth test.	2017-03-04 14:46:48 +08:00
ME_Kun_Han	3562424ee3	fix bug, add param for generating tc url and add play stream to make-bandwidth checking success (#790)	2017-03-04 14:44:34 +08:00
winlin	8ab43b3e78	Fix #794, refine the comments.	2017-03-04 14:29:17 +08:00
winlin	308c6fee18	Fix #786, simply don't reuse object. 3.0.20	2017-03-02 16:43:06 +08:00
winlin	7680ac04ad	Refine srs-librtmp	2017-03-01 18:09:07 +08:00
winlin	1743899a23	Refine code	2017-03-01 13:49:50 +08:00
winlin	16cde27a1e	Remove MacOS compile option, for it's on use. It's caused by paralell make	2017-03-01 12:39:42 +08:00
winlin	121a2e5886	For #110, refine thread object. 3.0.19	2017-03-01 12:28:32 +08:00
winlin	44014683e1	Refine thread.	2017-03-01 12:23:44 +08:00
winlin	5bec6a4fdd	Refine srs-librtmp	2017-03-01 12:03:49 +08:00
winlin	011b693235	Update srs-librtmp, set errno to ret when failed.	2017-03-01 11:00:54 +08:00
winlin	72c4ae4a8c	Refine srs-librtmp API, change print to format	2017-03-01 10:52:57 +08:00
winlin	ad87bd7cf2	Refine configure	2017-03-01 09:21:20 +08:00
winlin	68a5407b3a	Remove using of connect_app2.	2017-02-28 20:35:56 +08:00
winlin	26c20db2b3	Fix parse srs version bug	2017-02-28 20:03:46 +08:00
winlin	c849010fe2	Refine api for srs-librtmp	2017-02-28 19:46:09 +08:00
winlin	af73e8ee65	Add log functions for srs-librtmp	2017-02-28 16:19:54 +08:00
winlin	ca43bfe6d9	Fix build failed, for srs librtmp API changed.	2017-02-28 14:54:53 +08:00
winlin	cdfded6a74	Support disable valgrind	2017-02-28 14:47:00 +08:00
winlin	89a5fa69d1	Refine srs-librtmp, set the schema, rather that connect app3	2017-02-28 14:07:14 +08:00
winlin	4e96c443d8	Change the bool to int for C	2017-02-27 17:39:29 +08:00
winlin	747d6f2f52	For #299, write legal MPD, fix CORS.	2017-02-26 21:45:08 +08:00
winlin	8ab727f3c5	For #299, write MPD file.	2017-02-26 20:40:33 +08:00
winlin	3903d2a8e3	For #730, remove the test code. 2.0.234	2017-02-25 20:24:18 +08:00
HungMingWu	a6582c6208	Disable openssl thread support to prevent ubuntu linking pthread error	2017-02-25 09:47:29 +00:00
winlin	764cf245e9	For #774, build librtmp exmaples failed for -lpthread	2017-02-25 12:13:12 +08:00
winlin	ac0e27b936	For #774, refine code style	2017-02-25 12:10:41 +08:00
HungMingWu	01d5e4da17	Replace openssl from l-1.0.1f to 1.10e (#774) ... DUe to API breakchange, add a wrapper for backward compatibility	2017-02-25 12:06:39 +08:00
winlin	695ceeab48	Refine code for #777	2017-02-25 11:30:25 +08:00
Chengdong Zhang	a3df4e3bfb	Fix #744 http callback set a wrong default port (#777) ... * Add port verify Code is more robust * Verify port Verify port * Change hard code to defined. Change hard code to defined.	2017-02-25 11:28:59 +08:00
winlin	d786d61685	Merge branch '2.0release' into develop	2017-02-25 11:21:56 +08:00
winlin	0059b1cf7a	For #783, use directly free to replace auto free	2017-02-25 11:18:54 +08:00
ljx0305	b0d16840b5	fix Repeated release (#783) ... fix Repeated release	2017-02-25 11:15:27 +08:00
winlin	cee9d736a4	for #299, refine code.	2017-02-19 22:03:51 +08:00
winlin	ede1c34a25	for #299, refine the signature of api for hls/dash	2017-02-19 21:48:32 +08:00
HungMingWu	33d6274217	Replace ffmpeg version from 2.1.1 to 3.2.4	2017-02-13 23:29:39 +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	d612a21bad	for #299, refine audio codec object name	2017-02-12 20:46:24 +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	7fd221ef63	Always enable DVR	2017-02-11 17:27:40 +08:00
winlin	b0789c54e4	Update HLS wiki to v3	2017-02-11 14:28:40 +08:00
winlin	8e5d4dc73d	always enable http and hls	2017-02-11 13:29:53 +08:00
winlin	11e8fe5bc0	refine options, remove rtmp-hls	2017-02-11 12:45:49 +08:00
winlin	477414106a	add dash files.	2017-02-11 12:30:21 +08:00
winlin	5fec59ace2	merge from srs2, fix #503	2017-02-09 14:33:56 +08:00
winlin	99bffea328	fix #503, disable utilities when reload a source. 2.0.233	2017-02-09 14:29:57 +08:00
winlin	15570d93ce	change conf to console without daemon.	2017-02-09 14:17:36 +08:00
winlin	90ff579a83	add gitignore.	2017-02-09 13:56:04 +08:00
winlin	afbc3443f3	fix #738, support DVR general mp4. 3.0.17	2017-02-07 21:56:20 +08:00
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	b6bb3f2446	fix c99 build failed.	2017-01-31 22:17:27 +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	8588a10775	Merge branch '2.0release' into develop	2017-01-29 17:15:43 +08:00
winlin	a37a14377a	fix the example dvr config file error	2017-01-29 17:15:17 +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	e8353cba3b	for #299, add mp4 and dash doc.	2017-01-26 16:53:30 +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	c5fcc15989	update the date info	2017-01-18 16:41:47 +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