4448 commits

Author	SHA1	Message	Date
winlin	32d5b75d8c	For #307, fix some memory leaking	2020-04-07 19:47:04 +08:00
winlin	a8cc3a3430	For #307, fix some memory leaking	2020-04-07 19:07:11 +08:00
winlin	e22d1dffc1	Merge remote-tracking branch 'john/rtc' into feature/rtc	2020-04-07 17:30:06 +08:00
winlin	fa635e3333	Refine sendmmsg detect script	2020-04-07 17:28:24 +08:00
winlin	6c5b51618c	For #307, support config to send plaintext RTP.	2020-04-07 16:05:31 +08:00
winlin	00810e6d1d	Refine api for tcmalloc	2020-04-07 14:43:18 +08:00
winlin	963720e1eb	Fix tcmalloc build bug	2020-04-07 14:30:17 +08:00
winlin	35a037cf05	Add api for tcmalloc	2020-04-07 14:24:14 +08:00
winlin	574ae58adc	For #307, support mock server eip by API	2020-04-07 11:36:26 +08:00
winlin	b2f0696976	Fix build warning	2020-04-07 11:36:03 +08:00
winlin	bb0ca05390	Merge branch 'develop' into feature/rtc	2020-04-06 21:38:05 +08:00
winlin	9c1dfb79d3	Fix gperf build bug	2020-04-06 21:37:37 +08:00
winlin	368e93e9e8	For #307, support use sendto or sendmsg when senmmsg(1 msg)	2020-04-06 21:24:06 +08:00
winlin	59b9fa9610	For #307, always 1 if os does not support sendmmsg	2020-04-06 19:42:37 +08:00
winlin	7cfd2879b0	For #307, config sendmmsg max	2020-04-06 00:24:14 +08:00
winlin	40c95b04ca	Merge remote-tracking branch 'winlin/feature/perf_stat' into feature/rtc	2020-04-05 23:01:21 +08:00
winlin	b8db61bd9c	For #307, Support disable sendmmsg	2020-04-05 22:13:49 +08:00
winlin	6f7ebbdc5f	Merge branch 'develop' into feature/rtc	2020-04-05 21:59:46 +08:00
winlin	f228b3809a	Fix utest failed.	2020-04-05 21:22:50 +08:00
winlin	dc3df926eb	For #307, support configure with sendmmsg.	2020-04-05 18:34:57 +08:00
winlin	b23525033b	Merge branch 'develop' into feature/rtc	2020-04-05 17:21:07 +08:00
winlin	10d5f99d3d	For #307, SRTP ASM only works with openssl-1.0, auto detect it. 4.0.22	2020-04-05 17:14:22 +08:00
winlin	133e3ce075	For #307, use sendmmsg in rtc server	2020-04-05 16:53:08 +08:00
xialixin	d2b8b937d6	fix generate ssrc, rtmp muxer cycle sleep, ps steam parase etc..	2020-04-05 13:53:14 +08:00
xialixin	9e9b5374d5	srs_get_sip_utc_date external use	2020-04-05 13:51:19 +08:00
xialixin	c70ed1cd74	add sip session status check	2020-04-05 13:49:47 +08:00
xialixin	778f12508f	add todo info log level compile error	2020-04-05 13:48:42 +08:00
xialixin	8ac39cb22f	del print_sip_message config	2020-04-05 13:45:52 +08:00
winlin	737dcdd2c8	Merge branch 'develop' into feature/rtc	2020-04-04 22:48:33 +08:00
winlin	9943565ec9	Merge RTC and GB28181, with bugs fixed. 4.0.21	2020-04-04 22:45:16 +08:00
winlin	55a4052d90	For #307, support sendmmsg to improve RTC performance	2020-04-04 22:43:44 +08:00
winlin	3793404ceb	Refine scripts	2020-04-04 20:24:24 +08:00
winlin	634fa27320	Refine configure cleanup script	2020-04-04 18:47:12 +08:00
winlin	654cde109d	Fix options script bug	2020-04-04 17:10:45 +08:00
xialixin	92d351ef35	fix 'output' format define; support 'host' auto get; time config use SRS internal format; support auto create stream channel on/off	2020-04-04 16:07:23 +08:00
xialixin	5e4fdfd1d4	fix after RTMP is closed, empty PPS and SPS. sip client sockaddr set	2020-04-04 16:07:23 +08:00
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