4089 commits

Author	SHA1	Message	Date
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