5419 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	a912f0475f	Merge branch 'feature/ffmpeg' into feature/codec	2020-03-22 18:17:37 +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	355f351435	Merge pull request #1651 from lam2003/3.0release ... 修复srs_write_large_iovs中nwrite未累加的错误	2020-03-21 19:44:37 +08:00
winlin	b6b52363fb	Update authors	2020-03-21 19:41:59 +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	75f62dc653	Update mirror	2020-03-21 16:34:18 +08:00
winlin	5a55cff7ba	Update mirror	2020-03-21 16:30:29 +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
winlin	881506883e	Update	2020-03-20 15:16:30 +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
winlin	737e4bc32d	Update	2020-03-19 17:57:23 +08:00
winlin	83f743645b	Release multiple processes for SRS by reuseport	2020-03-19 17:49:37 +08:00
l	bbfb03f98a	修复srs_write_large_iovs中nwrite未累加的错误	2020-03-19 14:36:56 +08:00
l	f9114770af	Merge pull request #2 from ossrs/3.0release ... update to latest	2020-03-19 14:32:35 +08:00
winlin	8eef439c90	For #1638, #307, use hourglass for timer.	2020-03-19 12:58:04 +08:00
winlin	830e60da29	For #1638, #307, update authors for rtc	2020-03-19 10:36:47 +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	aead1a5b74	Release 3.0.134, 3.0-b3	2020-03-18 16:33:08 +08:00
winlin	c210c0b2f5	For #1638, #307, refactor rtc player.	2020-03-18 10:03:20 +08:00