5462 commits

Author	SHA1	Message	Date
xialixin	ac8acc0b22	fix 28281 to 28181, sip heart message, timeout channel peer ip and port reset	2020-04-04 16:07:23 +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	5144794044	Detect older docker and disable SRTP ASM	2020-04-04 14:50:36 +08:00
winlin	f504cb2724	Refine build script	2020-04-03 22:46:04 +08:00
winlin	366d800720	For #307, use files of openssl 1.0.*	2020-04-03 21:59:32 +08:00
winlin	5ad58933a9	For #307, build SRTP with openssl to improve performance. 4.0.19	2020-04-03 21:14:06 +08:00
xiaozhihong	22fe799649	Add annotation about rtp packet. Remove no need verbose log.	2020-04-03 16:35:47 +08:00
winlin	0ff3ce7464	Merge remote-tracking branch 'john/rtc' into feature/rtc	2020-04-03 15:17:13 +08:00
winlin	9e7e80f5f5	Add TODO comment for Cert	2020-04-03 15:08:52 +08:00
winlin	8c42ad622b	Config to use RSA or ECDSA	2020-04-03 15:05:04 +08:00
winlin	c70a0eb07c	Config to use RSA or ECDSA	2020-04-03 15:03:09 +08:00
winlin	5e06a2568b	For #370, support SRTP with ASM(enable openssl) by default	2020-04-03 14:37:48 +08:00
winlin	cdb20c79cc	Revert part of 01d5e4da, to keep both openssl 1.0 and 1.1, because SRTP depends on 1.0	2020-04-03 14:03:57 +08:00
winlin	862c211acd	Support openssl 1.0 and 1.1, RSA and ECDSA	2020-04-03 13:43:13 +08:00
winlin	81bb8747f2	Refine script	2020-04-03 13:42:52 +08:00
winlin	bd05f69d0b	Refine openssl build script on OSX	2020-04-03 13:42:24 +08:00
winlin	9ad5a5d9b6	RTC support openssl 1.0.*	2020-04-03 13:41:45 +08:00
winlin	f853c7a1e0	Support start SRS when wireshark capturing	2020-04-03 13:40:34 +08:00
xiaozhihong	3cf03393c0	format a=candidate line	2020-04-02 21:31:22 +08:00
xiaozhihong	d6adb5cd8d	process USE-CANDIDATE/ICE-CONTROLLING/ICE-CONTROLLED atrribute in STUN	2020-04-02 21:31:06 +08:00
winlin	15384e61e2	Remove duplicated build for srtp2	2020-04-02 12:33:58 +08:00
winlin	8de89f3f37	Add TODO for SRTP-GCM for RTC	2020-04-02 12:28:47 +08:00
winlin	51bae42560	For RTC, verify peer and accept all certificate.	2020-04-02 11:41:57 +08:00
winlin	302da32fc5	When configure, default to make clean	2020-04-02 11:41:36 +08:00
xiaozhihong	bfd8971db8	fix compile warning.	2020-04-01 14:56:31 +08:00
xiaozhihong	4f671b1de2	Merge remote-tracking branch 'upstream/feature/rtc' into rtc	2020-04-01 14:39:05 +08:00
xiaozhihong	14421a7f0b	add annotation about some sdp line	2020-04-01 14:38:00 +08:00
xiaozhihong	f4067bcb4d	fix nack bug	2020-04-01 14:37:14 +08:00
winlin	608f3d0fae	For #1500, support push stream by GB28181. 4.0.18	2020-03-31 23:06:07 +08:00
winlin	d81cde695d	Refactor code	2020-03-31 22:48:38 +08:00
winlin	e19b927f92	Merge GB28181	2020-03-31 22:45:20 +08:00
winlin	6012ac4eb0	Refine code	2020-03-31 22:30:57 +08:00
winlin	a342f460e7	Merge branch '4.0release' into xialixin-dev-28181	2020-03-31 20:09:07 +08:00
winlin	33455867f9	Merge branch 'dev-28181' of https://github.com/xialixin/srs into xialixin-dev-28181	2020-03-31 20:08:24 +08:00
winlin	df6274daf8	Merge branch 'feature/rtc' into develop	2020-03-31 18:19:15 +08:00
winlin	4ac8991a8e	Update author to runner365 for SRT	2020-03-31 18:10:44 +08:00
winlin	74ad7143e7	Change authro to Bepartofyou for RTC codec	2020-03-31 18:05:32 +08:00
winlin	45db63249d	Update author to John for RTC	2020-03-31 18:03:04 +08:00
winlin	6022ac5cdb	Add comments for RTC candidate.	2020-03-31 17:33:04 +08:00
winlin	ecf0f012b5	Add comments for RTC candidate.	2020-03-31 17:26:32 +08:00
winlin	c7113f27e0	Play stream by WebRTC on iOS/Android/PC browser. 4.0.17	2020-03-31 09:35:36 +08:00
xialixin	c99fb99ab6	refactor gb28181, supporting SIP server enable, multiplex, API interface	2020-03-31 00:39:10 +08:00
winlin	03289012fd	Refactor code for RTC	2020-03-30 21:21:31 +08:00
winlin	e65b6283df	Merge remote-tracking branch 'john/rtc' into feature/rtc	2020-03-30 20:46:15 +08:00
winlin	f9f9cfda9b	Refine cherrypy install script	2020-03-30 18:25:22 +08:00
xiaozhihong	9dadcdffd6	Merge remote-tracking branch 'upstream/feature/rtc' into sdp	2020-03-30 15:16:44 +08:00
xiaozhihong	49da2099c1	sdp exchange.	2020-03-30 15:16:29 +08:00
winlin	f3d708c2b5	Fix utest build warnings	2020-03-30 12:46:53 +08:00
winlin	57604a9c65	For #1672, fix dvr close file failed bug. 3.0.140	2020-03-30 10:44:11 +08:00
xfalcon	cd1513d6a3	fix fs not close,when dvr error (#1672)	2020-03-30 10:37:16 +08:00
winlin	bf297fd070	Refine make help	2020-03-29 21:36:41 +08:00
winlin	60d810693c	Refine rebuild components	2020-03-29 21:30:32 +08:00
winlin	056fcd2928	Refine clean script	2020-03-29 19:06:51 +08:00
winlin	40cc8ed47c	Refine file path for st and ffmpeg	2020-03-29 18:44:01 +08:00
winlin	a60dbc167a	Update macro	2020-03-29 18:01:46 +08:00
winlin	3b8450d4bd	Support cleanup componets	2020-03-29 17:54:27 +08:00
winlin	6935bb18ae	Merge branch '4.0release' into develop	2020-03-29 17:36:33 +08:00
winlin	6b8f0d84a3	Merge branch '3.0release' into 4.0release	2020-03-29 17:31:41 +08:00
winlin	80f315f1ae	Support utest on mac osx	2020-03-29 17:29:09 +08:00
winlin	22fbae139c	Refine links use relative path	2020-03-29 17:15:29 +08:00
winlin	22ec783c3f	Merge branch '3.0release' into 4.0release	2020-03-29 16:52:46 +08:00
winlin	1c65987472	Refine links use relative path	2020-03-29 16:51:56 +08:00
winlin	2ba8104b37	Update coverage script	2020-03-29 16:36:49 +08:00
winlin	b9a3df5c55	Update utest script	2020-03-29 16:18:20 +08:00
winlin	f8b0bc122b	Update build script	2020-03-29 15:48:57 +08:00
winlin	0081525380	Update package script	2020-03-29 15:29:07 +08:00
winlin	c0a8193537	Update build script	2020-03-29 15:23:40 +08:00
winlin	d5339acc57	Update package script	2020-03-29 14:12:37 +08:00
winlin	84652265d9	Update README	2020-03-29 00:23:16 +08:00
winlin	cc6a447332	Merge feature/rtc	2020-03-29 00:21:00 +08:00
winlin	32d818d69c	Merge 4.0release	2020-03-29 00:16:37 +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	0fd75434a6	For #307, fast build openssl	2020-03-28 21:33:47 +08:00
winlin	c1e124786c	For #307, fix build warnings for rtc	2020-03-28 20:57:03 +08:00
winlin	dae7af8444	For #307, rtc support osx	2020-03-28 20:52:42 +08:00
winlin	04c3370458	Merge branch 'develop' into feature/rtc	2020-03-28 18:06:40 +08:00
winlin	f29db522c1	Merge branch '4.0release' into develop	2020-03-28 18:05:46 +08:00
winlin	9e8b88825b	Merge branch '3.0release' into 4.0release	2020-03-28 18:05:19 +08:00
winlin	218fe332aa	For #1250, support osx build	2020-03-28 18:04:34 +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	0a030a4ade	Update	2020-03-28 17:42:26 +08:00
winlin	3556da40ce	Fix #1250, Support macOS, OSX, MacbookPro, Apple Darwin. 3.0.138	2020-03-28 17:23:11 +08:00
winlin	c339542ce0	Support macOS OSX	2020-03-28 17:20:40 +08:00
winlin	90a39ec46d	Add api to stat mw iovec	2020-03-27 13:37:39 +08:00
winlin	0d060a1cec	For #1659, #307, support aliyun slb UDP health check	2020-03-24 12:12:41 +08:00
winlin	57c23d93c1	Refactor url for rtc player	2020-03-23 13:36:17 +08:00
winlin	4c63319b5d	Release rtc_player to ossrs.net	2020-03-23 10:36:15 +08:00
winlin	8a7f35dc6d	Release rtc_player to ossrs.net	2020-03-22 22:52:51 +08:00
winlin	6edca6147c	Release rtc_player to ossrs.net	2020-03-22 22:51:09 +08:00
winlin	f8b4ba1e5a	Release rtc_player to ossrs.net	2020-03-22 22:48:51 +08:00
winlin	98d372bd40	Release rtc_player to ossrs.net	2020-03-22 21:54:18 +08:00
winlin	2b6da30ac6	Welcome maintainers Runner365, John, B.P.Y(Bepartofyou). 4.0.15	2020-03-22 21:22:15 +08:00
bepartofyou	923209b070	Merge remote-tracking branch 'srs/feature/codec' into feature/rtc_audio	2020-03-22 20:16:24 +08:00
bepartofyou	8332a2fbdb	ffmpeg ubuntu build files	2020-03-22 20:15:23 +08:00
bepartofyou	766da5188b	Merge remote-tracking branch 'srs/feature/codec' into feature/rtc_audio	2020-03-22 19:55:29 +08:00
winlin	e5e2d05da0	For #307, support play with WebRTC. 4.0.14	2020-03-22 19:46:56 +08:00
bepartofyou	4a17259471	err wrap change to new	2020-03-22 19:36:11 +08:00
winlin	41acc5033e	For #307, support disable asm for FFMPEG	2020-03-22 19:26:26 +08:00
winlin	caf7e9e6ea	Merge branch 'feature/rtc' into develop	2020-03-22 18:53:39 +08:00
winlin	c00ffa530b	Merge branch 'feature/codec' into feature/rtc	2020-03-22 18:42:49 +08:00
winlin	602a478e1b	For #1659, #307, add switch to disable rtc	2020-03-22 18:17:05 +08:00
winlin	37c84eccc0	For #1659, #307, add x86 asm for ffmpeg for rtc	2020-03-22 17:14:07 +08:00
xiaozhihong	734e848741	Update RtcSession peer address when changed.	2020-03-22 16:54:31 +08:00
winlin	4308f238c0	For #1659, #307, add ffmpeg-4.2-fit for rtc	2020-03-22 16:34:54 +08:00
winlin	634a14bfa6	For #1659, #307, add opus codec library	2020-03-22 14:03:48 +08:00
winlin	2da4e0a43e	For #1638, #307, config to discard aac for rtc	2020-03-22 08:28:51 +08:00
winlin	e1fe2d1c1d	For #1638, #307, add comments for audio codec	2020-03-22 07:18:25 +08:00
七曦	f09dda85fc	Exception handle	2020-03-21 23:27:28 +08:00
winlin	2757ec7973	Merge from bepartofyou	2020-03-21 23:09:57 +08:00
winlin	0cd67a997e	For #1638, #307, add comments for vhost rtc config	2020-03-21 22:52:59 +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
七曦	a0a4337214	make webrtc audio work	2020-03-21 21:50:06 +08:00
xiaozhihong	7315b1a26d	Fix config read "bframe" discad bug.	2020-03-21 21:40:26 +08:00
xiaozhihong	fa700dad64	1. Modify rtc.conf to support Bframe discard. ... 2. Rename srs_app_rtp.cpp to srs_app_rtc.cpp	2020-03-21 21:26:30 +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	97035d2301	Merge pull request #1654 from cainiaoDJ/update_cmakelists_for_clion ... 更新CMakeLists.txt文件，使项目能在clion编译通过	2020-03-21 19:39:46 +08:00
winlin	955de3dac9	Merge branch '3.0release' into 4.0release	2020-03-21 19:36:16 +08:00
winlin	68ad006b73	Remove empty line.	2020-03-21 19:03:17 +08:00
winlin	3f6a2871b0	For #1638, #307, show error information when api failed.	2020-03-21 19:00:47 +08:00
winlin	d2036455ac	Refactor api, follow https://github.com/rtcdn/rtcdn-draft	2020-03-21 18:33:36 +08:00
winlin	61b8ae8c30	Refactor api, follow https://github.com/rtcdn/rtcdn-draft	2020-03-21 18:30:53 +08:00
winlin	3360db7b77	Refactor api, follow https://github.com/rtcdn/rtcdn-draft	2020-03-21 17:56:26 +08:00
winlin	532750f18a	Refactor api data, url to api	2020-03-21 17:33:54 +08:00
winlin	de9a004ff7	Merge branch 'dev-28181' of https://github.com/xialixin/srs into feature/gb28281-2	2020-03-20 21:39:04 +08:00
yanghuiwen	2911c814c4	更新CMakeLists.txt文件，使项目能在clion编译通过	2020-03-20 17:07:16 +08:00
xialixin	8b4f84e336	fix push.gb28181.conf, gb28181conn repeat call serve()	2020-03-20 10:38:38 +08:00
xialixin	cbe9c1dabc	Support gb28181 sip over udp, ps steam over rtp	2020-03-20 00:01:48 +08:00
l	bbfb03f98a	修复srs_write_large_iovs中nwrite未累加的错误	2020-03-19 14:36:56 +08:00
winlin	8eef439c90	For #1638, #307, use hourglass for timer.	2020-03-19 12:58:04 +08:00
HuyaJohn	94e4f4539d	merge feature/rtc, fix conflict	2020-03-18 16:34:15 -07:00
HuyaJohn	d1d16d490e	Detect B frame in avc stream. Fix compiler error with verbose	2020-03-18 16:27:31 -07:00
winlin	0b6e9257f9	For #1638, #307, remove unused code for rtc	2020-03-18 18:35:02 +08:00
winlin	018577e685	For #1638, #307, fix error new bug for rtc	2020-03-18 18:12:37 +08:00
winlin	979d7c3f4f	For #1638, #307, refactor rtc player.	2020-03-18 17:21:50 +08:00
winlin	c210c0b2f5	For #1638, #307, refactor rtc player.	2020-03-18 10:03:20 +08:00
xiaozhihong	e2233027b8	fix h264 rtp packet error	2020-03-18 08:45:20 +08:00
winlin	fc84f1e545	Refactor source cid with pid	2020-03-17 18:43:11 +08:00
winlin	28c1c57854	For #1638, #307, should set err in return value.	2020-03-17 18:33:05 +08:00
winlin	0ff8a3761b	For #1638, #307, should check error by fetch_or_create source	2020-03-17 18:24:28 +08:00
winlin	ed2996141c	For #1638, #307, refine api and udp for rtc.	2020-03-17 18:11:03 +08:00
winlin	2c4dc0fb3d	For #1638, #307, extract rtc server to hybrid manager.	2020-03-17 17:56:37 +08:00
winlin	4318d989a6	For #1638, #307, switch to RTC session context cid for cleanup	2020-03-17 12:41:50 +08:00
winlin	25fec76ea9	For #1638, #307, switch to RTC session context cid for reusing UDP ports	2020-03-17 12:33:08 +08:00
winlin	29b9203428	For #1638, #307, use short-term http connection for rtc to use new cid.	2020-03-17 12:10:42 +08:00
winlin	6118ca382a	For #1638, #307, http api success with message, timeout as such	2020-03-17 11:40:05 +08:00
winlin	b5dd502103	For #1638, #307, fix build warnings	2020-03-17 09:16:52 +08:00
HuyaJohn	e8b2bb5d28	process err, do error check, add some error code	2020-03-16 07:35:24 -07:00
winlin	c2a667cc35	For #1638, #307, add comments for api and enum	2020-03-16 22:01:09 +08:00
winlin	2f0b150588	For #1638, #307, accept srs_string_dumps_hex to app utility.	2020-03-16 18:05:42 +08:00
winlin	e905fce847	For #1638, #307, add comments in RTMP/RTP message for RTC.	2020-03-16 17:39:06 +08:00
winlin	9ba861f42f	3.0release is beta now	2020-03-16 15:11:34 +08:00
winlin	a8ddd5afe7	For #1635, refine inotify watch for relative path	2020-03-16 11:52:31 +08:00
winlin	8db2c3d821	For #1635, refine inotify watch for relative path	2020-03-16 11:39:20 +08:00
winlin	9e856c84e7	For #1638, #307, remove unused bash variable.	2020-03-15 15:58:28 +08:00
winlin	4b23d04635	For #1638, #307, fix rtc player demo bug	2020-03-14 23:22:25 +08:00
winlin	60c8b37f05	For #1638, #307, merge john, add NACK suport, remove debug code, verbose log	2020-03-14 22:51:35 +08:00
winlin	c2916acd92	For #1638, #307, define webrtc:// url for play	2020-03-14 22:48:02 +08:00
xiaozhihong	2b56f9ee59	add NACK suport, remove debug code, verbose log	2020-03-14 22:11:01 +08:00
winlin	12e99f1897	For #1638, #307, use webrtc adapter.js for demo.	2020-03-14 21:14:17 +08:00
winlin	a42cf3ae8d	For #1638, #307, refactor rtc config.	2020-03-14 18:05:58 +08:00
winlin	6f4584db53	Merge SRS4	2020-03-14 17:16:51 +08:00
winlin	51af2b4779	For #1638, #307, rtc conf support ENV.	2020-03-14 17:15:46 +08:00
winlin	a135eb2144	Merge SRS3	2020-03-14 14:39:11 +08:00
winlin	88336b1f5e	Remove KAFKA config, because it's removed from code	2020-03-14 14:38:26 +08:00
winlin	70307ed8f9	Update README	2020-03-14 14:35:57 +08:00
xiaozhihong	6c88f58079	remove debug code, fix rtc.html	2020-03-13 22:50:34 +08:00
winlin	d21ef106a0	Merge branch 'rtc' of https://github.com/xiaozhihong/srs into xiaozhihong-rtc	2020-03-13 21:18:09 +08:00
xiaozhihong	768598a3bb	add kernel rtp packet	2020-03-13 20:35:07 +08:00
xiaozhihong	027d34bbd3	add rtp shared packet	2020-03-13 20:34:40 +08:00
winlin	a7c8980a60	For #1636, muxing sh, use sound_rate if aac sr not set.	2020-03-13 17:36:22 +08:00
winlin	7036f839d2	For #1636, add comments	2020-03-13 17:05:22 +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	c66f33ac87	Merge pull request #1636 from runner365/3.0release.srt.dev ... support all aac sample rate in srt2rtmp	2020-03-13 16:46:49 +08:00
winlin	08bffc60fb	Update install	2020-03-13 16:29:54 +08:00
xiaozhihong	6decdc7838	adjust code style, fix some bug, add rtc session timeout	2020-03-13 00:24:56 +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
runner365	f102a598b8	Merge branch 'develop' into 3.0release.srt.dev	2020-03-12 20:30:59 +08:00
runner365	b9195122cf	support all sample rate in aac	2020-03-12 20:30:07 +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	6c55fd3e4b	For #1634, refactor output with datetime for ingest/encoder/exec. 3.0.125	2020-03-11 19:42:42 +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
HuyaJohn	da72caf8b9	h264 packet done, chrome play well	2020-03-11 04:21:44 -07:00
winlin	c78595c1fa	For #1634, refactor encoder output, support timestamp variables.	2020-03-11 19:19:17 +08:00
winlin	66b194cd63	For #1634, refactor encoder process management.	2020-03-11 19:08:36 +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
xiaozhihong	e831f3254a	some code	2020-03-11 00:04:12 +08:00
HuyaJohn	ff0e03800d	h264 rtp debuging	2020-03-10 04:47:49 -07:00
xiaozhihong	e2675109fb	fix rtp h264 packet bug	2020-03-10 00:45:40 +08:00
HuyaJohn	3ae510b843	rtp dispatch done, but video can not play in chrome	2020-03-09 04:46:27 -07:00
xiaozhihong	2f462775a0	rtp support	2020-03-09 00:40:30 +08:00
HuyaJohn	2e68c375e3	start coding flv->rtp	2020-03-08 04:20:46 -07:00
xiaozhihong	c62901a3ac	make code easy, wrap udp remux socket	2020-03-08 00:30:31 +08:00
winlin	5586c2a128	For #1612, refactor return value for RTSP initialize.	2020-03-07 22:42:23 +08:00
winlin	dcb0553cc8	For #1612, fix crash bug for RTSP. 4.0.12	2020-03-07 22:35:11 +08:00
winlin	12a74326e8	Merge pull request #1612 from xialixin/develop ... Fix disconnect RTSP connection has assertion, resulting in program exit	2020-03-07 22:31:34 +08:00
winlin	5f9ded73ce	Merge pull request #1625 from wasphin/feature/remove-unused-ip ... Remove unused ip variable	2020-03-07 22:28:56 +08:00
winlin	41acf9ca8e	For #1631, support sei_filter for SRT. 4.0.11	2020-03-07 22:25:19 +08:00
runner365	a2839aacdf	add h264 sei filter	2020-03-07 16:15:36 +08:00
HuyaJohn	b730458d51	add candidates ip list, add rtc_upload.html to test	2020-03-06 23:28:15 -08:00
runner365	4242985b36	update only support h264+aac	2020-03-07 15:15:14 +08:00
xiaozhihong	a36ed6954f	add rtc.html temp	2020-03-06 23:59:59 +08:00
xiaozhihong	936ba7583e	modify depend.sh	2020-03-06 23:40:20 +08:00
xiaozhihong	9d5495c0c2	"stun and dtls done"	2020-03-06 23:01:48 +08:00
Xiaofeng Wang	b525fc65aa	Remove unused ip variable ... * "inet addr" is not compatible with rhel/centos 7+; * ifconfig has been replaced by ip-utils in newer distro;	2020-03-03 21:10:43 +08:00
xiaozhihong	30d8b2209f	parse sdp	2020-03-02 22:47:40 +08:00
runner365	40a09958c4	add checking for pes_parse	2020-03-01 19:42:32 +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	f917cc1e0c	For SRT, perfer mix_correct to true as default.	2020-03-01 10:09:44 +08:00
runner365	7f4cc6221c	1,solve audio timestamp bugs;2,solve video dts increase bugs	2020-02-29 16:47:20 +08:00
xiaozhihong	62563bdd81	rtc framework	2020-02-28 23:18:39 +08:00
runner365	ed1a3aa37c	Merge branch 'develop' into 3.0release.srt.dev	2020-02-26 17:46:44 +08:00
winlin	ea305790df	For #1579, refactor log for gracefully quit.	2020-02-26 16:38:06 +08:00
runner365	4bd37d43b4	solve dts==0 bugs; solve large aac 2930bytes timestamp bugs	2020-02-26 11:14:05 +08:00
winlin	bbdbcf173c	For #1615, refactor the version and API for SRT.	2020-02-26 09:06:53 +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	771f07ee07	Merge branch 'develop' into 4.0release	2020-02-25 09:55:19 +08:00
winlin	1e998678f7	Merge pull request #1615 from runner365/3.0release.srt.dev ... update streamid decode for get more encoder such as VMIX	2020-02-25 09:54:33 +08:00
runner365	0dd72e0e5b	Merge branch '3.0release.srt.dev' into 3.0release	2020-02-24 12:56:01 +08:00
runner365	bbfa552140	update streamid decode for get more encoder such as VMIX	2020-02-24 12:55:17 +08:00
xiaozhihong	51abb0844e	rtp session manager, stun codding	2020-02-23 23:19:40 +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
xiaozhihong	bc22ebe949	add rtc http request and response, exchange sdp.	2020-02-21 23:50:22 +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	e6c329293c	Refine log	2020-02-18 15:07:15 +08:00
winlin	f4c7b882c5	For #1579, define signals for fast/grace quit and upgrade	2020-02-18 09:53:40 +08:00
夏立新	d6e11706ec	Fix disconnect RTSP connection has assertion, resulting in program exit	2020-02-17 18:46:05 +08:00
夏立新	df3ec15cd1	Fix checking the completion of one frame data in RTSP RTP stream	2020-02-17 18:08:16 +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	4e7e9809f3	Fix bash script bug for macOS, eventhough we don't support it.	2020-02-16 22:35:40 +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	4276bea463	Migrating streaming service from ossrs.net to r.ossrs.net	2020-02-14 22:00:58 +08:00
winlin	23324cde31	Migrating streaming service from ossrs.net to r.ossrs.net	2020-02-14 21:57:02 +08:00
Alex.CR	ce4123f250	rtmp tcp listen port bugs in srt2rtmp (#1602) ... * update srt2rtmp about rtmp listen tcp port * update srt2rtmp about rtmp listen tcp port	2020-02-13 17:02:54 +08:00
runner365	94741c1676	update srt2rtmp about rtmp listen tcp port	2020-02-13 16:58:35 +08:00
runner365	76204fa2ba	Merge remote-tracking branch 'srs/develop' into 3.0release	2020-02-13 16:52:47 +08:00
runner365	8e40f9cf22	update srt2rtmp about rtmp listen tcp port	2020-02-13 16:52:26 +08:00
winlin	8b7fbac7d4	SRT supports detail config for DynamicConfig. 4.0.4	2020-02-13 12:17:09 +08:00
Alex.CR	9dad53691e	solve latency parameter error (#1600) ... * solve latency parameter error	2020-02-13 10:54:24 +08:00
runner365	d8419bd4dd	solve latency parameter error	2020-02-13 09:58:14 +08:00
Alex.CR	5f7d23f123	add srt parameter configure (#1599) ... * if there isn't srt connect, it needn't epoll wait * solve repush srt bugs * change two thread to one thread * mpegts discard header is not 0x47 * add srt_epoll_clear_usocks * add srt parameter configure	2020-02-12 21:03:26 +08:00
runner365	24f286684e	add srt parameter configure	2020-02-12 20:02:55 +08:00
Alex.CR	c2012379af	change srt epoll thread to one thread (#1597) ... * if there isn't srt connect, it needn't epoll wait * solve repush srt bugs * change two thread to one thread * mpegts discard header is not 0x47 * add srt_epoll_clear_usocks	2020-02-12 10:23:39 +08:00
runner365	6f4c124f58	solve merge confict	2020-02-12 10:19:30 +08:00
runner365	1a1d0e9267	add srt_epoll_clear_usocks	2020-02-12 09:54:07 +08:00
runner365	548c918efb	mpegts discard header is not 0x47	2020-02-11 21:36:36 +08:00
runner365	4fdf242e99	change two thread to one thread	2020-02-11 20:37:42 +08:00
winlin	d2a071f041	Add TODO for incompatible APIs of librtmp	2020-02-11 19:32:46 +08:00
Alex.CR	3847807534	solve srt repush bugs (#1596) ... * if there isn't srt connect, it needn't epoll wait * solve repush srt bugs	2020-02-09 11:50:58 +08:00
runner365	1c6203bda2	solve repush srt bugs	2020-02-09 11:09:48 +08:00
runner365	1941f55475	if there isn't srt connect, it needn't epoll wait	2020-02-05 21:21:12 +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	f6fa889393	For #1592, default ff_log_level to info	2020-02-05 13:20:37 +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	c50c51889a	For #1592, support ff_log_level and default to warning	2020-02-05 12:32:15 +08:00
winlin	2fa151726b	For #1592, rename ff_log_dir.	2020-02-05 12:15:44 +08:00
winlin	823b4fa56f	Merge branch '3.0release' into develop	2020-02-04 19:34:09 +08:00
winlin	a99cee2819	For #1186, refactor security check. 3.0.114	2020-02-04 19:33:11 +08:00
winlin	b9d45ba7d9	For #1186, refactor security check. 3.0.114	2020-02-04 19:21:15 +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	68efca4fa9	For #939, always enable fast FLV streaming.	2020-02-04 16:39:01 +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	a6f88805f3	Remove test code	2020-01-29 14:42:18 +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	6ed6ce58e4	Merge SRS3	2020-01-28 21:37:37 +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	b605edb9b3	Merge 3.0	2020-01-27 19:52:41 +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	07f4bc65c3	Merge branch '3.0release' into develop	2020-01-26 17:33:29 +08:00
winlin	01870cce56	Allow use libst.so for ST is MPL license.	2020-01-26 17:33:10 +08:00
winlin	d5c1546237	Update doc for SRT	2020-01-26 14:37:59 +08:00
winlin	88c9c13707	Update readme for SRT	2020-01-26 14:17:42 +08:00
winlin	a7631a2850	Update doc	2020-01-26 12:24:02 +08:00
winlin	fd3e4f406a	Update doc	2020-01-26 11:39:02 +08:00
winlin	ec3b442a42	Update doc	2020-01-26 11:29:29 +08:00
winlin	c9f3706425	Move doc	2020-01-26 11:14:18 +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	a17c1e5f65	Merge SRT from runner365	2020-01-25 17:24:25 +08:00
runner365	8d277c6e8b	solve merge problem	2020-01-25 16:24:04 +08:00
runner365	dece458a90	solve rtmp client timeout bugs in srt2rtmp	2020-01-25 16:15:27 +08:00
winlin	bbc7023f85	Merge SRS3	2020-01-25 15:05:52 +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	b7855d133d	Merge remote-tracking branch 'runner365/3.0release.srt.dev' into srt	2020-01-24 16:11:01 +08:00
winlin	5f174552f3	Merge SRT	2020-01-24 16:10:40 +08:00
winlin	235c889e14	Update config	2020-01-24 15:35:14 +08:00
winlin	e3169a080b	Refactor SRT build, use libsrt.a static library	2020-01-24 07:06:30 +08:00
winlin	307a4315f1	Fix bug, should return error when wrapped	2020-01-23 21:33:59 +08:00
winlin	7c9b31815f	Refactor code, add stop for hybrid server to do cleanup.	2020-01-23 21:16:34 +08:00
winlin	db5788b205	Update README for SRT	2020-01-23 20:47:32 +08:00
winlin	2363d258de	Refactor hybrid server model	2020-01-23 20:42:50 +08:00
winlin	33c6bf1f8f	Refactor SRT, using reverse dependency, SRT depends on APP.	2020-01-23 19:40:40 +08:00
winlin	87ba204a42	Update doc for SRT url.	2020-01-23 18:25:44 +08:00
winlin	1959d1d920	Extract hybrid server for SRT	2020-01-23 18:21:11 +08:00
winlin	225c830971	Refine main run process	2020-01-23 17:44:36 +08:00
runner365	06e7a20b5f	update streamid decode	2020-01-23 17:19:06 +08:00
winlin	d88d422794	Update doc for SRT.	2020-01-23 16:49:05 +08:00
runner365	d7437834d4	update is_streamid_valid	2020-01-23 16:12:22 +08:00
winlin	bc26df4893	Remove noused debug function srs_trace_data	2020-01-23 14:44:30 +08:00
winlin	aacf519169	Revert log for forwarder in source	2020-01-23 14:42:06 +08:00
winlin	a7b8695cb0	Refactor code, include without path	2020-01-23 14:33:11 +08:00
winlin	f143757429	Use macro to disable SRT in code	2020-01-23 14:23:09 +08:00
winlin	fb29096505	For SRT, allow/default disable it by --without-srt	2020-01-23 14:22:22 +08:00
winlin	fb5928f927	Fix build failed for SRT with modules.	2020-01-23 13:24:47 +08:00
winlin	2de8d788f6	Revert configure changes(srs_ingest_hls,utest) in previous commit	2020-01-23 12:32:15 +08:00
winlin	106113c5f0	For previous revert, pick some code for LibSRTRoot	2020-01-23 12:15:02 +08:00
winlin	a27c4f7095	Revert "remove modules for srt compile" ... This reverts commit d4c08c44d8.	2020-01-23 12:09:54 +08:00
winlin	c7f6eef4ac	Refine config file, link to issue.	2020-01-23 11:51:35 +08:00
winlin	65e8835fb5	Ignore .vscode in git.	2020-01-23 09:24:41 +08:00
winlin	d28e82962d	Ignore .vscode in git.	2020-01-23 09:17:01 +08:00
runner365	03ef01c635	update configure	2020-01-22 10:59:50 +08:00
runner365	d4c08c44d8	remove modules for srt compile	2020-01-21 20:31:33 +08:00
runner365	746d188e6f	update srt.conf	2020-01-21 19:23:38 +08:00
runner365	5c5fd805c5	add srt mpegts to rtmp	2020-01-21 19:20:09 +08:00
winlin	6107db91f5	Release 3.0 alpha9, 3.0a9, 3.0.105	2020-01-21 16:14:15 +08:00
winlin	c3bf0cbe1b	For #1547, check options for crossbuild.	2020-01-21 15:47:19 +08:00
winlin	ba61fe8bc5	Fix #1221, remove complex configure options. 3.0.104	2020-01-21 15:22:55 +08:00
winlin	0df108740a	Fix #1547, support crossbuild for ARM/MIPS.	2020-01-21 13:59:43 +08:00
winlin	6af8e38017	For #1547, support setting cc/cxx/ar tools. 3.0.103	2020-01-21 10:28:25 +08:00
winlin	a6fe4e80d3	For #1547, remove the SRS_OSX macro in code	2020-01-20 11:25:39 +08:00
winlin	024433f327	For #1547, refine configure, remove some macros	2020-01-20 10:44:46 +08:00
winlin	1bf90a6e21	Ignore noreply user.	2020-01-19 18:25:29 +08:00
l	86d04a70ed	Fix #1580, fix cid range problem. 3.0.102	2020-01-19 18:21:28 +08:00
winlin	9ac8585cf9	Fix codec check	2020-01-19 13:16:49 +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
runner365	7b9e3ecdc4	add ts demux	2020-01-17 19:43:54 +08:00
winlin	9dbd049e79	For #1568, extract SrsSourceManager from SrsSource.	2020-01-16 17:56:55 +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
runner365	1481928b53	reject repeated srt pusher connection	2020-01-15 10:30:20 +08:00
runner365	b53b75ea1e	srt pull/push server	2020-01-14 21:10:33 +08:00
winlin	816aa91a7f	Fix utest bug, init fd	2020-01-13 14:48:49 +08:00
runner365	aeee3011ef	add srt server file	2020-01-11 23:05:10 +08:00
winlin	98df29c6fb	For #1042, improve test coverage for service. 3.0.97	2020-01-10 11:36:38 +08:00
winlin	6c1067d56a	Merge from 2.0	2020-01-09 10:20:49 +08:00
winlin	dd46a4f700	Fix #1554, support logrotate copytruncate. 2.0.272	2020-01-09 10:03:17 +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
Michael.Ma	459488bcf8	fix logrotate empty file hole issue (#1561) ... * fix logrotate empty file hole issue refer to https://github.com/ossrs/srs/issues/1554	2020-01-08 17:54:06 +08:00
winlin	36bfbb902b	Refien utest for log heaer generating.	2020-01-08 14:32:24 +08:00
winlin	80bac7d982	Improve test coverage for rtmp client service.	2020-01-08 14:26:38 +08:00
winlin	cc11f36940	Improve test coverage for log service.	2020-01-08 14:24:41 +08:00
winlin	2cc021b2d7	Improve test coverage for http client service.	2020-01-08 14:00:27 +08:00
winlin	06c1d4d7f9	Fix some warnings for compiler	2020-01-05 22:37:25 +08:00
winlin	69e2d94e50	Fix some warnings for compiler	2020-01-05 22:30:57 +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	498f3c5df9	Improve test coverage for service TCP/UDP.	2020-01-05 18:44:07 +08:00
winlin	42ee6570a7	Improve test coverage for service TCP/UDP.	2020-01-05 18:43:23 +08:00
winlin	02c1bd0946	Improve test coverage for service TCP/UDP.	2020-01-05 18:42:37 +08:00
winlin	265b70863c	Improve test coverage for service TCP/UDP.	2020-01-05 18:37:20 +08:00
winlin	9bd8b363b3	Improve test coverage for http service.	2020-01-05 17:02:57 +08:00
winlin	6d0ac35db9	Merge 2.0release #1551	2020-01-05 14:43:46 +08:00
winlin	b5f4b96060	Merge #1551, fix memory leak in RTSP stack. 2.0.270	2020-01-05 14:41:31 +08:00
alphonsetai	763c06976a	fix memory leak	2020-01-05 14:38:08 +08:00
winlin	79314f7d4a	Improve test coverage for HTTP service	2020-01-03 13:31:08 +08:00
winlin	646eeb05e9	For #1042, improve test coverage for config. 3.0.91	2020-01-02 11:18:45 +08:00
winlin	fa7fd85ca6	Improve test coverage for config.	2020-01-02 11:08:18 +08:00
winlin	45aa325722	Improve test coverage for config.	2020-01-01 21:01:14 +08:00
winlin	4848d3ab91	Improve test coverage for config.	2020-01-01 17:15:21 +08:00
winlin	0fd0114ee6	Improve test coverage for config.	2020-01-01 17:14:59 +08:00
winlin	f7673f6009	Improve test coverage for config.	2020-01-01 16:06:12 +08:00
winlin	a9dba511ab	Improve test coverage for config.	2020-01-01 16:04:35 +08:00
winlin	146a095b38	Improve test coverage for config.	2020-01-01 15:52:10 +08:00
winlin	2942955b30	Improve test coverage for config.	2020-01-01 15:49:04 +08:00
winlin	7136c7c9b8	Improve test coverage for config.	2020-01-01 14:21:24 +08:00
winlin	de87b64f59	Improve test coverage for config.	2020-01-01 14:12:36 +08:00
winlin	a71d93188b	Improve test coverage for config.	2020-01-01 13:41:19 +08:00
winlin	36236192fa	Improve test coverage for mp4	2020-01-01 12:00:48 +08:00
winlin	d2052fd4cd	Support sequence header only for mp4	2020-01-01 11:54:53 +08:00
winlin	c3e0dcfa9e	Improve test coverage for mp4 decoder	2019-12-31 19:37:48 +08:00
winlin	7597a956ed	Improve test coverage for dash init encoder	2019-12-31 19:17:40 +08:00
winlin	1cfadfed3a	Improve test coverage for mp4 boxes	2019-12-31 18:59:30 +08:00
winlin	e8dbee1474	Refine url/urn box dumps	2019-12-31 15:55:34 +08:00
winlin	9cb2449175	Fix mp4 url/urn bug.	2019-12-31 15:35:45 +08:00
winlin	adad90d316	Refactor the mock file reader/writer	2019-12-31 15:15:56 +08:00
winlin	d32a7e9770	Improve test coverage for mp4 box	2019-12-30 20:50:58 +08:00
winlin	f3831d2d5b	Improve test coverage for mp4 dumps	2019-12-30 16:36:11 +08:00
winlin	b63f2f283d	Fix mp4 security issue, check buffer when required size is variable.	2019-12-30 14:34:23 +08:00
winlin	9140e0f19d	Improve test coverage for kernel mp4.	2019-12-30 13:50:19 +08:00
winlin	d783a12f89	Happy 2020	2019-12-30 10:10:35 +08:00
winlin	8075628d9e	Fix utest fail.	2019-12-29 19:16:16 +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	be0cb164ec	Add links for flv.js, hls.js and dash.js	2019-12-27 10:40:44 +08:00
winlin	c2e9e96e28	Change the default page to srs_player	2019-12-27 09:11:26 +08:00
winlin	76a7985cbe	For #1105, fix dash mp4 bug.	2019-12-26 18:39:14 +08:00
winlin	b9d720c927	For #1105, http server support mp4 range.	2019-12-26 18:33:52 +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	32a2b7f0a5	For #1488, improve coverage for parsing client ip.	2019-12-26 12:20:53 +08:00
winlin	2115d5d22a	For #1488, add test and improve coverage for parsing client ip.	2019-12-26 12:07:52 +08:00
winlin	316cab794a	For #1488, pass client ip to http callback.3.0.85	2019-12-26 11:42:19 +08:00
winlin	d367730883	For #1488, support parsing original ip from header for proxy	2019-12-26 11:33:26 +08:00
winlin	09b65aff96	For #1488, pass client ip to http callback. 2.0.269	2019-12-26 10:37:16 +08:00
winlin	c5a8d21db6	For #1537, #1282, use new algorithm for arm.	2019-12-25 20:11:31 +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	416568f4ab	Remove FFMPEG and NGINX, please use srs-docker instead	2019-12-25 18:39:01 +08:00
winlin	ff2001a612	Compress repository, remove gprof files.	2019-12-25 18:30:55 +08:00
winlin	a11461905b	Remove FFMPEG and NGINX, please use srs-docker instead . 3.0.82	2019-12-25 18:29:07 +08:00
winlin	bf807778e5	For #1537, #1282, support multiple options for --extra-flags	2019-12-25 17:52:51 +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	f47e846bd2	For #1537, #1282, refine build st script	2019-12-25 16:26:40 +08:00
winlin	97bb8a5405	For #1537, #1282, support disable ASM to avoid building bug.	2019-12-25 16:22:00 +08:00
winlin	b672ad4b1f	For #1537, #1282, sync with state-threads/srs	2019-12-25 16:09:25 +08:00
winlin	4e93ded864	For #1537, #1282, remove not used file st-1.9.zip	2019-12-25 16:05:50 +08:00
winlin	e42633cd65	For #1537, #1282, when not use builtin setjmp, donot compile md.S	2019-12-25 16:04:28 +08:00
winlin	916ec71801	For #1537, #1282, use ST source code in SRS	2019-12-25 15:55:56 +08:00
winlin	c91ffbee93	For #1537, #1282, remove not used patches, note the patch for ARM already merged to ST in SRS3	2019-12-25 15:49:25 +08:00
winlin	a0c631de9f	For #1537, #1282, support --extra-flags for unknown CPU arch.	2019-12-25 15:46:58 +08:00
winlin	71810c0209	For #1537, disable crossbuild for ARM/MIPS.	2019-12-25 13:18:53 +08:00
winlin	dffc96d2fe	For #1537, disable crossbuild for ARM/MIPS.	2019-12-25 13:17:49 +08:00
winlin	e6e4bd7fb4	Remove useless warning log for reloading.	2019-12-24 19:26:22 +08:00
winlin	e2def1b24f	Ignore some coverage for mp4.	2019-12-24 17:42:00 +08:00
winlin	e2f86464c5	Ignore some coverage for ts.	2019-12-24 17:29:46 +08:00
winlin	995bd5cdd2	Update new AUTHORS	2019-12-24 17:29:30 +08:00
winlin	0c20a45f5c	Ignore test coverage for some lines for mp4	2019-12-24 15:41:36 +08:00
winlin	a119305b31	Ignore coverage for codec sps-pps parsing.	2019-12-24 15:36:22 +08:00
winlin	aa4a27b9fa	Ignore coverage for codec sps-pps parsing.	2019-12-24 15:35:19 +08:00
winlin	7eccc9da26	For #1508, support chunk length and content in multiple parts.	2019-12-24 14:58:35 +08:00
winlin	a35a7f915e	Fix bug for HTTP write jsonp for srs-console.	2019-12-24 10:32:52 +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	01a4503ceb	Support build srs-librtmp by VS2015. 2.0.267	2019-12-23 18:12:45 +08:00
winlin	08bbbc5414	Support build srs-librtmp by VS2015. 2.0.267	2019-12-23 17:11:31 +08:00
winlin	c6732d0fbb	Support build srs-librtmp by VS2015. 2.0.267	2019-12-23 17:02:09 +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	ae785eda8d	Improve test coverage for kernel fast stream.	2019-12-20 18:56:53 +08:00
winlin	da7e76c96a	For#1508, check the error correctly for strtol.	2019-12-20 16:48:51 +08:00
winlin	cab15c348c	Fix #1508, http-client support read chunked response. 3.0.76	2019-12-20 16:09:37 +08:00
winlin	788b200e90	For #1508, check the error by http_errno for http-parser.	2019-12-20 16:08:24 +08:00
winlin	2b51cee3ef	For #1508, check the chunk header length.	2019-12-20 14:51:01 +08:00
winlin	4382ced3bf	For #1508, Refactor srs_is_digital, support all zeros.	2019-12-20 14:49:25 +08:00
winlin	cee4feda61	Fix make -jN random failed.	2019-12-20 11:49:27 +08:00
winlin	fc9855bc7a	Refine the RTMP iovs cache increasing to much faster.	2019-12-19 15:04:14 +08:00
winlin	49c737f996	Fix #1524, memory leak for amf0 strict array. 3.0.75	2019-12-19 14:39:34 +08:00
winlin	1e4f22f83d	Fix random build failed bug for modules.	2019-12-19 14:30:34 +08:00
winlin	d7078a72d4	For #1520, add TODO list for configing server itself in coworker.	2019-12-19 14:15:21 +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	0200baa179	Improve test coverage for protocols.	2019-12-18 21:19:42 +08:00
winlin	25f132ec2f	Improve test coverage for protocols.	2019-12-18 21:18:11 +08:00
winlin	bf92172e62	Improve coverage for RAW AVC protocol.	2019-12-18 20:37:49 +08:00
winlin	4a5323b054	Improve coverage for RAW AVC protocol.	2019-12-18 20:27:48 +08:00
winlin	23a1674ce0	Improve coverage for RAW AVC protocol.	2019-12-18 20:13:11 +08:00
winlin	8047d0df45	For #1042, add test for RAW AVC protocol.	2019-12-18 15:50:17 +08:00
winlin	6eec7c1dfe	Refactor the query string for srs-player	2019-12-18 14:46:21 +08:00
winlin	b52628ce01	Refactor the comments to use flash publisher	2019-12-18 14:37:39 +08:00
winlin	931496e3b9	Refactor the comments to use flash publisher	2019-12-18 14:37:10 +08:00
winlin	4e3650b8c7	Refactor the comments to use flash publisher	2019-12-18 14:35:43 +08:00
winlin	dd44d76d72	Refactor the comments to use flash publisher	2019-12-18 14:35:07 +08:00
winlin	7497df7a15	Refactor the comments to enable flash	2019-12-18 13:59:05 +08:00
winlin	4a5afe3428	Add tips when flash is disabled.	2019-12-18 12:06:32 +08:00
winlin	901c69b381	Update srs-player version	2019-12-18 11:54:17 +08:00
winlin	cef7ec79b3	Detect whether flash enabled for srs-bwt.	2019-12-18 11:50:43 +08:00
winlin	c830dc6700	Detect whether flash enabled for srs-publisher.	2019-12-18 11:33:34 +08:00
winlin	b0afc00733	Detect whether flash enabled for srs-player. 3.0.73	2019-12-18 11:06:01 +08:00
winlin	33c7f6d0e4	Temporarily disable chat demo page.	2019-12-18 09:16:56 +08:00
winlin	216a23f709	Fix the http implicit handler bug	2019-12-17 21:24:24 +08:00
winlin	b247c9759a	Improve test coverage for http handler	2019-12-17 21:17:44 +08:00
winlin	6c50d85671	Improve test coverage for http message	2019-12-17 21:08:18 +08:00
winlin	43a5cea158	Improve test coverage for HTTP CORS	2019-12-17 21:03:28 +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	ec0fb82c0e	Improve test coverage for http server mux.	2019-12-17 19:39:36 +08:00
winlin	81947df819	Enhance HTTP response write for final_request.	2019-12-17 19:09:39 +08:00
winlin	e27cc059e4	Ignore coverage for http-parser	2019-12-17 17:37:29 +08:00
winlin	df359f747a	Ignore coverage for json-parser	2019-12-17 17:30:49 +08:00
winlin	191b07668d	Refactor HTTP stream to disconnect client when unpublish	2019-12-17 16:54:06 +08:00
winlin	1e83da7812	Refactor HTTP recv request timeout to 15s.	2019-12-17 16:37:00 +08:00
winlin	2df1dcb05a	Fix HTTP-FLV and VOD-FLV conflicting bug.	2019-12-17 16:01:04 +08:00
winlin	d9842b0371	Refactor HttpResponseWriter.write, default to single text mode.	2019-12-17 15:14:59 +08:00
winlin	8cdb7cc727	Add test for vod stream handler	2019-12-17 14:33:47 +08:00
winlin	97f2c5bf0c	Refactor http static file server path resolving.	2019-12-16 20:07:06 +08:00
winlin	fa362607b2	Add test for http basic handler	2019-12-16 19:32:41 +08:00
winlin	6bad973a7c	Fix HTTP parser bug for parsing header from multiple pieces of data.	2019-12-16 18:21:39 +08:00
winlin	45ed458927	Eliminate dead code of ts cache for HTTP message	2019-12-16 16:07:17 +08:00
winlin	ca2b68f428	Refactor header of HTTP message by using SrsHttpHeader.	2019-12-16 16:00:02 +08:00
winlin	dcb7b6aae0	Refactor HTTP Message by decoupling with http_parser	2019-12-16 15:12:26 +08:00
winlin	547cd4f518	Word the comments about the order of HTTP header	2019-12-16 12:25:29 +08:00
winlin	0886acbdb7	Improve test coverage for HTTP header.	2019-12-16 12:11:29 +08:00
winlin	8c10c26f00	Improve the coverage for HTTP error response.	2019-12-16 11:36:39 +08:00
winlin	474266eae7	Refine the comments for http content-type detecting	2019-12-14 23:34:09 +08:00
winlin	4758a284d7	Add test for http status.	2019-12-14 10:12:25 +08:00
winlin	6ce04051e4	Improve test coverage of status for HTTP.	2019-12-13 20:05:18 +08:00
winlin	0394d95e4b	Refine file structure for RTMP/HTTP protocol stack utest.	2019-12-13 20:04:33 +08:00
winlin	8d9554df8e	Remove dead code in SrsRtmpClient::handshake	2019-12-13 16:31:32 +08:00
winlin	1c391c85ae	Merge 2.0release	2019-12-13 10:47:04 +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	f298d5204b	For #1042, cover RTMP other codes	2019-12-12 15:58:56 +08:00
winlin	cfcb3ce7b2	For #1042, cover RTMP other codes	2019-12-12 15:46:46 +08:00
winlin	2731fe1f3e	SrsPacket supports converting to message, so can be sent by one API.	2019-12-12 15:11:31 +08:00
winlin	82c4f41975	For #1042, cover RTMP other codes	2019-12-12 10:12:31 +08:00
winlin	bd3d9f32b7	For #1042, cover RTMP other codes	2019-12-11 20:22:39 +08:00
winlin	22d4159373	For #1042, cover RTMP server response commands.	2019-12-11 18:43:37 +08:00
winlin	9c62a68e15	For #1042, cover RTMP server response commands.	2019-12-11 18:25:47 +08:00
winlin	5516877867	For #1042, cover RTMP client/server protocol.	2019-12-11 18:12:06 +08:00
winlin	4f298134af	Fix #1445, limit the createStream recursive depth. 3.0.70	2019-12-11 17:56:31 +08:00
winlin	41a9f15626	For #1042, cover RTMP client protocol.	2019-12-11 15:59:29 +08:00
winlin	69817a9f34	For #1042, cover RTMP handshake protocol.	2019-12-11 15:02:35 +08:00
winlin	f51f1efe42	For #1042, cover RTMP handshake protocol.	2019-12-11 14:32:57 +08:00
winlin	7bd7e1ccca	Refine the circleci codecov script.	2019-12-11 12:06:28 +08:00
winlin	78da67e8d1	For #1229, fix the security risk in logger. 3.0.69	2019-12-11 11:56:00 +08:00
winlin	ad70589347	For #1229, fix the security risk in HDS. 3.0.69	2019-12-11 11:31:32 +08:00
winlin	d866c77265	Fix the path for circleci	2019-12-11 07:23:54 +08:00
winlin	20fbb4466f	Fix the path for circleci	2019-12-11 07:09:28 +08:00
winlin	f1cca0c360	Fix the path for circleci	2019-12-11 07:02:42 +08:00
winlin	0c673deb81	Fix the path for circleci	2019-12-10 23:25:15 +08:00
winlin	fae3a714a2	Fix the path for circleci	2019-12-10 23:21:26 +08:00
winlin	4c93d3a4c7	Fix the path for circleci	2019-12-10 23:13:56 +08:00
winlin	749b9fe444	Fix the path for circleci	2019-12-10 22:24:16 +08:00
winlin	0677e378ba	Fix the path for circleci	2019-12-10 22:18:31 +08:00
winlin	e3077a8034	Fix the path for circleci	2019-12-10 22:09:52 +08:00
winlin	1b2aff84bc	Fix the path for circleci	2019-12-10 21:45:58 +08:00
winlin	c90e321f9c	Fix the path for circleci	2019-12-10 21:34:20 +08:00
winlin	94adda5dae	Fix the circleci path	2019-12-10 21:14:01 +08:00
winlin	979f82e0dc	Fix the circleci path.	2019-12-10 20:32:33 +08:00
winlin	d908ee73db	Make the hls_dipose more specific	2019-12-10 16:48:35 +08:00
winlin	1c227f4f8a	Refine logger for hls_dts_directly	2019-12-10 15:59:15 +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	31f341e205	For #1506, refine the AAC samples guess algorithm.	2019-12-05 20:16:23 +08:00
winlin	52c6c7c45d	For #1506, ignore video when codec is unknown.	2019-12-05 19:21:43 +08:00
winlin	65c66592e9	Refine statistic url	2019-12-04 10:47:02 +08:00
winlin	2d85b036cb	Refine stat for player index	2019-12-03 18:26:01 +08:00
winlin	643d06473f	Refine player with statistics.	2019-12-03 10:18:13 +08:00
winlin	5a3fd1e68a	Release v3.0-a2, 3.0.67	2019-12-01 19:24:17 +08:00
winlin	517974d451	Refine redirect flow for origin cluster	2019-11-30 19:06:41 +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	ba02640c46	Refine tid in error log	2019-11-29 12:33:32 +08:00
winlin	7bd704e695	Cover protocol stack RTMP. 3.0.63	2019-11-22 12:06:15 +08:00
winlin	2731afc161	Cover protocol stack RTMP. 3.0.63	2019-11-20 14:08:53 +08:00
winlin	40e60aff4d	Cover protocol stack RTMP. 3.0.63	2019-11-20 11:14:02 +08:00
winlin	3365bc6b02	Cover protocol stack RTMP. 3.0.63	2019-11-20 11:05:56 +08:00
winlin	6eab86644e	Cover protocol stack RTMP. 3.0.63	2019-11-19 18:18:43 +08:00
winlin	c8bb7e71c9	Cover protocol stack RTMP. 3.0.63	2019-11-19 11:47:31 +08:00
winlin	ea96e414ca	Cover protocol stack RTMP. 3.0.63	2019-11-08 09:26:57 +08:00
winlin	78e5f46ff7	Cover protocol stack RTMP. 3.0.63	2019-11-05 14:00:00 +08:00
winlin	466f99a1c8	Cover protocol stack RTMP. 3.0.63	2019-11-05 10:31:21 +08:00
winlin	ce8f778fe6	Cover protocol stack RTMP. 3.0.63	2019-11-05 10:17:06 +08:00
winlin	918a2943c9	Cover protocol stack RTMP. 3.0.63	2019-11-05 09:55:45 +08:00
winlin	9067786bd3	Cover protocol stack RTMP. 3.0.63	2019-11-04 09:31:30 +08:00
winlin	a726a14b37	Cover protocol stack RTMP. 3.0.63	2019-10-29 10:02:03 +08:00
winlin	8c214dc967	Cover protocol stack RTMP. 3.0.63	2019-10-28 08:57:11 +08:00
winlin	cf9a6b4f48	Cover protocol stack RTMP. 3.0.63	2019-10-28 08:41:49 +08:00
winlin	1583f6cc3f	Cover protocol stack RTMP. 3.0.63	2019-10-25 08:18:21 +08:00
winlin	2b2a62ccba	Cover protocol stack RTMP. 0.6.63	2019-10-23 09:26:10 +08:00
winlin	f99ca04bd5	Cover JSON codec. 3.0.62	2019-10-23 08:59:30 +08:00
winlin	1b2449ca3f	Cover JSON codec. 3.0.62	2019-10-23 08:47:02 +08:00
winlin	48970389ba	Cover JSON codec. 3.0.62	2019-10-22 10:06:12 +08:00
winlin	e816ac28d2	Cover JSON codec. 3.0.62	2019-10-22 10:02:37 +08:00
winlin	1ebec34d5b	Cover JSON codec. 3.0.62	2019-10-22 09:58:09 +08:00
winlin	e683f07715	Cover JSON codec. 3.0.62	2019-10-22 09:01:29 +08:00
winlin	c7602d8cee	Cover JSON codec. 3.0.62	2019-10-22 08:54:29 +08:00
winlin	aee704fd1f	Cover AMF0 codec. 3.0.61	2019-10-22 08:30:46 +08:00
winlin	0a9659b749	Cover AMF0 codec. 3.0.61	2019-10-21 09:29:42 +08:00
winlin	232024ef67	AMF0: Refine utest	2019-10-18 08:54:59 +08:00
winlin	9542cd2ba5	AMF0: Refine utest	2019-10-18 08:54:13 +08:00
winlin	026b2a2a1e	Cover AMF0 codec. 3.0.61	2019-10-18 00:48:49 +00:00
winlin	da46091d3c	Cover AMF0 codec. 3.0.61	2019-10-12 09:27:32 +08:00
winlin	99ca2b9567	Cover AMF0 codec. 3.0.61	2019-10-12 08:56:04 +08:00
winlin	f8943f8f7d	Cover AMF0 codec. 3.0.61	2019-10-12 08:39:40 +08:00
winlin	ebe8fa44e5	Cover AMF0 codec. 3.0.61	2019-10-12 00:36:52 +00:00
winlin	9d1249e256	Cover AMF0 codec. 3.0.61	2019-10-12 00:32:25 +00:00
winlin	b2e4a5f834	Cover AMF0 codec. 3.0.61	2019-10-11 09:28:53 +08:00
winlin	f24d82fada	Cover AMF0 codec. 3.0.61	2019-10-10 08:49:57 +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	b0227e0d22	Fix bug for package script	2019-10-05 20:46:44 +08:00
winlin	7af087652f	Add uninstall script	2019-10-05 20:43:04 +08:00
winlin	254549e3f4	Add uninstall script	2019-10-05 20:40:45 +08:00
winlin	5d9bc0658e	Fix package bug	2019-10-05 20:37:25 +08:00
winlin	64288d1f1e	Support systemctl service for CentOS7. 3.0.58	2019-10-05 20:33:26 +08:00
winlin	f6fc31db66	Add config files for go-oryx	2019-10-05 17:02:25 +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	1a65927b1b	Remvoe HSTRS warning.	2019-10-03 13:18:28 +08:00
winlin	0741b64b25	Remove KAFKA. 3.0.53	2019-10-03 12:49:22 +08:00
winlin	306ed8dbc8	Remove KAFKA. 3.0.53	2019-10-03 12:49:01 +08:00
winlin	5d17bb8bb0	Remove KAFKA. 3.0.53	2019-10-03 12:45:38 +08:00
winlin	bb3e8a41d1	Cover all kernel flv.	2019-05-23 07:53:03 +08:00
winlin	32b53de46d	Cover FLV decoder	2019-05-21 08:51:58 +08:00
winlin	8311f0dc5a	Cover FLV decoder	2019-05-21 08:45:53 +08:00
winlin	ea9c4f89af	Covert FLV Vod decoder.	2019-05-21 08:43:20 +08:00
winlin	3bd7978b59	Cover FLV decoder.	2019-05-21 08:31:00 +08:00
winlin	7aa5fbee85	Cover FLV transmux.	2019-05-21 08:20:04 +08:00
winlin	f760c04340	Cover FLV vod open	2019-05-20 09:00:16 +08:00
winlin	dd4ccfab79	Cover shared ptr message.	2019-05-20 08:45:42 +08:00
winlin	9cdd506b4f	Deprecated srs-librtmp.	2019-05-17 08:14:26 +08:00
winlin	8b595c4cdf	Cover more kernel time.	2019-05-15 08:57:46 +08:00
winlin	f7994b85eb	Cover more kernel codec.	2019-05-15 08:44:38 +08:00
winlin	77cc148608	Refine utest	2019-05-14 08:42:46 +08:00
winlin	58561b9f76	Refine utest	2019-05-14 08:40:22 +08:00
winlin	c10671cbb3	Cover all kernel file.	2019-05-14 08:24:43 +08:00
winlin	13c4498e11	Cover mp4 header.	2019-05-14 08:17:39 +08:00
winlin	1605000817	Covert Kernel File reader/writer. 3.0.52	2019-05-14 08:13:27 +08:00
winlin	d5661dcc4e	Cover kernel file writer.	2019-05-13 08:49:38 +08:00
winlin	a7e0d672a7	Cover kernel file writer.	2019-05-13 08:48:53 +08:00
winlin	6ac5b0a006	Cover tcp socket IO.	2019-05-13 08:08:41 +08:00
winlin	467d5e5f50	Fix build failed bug.	2019-05-09 08:51:14 +08:00
winlin	ccba55cdd8	Migrate is_never_timeout to utility.	2019-05-09 08:42:53 +08:00
winlin	1b37b90b8f	Covert tcp read, write and readfully.	2019-05-09 08:38:54 +08:00
winlin	38a6f5e6cf	Support TCP server utest.	2019-05-09 08:05:27 +08:00
winlin	9366161871	Refine utest for tcp connection.	2019-05-09 07:54:21 +08:00
winlin	5d8fb01b45	Fix #1352, fix typo of daemon.	2019-05-07 07:46:20 +08:00
winlin	ffe391aa49	Fix HLS no PMT/PAT bug.	2019-05-07 07:40:19 +08:00
winlin	1d3afa5ab9	Add utest for tcp server	2019-05-06 09:53:55 +08:00
winlin	c71b867b4f	Refine comments.	2019-05-06 07:43:05 +08:00
winlin	3d57c1c9bc	Refine ST service.	2019-05-05 08:45:11 +08:00
winlin	202a584aab	Refine ST service.	2019-05-05 08:17:48 +08:00
winlin	a4160308f5	Refine comments.	2019-05-05 07:55:55 +08:00
winlin	6730f08f45	Refine core.hpp	2019-05-05 07:44:39 +08:00
winlin	b02527dec0	Refine usage.	2019-04-30 09:15:06 +08:00
winlin	2de3045b25	Remove noisy informations.	2019-04-30 08:53:51 +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	0564cdedec	Refine typo in comments.	2019-04-30 08:31:36 +08:00
winlin	6b2c71d385	Refine typo in files. 3.0.51	2019-04-30 08:30:13 +08:00
winlin	45009785fb	Refine typo in app.	2019-04-30 08:24:52 +08:00
winlin	aac8a13f42	Refine typo in app.	2019-04-28 09:08:05 +08:00
winlin	4d25520f99	Refine typo in service.	2019-04-28 08:23:16 +08:00
winlin	224d7c539f	Refine typo in service.	2019-04-28 08:21:48 +08:00
winlin	fbe40dc42c	Refine code	2019-04-25 11:04:10 +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	8a94ac4b49	Upgrade http-parser to 2.9.2	2019-04-25 10:39:38 +08:00
winlin	0ee386b656	Refine http parser code.	2019-04-25 08:51:38 +08:00
winlin	cfc92d5e93	Use http-parser 2.9.2	2019-04-24 09:37:25 +08:00
winlin	646d490a18	Reset http-parser 2.1	2019-04-23 08:31:21 +08:00
winlin	6e9bba4220	Refine SrsHttpUri.	2019-04-23 08:26:15 +08:00
winlin	b285029e15	Refine SrsHttpUri.get_uri_field, without depends on http parser.	2019-04-23 08:17:59 +08:00
winlin	8bc77387ff	Refine typo in protocol.	2019-04-23 08:06:50 +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	b2f598dede	Refine SrsStSocket in time unit.	2019-04-22 08:07:37 +08:00
winlin	e436cc5665	Refine SrsBasicRtmpClient in time unit.	2019-04-22 08:03:12 +08:00
winlin	c6dcc76fea	Refine SrsRequest.duration in time unit.	2019-04-19 08:48:44 +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	73e71d26ea	Refine SrsGopCache::start_time in time unit.	2019-04-19 08:04:09 +08:00
winlin	1626942d29	Fix SrsHlsMuxer::segment_close bug, reopen segment when close failed.	2019-04-18 09:28:08 +08:00
winlin	d306ee7506	Refine ms in time unit	2019-04-18 08:50:43 +08:00
winlin	5af572ab50	Refine SrsRtmpConn.duration in time unit.	2019-04-18 08:46:42 +08:00
winlin	f6f49c68da	Refine SrsRecvThread timeout in time unit	2019-04-18 08:42:43 +08:00
winlin	6b587c5e0f	Refine SrsUdpPacketRecvCycleInterval in time unit.	2019-04-18 08:17:37 +08:00
winlin	283c4c7449	Refine SrsPithyPrint.age or SrsIngesterFFMPEG.alive in time unit.	2019-04-18 08:15:55 +08:00
winlin	522cbf1df8	Refine SrsHourGlass in time unit.	2019-04-18 08:11:16 +08:00
winlin	f5a1f9b774	Refine SrsFragment.start_dts in time unit	2019-04-18 08:01:17 +08:00
winlin	288bed6e26	Refine SrsTcpClient.timeout in time unit.	2019-04-18 07:58:37 +08:00
winlin	33c66b64c5	Refine name TMMS to TIMEOUT	2019-04-18 07:47:35 +08:00
winlin	5505eceeac	Refine SrsTcpClient.timeout in time unit.	2019-04-18 07:43:51 +08:00
winlin	feb34ed225	Refine SrsStSocket in time unit	2019-04-17 09:21:38 +08:00
winlin	5a45fd98c3	Refine get_recv_timeout and is_never_timeout in time unit	2019-04-17 08:38:34 +08:00
winlin	d3dc45f357	Refine set_recv_timeout in time unit	2019-04-17 08:31:53 +08:00
winlin	38bbf6b111	Refine get_send_timeout in time unit	2019-04-17 08:23:15 +08:00
winlin	f4bee37e76	Refine set_send_timeout in time unit	2019-04-17 08:18:37 +08:00
winlin	a1398892d0	Refine const timeouts in time unit	2019-04-17 08:08:31 +08:00
winlin	61afca7160	Refine SrsTcpClient timeout in time unit	2019-04-17 07:56:28 +08:00
winlin	e9770933a6	Refine dash controller publish or unpublish	2019-04-17 07:34:01 +08:00
winlin	6380e8f1c0	Fix HLS segment close bug	2019-04-16 09:32:26 +08:00
winlin	138d1e3cad	Refine get_vhost_http_remux_fast_cache in time unit	2019-04-16 08:50:48 +08:00
winlin	010e35bec2	Refine get_hds_fragment and get_hds_window in time unit	2019-04-16 08:24:11 +08:00
winlin	917f6d066d	Refine get_hls_window in time unit	2019-04-16 08:20:32 +08:00
winlin	ca705a6f62	Refine get_hls_fragment in time unit	2019-04-16 08:14:12 +08:00
winlin	402e614471	Refine get_send_min_interval in time unit	2019-04-16 07:59:27 +08:00
winlin	c1b64ba24f	Refine get_queue_length and set_queue_size in time unit	2019-04-16 07:55:19 +08:00
ME_Kun_Han	af49e218ce	for #1349, use correct value for SRS_CONF_DEFAULT_HLS_ON_ERROR_IGNORE and SRS_CONF_DEFAULT_HLS_ON_ERROR (#1351)	2019-04-15 08:17:35 +08:00
winlin	465d255940	Refine SRS_AUTO_HLS_SEGMENT_MIN_DURATION_MS in time unit	2019-04-15 07:56:16 +08:00
winlin	980c32aee6	Refine on_hls duration in time unit	2019-04-15 07:53:29 +08:00
winlin	5f3d09c8a0	Refine hls muxer duration in time duration.	2019-04-15 07:47:37 +08:00
winlin	41d1e91540	Fix start and end time bug	2019-04-12 10:00:39 +08:00
winlin	9b91c10e52	Fix timeout bug, use 30s as RTMP default timeout	2019-04-12 08:29:10 +08:00
winlin	bc1189caee	Refine SrsFragment.duration in time unit.	2019-04-12 08:04:06 +08:00
winlin	0879bef9b2	Refine SRS_CONSTS_NO_TMMS to SRS_UTIME_NO_TIMEOUT	2019-04-11 09:33:26 +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	92980a0ca2	Refine SRS_CONSTS_RTMP_TMMS in time unit	2019-04-11 09:18:20 +08:00
winlin	5b0e0d0838	Refine SRS_CONSTS_RTMP_PULSE_TMMS in time unit	2019-04-11 08:43:42 +08:00
winlin	695d430dcf	Refine SrsMessageQueue.duration in time unit.	2019-04-11 08:35:57 +08:00
winlin	170cca1f58	Refine srs_get_system_startup_time in time unit	2019-04-10 09:11:54 +08:00
winlin	6c12aa0eca	Refine srs_update_system_time in time unit	2019-04-10 09:07:03 +08:00
winlin	9b7c0802a9	Refine srs_update_system_time in time unit	2019-04-10 08:32:46 +08:00
winlin	9b1222a79c	Refine get_publish_normal_timeout in time unit	2019-04-10 07:58:39 +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	5df8f2f6c1	Refine get_pithy_print in time unit	2019-04-09 08:55:54 +08:00
winlin	60f9561d2d	Refine get_heartbeat_interval in time unit	2019-04-09 08:47:18 +08:00
winlin	5937304717	Refine get_dash_timeshift in time unit	2019-04-08 09:20:02 +08:00
winlin	12cf17ef6b	Refine get_dash_update_period in time unit	2019-04-08 09:10:06 +08:00
winlin	4302ab7708	Refine get_dash_fragment to time unit	2019-04-08 09:02:39 +08:00
winlin	bb6389143f	Refine get_bw_check_interval in time unit	2019-04-08 08:46:22 +08:00
winlin	74c1944e15	Refine config, allow parse multiple times.	2019-04-08 08:31:58 +08:00
winlin	6239dfa489	Apply time unit	2019-04-07 16:25:52 +08:00
winlin	7037f6a197	Cover more ST Coroutine code	2019-04-07 15:22:09 +08:00
winlin	1ce040cc2c	Cover more ST Coroutine code	2019-04-07 14:35:11 +08:00
winlin	3d5508e088	Cover more ST Coroutine code	2019-04-07 13:52:16 +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	633a9a0d35	Merge #1324, Remove dead code	2019-04-05 18:55:33 +08:00
winlin	b9750baa52	For #1339, Support HTTP-FLV params.	2019-04-05 18:44:50 +08:00
winlin	91c462b6ba	For #1339, Support HTTP-FLV params. 2.0.262	2019-04-05 18:16:05 +08:00
YLX	ab833943e1	fix: support parse flv query params to http callback (#1339)	2019-04-05 15:44:00 +08:00
winlin	251f19718e	CI: Cover kernel mp4 print box	2019-02-07 22:49:41 +08:00
winlin	f7b2ee4cc9	CI: Cover kernel utility	2019-02-07 20:58:33 +08:00
winlin	a8408de972	CI: Cover kernel mp4	2019-02-05 20:15:32 +08:00
winlin	a0ba17b397	CI: Cover kernel ts	2019-02-05 16:49:29 +08:00
winlin	073d42ca7d	CI: Refine hls ts context writer	2019-02-05 16:26:43 +08:00
winlin	36c41715e7	CI: Cover kernel ts	2019-02-05 09:57:06 +08:00
winlin	8eccfeceb9	CI: Cover kernel ts	2019-02-05 08:33:29 +08:00
winlin	3f59c7885e	CI: Cover kernel ts	2019-02-04 16:12:37 +08:00
winlin	4187fa0068	CI: Cover kernel utility	2019-02-04 15:11:41 +08:00
winlin	572ce5ccff	CI: Cover kernel mp3	2019-02-04 14:24:31 +08:00
winlin	39541b51a1	CI: Cover all kernel log	2019-02-04 13:41:09 +08:00
winlin	492db1a904	CI: Cover kernel flv	2019-02-04 13:15:11 +08:00
winlin	2fec88b769	CI: Fix kernel file case failed.	2019-02-04 12:54:31 +08:00
winlin	ec16e53802	CI: Cover kernel file	2019-02-04 12:48:56 +08:00
winlin	3064b941d5	CI: Cover kernel codec av frame and format	2019-02-04 12:05:07 +08:00
winlin	2bdba63b0b	CI: Cover kernel codec	2019-02-03 22:21:52 +08:00
winlin	c2a938473a	CI: Cover kernel codec	2019-02-03 22:03:15 +08:00
winlin	1df1d84766	CI: Cover kernel LB round robin	2019-02-03 21:23:06 +08:00
winlin	5b311a06b7	CI: Verify kernel aac write ADTS packet	2019-02-03 21:14:14 +08:00
winlin	917cb4a299	CI: Cover all kernel aac	2019-02-03 20:58:04 +08:00
winlin	2ae3440128	CI: Cover all kernel error	2019-02-03 12:56:29 +08:00
winlin	3cd3739433	CI: Cover all kernel error	2019-02-03 12:51:48 +08:00
winlin	8c9857ff6f	CI: Remove macros for utest	2019-02-03 12:38:07 +08:00
winlin	bfeea72eac	CI: Cover all kernel buffer	2019-02-03 12:28:18 +08:00
winlin	a2b0767874	Fix build failed.	2019-02-03 09:38:20 +08:00
winlin	c646e3f287	CI: Research support codecov	2019-02-03 09:27:08 +08:00
winlin	a25efa3764	CI: Update codecov badge	2019-02-02 21:51:08 +08:00
winlin	7243d8e7b8	CI: Support codecov	2019-02-02 21:42:03 +08:00
winlin	b4619e3393	Kbps: Remove the union for kbps slice	2019-02-02 18:20:19 +08:00
winlin	98706f793e	Support Opus audio-level	2019-01-17 16:01:43 +08:00
winlin	f1b1f78c4e	Parse Opus for tools	2019-01-17 11:35:15 +08:00
winlin	e77b570636	Add codec OPUS/HEVC to FLV	2019-01-17 09:24:17 +08:00
winlin	b2d1d84634	Change to 2019	2019-01-01 21:37:28 +08:00
winlin	66198b6f78	Add utest for RTMP protocol	2019-01-01 21:05:52 +08:00
winlin	a2d6566019	Add kernel utility utest	2019-01-01 20:19:44 +08:00
winlin	6e44aa4a4f	Cover Kbps statistic	2019-01-01 18:22:11 +08:00
winlin	6e9c7dd11e	Add utest for SrsKbps as RAW statistics	2019-01-01 17:44:39 +08:00
winlin	6234905532	Refactor ISrsKbpsDelta	2019-01-01 17:36:27 +08:00
winlin	dcebf8a31f	Refine kbps	2019-01-01 14:04:50 +08:00
winlin	aef838338c	Add utest for kbps connections	2018-12-23 21:19:17 +08:00
winlin	c26b475bae	Refine kbps, stub wall clock	2018-12-23 20:47:17 +08:00
winlin	4c40370986	Refine kbps more testable	2018-12-23 20:30:12 +08:00
winlin	16fa4c588a	Rename ISrsProtocolReaderWriter to ISrsProtocolReadWriter	2018-12-23 20:08:04 +08:00
winlin	6e75993e7f	Change public virtual to virtual public	2018-12-23 19:54:08 +08:00
winlin	5d959661e7	No sudoer	2018-12-22 20:51:57 +08:00
winlin	2e9bf2af83	Always enable SRS_StreamCaster	2018-12-22 20:45:25 +08:00
winlin	1dc95cba78	Always enable SRS_Ingest	2018-12-22 20:31:47 +08:00
winlin	aa1a5442f9	Always enable SRS_Ingest	2018-12-22 20:30:13 +08:00
winlin	c6844527fb	Always enable SRS_SSL	2018-12-22 20:23:39 +08:00
winlin	e4e6dd2169	Always enable SRS_SSL	2018-12-22 20:08:42 +08:00
winlin	0bc7fdbb35	Always enable SRS_SSL	2018-12-22 20:03:40 +08:00
winlin	8e294709b0	Always enable SRS_STAT	2018-12-22 19:58:36 +08:00
winlin	71f1ccbf90	Always enable SRS_HLS	2018-12-22 19:54:10 +08:00
winlin	f003ba9a29	Always enable SRS_DVR	2018-12-22 19:50:57 +08:00
winlin	330100769f	Always enable SRS_TRANSCODE	2018-12-22 19:48:55 +08:00
winlin	0626bc5982	Use openssl in docker	2018-12-10 14:27:55 +08:00
winlin	432a575c7a	Use docker for #1274 and #1250	2018-12-10 00:07:38 +08:00
winlin	b0e91e8fe9	Use docker for #1274 and #1250	2018-12-10 00:05:23 +08:00
winlin	f1ab8fecac	Fix build warning	2018-12-09 22:48:47 +08:00
winlin	ef3e35f173	Fix build warning	2018-12-09 21:04:43 +08:00
winlin	4d157f2148	Fix build warning	2018-12-09 21:00:38 +08:00
winlin	dcc2a73e7a	Refine kernel aac	2018-12-09 20:58:40 +08:00
winlin	572a2806c1	Refine utest	2018-12-09 20:36:31 +08:00
winlin	a8be5f8f27	Allow OSX for utest	2018-12-09 19:41:59 +08:00
winlin	f2a93755c2	Allow OSX for utest	2018-12-09 19:39:36 +08:00
winlin	f1033296bb	Upgrade to FFMPEG 4.1 and X264 157. 2.0.261	2018-12-01 20:21:35 +08:00
winlin	acaae0d5c9	Update SRS3	2018-11-27 21:45:57 +08:00
winlin	ba4ef34d27	Merge 2.0release	2018-11-27 21:24:51 +08:00
Steven Liu	78cf3d4b58	upgrade x264 and ffmpeg to newest version (#1274) ... The ffmpeg and x264 in srs is too old. Signed-off-by: Steven Liu lq@chinaffmpeg.org Signed-off-by: Steven Liu <lq@chinaffmpeg.org>	2018-11-27 21:17:42 +08:00
winlin	ff82ca1233	Merge branch 2.0release into 3.0release	2018-11-11 16:24:09 +08:00
winlin	99430d2edb	For #1250, Not support macOS 10.14	2018-11-11 16:24:00 +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
MakarovYaroslav	e62ac29f48	add ignoring _definst_ at the end of app (#1261)	2018-11-11 13:31:29 +08:00
winlin	b2066cbf68	#1263, Fix string trim bug. 2.0.259	2018-11-11 13:30:12 +08:00
MakarovYaroslav	a2480a6c94	fix bug with for loop (#1263)	2018-11-11 13:27:33 +08:00
winlin	39f1629168	Merge from SRS2	2018-10-28 14:24:18 +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
RocFang	768fe68ca3	fix st_usleep param from us to ms. (#1236) ... fix st_usleep param from us to ms.	2018-10-08 07:14:14 +08:00
winlin	3f009937ee	Merge #1237 from 2.0release	2018-10-08 07:10:29 +08:00
winlin	9859fa9e6f	Merge #1237, Support param for transcoder. 2.0.256	2018-10-08 07:09:31 +08:00
Mirko Velic	70ad16ff6a	Add request stream param to encoder output format parameters. (#1237)	2018-10-08 07:01:49 +08:00
winlin	8e55ef4b60	Refine code	2018-08-26 14:29:45 +08:00
winlin	1e2cca4712	For #1093, Refine HLS encryption wiki	2018-08-25 21:59:56 +08:00
winlin	5945fb5a24	Fix #1093, Support HLS encryption. 3.0.42	2018-08-25 21:17:33 +08:00
winlin	ee068cf120	For #1109, Support without ssl for HLS key.	2018-08-25 21:15:26 +08:00
winlin	522fba99aa	Merge branch 3.0release into harlanc-3.0release	2018-08-25 18:12:39 +08:00
winlin	e73e30de3a	Fix #1051, Drop ts when republishing stream. 3.0.41	2018-08-25 18:10:55 +08:00
winlin	74d5d15c9f	Merge branch 3.0release of https://github.com/harlanc/srs into harlanc-3.0release	2018-08-25 12:43:52 +08:00
winlin	1e054d2bcc	Fix #354, Rename impl__SrsAutoFree to impl_SrsAutoFree	2018-08-25 12:20:52 +08:00
Harlan	22c5af62cf	Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release ... # Conflicts: # trunk/src/kernel/srs_kernel_utility.hpp	2018-08-15 07:37:12 +08:00
Harlan	bf12a45274	add configuration instructions for hls encryption	2018-08-12 14:18:05 +08:00
Harlan	ac6b37de4b	rewrite ff_data_to_hex	2018-08-12 14:10:18 +08:00
winlin	a9b5d65ca7	For #1202, Support auth_key param for srs player	2018-08-12 11:52:18 +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	928c6ab091	For #1181, Add utest	2018-08-11 13:16:59 +08:00
winlin	01d8bba455	For #1181, Refine code to write utest	2018-08-11 12:33:03 +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	03ac48f8fa	Merge 2.0, for FLV latency	2018-08-05 20:25:28 +08:00
winlin	c45f72ef7b	Refine HTTP-FLV latency, support realtime mode. 2.0.252	2018-08-05 20:23:17 +08:00
winlin	580c94c8c0	Refine code	2018-08-05 18:58:23 +08:00
winlin	31945c244d	For #1110, Refine code.	2018-08-05 11:09:48 +08:00
winlin	455a060fa5	Merge 2.0	2018-08-05 10:52:37 +08:00
winlin	ee43fc92ae	For #1110, Refine conf	2018-08-05 10:47:01 +08:00
winlin	ae99131512	Fix #1087, Ignore iface without address. 3.0.37	2018-08-05 10:41:31 +08:00
winlin	82699ff616	Refine code for librtmp	2018-08-05 10:39:52 +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	09dbda5b18	For #1031, SRS forwarder support douyu.com.	2018-08-02 07:24:08 +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	dea5e5bb48	Add utest or CRC32 IEEE, refine TABs of code	2018-07-21 19:09:32 +08:00
winlin	608c88b8f2	Merge 2.0release	2018-07-21 17:52:12 +08:00
winlin	6d7c7418a8	Merge #1119, fix memory leak. 2.0.249	2018-07-21 17:49:46 +08:00
winlin	551863a7ed	Refine code	2018-07-21 17:34:31 +08:00
winlin	693194dffe	Merge 2.0release	2018-07-18 19:26:53 +08:00
winlin	d27db215df	For #1176, should not close fd when success.	2018-07-18 19:21:29 +08:00
winlin	e4742ddac7	Merge 2.0release	2018-07-17 13:59:51 +08:00
winlin	2d49b9d1a7	Merge #1176, fix scaned issues. 2.0.248	2018-07-17 13:44:01 +08:00
Hui Zhang (huzhang2)	01ed485cf3	fix #1172 #1173 #1174 #1175 ... security scan report issue	2018-07-17 10:03:13 +08:00
Harlan	e9cb8210fc	fix default value error	2018-05-15 11:20:52 +08:00
Harlan	45a57acbb4	fix bug	2018-04-06 10:05:13 +08:00
Harlan	43ebd5958d	fix bug that only one stream can be encrypted..	2018-04-03 22:00:32 +08:00
winlin	dba44c7c3f	Merge branch 'develop' into 3.0release	2018-03-25 20:00:33 +08:00
xialixin	bb4e16ae3c	fix create dir success result check (#1080)	2018-03-25 17:48:07 +08:00
xialixin	aaf2905a9d	add: hls configuration adds [duration] variable (#1083)	2018-03-25 17:47:37 +08:00
Harlan	52596a0b04	add HLS encryption feature	2018-03-25 12:05:52 +08:00
winlin	0d78b908a7	Fix client tools resolve dns failed bug	2018-03-20 19:50:46 +08:00
winlin	449c632e49	For #464: Add example for origin cluster	2018-03-03 10:01:01 +08:00
winlin	bd797ad385	Fix utest build failed for ::atoi	2018-03-03 09:33:15 +08:00
winlin	459272b94c	Merge #1077 from 2.0release	2018-02-28 14:10:09 +08:00
winlin	0fe17c3e34	Merge #1077, fix crash for edge HLS. 2.0.247	2018-02-28 13:37:30 +08:00
RocFang	fd016ed91a	use hls->initialize to set req of hls (#1077)	2018-02-28 13:35:33 +08:00
winlin	4bf5ab2044	Fix #464, support RTMP origin cluster. 3.0.29	2018-02-16 16:40:48 +08:00
winlin	c70421e656	Fix #464, support origin cluster	2018-02-16 16:39:07 +08:00
winlin	2f09ec4353	For #464, refine result of origin cluster api	2018-02-16 14:13:14 +08:00
winlin	92f2bcd878	For #464, support config origin cluster	2018-02-16 10:31:19 +08:00
winlin	55c96192e2	For #464, refine code	2018-02-16 10:19:48 +08:00
winlin	ec362b2774	For #464, query origin info and ip addresses	2018-02-16 09:37:31 +08:00
winlin	469250f850	For #464, support origin cluster api	2018-02-15 20:55:34 +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	a2cefe4dbd	For #1059, show more information from stream	2018-02-13 09:02:46 +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
juntaoliu	a6871052af	set tcp keepalive for tcp socket (#1045)	2018-01-07 17:03:13 +08:00
winlin	82457cda4b	Change date from 2017 to 2018	2018-01-07 11:00:58 +08:00
winlin	ca1395a807	Change date from 2017 to 2018	2018-01-07 10:58:53 +08:00
winlin	d9e37d2f54	Merge branch '2.0release' into 3.0release	2018-01-04 13:49:55 +08:00
RocFang	d22d7afd83	update init.d file (#1039)	2018-01-04 13:45:56 +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
RocFang	015e76cb3f	Update configure (#1033) ... allow user to add some specific flags.	2018-01-01 22:57:44 +08:00
winlin	922a8f3a5c	For #988, refine code.	2018-01-01 22:45:22 +08:00
winlin	823dc2df21	Refine help	2018-01-01 22:44:48 +08:00
Thomas Dreibholz	feaae341b9	IPv6 support (for 3.0 release) (#988) ... * IPv6 support, part 1. * IPv6 support, part 2. * Some more IPv6 work. * Made functions for address:port paŕsing IPv6-capable. * Fixed type (compile warning). * Fixed formatting. * Reverted option change. * Replaced abort() by proper error handling. * Also retrieving local IPv6 addresses now.	2018-01-01 22:43:58 +08:00
winlin	db08f1586c	For #913, APP support complex error.	2018-01-01 22:32:54 +08:00
winlin	e2c1f58674	For #913, APP support complex error.	2018-01-01 21:20:57 +08:00
winlin	6eae93258a	For #913, APP support complex error.	2018-01-01 19:39:57 +08:00
winlin	aebbbadf42	For #913, Service support complex error.	2018-01-01 11:41:15 +08:00
winlin	15aea686c3	For #913, KAFKA, RTSP support complex error.	2018-01-01 10:30:31 +08:00
winlin	70a20ffadb	For #913, RTMP support complex error.	2018-01-01 09:38:22 +08:00
winlin	60accb6e54	For #913, AMF0 and RTMP support complex error.	2017-12-31 20:52:04 +08:00
winlin	204ef041da	For #913, Kernel MP4 FLV HTTP support complex error.	2017-12-31 12:11:48 +08:00
winlin	9802dc326e	For #913, source support complex error	2017-09-23 22:12:33 +08:00
winlin	abcaba33ee	For #913: TS/HLS/MPEGTS support complex error	2017-09-22 21:50:54 +08:00
winlin	20a42599f3	For #913, http callback use complex error	2017-09-22 19:54:50 +08:00
winlin	fd91df9411	For #913, reload use complex error	2017-09-22 16:14:30 +08:00
ME_Kun_Han	3744606c9b	fix bug: parsing Exp-Golomb codes failed (#978)	2017-09-19 18:57:37 +08:00
winlin	baa55f14b9	Change stable release to SRS2	2017-08-19 20:19:35 +08:00
winlin	9f5224c34a	For #913, use complex error for http	2017-07-29 21:39:57 +08:00
winlin	661eb8b37c	For #913, use complex error for reload utc time	2017-07-29 20:02:38 +08:00
winlin	5c9a12e72a	For #913, use complex error for listener	2017-07-29 12:45:17 +08:00
winlin	71dd3f3137	For #913, use complex error for server handler.	2017-07-18 20:24:07 +08:00
winlin	e135ab59d9	Fix the utest failed for chunk_size	2017-06-28 09:44:10 +08:00
winlin	6d4315fc3c	Disable valgrind by default	2017-06-28 09:08:19 +08:00
winlin	0ad4b65a56	Disable valgrind for osx.	2017-06-13 16:20:00 +08:00
winlin	b3825c4021	Fix warnings	2017-06-13 16:10:46 +08:00
winlin	9db2a04c3b	For #913, coroutine support complex error.	2017-06-11 18:44:20 +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	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	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	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
haofz	52b6823a90	fix #826, fix memory leak in streamCasterFlv (#836)	2017-04-15 16:56:28 +08:00
winlin	8d35585c13	Merge #841, avoid the duplicated sps/pps in ts. 2.0.236	2017-04-15 16:54:42 +08:00
ME_Kun_Han	bd2a1f9d3c	fixed bug: video rendering in hls stream generates only vertical parttern (#841)	2017-04-15 16:49:02 +08:00
winlin	33375db401	Merge from SRS2, for #834	2017-04-09 18:52:21 +08:00
winlin	b11ddc7f41	Fix #834, crash for TS context corrupt. 2.0.235	2017-04-09 18:45:42 +08:00
winlin	8b7566a007	Refine code	2017-03-26 18:30:33 +08:00
winlin	032107dbf0	Refine hls ingester	2017-03-26 17:18:34 +08:00
winlin	609605a50b	Fix #820, extract service for modules. 3.0.21	2017-03-26 17:05:50 +08:00
winlin	b75a3fad4e	For #820, fix ubuntu build failed.	2017-03-26 16:48:43 +08:00
winlin	362b5788cd	For #820, fix warnings	2017-03-26 16:45:00 +08:00
winlin	7d618fed43	For #820, fix utest failed.	2017-03-26 14:25:08 +08:00
winlin	e3526c0cf6	For #820, modules use service only.	2017-03-26 13:40:39 +08:00
winlin	ff822b55cd	For #820, extract service module.	2017-03-26 10:16:21 +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	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
winlin	db231f6d37	refine hls html5 video template.	2017-01-10 18:43:36 +08:00
winlin	087a596a63	refine hls html5 video template.	2017-01-10 18:43:10 +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	b7dd764920	update gitignore	2017-01-09 15:17:08 +08:00
winlin	10a0c6c10c	update for srs3	2017-01-06 17:55:06 +08:00
winlin	1b1ae00910	fix #727, install valgrind-devel	2017-01-06 17:51:07 +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	d29416a5f0	add conf sample for ingest rtsp	2017-01-06 10:47:05 +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
winlin	759c84a395	for #513, remove hls ram from srs2 to srs3+. 2.0.224	2016-12-15 14:48:38 +08:00
winlin	f30b3073a2	refine the cros of api for flv	2016-12-15 14:10:02 +08:00
winlin	3df8f11884	refine thread stop	2016-12-14 18:21:50 +08:00
winlin	8935fe8897	merge srs2.	2016-12-13 18:43:22 +08:00
winlin	aca8a79d95	fix #713, disable the source cleanup. 2.0.223	2016-12-13 18:41:45 +08:00
winlin	9ba4bed648	merge srs2	2016-12-13 17:58:42 +08:00
winlin	cb1d47bfef	fix #713, refine source to avoid critical fetch and create. 2.0.222	2016-12-13 17:57:49 +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	9e9cad1826	refine messages	2016-12-08 17:55:11 +08:00
winlin	dd1c769f65	refine main	2016-12-08 17:35:33 +08:00
winlin	83c251fc1c	fix bug	2016-12-08 17:29:13 +08:00
winlin	2d387035cd	refine the global variables.	2016-12-08 17:26:04 +08:00
winlin	b06203e777	dispose kafka	2016-12-08 11:48:50 +08:00
winlin	9a3674c624	refine kafka	2016-12-08 11:44:49 +08:00
winlin	28517849ed	refine typo	2016-12-07 12:09:39 +08:00
winlin	f6c8e02cca	Merge branch '2.0release' into develop	2016-11-24 18:12:31 +08:00
ME_Kun_Han	ec4d1b3b4f	fix bug: run srs at startup failed. (#454)	2016-11-24 18:05:43 +08:00
winlin	6dfb44b7b5	Merge branch '2.0release' into develop	2016-11-15 10:43:42 +08:00
winlin	85a7cb884f	fix bug: fix the way calculating PCR for ts(#678) (#430)	2016-11-15 10:42:02 +08:00
hankun	e0ab8b080d	fix bug: fix the way calculating PCR for ts(#678)	2016-11-09 10:14:12 +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
ME_Kun_Han	f107f404ea	fix bug for issues #654 (#426)	2016-11-05 10:46:24 +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	5796e4bf89	merge from srs2	2016-10-26 09:53:27 +08:00
hankun	4f09bcce9f	fix the bug: when trying to push same stream more than twice, to play it through http-flv will cause a core dump(#666)	2016-10-20 10:49:59 +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
ME_Kun_Han	7058411cb8	fix the core dump when trying to close srs (#386)	2016-10-10 11:51:49 +08:00
winlin	78aa518ecc	merge srs2	2016-09-27 11:00:13 +08:00
winlin	b19702f669	update srs player	2016-09-27 10:58:04 +08:00
winlin	9cc528cd33	merge srs2	2016-09-23 15:47:17 +08:00
winlin	3659eec9d1	update the cwd	2016-09-23 15:37:51 +08:00
winlin	0e308b0fa1	merge srs2, support oryx	2016-09-23 15:33:43 +08:00
winlin	07fe35f11d	support asprocess for oryx. 2.0.218	2016-09-23 15:17:46 +08:00
winlin	b748fac23a	support asprocess for oryx. 2.0.218	2016-09-23 15:00:50 +08:00
winlin	2a01540433	support change work_dir for oryx.	2016-09-23 14:53:58 +08:00
winlin	b5d466f3d2	update utest	2016-09-15 14:47:42 +08:00
winlin	0fb71281a9	add circleci	2016-09-15 14:28:54 +08:00
winlin	cbffe74494	add circleci	2016-09-15 14:15:49 +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	0596550a72	Merge branch '2.0release' into develop	2016-09-15 13:31:28 +08:00
winlin	99d87f9f9c	fix sys-ssl librtmp build bug.	2016-09-15 13:17:58 +08:00
winlin	4bcd90d747	fix sys-ssl librtmp build bug.	2016-09-15 13:11:42 +08:00
winlin	92fb81003c	link crypto when use sys-ssl	2016-09-15 12:59:34 +08:00
winlin	77bca7cc05	Merge branch '2.0release' into develop	2016-09-13 18:08:19 +08:00
winlin	53d2eb5e02	fix librtmp get bytes bug.	2016-09-13 18:08:12 +08:00
winlin	6b8fe92afa	Merge branch '2.0release' into develop	2016-09-13 15:53:40 +08:00
winlin	588de3e7b4	check lsb_realease for install	2016-09-13 15:53:34 +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	c231f45fe8	Merge branch '2.0release' into develop	2016-09-09 14:57:58 +08:00
winlin	bd652e4607	fix build failed for stdc++	2016-09-09 14:41:02 +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	49b880d4ce	refine comments	2016-09-09 14:18:50 +08:00
winlin	eb915413ad	Merge branch '2.0release' into develop	2016-09-09 14:14:22 +08:00
winlin	0015b303a6	librtmp: refine comment for NALU process.	2016-09-09 14:14:12 +08:00
winlin	93eb961b4c	Merge branch '2.0release' into develop	2016-09-09 11:33:58 +08:00
winlin	4c6c2c28b8	refine h264 raw publish with fps	2016-09-09 11:32:24 +08:00
winlin	09895fcfc2	Merge branch '2.0release' into develop	2016-09-09 11:03:39 +08:00
Star Brilliant	a164c90e28	Flush the stdout buffer after logging to console ... Normally if the stdout is connected to a PTY, the stdout buffer is flushed automatically after each \n. However if I run SRS under Docker, the stdout is not connected to a PTY (unless I ask it to), causing the last log line to be incomplete (showing only half). By adding fflush, we could make sure each log line is completely shown, whenever the stdout is connected to a PTY or not.	2016-09-08 07:58:52 -05:00
winlin	17df61724d	Merge branch '2.0release' into develop	2016-09-08 19:56:17 +08:00
winlin	7aaa74b9e0	TODO: FIXME: for librtmp, must group NALUs to frame.	2016-09-08 19:56:06 +08:00
winlin	2cf077abe9	Merge branch '2.0release' into develop	2016-09-08 18:55:40 +08:00
winlin	80a98cf836	refine annexb parse	2016-09-08 18:55:35 +08:00
winlin	b24d1de377	Merge branch '2.0release' into develop	2016-09-05 14:56:41 +08:00
winlin	590e951739	fix memory leak of source.	2016-09-05 14:56:31 +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