4361 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
HungMingWu	815d50f00a	Remove warning: C++11 requires a space between string literal and macro (#874) ... On Ubuntu 17.04, the default gcc compiler version is 6.3.0. It switch standard from c++98 to c++11. So it would generate verbose warnings.	2017-05-06 14:05:22 +08:00
winlin	a58874178b	Fix merge build failed.	2017-05-01 16:49:09 +08:00
winlin	f97260be1d	Merge SRS2	2017-05-01 16:44:14 +08:00
winlin	a613eb78c6	Fix #865, shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242	2017-05-01 16:39:59 +08:00
walkermi	79e4f9f3a0	fixed compile error when add --log-info (#860) ... * Update srs_app_server.cpp fixed compile error when add --log-info * Update srs_app_mpegts_udp.cpp fixed compile error when add --log-info	2017-04-30 12:29:37 +08:00
winlin	ae5450181c	Fix #636, FD leak for requesting empty HTTP stream. 2.0.241	2017-04-30 12:03:31 +08:00
HungMingWu	98d4b6ae11	Refine srs_kernel_codec audio & video config code (#854)	2017-04-24 10:08:57 +08:00
winlin	c97f2233a2	Merge SRS2 for #851	2017-04-23 21:00:06 +08:00
winlin	ff87318b95	Fix #851, HTTP API support number of video frames for FPS. 2.0.240	2017-04-23 20:55:51 +08:00
winlin	d0bf47906d	Merge SRS2	2017-04-18 21:11:36 +08:00
winlin	4167715153	Release 2.0r1, 2.0.239	2017-04-18 21:08:31 +08:00
winlin	d15c21a034	Merge branch '2.0release' into develop	2017-04-18 11:51:25 +08:00
winlin	f2dd866c78	Fix typo of Readme.	2017-04-18 11:51:19 +08:00
winlin	9a2a6ab95f	Merge SRS2	2017-04-18 11:42:11 +08:00
winlin	5e284b58a4	Fix #848, crash at HTTP fast buffer grow 2.0.239	2017-04-18 11:41:09 +08:00
winlin	bcd24126c5	Update comments for HLS	2017-04-16 21:43:30 +08:00
winlin	a98c9e04e3	Fix #547, support HLS audio in TS. 3.0.22	2017-04-16 21:33:39 +08:00
winlin	6ee85aea83	Refine mp4, extract mp4 box reader.	2017-04-16 20:46:04 +08:00
winlin	c9bed5a8bf	Refine mp4 codec for mdat.	2017-04-16 20:16:11 +08:00
winlin	18d9f6c8f1	Fix build failed.	2017-04-16 15:54:30 +08:00
winlin	1054b0a90f	Merge SRS2	2017-04-15 20:46:00 +08:00
winlin	33a0abdeff	Fix #844, support Haivision encoder. 2.0.238	2017-04-15 20:44:02 +08:00
winlin	d6e28bde69	Merge from SRS2.	2017-04-15 17:09:50 +08:00
HungMingWu	14acc59a19	Refine kernel/mp4 code (#823)	2017-04-15 17:05:05 +08:00
winlin	1c139d8fd8	Merge #846, fix fd leak for FLV stream caster. 2.0.237	2017-04-15 16:59:36 +08:00