4265 Commits (94afe6c56e3a417561dbbc5b83191e9122292c33)

Author	SHA1	Message	Date
bepartofyou	8332a2fbdb	ffmpeg ubuntu build files	5 years ago
bepartofyou	766da5188b	Merge remote-tracking branch 'srs/feature/codec' into feature/rtc_audio	5 years ago
winlin	e5e2d05da0	For #307, support play with WebRTC. 4.0.14	5 years ago
bepartofyou	4a17259471	err wrap change to new	5 years ago
winlin	41acc5033e	For #307, support disable asm for FFMPEG	5 years ago
winlin	caf7e9e6ea	Merge branch 'feature/rtc' into develop	5 years ago
winlin	c00ffa530b	Merge branch 'feature/codec' into feature/rtc	5 years ago
winlin	602a478e1b	For #1659, #307, add switch to disable rtc	5 years ago
winlin	37c84eccc0	For #1659, #307, add x86 asm for ffmpeg for rtc	5 years ago
xiaozhihong	734e848741	Update RtcSession peer address when changed.	5 years ago
winlin	4308f238c0	For #1659, #307, add ffmpeg-4.2-fit for rtc	5 years ago
winlin	634a14bfa6	For #1659, #307, add opus codec library	5 years ago
winlin	2da4e0a43e	For #1638, #307, config to discard aac for rtc	5 years ago
winlin	e1fe2d1c1d	For #1638, #307, add comments for audio codec	5 years ago
七曦	f09dda85fc	Exception handle	5 years ago
winlin	2757ec7973	Merge from bepartofyou	5 years ago
winlin	0cd67a997e	For #1638, #307, add comments for vhost rtc config	5 years ago
winlin	be746da21c	Merge branch '3.0release' into 4.0release	5 years ago
winlin	0dd6c31487	Fix #1629, fix kickoff FLV client bug. 3.0.137	5 years ago
七曦	a0a4337214	make webrtc audio work	5 years ago
xiaozhihong	7315b1a26d	Fix config read "bframe" discad bug.	5 years ago
xiaozhihong	fa700dad64	1. Modify rtc.conf to support Bframe discard. ... 2. Rename srs_app_rtp.cpp to srs_app_rtc.cpp	5 years ago
winlin	850a4bbf20	Fix #1619, configure without utest by default. 3.0.136	5 years ago
winlin	f89b4b3b26	For #1651, fix return pnwrite of srs_write_large_iovs. 3.0.135	5 years ago
winlin	97035d2301	Merge pull request #1654 from cainiaoDJ/update_cmakelists_for_clion ... 更新CMakeLists.txt文件，使项目能在clion编译通过	5 years ago
winlin	955de3dac9	Merge branch '3.0release' into 4.0release	5 years ago
winlin	68ad006b73	Remove empty line.	5 years ago
winlin	3f6a2871b0	For #1638, #307, show error information when api failed.	5 years ago
winlin	d2036455ac	Refactor api, follow https://github.com/rtcdn/rtcdn-draft	5 years ago
winlin	61b8ae8c30	Refactor api, follow https://github.com/rtcdn/rtcdn-draft	5 years ago
winlin	3360db7b77	Refactor api, follow https://github.com/rtcdn/rtcdn-draft	5 years ago
winlin	532750f18a	Refactor api data, url to api	5 years ago
winlin	de9a004ff7	Merge branch 'dev-28181' of https://github.com/xialixin/srs into feature/gb28281-2	5 years ago
yanghuiwen	2911c814c4	更新CMakeLists.txt文件，使项目能在clion编译通过	5 years ago
xialixin	8b4f84e336	fix push.gb28181.conf, gb28181conn repeat call serve()	5 years ago
xialixin	cbe9c1dabc	Support gb28181 sip over udp, ps steam over rtp	5 years ago
l	bbfb03f98a	修复srs_write_large_iovs中nwrite未累加的错误	5 years ago
winlin	8eef439c90	For #1638, #307, use hourglass for timer.	5 years ago
HuyaJohn	94e4f4539d	merge feature/rtc, fix conflict	5 years ago
HuyaJohn	d1d16d490e	Detect B frame in avc stream. Fix compiler error with verbose	5 years ago
winlin	0b6e9257f9	For #1638, #307, remove unused code for rtc	5 years ago
winlin	018577e685	For #1638, #307, fix error new bug for rtc	5 years ago
winlin	979d7c3f4f	For #1638, #307, refactor rtc player.	5 years ago
winlin	c210c0b2f5	For #1638, #307, refactor rtc player.	5 years ago
xiaozhihong	e2233027b8	fix h264 rtp packet error	5 years ago
winlin	fc84f1e545	Refactor source cid with pid	5 years ago
winlin	28c1c57854	For #1638, #307, should set err in return value.	5 years ago
winlin	0ff8a3761b	For #1638, #307, should check error by fetch_or_create source	5 years ago
winlin	ed2996141c	For #1638, #307, refine api and udp for rtc.	5 years ago
winlin	2c4dc0fb3d	For #1638, #307, extract rtc server to hybrid manager.	5 years ago
winlin	4318d989a6	For #1638, #307, switch to RTC session context cid for cleanup	5 years ago
winlin	25fec76ea9	For #1638, #307, switch to RTC session context cid for reusing UDP ports	5 years ago
winlin	29b9203428	For #1638, #307, use short-term http connection for rtc to use new cid.	5 years ago
winlin	6118ca382a	For #1638, #307, http api success with message, timeout as such	5 years ago
winlin	b5dd502103	For #1638, #307, fix build warnings	5 years ago
HuyaJohn	e8b2bb5d28	process err, do error check, add some error code	5 years ago
winlin	c2a667cc35	For #1638, #307, add comments for api and enum	5 years ago
winlin	2f0b150588	For #1638, #307, accept srs_string_dumps_hex to app utility.	5 years ago
winlin	e905fce847	For #1638, #307, add comments in RTMP/RTP message for RTC.	5 years ago
winlin	9ba861f42f	3.0release is beta now	5 years ago
winlin	a8ddd5afe7	For #1635, refine inotify watch for relative path	5 years ago
winlin	8db2c3d821	For #1635, refine inotify watch for relative path	5 years ago
winlin	9e856c84e7	For #1638, #307, remove unused bash variable.	5 years ago
winlin	4b23d04635	For #1638, #307, fix rtc player demo bug	5 years ago
winlin	60c8b37f05	For #1638, #307, merge john, add NACK suport, remove debug code, verbose log	5 years ago
winlin	c2916acd92	For #1638, #307, define webrtc:// url for play	5 years ago
xiaozhihong	2b56f9ee59	add NACK suport, remove debug code, verbose log	5 years ago
winlin	12e99f1897	For #1638, #307, use webrtc adapter.js for demo.	5 years ago
winlin	a42cf3ae8d	For #1638, #307, refactor rtc config.	5 years ago
winlin	6f4584db53	Merge SRS4	5 years ago
winlin	51af2b4779	For #1638, #307, rtc conf support ENV.	5 years ago
winlin	a135eb2144	Merge SRS3	5 years ago
winlin	88336b1f5e	Remove KAFKA config, because it's removed from code	5 years ago
winlin	70307ed8f9	Update README	5 years ago
xiaozhihong	6c88f58079	remove debug code, fix rtc.html	5 years ago
winlin	d21ef106a0	Merge branch 'rtc' of https://github.com/xiaozhihong/srs into xiaozhihong-rtc	5 years ago
xiaozhihong	768598a3bb	add kernel rtp packet	5 years ago
xiaozhihong	027d34bbd3	add rtp shared packet	5 years ago
winlin	a7c8980a60	For #1636, muxing sh, use sound_rate if aac sr not set.	5 years ago
winlin	7036f839d2	For #1636, add comments	5 years ago
winlin	aa20a04abb	For #1636, fix bug for mux AAC to ADTS, never overwrite by RTMP sampling rate. 4.0.13	5 years ago
winlin	c66f33ac87	Merge pull request #1636 from runner365/3.0release.srt.dev ... support all aac sample rate in srt2rtmp	5 years ago
winlin	08bffc60fb	Update install	5 years ago
xiaozhihong	6decdc7838	adjust code style, fix some bug, add rtc session timeout	5 years ago
winlin	1382337cb4	Merge SRS3	5 years ago
winlin	856ed5a971	For #1635, inotify watch ConfigMap for reload. 3.0.134	5 years ago
winlin	bb509d23e2	For #1635, inotify watch ConfigMap for reload. 3.0.133	5 years ago
winlin	88368ed18d	For #1635, inotify watch ConfigMap for reload. 3.0.132	5 years ago
winlin	940798a9c7	For #1635, inotify watch ConfigMap for reload. 3.0.131	5 years ago
runner365	f102a598b8	Merge branch 'develop' into 3.0release.srt.dev	5 years ago
runner365	b9195122cf	support all sample rate in aac	5 years ago
winlin	5e60c8f9cc	For #1635, inotify watch ConfigMap for reload. 3.0.130	5 years ago
winlin	9b663c070a	Fix #1635, support auto reaload config by inotify. 3.0.129	5 years ago
winlin	b33751e2c1	Merge SRS3	5 years ago
winlin	4b395f6e16	Fix #1630, disable cache for stream changing, and drop dup header. 3.0.128	5 years ago
winlin	ed41ca867b	For #1594, detect and disable daemon for docker. 3.0.127	5 years ago
winlin	c1e07d6a96	For #1634, always check status in thread loop. 3.0.126	5 years ago
winlin	6a765ab849	Merge SRS3	5 years ago
winlin	6c55fd3e4b	For #1634, refactor output with datetime for ingest/encoder/exec. 3.0.125	5 years ago
winlin	c61c2a939f	For #1634, refactor output with datetime for ingest/encoder/exec. 3.0.125	5 years ago
HuyaJohn	da72caf8b9	h264 packet done, chrome play well	5 years ago
winlin	c78595c1fa	For #1634, refactor encoder output, support timestamp variables.	5 years ago
winlin	66b194cd63	For #1634, refactor encoder process management.	5 years ago
winlin	927c0c8e39	For #1634, fix quit by accident SIGTERM while killing FFMPEG. 3.0.124	5 years ago
xiaozhihong	e831f3254a	some code	5 years ago
HuyaJohn	ff0e03800d	h264 rtp debuging	5 years ago
xiaozhihong	e2675109fb	fix rtp h264 packet bug	5 years ago
HuyaJohn	3ae510b843	rtp dispatch done, but video can not play in chrome	5 years ago
xiaozhihong	2f462775a0	rtp support	5 years ago
HuyaJohn	2e68c375e3	start coding flv->rtp	5 years ago
xiaozhihong	c62901a3ac	make code easy, wrap udp remux socket	5 years ago
winlin	5586c2a128	For #1612, refactor return value for RTSP initialize.	5 years ago
winlin	dcb0553cc8	For #1612, fix crash bug for RTSP. 4.0.12	5 years ago
winlin	12a74326e8	Merge pull request #1612 from xialixin/develop ... Fix disconnect RTSP connection has assertion, resulting in program exit	5 years ago
winlin	5f9ded73ce	Merge pull request #1625 from wasphin/feature/remove-unused-ip ... Remove unused ip variable	5 years ago
winlin	41acf9ca8e	For #1631, support sei_filter for SRT. 4.0.11	5 years ago
runner365	a2839aacdf	add h264 sei filter	5 years ago
HuyaJohn	b730458d51	add candidates ip list, add rtc_upload.html to test	5 years ago
runner365	4242985b36	update only support h264+aac	5 years ago
xiaozhihong	a36ed6954f	add rtc.html temp	5 years ago
xiaozhihong	936ba7583e	modify depend.sh	5 years ago
xiaozhihong	9d5495c0c2	"stun and dtls done"	5 years ago
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;	5 years ago
xiaozhihong	30d8b2209f	parse sdp	5 years ago
runner365	40a09958c4	add checking for pes_parse	5 years ago
winlin	1b9a705e4b	For #1621, support mix_correct for aggregate aac packets. 4.0.10	5 years ago
winlin	f917cc1e0c	For SRT, perfer mix_correct to true as default.	5 years ago
runner365	7f4cc6221c	1,solve audio timestamp bugs;2,solve video dts increase bugs	5 years ago
xiaozhihong	62563bdd81	rtc framework	5 years ago
runner365	ed1a3aa37c	Merge branch 'develop' into 3.0release.srt.dev	5 years ago
winlin	ea305790df	For #1579, refactor log for gracefully quit.	5 years ago
runner365	4bd37d43b4	solve dts==0 bugs; solve large aac 2930bytes timestamp bugs	5 years ago
winlin	bbdbcf173c	For #1615, refactor the version and API for SRT.	5 years ago
winlin	04d0620dde	For #1615, fix build failed and srt api issue	5 years ago
winlin	90afd06c85	For #1615, support default app(live) for vmix SRT. 4.0.9	5 years ago
winlin	771f07ee07	Merge branch 'develop' into 4.0release	5 years ago
winlin	1e998678f7	Merge pull request #1615 from runner365/3.0release.srt.dev ... update streamid decode for get more encoder such as VMIX	5 years ago
runner365	0dd72e0e5b	Merge branch '3.0release.srt.dev' into 3.0release	5 years ago
runner365	bbfa552140	update streamid decode for get more encoder such as VMIX	5 years ago
xiaozhihong	51abb0844e	rtp session manager, stun codding	5 years ago
winlin	67d78dff0e	For #1598, support SLB health checking by TCP. 4.0.8	5 years ago
winlin	ef2b123325	Merge branch '3.0release' into 4.0release	5 years ago
winlin	20b9d6ab02	For #1598, support SLB health checking by TCP. 3.0.123	5 years ago
xiaozhihong	bc22ebe949	add rtc http request and response, exchange sdp.	5 years ago
winlin	4a69499f2c	Fix bug for librtmp client ipv4/ipv6 socket. 3.0.122	5 years ago
winlin	1d01ef499d	For #1579, support rolling update of k8s. 4.0.7	5 years ago
winlin	ad3cfbfd2c	For #1579, support start/final wait for gracefully quit. 4.0.6	5 years ago
winlin	388ad61cdc	Merge branch '3.0release' into 4.0release	5 years ago
winlin	dc0f804452	For #1579, support start/final wait for gracefully quit. 3.0.121	5 years ago
winlin	d87f58a611	For #1579, support gracefully quit and force to. 4.0.5	5 years ago
winlin	0c48c42f36	Merge branch '3.0release' into 4.0release	5 years ago
winlin	58b40478b6	For #1579, support force gracefully quit. 3.0.120	5 years ago
winlin	eefd74e0e4	Merge branch '3.0release' into develop	5 years ago
winlin	3c597545b1	For #1579, support gracefully quit. 3.0.119	5 years ago
winlin	e6c329293c	Refine log	5 years ago
winlin	f4c7b882c5	For #1579, define signals for fast/grace quit and upgrade	5 years ago
夏立新	d6e11706ec	Fix disconnect RTSP connection has assertion, resulting in program exit	5 years ago
夏立新	df3ec15cd1	Fix checking the completion of one frame data in RTSP RTP stream	5 years ago
winlin	5be69d290f	For #1601, flush async on_dvr/on_hls events before stop. 3.0.118	5 years ago
winlin	4e7e9809f3	Fix bash script bug for macOS, eventhough we don't support it.	5 years ago
winlin	0723b36f0e	Merge branch '3.0release' into develop	5 years ago
winlin	131acf5bb0	For #1595, migrating streaming from ossrs.net to r.ossrs.net. 3.0.117	5 years ago
winlin	4276bea463	Migrating streaming service from ossrs.net to r.ossrs.net	5 years ago
winlin	23324cde31	Migrating streaming service from ossrs.net to r.ossrs.net	5 years ago
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	5 years ago
runner365	94741c1676	update srt2rtmp about rtmp listen tcp port	5 years ago
runner365	76204fa2ba	Merge remote-tracking branch 'srs/develop' into 3.0release	5 years ago
runner365	8e40f9cf22	update srt2rtmp about rtmp listen tcp port	5 years ago
winlin	8b7fbac7d4	SRT supports detail config for DynamicConfig. 4.0.4	5 years ago
Alex.CR	9dad53691e	solve latency parameter error (#1600) ... * solve latency parameter error	5 years ago
runner365	d8419bd4dd	solve latency parameter error	5 years ago
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	5 years ago
runner365	24f286684e	add srt parameter configure	5 years ago
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	5 years ago
runner365	6f4c124f58	solve merge confict	5 years ago
runner365	1a1d0e9267	add srt_epoll_clear_usocks	5 years ago
runner365	548c918efb	mpegts discard header is not 0x47	5 years ago
runner365	4fdf242e99	change two thread to one thread	5 years ago
winlin	d2a071f041	Add TODO for incompatible APIs of librtmp	5 years ago
Alex.CR	3847807534	solve srt repush bugs (#1596) ... * if there isn't srt connect, it needn't epoll wait * solve repush srt bugs	5 years ago
runner365	1c6203bda2	solve repush srt bugs	5 years ago
runner365	1941f55475	if there isn't srt connect, it needn't epoll wait	5 years ago
winlin	bdc7973596	Merge branch '3.0release' into develop	5 years ago
winlin	fc769550db	Fix #665, fix HTTP-FLV reloading bug. 3.0.116	5 years ago
winlin	f6fa889393	For #1592, default ff_log_level to info	5 years ago
winlin	c6d914bc13	Fix #1592, fix terminal echo off by redirect process stdin. 3.0.115	5 years ago
winlin	c50c51889a	For #1592, support ff_log_level and default to warning	5 years ago
winlin	2fa151726b	For #1592, rename ff_log_dir.	5 years ago
winlin	823b4fa56f	Merge branch '3.0release' into develop	5 years ago
winlin	a99cee2819	For #1186, refactor security check. 3.0.114	5 years ago
winlin	b9d45ba7d9	For #1186, refactor security check. 3.0.114	5 years ago
winlin	c51c378869	For #1186, refactor security check. 3.0.114	5 years ago
winlin	3023dc7b40	Update project code. 4.0.3	5 years ago
winlin	55fa62e41f	Update version4	5 years ago
winlin	59439cf8b5	Merge branch '3.0release' into develop	5 years ago
winlin	c01806d5c4	Refine version3	5 years ago
winlin	4f39303f37	Fix #939, response right A/V flag in FLV header. 3.0.113	5 years ago
winlin	68efca4fa9	For #939, always enable fast FLV streaming.	5 years ago
winlin	a2a6ca8258	For #939, always enable fast FLV streaming.	5 years ago
winlin	fb555b4d8f	Merge branch '3.0release' into develop	5 years ago