1727 commits

Author	SHA1	Message	Date
winlin	8b279a9ac4	Merge branch '4.0release' into develop	2020-09-10 19:38:02 +08:00
winlin	0cadbca52f	Merge SRS3	2020-09-10 19:36:55 +08:00
winlin	63b5c51748	RTC: Change SO_REUSEPORT fail to warning. 3.0.142	2020-09-10 19:35:04 +08:00
winlin	c708103cd4	RTC: Refine NACK RTT and efficiency. 4.0.42	2020-09-09 15:42:02 +08:00
winlin	3026f2fda8	Refine PLI/NACK/DTLS logs. 4.0.41	2020-09-08 13:37:23 +08:00
winlin	e4ea2be008	Fix serval bugs for RTC. Refine context API. 4.0.40	2020-08-30 12:26:42 +08:00
winlin	7fed6e631a	Refine code	2020-08-30 10:13:23 +08:00
winlin	311cb77b36	Context: Refine API	2020-08-30 09:53:10 +08:00
winlin	a3e912f5dc	RTC: DTLS support ARQ, covered with utest. 4.0.39	2020-08-18 20:24:49 +08:00
winlin	47c43e47b6	RTC: Fix is_started state init bug	2020-08-07 12:48:45 +08:00
winlin	9530ea73e3	RTC: Refine error check. 4.0.37	2020-08-06 11:15:28 +08:00
winlin	fc10e98f1c	RTC: Remove dead code. Fix DTLS empty ctx issue	2020-08-04 20:08:21 +08:00
winlin	21835c38b7	RTC: Support multiple address for client. 4.0.36	2020-07-25 09:33:18 +08:00
winlin	70c3fc78af	Refine log context with random string. 4.0.35	2020-07-11 22:24:17 +08:00
winlin	0a16b1c1e3	Log: Refine log context.	2020-07-11 20:58:25 +08:00
winlin	a6b2e28d50	RTC: Refine the api for context.	2020-07-10 18:06:07 +08:00
winlin	7052a1fafb	Log: Refine context id	2020-07-09 17:16:59 +08:00
winlin	f551ff5ae8	Log: Use string compare function	2020-07-05 23:49:47 +08:00
winlin	6624b8acca	Log: Use object as context id for complex context	2020-07-05 23:26:55 +08:00
winlin	d453c6c22e	Fix some bugs for RTC. 4.0.34	2020-07-03 09:24:13 +08:00
winlin	4146346243	Merge #1830 to fix bugs in GB28181. 4.0.33	2020-07-03 09:20:02 +08:00
winlin	f514dd78c1	Merge branch '4.0release' into develop	2020-06-28 10:28:39 +08:00
winlin	78e28dcfde	Merge branch '3.0release' into 4.0release	2020-06-28 10:28:14 +08:00
winlin	e3f1aee6c1	Release 3.0 r0, 3.0.141	2020-06-27 11:47:36 +08:00
winlin	6314c273ff	Support static link c++ libraries. 4.0.32	2020-06-24 13:36:18 +08:00
winlin	ab6bc39676	Change log cid from int to string. 4.0.31	2020-06-23 18:35:59 +08:00
winlin	2c1bd6da3e	Merge SRS	2020-06-14 12:35:03 +08:00
winlin	e75f28a327	GB28181 with JitterBuffer support. 4.0.29	2020-06-13 13:17:23 +08:00
winlin	6e04c66402	Support enable C++11. 4.0.29	2020-06-03 19:18:41 +08:00
winlin	f83276c457	Remove srs-librtmp.	2020-05-31 10:56:36 +08:00
winlin	471bb0914f	RTC: disable GSO and sendmmsg. 4.0.27	2020-05-21 19:03:50 +08:00
winlin	9199e40fc1	RTC: Remove dead macros	2020-05-21 16:52:25 +08:00
winlin	f03bf601e4	RTC: Directly send without sendmmsg	2020-05-21 16:52:24 +08:00
winlin	3cb797dccd	For #307, refine core structure, RTMP base on frame, RTC base on RTP. 4.0.26	2020-05-14 10:47:21 +08:00
winlin	54d8c36905	RTC: Refine audio to RTP packet base.	2020-05-13 20:13:25 +08:00
winlin	365e6bb45a	Refine RTC publisher, no cache. 4.0.25	2020-05-03 19:09:48 +08:00
winlin	5ee5ef6ab2	For #307, support publish RTC with passing opus. 4.0.24	2020-04-30 10:57:03 +08:00
winlin	ed338f4c0a	Refactor macro SRS_AUTO_XXX to SRS_XXX.	2020-04-29 20:02:28 +08:00
winlin	c93cd86ce4	For #307, refine performance	2020-04-18 20:37:08 +08:00
winlin	08312ddc42	Support config the mw_sleep and mw_msgs	2020-04-18 10:04:45 +08:00
winlin	170b7453f4	Refine for performance	2020-04-18 08:10:28 +08:00
winlin	f0015a7cc1	For #307, refine GSO performance, alloc iovs	2020-04-17 07:10:16 +08:00
winlin	d906ced5c3	For #307, set cache to about 1.4GB when clients is 2k	2020-04-16 14:13:09 +08:00
winlin	7b68f55edc	Refactor GSO mmsghdr alloc	2020-04-15 22:11:03 +08:00
winlin	a80084289b	Support debug	2020-04-14 20:12:33 +08:00
winlin	bda7bdee54	Change RTC realtime to 0 cache	2020-04-14 19:19:46 +08:00
winlin	7574dbefb1	For #307, support sendmmsg, GSO and reuseport. 4.0.23	2020-04-14 14:02:54 +08:00
winlin	fdc0c44b7e	For #307, for realtime, change wait messages from 0 to 2	2020-04-14 13:55:55 +08:00
winlin	11bcd0cb27	Merge branch 'develop' into feature/rtc	2020-04-07 20:19:06 +08:00
winlin	61c7443c4b	Merge from SRS3	2020-04-07 20:18:31 +08:00
winlin	35a037cf05	Add api for tcmalloc	2020-04-07 14:24:14 +08:00
winlin	b23525033b	Merge branch 'develop' into feature/rtc	2020-04-05 17:21:07 +08:00
winlin	10d5f99d3d	For #307, SRTP ASM only works with openssl-1.0, auto detect it. 4.0.22	2020-04-05 17:14:22 +08:00
winlin	737dcdd2c8	Merge branch 'develop' into feature/rtc	2020-04-04 22:48:33 +08:00
winlin	9943565ec9	Merge RTC and GB28181, with bugs fixed. 4.0.21	2020-04-04 22:45:16 +08:00
winlin	55a4052d90	For #307, support sendmmsg to improve RTC performance	2020-04-04 22:43:44 +08:00
winlin	c5c0df6536	Update build script	2020-04-04 15:44:56 +08:00
winlin	573449f1b0	For #307, refine RTC latency from 600ms to 200ms. 4.0.20	2020-04-04 15:36:35 +08:00
winlin	5ad58933a9	For #307, build SRTP with openssl to improve performance. 4.0.19	2020-04-03 21:14:06 +08:00
winlin	608f3d0fae	For #1500, support push stream by GB28181. 4.0.18	2020-03-31 23:06:07 +08:00
winlin	c7113f27e0	Play stream by WebRTC on iOS/Android/PC browser. 4.0.17	2020-03-31 09:35:36 +08:00
winlin	57604a9c65	For #1672, fix dvr close file failed bug. 3.0.140	2020-03-30 10:44:11 +08:00
winlin	84652265d9	Update README	2020-03-29 00:23:16 +08:00
winlin	13ee53434e	Merge branch '4.0release' into develop	2020-03-29 00:14:46 +08:00
winlin	3e0a7ee7fb	Merge branch '3.0release' into 4.0release	2020-03-29 00:13:41 +08:00
winlin	98a71954da	Support multiple OS/Platform build cache. 3.0.139	2020-03-29 00:09:17 +08:00
winlin	c2b02f86fa	Merge 4.0release	2020-03-28 17:46:47 +08:00
winlin	217b8b94b6	Merge 3.0release	2020-03-28 17:45:14 +08:00
winlin	3556da40ce	Fix #1250, Support macOS, OSX, MacbookPro, Apple Darwin. 3.0.138	2020-03-28 17:23:11 +08:00
winlin	2b6da30ac6	Welcome maintainers Runner365, John, B.P.Y(Bepartofyou). 4.0.15	2020-03-22 21:22:15 +08:00
winlin	e5e2d05da0	For #307, support play with WebRTC. 4.0.14	2020-03-22 19:46:56 +08:00
winlin	be746da21c	Merge branch '3.0release' into 4.0release	2020-03-21 22:42:17 +08:00
winlin	0dd6c31487	Fix #1629, fix kickoff FLV client bug. 3.0.137	2020-03-21 22:41:25 +08:00
winlin	850a4bbf20	Fix #1619, configure without utest by default. 3.0.136	2020-03-21 20:41:37 +08:00
winlin	f89b4b3b26	For #1651, fix return pnwrite of srs_write_large_iovs. 3.0.135	2020-03-21 20:20:40 +08:00
winlin	aa20a04abb	For #1636, fix bug for mux AAC to ADTS, never overwrite by RTMP sampling rate. 4.0.13	2020-03-13 16:56:00 +08:00
winlin	1382337cb4	Merge SRS3	2020-03-12 22:42:33 +08:00
winlin	856ed5a971	For #1635, inotify watch ConfigMap for reload. 3.0.134	2020-03-12 22:26:34 +08:00
winlin	bb509d23e2	For #1635, inotify watch ConfigMap for reload. 3.0.133	2020-03-12 22:08:23 +08:00
winlin	88368ed18d	For #1635, inotify watch ConfigMap for reload. 3.0.132	2020-03-12 21:58:29 +08:00
winlin	940798a9c7	For #1635, inotify watch ConfigMap for reload. 3.0.131	2020-03-12 21:45:10 +08:00
winlin	5e60c8f9cc	For #1635, inotify watch ConfigMap for reload. 3.0.130	2020-03-12 19:37:31 +08:00
winlin	9b663c070a	Fix #1635, support auto reaload config by inotify. 3.0.129	2020-03-12 18:14:23 +08:00
winlin	b33751e2c1	Merge SRS3	2020-03-12 12:18:15 +08:00
winlin	4b395f6e16	Fix #1630, disable cache for stream changing, and drop dup header. 3.0.128	2020-03-12 11:55:37 +08:00
winlin	ed41ca867b	For #1594, detect and disable daemon for docker. 3.0.127	2020-03-12 10:11:41 +08:00
winlin	c1e07d6a96	For #1634, always check status in thread loop. 3.0.126	2020-03-12 08:59:13 +08:00
winlin	6a765ab849	Merge SRS3	2020-03-11 19:45:01 +08:00
winlin	c61c2a939f	For #1634, refactor output with datetime for ingest/encoder/exec. 3.0.125	2020-03-11 19:33:55 +08:00
winlin	927c0c8e39	For #1634, fix quit by accident SIGTERM while killing FFMPEG. 3.0.124	2020-03-11 19:04:52 +08:00
winlin	dcb0553cc8	For #1612, fix crash bug for RTSP. 4.0.12	2020-03-07 22:35:11 +08:00
winlin	41acf9ca8e	For #1631, support sei_filter for SRT. 4.0.11	2020-03-07 22:25:19 +08:00
winlin	1b9a705e4b	For #1621, support mix_correct for aggregate aac packets. 4.0.10	2020-03-01 10:17:03 +08:00
winlin	04d0620dde	For #1615, fix build failed and srt api issue	2020-02-25 13:45:05 +08:00
winlin	90afd06c85	For #1615, support default app(live) for vmix SRT. 4.0.9	2020-02-25 13:22:44 +08:00
winlin	67d78dff0e	For #1598, support SLB health checking by TCP. 4.0.8	2020-02-21 23:56:40 +08:00
winlin	ef2b123325	Merge branch '3.0release' into 4.0release	2020-02-21 23:52:04 +08:00
winlin	20b9d6ab02	For #1598, support SLB health checking by TCP. 3.0.123	2020-02-21 23:51:40 +08:00
winlin	4a69499f2c	Fix bug for librtmp client ipv4/ipv6 socket. 3.0.122	2020-02-21 23:11:09 +08:00
winlin	1d01ef499d	For #1579, support rolling update of k8s. 4.0.7	2020-02-20 01:06:33 +08:00
winlin	ad3cfbfd2c	For #1579, support start/final wait for gracefully quit. 4.0.6	2020-02-18 23:39:40 +08:00
winlin	388ad61cdc	Merge branch '3.0release' into 4.0release	2020-02-18 23:38:52 +08:00
winlin	dc0f804452	For #1579, support start/final wait for gracefully quit. 3.0.121	2020-02-18 23:37:11 +08:00
winlin	d87f58a611	For #1579, support gracefully quit and force to. 4.0.5	2020-02-18 22:16:28 +08:00
winlin	0c48c42f36	Merge branch '3.0release' into 4.0release	2020-02-18 22:15:29 +08:00
winlin	58b40478b6	For #1579, support force gracefully quit. 3.0.120	2020-02-18 22:15:12 +08:00
winlin	eefd74e0e4	Merge branch '3.0release' into develop	2020-02-18 20:25:07 +08:00
winlin	3c597545b1	For #1579, support gracefully quit. 3.0.119	2020-02-18 19:59:47 +08:00
winlin	5be69d290f	For #1601, flush async on_dvr/on_hls events before stop. 3.0.118	2020-02-17 11:53:04 +08:00
winlin	0723b36f0e	Merge branch '3.0release' into develop	2020-02-16 13:31:54 +08:00
winlin	131acf5bb0	For #1595, migrating streaming from ossrs.net to r.ossrs.net. 3.0.117	2020-02-14 23:04:01 +08:00
winlin	8b7fbac7d4	SRT supports detail config for DynamicConfig. 4.0.4	2020-02-13 12:17:09 +08:00
winlin	bdc7973596	Merge branch '3.0release' into develop	2020-02-05 14:18:07 +08:00
winlin	fc769550db	Fix #665, fix HTTP-FLV reloading bug. 3.0.116	2020-02-05 14:17:30 +08:00
winlin	c6d914bc13	Fix #1592, fix terminal echo off by redirect process stdin. 3.0.115	2020-02-05 13:04:00 +08:00
winlin	823b4fa56f	Merge branch '3.0release' into develop	2020-02-04 19:34:09 +08:00
winlin	c51c378869	For #1186, refactor security check. 3.0.114	2020-02-04 19:07:54 +08:00
winlin	3023dc7b40	Update project code. 4.0.3	2020-02-04 17:11:22 +08:00
winlin	55fa62e41f	Update version4	2020-02-04 17:06:10 +08:00
winlin	59439cf8b5	Merge branch '3.0release' into develop	2020-02-04 17:05:19 +08:00
winlin	c01806d5c4	Refine version3	2020-02-04 17:04:03 +08:00
winlin	4f39303f37	Fix #939, response right A/V flag in FLV header. 3.0.113	2020-02-04 17:02:02 +08:00
winlin	a2a6ca8258	For #939, always enable fast FLV streaming.	2020-02-04 16:13:48 +08:00
winlin	fb555b4d8f	Merge branch '3.0release' into develop	2020-01-29 20:31:05 +08:00
winlin	c9a2e19b2f	Support isolate version file. 3.0.112	2020-01-29 20:30:58 +08:00
winlin	77114c7df0	Merge SRS3	2020-01-29 20:30:06 +08:00
winlin	41f3925abc	Add version file for srs3	2020-01-29 20:28:37 +08:00
winlin	23ece94064	Fix #1206, dispose ingester while server quiting. 3.0.111	2020-01-29 20:22:28 +08:00
winlin	f18cc89860	Update version	2020-01-28 21:50:08 +08:00
winlin	31db28b70d	Update version	2020-01-28 21:48:53 +08:00
winlin	c90f441655	Update version	2020-01-28 21:47:04 +08:00
winlin	7c3b3608c0	Update version	2020-01-28 21:46:19 +08:00
winlin	feca34ee59	Update version	2020-01-28 21:46:05 +08:00
winlin	ec69b0786c	Update version	2020-01-28 21:45:37 +08:00
winlin	6a514732b5	Update version	2020-01-28 21:45:05 +08:00
winlin	afc0faf738	Use multiple revisions. 3.0.111	2020-01-28 21:42:48 +08:00
winlin	deaa0f0f15	Update version	2020-01-28 21:41:58 +08:00
winlin	0fc026ef6b	Update version	2020-01-28 21:38:28 +08:00
winlin	adf7ef4511	Fix #1230, racing condition in source fetch or create. 3.0.110	2020-01-28 21:35:06 +08:00
winlin	5d365bade8	Fix #1303, do not dispatch previous meta when not publishing. 3.0.109	2020-01-27 19:46:08 +08:00
winlin	d9bbd97d72	Allow use libsrt.so for SRT is MPL license.	2020-01-26 17:41:05 +08:00
winlin	2775a391e0	Fix #878, remove deprecated #EXT-X-ALLOW-CACHE for HLS. 3.0.108	2020-01-25 20:03:22 +08:00
winlin	74154cdfd9	Fix #703, drop video data util sps/pps. 3.0.107	2020-01-25 18:05:18 +08:00
winlin	978d5e993b	Fix #1108, reap DVR tmp file when unpublish. 3.0.106	2020-01-25 15:04:34 +08:00
winlin	5d0833fcc3	Add author runner365	2020-01-24 18:41:09 +08:00
winlin	fddfbdde5f	Fix #1147, support SRT(Secure Reliable Transport). 4.0.1	2020-01-24 16:16:16 +08:00
winlin	6107db91f5	Release 3.0 alpha9, 3.0a9, 3.0.105	2020-01-21 16:14:15 +08:00
winlin	ba61fe8bc5	Fix #1221, remove complex configure options. 3.0.104	2020-01-21 15:22:55 +08:00
winlin	6af8e38017	For #1547, support setting cc/cxx/ar tools. 3.0.103	2020-01-21 10:28:25 +08:00
l	86d04a70ed	Fix #1580, fix cid range problem. 3.0.102	2020-01-19 18:21:28 +08:00
winlin	3900179685	For #307, #1070, define FLV CodecID for AV1 and Opus. 3.0.101	2020-01-19 11:22:35 +08:00
winlin	0e750ab3eb	For #1575, use RTMP redirect as tcUrl and redirect2 as RTMP URL. 3.0.100	2020-01-16 14:28:05 +08:00
winlin	7240fe3040	For #1509, decrease the fast vector init size from 64KB to 64B. 3.0.99	2020-01-15 21:26:02 +08:00
winlin	857c783efc	For #1509, release coroutine when source is idle. 3.0.98	2020-01-15 19:51:33 +08:00
winlin	98df29c6fb	For #1042, improve test coverage for service. 3.0.97	2020-01-10 11:36:38 +08:00
winlin	c08b6f1961	Merge 2.0, support logrotate copytruncate. 3.0.96	2020-01-08 18:05:42 +08:00
winlin	731e87876e	Fix #1554, support logrotate copytruncate. 2.0.271	2020-01-08 17:57:04 +08:00
winlin	10464a5fbe	Always use string instance to avoid crash risk. 3.0.95	2020-01-05 22:17:15 +08:00
winlin	b794c9e4ec	For #460, fix ipv6 hostport parsing bug. 3.0.94	2020-01-05 22:16:21 +08:00
winlin	76d92792b7	For #460, fix ipv6 intranet address filter bug. 3.0.93	2020-01-05 21:25:51 +08:00
winlin	bc6c61e546	Fix #1543, use getpeername to retrieve client ip. 3.0.92	2020-01-05 20:06:25 +08:00
winlin	b5f4b96060	Merge #1551, fix memory leak in RTSP stack. 2.0.270	2020-01-05 14:41:31 +08:00
winlin	646eeb05e9	For #1042, improve test coverage for config. 3.0.91	2020-01-02 11:18:45 +08:00
winlin	d783a12f89	Happy 2020	2019-12-30 10:10:35 +08:00
winlin	eb8e7ad479	Fix #1255, support vhost/domain in query string for HTTP streaming. 3.0.90	2019-12-29 18:56:35 +08:00
winlin	8a28a11648	For #299, increase dash segment size for avsync issue. 3.0.89	2019-12-29 18:21:45 +08:00
winlin	d11a7b2e00	For #299, fix some bugs in dash, it works now. 3.0.88	2019-12-27 20:47:33 +08:00
winlin	043781fe81	Fix #1544, fix memory leaking for complex error. 3.0.87	2019-12-27 11:46:07 +08:00
winlin	7584c47aaf	Fix #1105, dvr mp4 supports playing on Chrome/Safari/Firefox. 3.0.86	2019-12-26 18:05:17 +08:00
winlin	316cab794a	For #1488, pass client ip to http callback.3.0.85	2019-12-26 11:42:19 +08:00
winlin	09b65aff96	For #1488, pass client ip to http callback. 2.0.269	2019-12-26 10:37:16 +08:00
winlin	84f6f3d051	For #1537, #1282, support aarch64 for armv8. 3.0.84	2019-12-25 19:58:15 +08:00
winlin	ea8111cff5	For #1537, support aarch64 for armv8. 3.0.84	2019-12-25 19:44:33 +08:00
winlin	0e0889af02	For #1538, fresh chunk allow fmt=0 or fmt=1. 3.0.83	2019-12-25 19:04:15 +08:00
winlin	f24694fc65	For #1537, #1282, remove cross-build, not used patches, directly build st.	2019-12-25 16:47:29 +08:00
winlin	40f6ecaee2	Merge SRS2 for running srs-librtmp on Windows. 3.0.80	2019-12-23 21:09:00 +08:00
winlin	c5f31570cd	Support parsing vhost splited by single seperator. 2.0.268	2019-12-23 18:31:14 +08:00
winlin	316628632b	Support build srs-librtmp by VS2015. 2.0.267	2019-12-23 17:01:02 +08:00
winlin	2d29e3c4e6	For #1535, deprecate Adobe FMS/AMS edge token traversing authentication. 3.0.79	2019-12-23 12:21:46 +08:00
winlin	9aaf5123ad	For #1535, deprecate BWT(bandwith testing). 3.0.78	2019-12-23 12:10:35 +08:00
winlin	1b3fe4eb06	For #1535, deprecate Adobe HDS(f4m). 3.0.77	2019-12-23 12:01:50 +08:00
winlin	cab15c348c	Fix #1508, http-client support read chunked response. 3.0.76	2019-12-20 16:09:37 +08:00
winlin	49c737f996	Fix #1524, memory leak for amf0 strict array. 3.0.75	2019-12-19 14:39:34 +08:00
winlin	acfeb8a66f	Fix #1520, #1223, bug for origin cluster 3+ servers. 3.0.74	2019-12-19 14:04:26 +08:00
winlin	b0afc00733	Detect whether flash enabled for srs-player. 3.0.73	2019-12-18 11:06:01 +08:00
winlin	dc1afc142f	Fix HTTP CORS bug when sending response for OPTIONS. 3.0.72	2019-12-17 20:52:10 +08:00
winlin	fde11756c3	Support openssl versions greater than 1.1.0. 2.0.266	2019-12-13 10:40:11 +08:00
winlin	6f453e7f46	For #547, #1506, default hls_dts_directly to on. 3.0.71	2019-12-12 16:51:34 +08:00
winlin	4f298134af	Fix #1445, limit the createStream recursive depth. 3.0.70	2019-12-11 17:56:31 +08:00
winlin	78da67e8d1	For #1229, fix the security risk in logger. 3.0.69	2019-12-11 11:56:00 +08:00
winlin	b4870a6d6f	Fix #1506, support directly turn FLV timestamp to TS DTS. 3.0.68	2019-12-05 20:47:23 +08:00
winlin	5a3fd1e68a	Release v3.0-a2, 3.0.67	2019-12-01 19:24:17 +08:00
winlin	e5285ecabf	Fix #1501, use request ip for origin cluster. 3.0.66	2019-11-30 18:50:24 +08:00
winlin	488f16f60c	Random tid for docker. 3.0.65	2019-11-30 17:34:25 +08:00
winlin	4cd03a7c06	Refine debug info for edge. 3.0.64	2019-11-30 17:31:27 +08:00
winlin	1c943f27c9	Release 2.0.265, r2.0-r7	2019-11-29 18:26:40 +08:00
winlin	2b2a62ccba	Cover protocol stack RTMP. 0.6.63	2019-10-23 09:26:10 +08:00
winlin	c7602d8cee	Cover JSON codec. 3.0.62	2019-10-22 08:54:29 +08:00
winlin	8ca7f7e5a4	Support log rotate by init.d command. 3.0.60	2019-10-07 17:44:25 +08:00
winlin	e045b0a619	We prefer ipv4, only use ipv6 if ipv4 is disabled. 3.0.59	2019-10-07 10:34:55 +08:00
winlin	64288d1f1e	Support systemctl service for CentOS7. 3.0.58	2019-10-05 20:33:26 +08:00
winlin	9d90a8177f	Disable SO_REUSEPORT if not supported. 3.0.57	2019-10-04 20:02:51 +08:00
winlin	88df9a2497	Support go-oryx rtmplb with proxy protocol. 3.0.56	2019-10-04 19:03:34 +08:00
winlin	130c545f9a	Refine origin cluster log	2019-10-04 06:51:15 +08:00
winlin	d3b142a0d9	Fix #775, Support SO_REUSEPORT. 3.0.54	2019-10-03 16:10:22 +08:00
winlin	5d17bb8bb0	Remove KAFKA. 3.0.53	2019-10-03 12:45:38 +08:00
winlin	1605000817	Covert Kernel File reader/writer. 3.0.52	2019-05-14 08:13:27 +08:00
winlin	6730f08f45	Refine core.hpp	2019-05-05 07:44:39 +08:00
winlin	6dbe79ad02	Remove noisy informations.	2019-04-30 08:43:12 +08:00
winlin	ad3749a4d5	Remove noisy informations.	2019-04-30 08:38:57 +08:00
winlin	6b2c71d385	Refine typo in files. 3.0.51	2019-04-30 08:30:13 +08:00
winlin	c933f8a870	Upgrade http-parser from 2.1 to 2.9.2 and cover it. 3.0.50	2019-04-25 10:41:59 +08:00
winlin	35fe05d62c	Refine typo in kernel.	2019-04-22 09:19:05 +08:00
winlin	735176cab4	Refine typo for core	2019-04-22 08:21:56 +08:00
winlin	98adbc4130	Refine typo.	2019-04-22 08:19:03 +08:00
winlin	394cdb5f04	Refine in time unit. 3.0.49	2019-04-22 08:12:17 +08:00
winlin	cfab73b552	Refine SrsWallClock and SrsKbps in time unit.	2019-04-19 08:39:38 +08:00
winlin	5560b529a7	Remove unused macros in ts.	2019-04-19 08:06:44 +08:00
winlin	d306ee7506	Refine ms in time unit	2019-04-18 08:50:43 +08:00
winlin	c1b64ba24f	Refine get_queue_length and set_queue_size in time unit	2019-04-16 07:55:19 +08:00
winlin	f8e6de71f3	Refine headers	2019-04-11 09:28:51 +08:00
winlin	53357e92fe	Refine headers	2019-04-11 09:27:16 +08:00
winlin	695d430dcf	Refine SrsMessageQueue.duration in time unit.	2019-04-11 08:35:57 +08:00
winlin	170872135d	Refine get_publish_1stpkt_timeout in time unit	2019-04-10 07:53:09 +08:00
winlin	d6828a3e58	Refine get_mw_sleep in time unit	2019-04-09 09:39:16 +08:00
winlin	839a496d50	Refine get_mr_sleep in time unit	2019-04-09 09:20:44 +08:00
winlin	a9a720e32f	Cover ST Coroutine and time unit. 3.0.48	2019-04-07 12:59:37 +08:00
winlin	f2b4bc7110	Fix #1304, Fix ST coroutine pull error. 3.0.47	2019-04-06 16:10:33 +08:00
winlin	23a2d8eefd	Support HTTP-FLV params. 3.0.46	2019-04-06 15:42:24 +08:00
winlin	a8781aee3e	For #1304, Default HSTRS to on. 2.0.264	2019-04-06 15:35:12 +08:00
winlin	a554dd85e1	Fix GCC7 build error, this statement may fall through. 2.0.263	2019-04-05 19:54:32 +08:00
winlin	91c462b6ba	For #1339, Support HTTP-FLV params. 2.0.262	2019-04-05 18:16:05 +08:00
winlin	b2d1d84634	Change to 2019	2019-01-01 21:37:28 +08:00
winlin	f1ab8fecac	Fix build warning	2018-12-09 22:48:47 +08:00
winlin	f1033296bb	Upgrade to FFMPEG 4.1 and X264 157. 2.0.261	2018-12-01 20:21:35 +08:00
winlin	24f46f5085	#1261, Support _definst_ for Wowza. 3.0.44	2018-11-11 13:51:10 +08:00
winlin	99aa249f3a	#1261, Support _definst_ for Wowza. 2.0.260	2018-11-11 13:33:47 +08:00
winlin	b2066cbf68	#1263, Fix string trim bug. 2.0.259	2018-11-11 13:30:12 +08:00
winlin	58e501ee24	Fix #1250, Support build on OSX10.14 Mojave. 2.0.258	2018-10-28 14:09:55 +08:00
winlin	63ac93a642	Merge #1236 from 2.0release	2018-10-08 07:22:21 +08:00
winlin	a5b452f965	Merge #1236, Fix sleep bug in us. 2.0.257	2018-10-08 07:16:07 +08:00
winlin	9859fa9e6f	Merge #1237, Support param for transcoder. 2.0.256	2018-10-08 07:09:31 +08:00
winlin	5945fb5a24	Fix #1093, Support HLS encryption. 3.0.42	2018-08-25 21:17:33 +08:00
winlin	e73e30de3a	Fix #1051, Drop ts when republishing stream. 3.0.41	2018-08-25 18:10:55 +08:00
winlin	1e054d2bcc	Fix #354, Rename impl__SrsAutoFree to impl_SrsAutoFree	2018-08-25 12:20:52 +08:00
winlin	728ddd133b	For #1202, Support edge/forward to Aliyun CDN. 3.0.40	2018-08-12 10:46:06 +08:00
winlin	74a87d54f2	For #1202, Support edge/forward to Aliyun CDN. 2.0.255	2018-08-12 10:44:55 +08:00
winlin	1cc72df134	Fix #910, Support HTTP FLV with HTTP callback. 3.0.39	2018-08-11 19:23:51 +08:00
winlin	1e7c12a6dd	For #910, Support HTTP FLV with HTTP callback. 2.0.254	2018-08-11 19:09:56 +08:00
winlin	6cea551c64	For #1110, Refine params in http callback. 2.0.253	2018-08-11 10:12:40 +08:00
winlin	d607c7f905	Refine HTTP-FLV latency, support realtime mode.3.0.38	2018-08-05 20:30:04 +08:00
winlin	c45f72ef7b	Refine HTTP-FLV latency, support realtime mode. 2.0.252	2018-08-05 20:23:17 +08:00
winlin	ae99131512	Fix #1087, Ignore iface without address. 3.0.37	2018-08-05 10:41:31 +08:00
winlin	29b74c7220	For #1110, Support params in http callback. 3.0.36	2018-08-04 19:51:04 +08:00
winlin	85d3a5001c	For #1110, Support params in http callback. 2.0.251	2018-08-04 19:36:42 +08:00
winlin	68a1656e07	Fix #1031, Always use vhost in stream query, the unify uri. 3.0.35	2018-08-02 09:17:49 +08:00
winlin	a66d450ec1	For #1031, SRS edge support douyu.com. 3.0.34	2018-08-02 07:14:06 +08:00
winlin	586899a010	For #1031, SRS edge support douyu.com. 2.0.250	2018-08-02 06:59:57 +08:00
winlin	41c6e833b9	Replace hex to string to match MIT license. 3.0.33	2018-07-22 18:47:38 +08:00
winlin	84f81983aa	Replace base64 to match MIT license. 3.0.32	2018-07-22 17:56:38 +08:00
winlin	0a63448b86	Replace crc32 MPEG and IEEE by pycrc to match MIT license. 3.0.31	2018-07-22 15:21:05 +08:00
winlin	e395878916	Replace crc32 IEEE by golang to match MIT license. 3.0.30	2018-07-21 20:58:20 +08:00
winlin	6d7c7418a8	Merge #1119, fix memory leak. 2.0.249	2018-07-21 17:49:46 +08:00
winlin	2d49b9d1a7	Merge #1176, fix scaned issues. 2.0.248	2018-07-17 13:44:01 +08:00
winlin	0fe17c3e34	Merge #1077, fix crash for edge HLS. 2.0.247	2018-02-28 13:37:30 +08:00
winlin	4bf5ab2044	Fix #464, support RTMP origin cluster. 3.0.29	2018-02-16 16:40:48 +08:00
winlin	d0fbf44d18	For #464, support config for origin cluster.	2018-02-14 21:52:40 +08:00
winlin	db6b8cf914	Fix #1057, switch to simple handshake. 3.0.28	2018-02-13 09:05:01 +08:00
winlin	681138d2af	Fix #1059, merge from 2.0, supports url with vhost in stream. 3.0.27	2018-02-13 08:52:57 +08:00
winlin	1721e4ea4b	Fix #1059, support vhost in stream parameters. 2.0.246	2018-02-13 08:31:25 +08:00
winlin	93d3e1464a	For #1045, revert macro for TCP keepalive detection, use system macro	2018-01-07 17:49:57 +08:00
winlin	366309ce2d	For #1045, revert macro for TCP keepalive detection, use system macro	2018-01-07 17:49:14 +08:00
winlin	049e7c82c0	Merge #1044, for #1045, set TCP SO_KEEPALIVE	2018-01-07 17:23:36 +08:00
winlin	911cd448f1	Merge #1045, for #1044, TCP connection alive detection. 2.0.245	2018-01-07 17:18:43 +08:00
winlin	ca1395a807	Change date from 2017 to 2018	2018-01-07 10:58:53 +08:00
winlin	5730bf8e43	Fix #913, support complex error. 3.0.26	2018-01-01 23:03:42 +08:00
winlin	b426036832	Merge #1033, allow user to add some specific flags. 2.0.244	2018-01-01 23:01:13 +08:00
winlin	baa55f14b9	Change stable release to SRS2	2017-08-19 20:19:35 +08:00
winlin	5c9a12e72a	For #913, use complex error for listener	2017-07-29 12:45:17 +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	6c64297264	Fix #821, support MP4 file parser. 3.0.24	2017-05-30 19:40:03 +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	e8cb2e6be4	Merge #899 to fix #893, ts PES ext length. 2.0.243	2017-05-29 12:15:04 +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	a613eb78c6	Fix #865, shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242	2017-05-01 16:39:59 +08:00
winlin	ae5450181c	Fix #636, FD leak for requesting empty HTTP stream. 2.0.241	2017-04-30 12:03:31 +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	5e284b58a4	Fix #848, crash at HTTP fast buffer grow 2.0.239	2017-04-18 11:41:09 +08:00
winlin	a98c9e04e3	Fix #547, support HLS audio in TS. 3.0.22	2017-04-16 21:33:39 +08:00
winlin	33a0abdeff	Fix #844, support Haivision encoder. 2.0.238	2017-04-15 20:44:02 +08:00
winlin	1c139d8fd8	Merge #846, fix fd leak for FLV stream caster. 2.0.237	2017-04-15 16:59:36 +08:00
winlin	8d35585c13	Merge #841, avoid the duplicated sps/pps in ts. 2.0.236	2017-04-15 16:54:42 +08:00
winlin	b11ddc7f41	Fix #834, crash for TS context corrupt. 2.0.235	2017-04-09 18:45:42 +08:00
winlin	609605a50b	Fix #820, extract service for modules. 3.0.21	2017-03-26 17:05:50 +08:00
winlin	0a57a46016	Refine LICENSE	2017-03-25 21:29:29 +08:00
winlin	f32aab3d92	For #299, refine code.	2017-03-25 17:21:39 +08:00
winlin	308c6fee18	Fix #786, simply don't reuse object. 3.0.20	2017-03-02 16:43:06 +08:00
winlin	121a2e5886	For #110, refine thread object. 3.0.19	2017-03-01 12:28:32 +08:00
winlin	3903d2a8e3	For #730, remove the test code. 2.0.234	2017-02-25 20:24:18 +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	99bffea328	fix #503, disable utilities when reload a source. 2.0.233	2017-02-09 14:29:57 +08:00
winlin	afbc3443f3	fix #738, support DVR general mp4. 3.0.17	2017-02-07 21:56:20 +08:00
winlin	38a683fe14	disable glibc memory check	2017-01-23 18:06:30 +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	4cff49afd2	for #742, refine source, meta and origin hub. 3.0.16	2017-01-19 12:38:55 +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	d76419e3bb	fix #749, timestamp overflow for ATC. 2.0.230	2017-01-18 11:47:43 +08:00
winlin	dca9749f37	for #742, refine the object live cycle. 3.0.15	2017-01-17 10:44:13 +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	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	e3aa34ec5f	fix #736, recovery the hls dispose. 2.0.227	2017-01-11 09:25:48 +08:00
winlin	c9a71b7fb2	fix #635, hls support NonIDR(open gop). 2.0.226	2017-01-10 11:14:20 +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	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	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	759c84a395	for #513, remove hls ram from srs2 to srs3+. 2.0.224	2016-12-15 14:48:38 +08:00
winlin	aca8a79d95	fix #713, disable the source cleanup. 2.0.223	2016-12-13 18:41:45 +08:00
winlin	439c67018d	remove unused macros.	2016-12-09 15:58:59 +08:00
winlin	2955b1fd2d	support log rotate signal SIGUSR1. 3.0.8	2016-12-08 18:23:22 +08:00
winlin	dd1c769f65	refine main	2016-12-08 17:35:33 +08:00
winlin	28517849ed	refine typo	2016-12-07 12:09:39 +08:00
winlin	0a8d40925f	merge from 2.0	2016-11-09 09:44:19 +08:00
winlin	d8599a56ca	fix #654, crash when source cleanup for edge. 2.0.221	2016-11-05 10:48:49 +08:00
winlin	2f5f7d4a7b	merge srs2	2016-10-26 09:55:24 +08:00
winlin	8b00e56a84	fix #666, crash when source cleanup for http-flv. 2.0.220	2016-10-26 09:54:49 +08:00
winlin	112d98ffdb	merge srs2.	2016-10-10 11:56:10 +08:00
winlin	d6fc289c6a	fix #661, close fd after thread stopped. 2.0.219	2016-10-10 11:54:08 +08:00
winlin	0e308b0fa1	merge srs2, support oryx	2016-09-23 15:33:43 +08:00
winlin	b748fac23a	support asprocess for oryx. 2.0.218	2016-09-23 15:00:50 +08:00
winlin	e15e07c4d1	merge srs2	2016-09-15 13:39:25 +08:00
winlin	ff3f8272a9	fix #640, typo for rtmp type. 2.0.217	2016-09-15 13:37:11 +08:00
winlin	504352d17a	merge srs2.	2016-09-12 18:21:44 +08:00
winlin	c2cb666995	fix fast stream error bug. 2.0.216	2016-09-12 18:21:14 +08:00
winlin	8a4e241eec	merge from srs2	2016-09-09 14:29:33 +08:00
winlin	6c4c68ccb6	2.0 beta1(2.0.215) released.	2016-09-09 14:26:16 +08:00
winlin	0e9318e5d8	merge from 2.0	2016-09-05 14:16:24 +08:00
winlin	c7b97aa1c3	fix memory leak at source. 2.0.214	2016-09-05 14:13:37 +08:00
winlin	815f2491a4	merge from 2.0	2016-09-05 09:39:20 +08:00
winlin	6ec60b0a21	fix memory leak at handshake. 2.0.213	2016-09-05 09:38:30 +08:00
winlin	39a46f7b97	Merge branch '2.0release' into develop	2016-09-03 23:11:58 +08:00
winlin	1214af643e	refine comments for arm	2016-09-03 23:11:51 +08:00
winlin	c0498c82ee	merge 2.0	2016-09-03 18:48:19 +08:00
winlin	e775eb3ff2	support all arm for patched st. 2.0.212	2016-09-03 18:47:46 +08:00
winlin	7d96a33207	Merge branch '2.0release' into develop	2016-09-01 16:51:18 +08:00
winlin	e2865c6ac1	workaround for #511, the fly stfd in close. 2.0.211	2016-09-01 16:51:09 +08:00
winlin	abeb4f46a9	merge 2.0	2016-08-06 17:28:43 +08:00
winlin	ec6e77992e	2.0.210	2016-08-06 16:38:18 +08:00
winlin	28080efec8	fix http reader bug, support infinite chunkted. 2.0.209	2016-01-13 12:44:51 +08:00
winlin	e2e6e76f92	for #558 and #559, 2.0.208	2016-01-11 13:21:28 +08:00
winlin	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
winlin	8155e97b84	add keyword XCORE for coredump to identify the version. 2.0.207	2016-01-05 16:49:27 +08:00
winlin	973194c663	merge from srs2.	2015-12-31 16:02:01 +08:00
winlin	26211abf2e	refine code.	2015-12-31 15:57:16 +08:00
winlin	eca46c03d2	refine code for consumer to refer the rtmp connection.	2015-12-26 12:13:17 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	5d3a183f43	fix #509, always alloc big object at heap. 2.0.205	2015-12-22 19:18:46 +08:00
winlin	8b24319ffb	fix #418, ignore null connect props to make RED5 happy. 2.0.204	2015-12-22 17:00:22 +08:00
winlin	c7850570c1	fix #546, thread terminate normally dispose bug. 2.0.203	2015-12-22 16:13:49 +08:00
winlin	cee8c3d07d	fix #541, failed when chunk size too small. 2.0.202	2015-12-22 15:39:12 +08:00
winlin	40457e6cab	default hls_on_error to continue. 2.0.201	2015-12-15 16:02:02 +08:00
winlin	2310b2da59	fix #518, fix fd leak bug when fork. 2.0.200	2015-11-16 18:06:44 +08:00
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	2015-11-11 10:45:45 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	a89ed68aa3	update readme for #511.	2015-11-06 10:51:32 +08:00
winlin	49d77b3f09	for #515, use srs_freepa and SrsAutoFreeA for array. 2.0.198	2015-11-02 13:42:05 +08:00
winlin	f57e537686	for #515, merge from srs2, use SrsAutoFreeA.	2015-11-02 11:29:20 +08:00
winlin	f4f76cd196	for #515, use SrsAutoFreeA to free the array.	2015-11-02 11:26:37 +08:00
winlin	8cec06e898	merge srs2, use srs_freepa for array	2015-11-02 11:05:39 +08:00
winlin	2af7749771	for #515, use srs_freepa to free the array.	2015-11-02 11:02:27 +08:00
winlin	d1979c760f	for #512, partical hotfix the hls pure audio. 2.0.196	2015-10-27 17:44:10 +08:00
winlin	9a47390253	fix #467, support write log to kafka. 3.0.6	2015-10-23 14:42:04 +08:00
winlin	29122b6e70	fix #502, transcoder support snapshot.	2015-10-20 14:52:34 +08:00
winlin	0c8209cccd	fix #448, fix the bug of response of http hooks. 2.0.195	2015-10-04 08:09:39 +08:00
winlin	7811b4f3f7	fix #497, response error when client not found to kickoff. 2.0.194	2015-10-01 13:20:13 +08:00
winlin	a3c229472e	fix #495, decrease the srs-librtmp size. 2.0.193	2015-10-01 13:04:28 +08:00
winlin	070ada1d6e	Merge branch '2.0release' into develop	2015-10-01 12:30:55 +08:00
winlin	65e4bf2e77	fix compile failed bug.	2015-10-01 12:30:38 +08:00
winlin	4e88262512	merge from srs2 to check cpus.	2015-09-23 15:11:33 +08:00
winlin	cfe2082353	fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192	2015-09-23 15:09:59 +08:00
winlin	6990508e58	for #485, srs for respberrypi and cubieboard. 2.0.191	2015-09-23 11:05:56 +08:00
winlin	b5996567e8	refine the role of srs, to cluster.	2015-09-21 12:09:09 +08:00
winlin	d8a64aaab5	fix #484, hotfix the openssl build script 2.0.190	2015-09-21 12:01:48 +08:00
winlin	8a90e76637	fix #459, support dvr raw api. 3.0.4	2015-09-15 23:00:00 +08:00
winlin	2a1b2b69a0	for #459, dvr support apply filter for ng-control dvr module.	2015-09-15 15:58:57 +08:00
winlin	8f9cfcdcf4	fix #319, http raw api support update global and vhost. 3.0.4	2015-09-15 13:03:18 +08:00
winlin	511627abab	fix #474, config to donot parse width/height from sps. 2.0.189	2015-09-14 18:36:44 +08:00
winlin	0d57ef9373	fix #458, http hooks use source thread cid. 2.0.188	2015-09-14 13:47:25 +08:00
winlin	6d50aa1aa2	#475, fix http hooks crash for st context switch. 2.0.187	2015-09-14 12:22:19 +08:00
winlin	abd7ee227c	support reload utc_time. 2.0.186	2015-09-09 23:37:07 +08:00
winlin	11c409688b	for #319, http raw api support query. 3.0.3	2015-08-31 23:34:03 +08:00
winlin	1b1a2a1e63	fix #471, api response the width and height. 3.0.2	2015-08-28 18:00:24 +08:00
winlin	c34b0c86e1	fix #367, support nginx-rtmp exec. 3.0.1	2015-08-25 22:29:00 +08:00
winlin	28791fd14a	release 2.0alpha0, the 2.0a0, 2.0.185	2015-08-23 09:00:21 +08:00
winlin	2cf526ffc7	close #454, support obs restart publish. 2.0.184	2015-08-18 17:43:01 +08:00
winlin	ae37fa8f3e	use send_min_interval for stream control. 2.0.183	2015-08-14 11:13:40 +08:00
winlin	653afd0700	merge from 2.0	2015-08-12 13:23:00 +08:00
winlin	9fb4640a8f	enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182	2015-08-12 13:22:09 +08:00
winlin	b27bb48447	refine the version	2015-08-12 08:18:45 +08:00
winlin	eab538d2e4	fix the version of srs2	2015-08-11 18:37:50 +08:00
winlin	0e3128d3e3	Merge branch '2.0release' into develop	2015-08-03 15:23:07 +08:00
winlin	8d86eb6516	refine code naming or comments.	2015-07-28 17:56:50 +08:00
winlin	c85f92c229	fix #169, support default values for transcode. 2.0.180	2015-07-21 12:07:26 +08:00
winlin	b54f9b0f94	refine the hls, ignore packet when no sequence header. 2.0.179	2015-07-20 09:31:46 +08:00
winlin	366d3a3f56	for #441, use 30s timeout for first msg. 2.0.178	2015-07-16 17:30:27 +08:00
winlin	5f77724021	refine hls disable the time jitter, support not mix monotonically increase. 2.0.177	2015-07-14 11:46:23 +08:00
winlin	438914c481	fix #433, fix the sps parse bug. 2.0.176	2015-07-01 14:50:45 +08:00
winlin	2f44a29b76	Merge branch '2.0release' into develop	2015-06-13 16:05:26 +08:00
winlin	0d66e92ab5	refine code, support configure to enable --memory-watch	2015-06-13 15:45:25 +08:00
winlin	56938efdbd	fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175	2015-06-10 15:38:13 +08:00
winlin	6941f2c072	fix #424, fix aggregate timestamp bug. 2.0.174	2015-06-10 13:53:13 +08:00
winlin	00d1fdded0	Merge branch '2.0release' into develop	2015-06-08 15:02:30 +08:00
winlin	573495a19f	refine the memory watcher.	2015-06-08 09:47:45 +08:00
winlin	bb4db61192	add srs memory watcher.	2015-06-07 15:12:55 +08:00
winlin	223ae194b1	fix #209, cleanup hls when stop and timeout. 2.0.173.	2015-05-30 14:41:09 +08:00
winlin	5caafadd45	fix #409: support pure video hls. 2.0.172.	2015-05-29 21:43:17 +08:00
winlin	cd162c2848	merge from 2.0	2015-05-25 01:04:04 +08:00
winlin	d12fc7fcc5	fix #405, improve the HTTP FLV performance to 6k. 2.0.171	2015-05-25 01:02:06 +08:00
winlin	4df19ba99a	for #405, improve the http flv to 3k. 2.0.170	2015-05-24 23:29:17 +08:00
winlin	960341b9b2	for #405, improve the HTT FLV to 3k. 2.0.169	2015-05-24 22:43:02 +08:00
winlin	fc995473eb	for #405, improve the HTTP FLV delivery 1k to 2.3k. 2.0.168	2015-05-24 21:17:00 +08:00
winlin	069ee0afc3	fix #404, register handler then start http thread. 2.0.167.	2015-05-24 15:19:09 +08:00
winlin	5908096fc3	refine the thread, protocol, kbps code. 2.0.166	2015-05-23 10:04:28 +08:00
winlin	6ca46e84bc	fix #397, the USER_HZ maybe not 100. 2.0.165	2015-05-22 17:16:33 +08:00
winlin	948d200ce1	fix #400, parse when got entire http header, by feilong. 2.0.164.	2015-05-22 12:00:48 +08:00
winlin	44bc7976ac	merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.	2015-05-19 18:06:20 +08:00
winlin	c617d2aaa5	support push flv stream over HTTP POST to SRS.	2015-05-10 10:35:35 +08:00
winlin	91e285b0cd	Merge branch '2.0release' into develop	2015-04-29 18:46:54 +08:00
winlin	4b372d8d16	change primary to the primary branch.	2015-04-29 18:46:47 +08:00
winlin	94681702e1	Merge branch '2.0release' into develop	2015-04-29 18:03:20 +08:00
winlin	e63b8eda51	migarate to srs org.	2015-04-29 18:03:17 +08:00
winlin	42ddb76544	Merge branch '2.0release' into develop	2015-04-29 18:01:24 +08:00
winlin	8603dba697	migarate to srs org.	2015-04-29 18:01:16 +08:00
winlin	17b15deee6	Merge branch '2.0release' into develop	2015-04-29 17:38:29 +08:00
winlin	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:38:23 +08:00
winlin	53e92a17f5	Merge branch '2.0release' into develop	2015-04-29 17:06:40 +08:00
winlin	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
winlin	22ca46350b	fix #383, support mix_correct algorithm. 2.0.161.	2015-04-15 17:12:22 +08:00
winlin	dcac9c69d5	fix #381, support reap hls/ts by gop or not. 2.0.160.	2015-04-13 10:32:32 +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	e56d7add44	fix bug of config to parse the default value. 2.0.158	2015-04-07 17:42:41 +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	17c0a5c470	fix #372, support transform vhost of edge 2.0.155.	2015-04-03 10:56:56 +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	717d088376	support server cycle handler. 2.0.153.	2015-03-31 18:06:55 +08:00
winlin	c49bc0628e	support on_hls for http hooks. 2.0.152.	2015-03-31 17:42:12 +08:00
winlin	f6e135943f	enhanced hls, support deviation for duration. 2.0.151.	2015-03-31 15:39:47 +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
winlin	b6feb0742f	fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148	2015-03-23 23:13:57 +08:00
winlin	f69fa7273b	fix #302, remove the thread unsafe code, no static.	2015-03-23 21:19:04 +08:00
winlin	33cca3e027	for #155, add todo for osx. 2.0.146	2015-03-21 15:22:45 +08:00
winlin	e45c62003a	Merge branch '2.0release' into develop	2015-03-21 11:55:35 +08:00
winlin	bbac2348db	for #354, remove the double underscore functions and variables.	2015-03-21 11:55:28 +08:00
winlin	45d9018051	Merge branch '2.0release' into develop	2015-03-21 10:25:09 +08:00
winlin	c6817cc422	for #354, remove the double underscore of macro.	2015-03-21 10:25:03 +08:00
winlin	f564c903ac	support got uptime and loadavg for osx. 2.0.145	2015-03-18 22:30:17 +08:00
winlin	f36e4a443d	refine the fast buffer. 2.0.144	2015-03-18 16:34:27 +08:00
winlin	6a98758435	revert the changes for SRS2.	2015-03-17 23:51:10 +08:00
winlin	df2644c850	merge from 2.0release	2015-03-17 23:48:50 +08:00
winlin	9f81a8b73e	for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.	2015-03-17 22:07:38 +08:00
winlin	ab673e1300	for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.	2015-03-17 22:06:59 +08:00
winlin	9e407d32fe	change verstion to 3.0.0	2015-03-17 07:58:38 +08:00
winlin	2241ba0e34	for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142	2015-03-17 07:57:58 +08:00
winlin	a21243ea12	merge from 2.0	2015-03-15 08:16:37 +08:00
winlin	d349a3dbda	update stable version check	2015-03-15 08:15:04 +08:00
winlin	519c25a064	fork srs2 and start srs3. 3.0.0	2015-03-15 08:06:41 +08:00
winlin	320f45c6f4	fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140.	2015-03-14 20:07:56 +08:00
winlin	27cb62b7aa	for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.	2015-03-14 19:45:13 +08:00
winlin	ffef62900f	for #328, support adobe hds. 2.0.138.	2015-03-12 11:15:15 +08:00
winlin	db7ddfd510	fix #155, #135, support osx(darwin) for mac pro. 2.0.137.	2015-03-10 12:50:27 +08:00
winlin	5143e3a58d	fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136	2015-03-08 19:59:10 +08:00
winlin	2e9f2753c9	for #316, add stream codec info. 2.0.135	2015-03-08 18:33:35 +08:00
winlin	8dbabe3708	fix #310, refine aac LC, support aac HE/HEv2. 2.0.134.	2015-03-08 17:36:43 +08:00
winlin	f26e719800	fix #322, fix http-flv stream bug, support multiple streams. 2.0.133.	2015-03-06 13:37:57 +08:00
winlin	3982ec1d87	refine http request parse. 2.0.132.	2015-03-06 11:36:26 +08:00
winlin	3e394a5f06	for #320, set socket send buffer to smaller macro. 2.0.131	2015-03-04 16:52:43 +08:00
winlin	983ab8fb89	pass all utest for 2.0	2015-03-04 12:24:22 +08:00
winlin	a47dbf7a92	for #320, refine code.	2015-03-03 17:28:07 +08:00
winlin	34d6a2ece5	for #320, support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129	2015-03-03 17:22:44 +08:00
winlin	fb3fced8d0	for #179, revert dvr http api. 2.0.128.	2015-03-01 17:57:28 +08:00
winlin	8ed256b7e9	for #179, wait keyframe for dvr. 2.0.127	2015-02-27 21:11:29 +08:00
winlin	0213cc6466	for #179, refine dvr, support POST create dvr when publish not start. 2.0.126	2015-02-27 20:39:36 +08:00
winlin	b903a7b436	for #179, dvr suport vhost/app/stream level control. 2.0.125.	2015-02-25 09:20:11 +08:00
winlin	1cb8e44b1b	fix #304, fix hls bug, write pts/dts error. 2.0.124.	2015-02-24 18:39:31 +08:00
winlin	d650118988	fix #179, dvr support api to start or stop. 2.0.123	2015-02-23 19:23:32 +08:00
winlin	a984eeecab	refine dvr, append file when dvr file exists. 2.0.122.	2015-02-19 19:50:10 +08:00
winlin	1102c7a58f	refine pithy print to more easyer to use 2.0.121.	2015-02-19 18:56:21 +08:00
winlin	9d233db27e	fix #133, support push rtsp to srs. 2.0.120.	2015-02-18 22:28:39 +08:00
winlin	e81e090239	for #133, add rtsp listener and handler.	2015-02-15 21:28:31 +08:00
winlin	78f34ad46f	for #304, support config default acodec/vcodec. 2.0.118.	2015-02-15 18:11:24 +08:00
winlin	3c813847bd	rewrite the ts remux of hls. 2.0.117	2015-02-15 16:37:28 +08:00
winlin	25af6c6847	for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116.	2015-02-12 13:34:59 +08:00
winlin	381e88d698	add release code. ZhouGuowen for SRS2.0	2015-02-11 08:52:52 +08:00
winlin	b982b27f6f	add dev code for each release. HuKaiqun for SRS1.0	2015-02-11 08:48:22 +08:00
winlin	e19ee0cb99	for #311, set pcr_base to dts. 2.0.114.	2015-02-10 23:15:43 +08:00
winlin	87519aaae8	fix the avc codec bug, the ibmf format may like the annexb, we must guess only one time. 2.0.114	2015-02-10 22:37:29 +08:00
winlin	d5e3ac4e7d	for #310, the aac profile must be object plus one. 1.0.26	2015-02-10 17:15:50 +08:00
winlin	4820d455d5	for #310, workaround to force to LC/MAIN, donot support SSR above. 2.0.113	2015-02-10 16:58:13 +08:00
winlin	a23191497f	fix #136, support hls without io(in ram). 2.0.112	2015-02-03 16:01:07 +08:00
winlin	16afe7ddbb	fix #250, support push MPEGTS over UDP to SRS. 2.0.111	2015-01-31 23:20:00 +08:00
winlin	70c8fe13c4	for #250, support h264 video for push mpegts over udp. 2.0.110	2015-01-31 19:46:55 +08:00
winlin	66fccdbbd1	for #250, demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109.	2015-01-31 12:21:04 +08:00
winlin	8374017329	build libfdk-aac in ffmpeg. 2.0.108	2015-01-29 10:45:19 +08:00
winlin	919a85b103	for #301, hls support h.264+mp3, ok for vlc. 2.0.107	2015-01-25 17:06:49 +08:00
winlin	2c42350489	for #301, http ts stream support h.264+mp3. 2.0.106	2015-01-25 16:42:22 +08:00
winlin	aaade0f04f	for #268, refine the pcr start at 0, dts/pts plus delay. 2.0.105	2015-01-25 13:35:53 +08:00
winlin	9cbc753e8e	for #151, #268, refine the pcr start at 0, dts/pts plus delay. 1.0.25	2015-01-25 13:30:45 +08:00
winlin	b0daf1482d	update version to 1.0.24	2015-01-25 13:10:30 +08:00
winlin	711b6ca277	for #250, basic stream caster framework. 2.0.104	2015-01-24 16:31:32 +08:00
winlin	4f5cc9c403	for #151, use absolutely overflow to make jwplayer happy. 1.0.23	2015-01-23 15:14:29 +08:00
winlin	73cfdea332	for #299, srs http server support dash vod stream over mp4 range. 2.0.103	2015-01-23 13:45:59 +08:00
winlin	2a05783d5c	for #293, support http ts stream. 2.0.101	2015-01-22 18:32:10 +08:00
winlin	2167a8385c	update version to 3.0.101	2015-01-22 09:36:19 +08:00
winlin	b7b268dfbf	fix #293, support http live flv/aac/mp3 stream with fast cache. 2.0.100.	2015-01-19 13:17:46 +08:00
winlin	53d9faf395	for #293, update readme.	2015-01-18 19:50:54 +08:00
winlin	e71bc0cbc5	for bug #277, refine the http server.	2015-01-17 23:44:21 +08:00
winlin	cbed2bbca4	fix #277, refine http server refer to go http-framework. 2.0.98	2015-01-17 23:00:40 +08:00
winlin	9bbbaad288	for bug #277, refine http api refer to go http-framework. 2.0.97	2015-01-17 21:58:23 +08:00
winlin	cc22ca4890	hotfix #290, use iformat only for rtmp input. 2.0.95	2015-01-17 13:06:18 +08:00
winlin	4449a8d7b0	fix #290, use iformat only for rtmp input. 1.0.22	2015-01-17 13:04:52 +08:00
winlin	63309a0538	refine for bug #288, drop info frame without error.	2015-01-14 11:55:15 +08:00
winlin	b705ed0b90	for bug #288, refine the codec decode info frame failed. 1.0.21	2015-01-14 11:32:19 +08:00
winlin	b466756931	merge from feilong for bug #281.	2015-01-08 17:44:08 +08:00
winlin	27e0521ace	fix #281, fix hls bug ignore type-9 send aud. 1.0.20	2015-01-08 17:37:28 +08:00
winlin	6c833902f9	merge http api from tufang. 2.0.92	2015-01-08 16:02:33 +08:00
winlin	0e9c9db3f4	fix the aggregate bug, adjust to starttime of msg. 2.0.91	2015-01-07 15:37:44 +08:00
winlin	0e03d019a8	for bug #215, srs rtmp dump support conn args. 2.0.90	2015-01-07 13:29:30 +08:00
winlin	dc11418c79	fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89	2015-01-03 15:33:23 +08:00
winlin	dd2c7e0b4d	hotfix to remove the pageUrl for http callback. 2.0.88	2015-01-03 15:08:46 +08:00
winlin	247b772449	hotfix to remove the pageUrl for http callback. 1.0.19	2015-01-03 15:07:12 +08:00
winlin	f881bc43b5	fix #179: dvr support custom filepath by variables. 2.0.87	2015-01-03 12:54:54 +08:00
winlin	75f2607685	fix #211, support security allow/deny publish/play all/ip. 2.0.86	2015-01-02 16:02:13 +08:00
winlin	f8ec7c706d	merge from 1.0.18, hotfix #207, trim the last 0 of log. 2.0.85	2015-01-02 12:57:44 +08:00
winlin	e590537dca	fix #207, trim the last 0 of log. 1.0.18	2015-01-02 12:56:15 +08:00
winlin	9d34820c80	fix #158: http-callback check http status code ok(200). 2.0.84	2015-01-02 10:21:04 +08:00
winlin	8df0f724d6	fix #216, http-callback post in application/json content-type. 2.0.83	2015-01-02 09:22:49 +08:00
winlin	ca977ef739	hotfix #216, http-callback post in application/json content-type. 1.0.17	2015-01-02 09:20:45 +08:00
winlin	518a5a72ab	fix #263, srs-librtmp flv read tag should init size. 2.0.82	2015-01-02 09:05:16 +08:00
winlin	c1c01ec802	hotfix #270, memory leak for http client post. 2.0.81	2015-01-01 11:47:18 +08:00
winlin	bb6dfe40c1	fix #270, memory leak for http client post. 1.0.16	2015-01-01 11:44:28 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	12f4abd553	fix #266, aac profile is object id plus one. 2.0.80	2014-12-29 14:24:22 +08:00
winlin	c0a6c3efa3	merge from 1.0release, hotfix #267, the forward dest ep should use server. 2.0.79	2014-12-29 09:07:50 +08:00
winlin	d9aca8ab82	hotfix #267, the forward dest ep should use server. 1.0.15	2014-12-29 09:05:56 +08:00
winlin	e27c95b0e8	merge from 1.0release for #268, the hls pcr is negative when startup. 2.0.78	2014-12-29 08:45:19 +08:00
winlin	513c1ec6d5	fix #268, the hls pcr is negative when startup. 1.0.14	2014-12-29 08:38:29 +08:00
winlin	9a66d22f3b	hotfix 1.0release, 1.0.13	2014-12-26 21:43:00 +08:00
winlin	b8de3bd3b4	convert the core to unix format.	2014-12-25 10:55:12 +08:00
winlin	92146712d8	fix srs-librtmp send raw aac audio channel bug. 2.0.76	2014-12-25 09:52:18 +08:00
winlin	28eedfc177	merge from 1.0release for #264, ignore the video NALU which is actually a sequence header to make HLS happy. 2.0.75	2014-12-22 17:12:09 +08:00
winlin	2e43a63bf4	fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12	2014-12-22 17:10:51 +08:00
winlin	eef8034632	merge from 1.0release for bug #264. 2.0.74	2014-12-20 11:58:39 +08:00
winlin	1dfac0bf1d	fix #264, support disconnect publish connect when hls error. 1.0.11	2014-12-20 11:45:59 +08:00
winlin	db13c725a6	refine #259, rename the on_dispose to wakeup. 2.0.73	2014-12-19 09:19:47 +08:00
winlin	0d6b91039d	fix #257, refine latency, send when got one+ msgs, 2.0.72	2014-12-16 09:26:22 +08:00
winlin	cbad7a3074	fix #257, server latency is 0.1s+, the bottleneck is encoder. 2.0.71	2014-12-13 12:48:49 +08:00
winlin	595bf24a51	for bug #257, default to off the realtime(min-latency).	2014-12-13 10:13:49 +08:00
winlin	10297fab51	fix #257, support 0.1s+ latency. 2.0.70	2014-12-12 21:51:06 +08:00
winlin	6bdd0af728	for bug #251, remove the queue fast cache for it's too complex, use queue fast vector instead. 2.0.69	2014-12-10 09:18:49 +08:00
winlin	7150a99f41	for bug #251, remove the mic(message iovs cache), no use.	2014-12-10 09:15:38 +08:00
winlin	a3de1c71fc	reset the mw_latency to 350.	2014-12-08 09:49:45 +08:00
winlin	1311b6fe65	fix #251, support 10k clients. 2.0.67	2014-12-07 16:31:47 +08:00
winlin	55d98fceed	for bug #251, add min msgs for queue cond wait.	2014-12-07 16:15:19 +08:00
winlin	5a2b8afead	for bug #251, add queue fast vector. 2.0.66	2014-12-07 13:26:45 +08:00
winlin	8f72f79504	for bug #251, add queue fast cache. 2.0.65	2014-12-07 12:08:38 +08:00
winlin	bba6063492	for bug #251, the shared ptr message share the header. 2.0.64	2014-12-07 11:25:05 +08:00
winlin	330819fb74	for bug #251, refine the mic algorithm. 2.0.63	2014-12-06 22:50:51 +08:00
winlin	d53fd7f570	for bug #251, support mic(message iovs cache). 2.0.61	2014-12-06 20:10:05 +08:00
winlin	d827928eeb	for bug #251, merge the performance refines.	2014-12-06 09:55:51 +08:00
winlin	9892b92258	Revert "for bug #251, somhc(session-oriented message-header cache). 2.0.61" ... It hurt performance, should never use it. This reverts commit d073adde58.	2014-12-06 01:19:49 +08:00
winlin	d073adde58	for bug #251, somhc(session-oriented message-header cache). 2.0.61	2014-12-06 00:59:10 +08:00
winlin	f9b9a60de7	for bug #251, remove the SrsMessage, use SrsCommonMessage or SrsSharedPtrMessage. 2.0.60	2014-12-05 23:03:52 +08:00
winlin	e80c8603d4	fix #251, revert changes, for the cond wait and fast cache queue is no use. 2.0.59	2014-12-05 20:55:19 +08:00
winlin	92ecdf088b	for bug #251, use macro to define the fast cache and cond wait. 2.0.58	2014-12-05 18:47:17 +08:00
winlin	cd317859db	add mw sleep time and msgs/iovs table.	2014-12-05 17:07:27 +08:00
winlin	9ee138746f	for bug #251, 9k+ clients, use fast cache for msgs queue. 2.0.57	2014-12-05 16:44:11 +08:00
winlin	dde05c6315	for bug #251, refine the send use cond wait.	2014-12-05 14:38:43 +08:00
winlin	fad6074a25	set send socket buf. mw/mr sleep default to 350.	2014-12-05 11:24:05 +08:00
winlin	279b4ff4c9	refine macros	2014-12-04 21:37:04 +08:00
winlin	b1d7fbe668	fix #241, add mw(merged-write) config. 2.0.53	2014-12-04 21:35:13 +08:00
winlin	f1192a8302	fix bug for bug #241, default to 32k for socket buffer.	2014-12-04 18:35:50 +08:00
winlin	5589b13d2e	for bug #241, support mr(merged-read) config and reload. 2.0.52.	2014-12-04 18:21:04 +08:00
winlin	57f844b636	for bug #249, simplify the macro, 0 to disable chunk stream cache.	2014-12-04 15:49:24 +08:00
winlin	a23b5b9a4b	for bug#241, simplify the buffer, donot change its size.	2014-12-04 15:43:37 +08:00
winlin	4b09531e2f	for bug #241, simplify the merged read config macros.	2014-12-04 15:33:17 +08:00
winlin	f57801eb46	fix #249, cache the chunk headers info to +5% or +10% performance. 2.0.51	2014-12-04 14:58:40 +08:00
winlin	90992b31a3	for bug #194, add the send macro to performance.	2014-12-04 13:54:02 +08:00
winlin	60bc9c2aa0	add performance header to control options for performance. 2.0.50	2014-12-04 13:43:55 +08:00
winlin	29324fab46	fix #248, improve about 15% performance for fast buffer. 2.0.49	2014-12-04 13:05:13 +08:00
winlin	f35ec2155b	for bug #241, support merged read. 2.0.48	2014-12-03 19:27:27 +08:00
winlin	463e1fbc41	for bug #237, refine the thread loop for publish thread. 2.0.47	2014-12-02 19:28:36 +08:00
winlin	e9712cc627	refine recv thread, donot set auto response for publish recv thread. 2.0.46	2014-12-02 17:16:20 +08:00
winlin	5905e5c050	merge from 1.0release, traverse the token before response connect. 2.0.45.	2014-12-02 15:41:54 +08:00
winlin	304208f822	fix #239, traverse the token before response connect. 1.0.10.	2014-12-02 15:27:36 +08:00