4436 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	9db2a04c3b	For #913, coroutine support complex error.	2017-06-11 18:44:20 +08:00
winlin	9ae54850bf	Update readme for json	2017-06-11 14:06:54 +08:00
winlin	b5c14938d9	For #913, config and log support complex error.	2017-06-11 14:03:19 +08:00
winlin	860aac3e50	For #913, config reload and persistence	2017-06-11 09:54:09 +08:00
winlin	7cac35a289	For #913, source cycle error	2017-06-11 09:40:07 +08:00
winlin	7275fd5397	Fix #916, build failed for headers for error.	2017-06-11 09:03:29 +08:00
winlin	a20e2c3ef6	For #913, refine server utility	2017-06-10 15:20:48 +08:00
winlin	ca9f0bdb1e	For #913, refine server initialize st	2017-06-10 14:29:41 +08:00
winlin	4e4091231e	Refine object create in server.	2017-06-10 14:19:10 +08:00
winlin	c32afb95ab	Release v2.0-r2, 2.0.243	2017-06-10 09:02:16 +08:00
winlin	e309be154e	Release v2.0-r2, 2.0.243	2017-06-10 08:59:14 +08:00
winlin	20cacd5ea0	Update readme for DASH	2017-06-10 08:54:59 +08:00
winlin	372a9e5cb3	Fix #915, string ends with	2017-06-10 08:42:42 +08:00
winlin	93710c7489	For #913, refine the error mechanism	2017-06-09 13:29:23 +08:00
winlin	bb200b5d2d	For #913, add complex error.	2017-06-09 11:50:35 +08:00
winlin	58521751c3	Fix #299, support experimental MPEG-DASH. 3.0.25	2017-06-04 19:56:29 +08:00
winlin	69374c8d6d	For #299, use format for v/a sequence header.	2017-06-04 19:35:52 +08:00
winlin	9ca36970aa	Fix #908, use empty coroutine to avoid NULL pointer.	2017-06-04 19:13:56 +08:00
winlin	0e9e1792fe	For #299, write fMP4 for DASH.	2017-06-04 15:10:35 +08:00
winlin	baed1cc043	For #821, support parse dash video segment	2017-06-03 23:12:54 +08:00
winlin	8cc3ab2fa2	For #821, print mdat and udat	2017-06-03 19:00:19 +08:00
winlin	beae090d67	Refine logger header	2017-05-31 13:52:21 +08:00
winlin	4f6f8a8244	Fix verbose bug, for #821	2017-05-30 19:42:20 +08:00
winlin	6c64297264	Fix #821, support MP4 file parser. 3.0.24	2017-05-30 19:40:03 +08:00
winlin	12a55cd0c2	Fix build failed.	2017-05-30 09:58:14 +08:00
winlin	86f3bd7a0f	Fix build failed.	2017-05-30 09:57:57 +08:00
winlin	121eadbc07	Fix build failed.	2017-05-30 09:54:38 +08:00
winlin	1bf99e8f3e	For #907, Wrap ST, only use in service ST.	2017-05-30 09:05:02 +08:00
winlin	54411e0768	Fix #904, replace NXJSON(LGPL) with json-parser(BSD). 3.0.23	2017-05-30 07:40:18 +08:00
winlin	6993ac226f	For #906, #902, use coroutine for reusable2 thread	2017-05-29 20:49:29 +08:00
winlin	ea9a5f26d9	For #906, #902, use coroutine for reusable thread	2017-05-29 20:33:32 +08:00
winlin	2ed2513f08	For #906, #902, use coroutine for one cycle thread	2017-05-29 19:45:19 +08:00
winlin	b21f92f97a	For #906, #902, remove the thread start and stop event	2017-05-29 18:42:36 +08:00
winlin	3ffb0980f5	For #906, #902, use connection manager to remove connection	2017-05-29 18:34:41 +08:00
winlin	44f542f77f	For #906, #902, replace the endless thread with coroutine	2017-05-29 17:56:26 +08:00
winlin	fc380fe48d	For #906, #902, refine thread object.	2017-05-29 17:19:06 +08:00
winlin	5792c462b8	Merge branch 'develop' into 3.0release	2017-05-29 12:17:25 +08:00
winlin	c4966484e1	For #893, #899, merge SRS2	2017-05-29 12:17:16 +08:00
winlin	e8cb2e6be4	Merge #899 to fix #893, ts PES ext length. 2.0.243	2017-05-29 12:15:04 +08:00
OtterWa	d1bd6993c5	fix ts decode (#899)	2017-05-29 12:11:42 +08:00
winlin	792ef6795f	Merge branch 'develop' of github.com:ossrs/srs into develop	2017-05-24 14:15:28 +08:00
winlin	2677ec8c3f	Update license mixing	2017-05-24 14:14:45 +08:00
winlin	1e3550a52c	For #821, Parse basic mp4 boxes.	2017-05-21 19:41:15 +08:00
HungMingWu	234904c206	Refine Refine Refine kernel/ts code (#891)	2017-05-21 09:09:58 +08:00
winlin	dd1cca45cc	Remove non-exists conf file.	2017-05-18 14:00:04 +08:00
winlin	eaccbd0f85	Support print MP4 box.	2017-05-14 22:16:15 +08:00
winlin	fe43a31d06	Parse all mp4 boxes	2017-05-13 22:37:46 +08:00
winlin	366d6bcb82	Refine code	2017-05-13 21:47:20 +08:00
xialixin	92c8c0505d	Fix the timebase bug, change from us to ms. (#876) ... * fix SRS_CONSTS_RTMP_PULSE_TMMS (int64_t)(500*1000LL) * fix SrsBufferCache::cycle st_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * 1000) * fix st_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * 1000)	2017-05-13 09:21:02 +08:00
HungMingWu	e8ea27088a	Refine Refine kernel/ts code (#881)	2017-05-13 09:19:19 +08:00