5394 commits

Author	SHA1	Message	Date
winlin	31ff84c82d	Ignore some files	2020-06-09 17:18:31 +08:00
winlin	b694550456	Support c++ .h and .cc	2020-06-09 17:17:36 +08:00
kyxlx550	84afc32a96	fix sip catalog status list check error	2020-06-09 10:08:41 +08:00
kyxlx550	ed82d60aac	fix while sleep time	2020-06-08 18:27:03 +08:00
kyxlx550	813c83ccc7	fix no maker one frame check	2020-06-08 18:26:08 +08:00
kyxlx550	2172209321	ps to rtmp via source, h264 start code with replace nalulen	2020-06-07 21:51:06 +08:00
kyxlx550	9855e6a715	ps to rtmp via source, h264 start code with replace nalulen	2020-06-07 21:51:06 +08:00
kyxlx550	194dcf504b	add ps over rtp jitter buffer	2020-06-07 21:51:05 +08:00
kyxlx550	3fe44c1c84	add lock list	2020-06-07 21:47:22 +08:00
kyxlx550	06548a7fa8	add set socket buffer func	2020-06-07 21:47:22 +08:00
kyxlx550	4fc54c9c99	add gb28181 ps jitter buffeer	2020-06-07 21:47:22 +08:00
kyxlx550	23ce929048	update gb28181 config wait_keyframe default on	2020-06-07 21:47:22 +08:00
winlin	6e04c66402	Support enable C++11. 4.0.29	2020-06-03 19:18:41 +08:00
winlin	5139816feb	Remove unused files	2020-06-03 18:14:18 +08:00
winlin	0992eb4580	Remove unused files	2020-06-03 18:00:21 +08:00
winlin	812403a44d	Remove srslibrtmp	2020-06-03 17:32:55 +08:00
winlin	8e519cedae	RTSP: Show engine and alloc ports	2020-06-03 09:16:11 +08:00
winlin	8ca793593d	RTC: Refactor code.	2020-06-02 19:00:31 +08:00
winlin	70d51ffc5b	Refine build script	2020-06-02 16:43:07 +08:00
winlin	95f656b46d	Merge service to protocol	2020-06-02 15:02:59 +08:00
winlin	f86706e0a2	RTC: Add config for twcc	2020-06-02 14:38:14 +08:00
winlin	32c5b6fbce	RTSP: Support video only.	2020-06-02 13:45:23 +08:00
jinxue.cgh	f13a1b8ac0	rtc: fix audio rtp packet no twcc sequenc number, not reset error bug	2020-06-02 11:00:59 +08:00
jinxue.cgh	e2fcd89644	rtc: refine set extension map for rtp_header	2020-06-02 11:00:52 +08:00
winlin	f83276c457	Remove srs-librtmp.	2020-05-31 10:56:36 +08:00
winlin	b8ba4ff779	RTC: Refine code	2020-05-31 10:54:59 +08:00
winlin	899493e968	Fix build failed	2020-05-30 17:52:11 +08:00
winlin	1c5ccaffc7	RTC: Fix memory leak	2020-05-29 17:07:49 +08:00
winlin	a78b6b8cda	RTC: Remove --research	2020-05-29 17:02:10 +08:00
winlin	d43d9674a3	RTC: Remove --librtmp	2020-05-29 17:00:06 +08:00
winlin	a3388bf624	RTC: Remove export srs-librtmp support	2020-05-27 14:20:40 +08:00
jinxue.cgh	b8ab6ef6ce	RTC: use c++ 98 style map.erase and NULL	2020-05-27 10:15:59 +08:00
winlin	23447dd6e2	RTC: Use c++98 map.earse	2020-05-26 18:24:37 +08:00
winlin	0be9340023	Update config file.	2020-05-26 17:01:01 +08:00
winlin	db43faa848	RTC: Refine blackhole for session	2020-05-26 13:49:27 +08:00
winlin	fccbe98f70	RTC: Remove dead code, no queue_length	2020-05-26 13:45:38 +08:00
winlin	f3e1d28b6b	RTC: Fix get candidate IP bug.	2020-05-26 13:08:56 +08:00
winlin	2b50326e97	HTTP: Close connection for HTTP static file server	2020-05-26 09:53:36 +08:00
winlin	f501d5b63d	RTC: Support hijack play and consuming	2020-05-24 21:40:23 +08:00
winlin	a5265c5753	RTC: Add comments.	2020-05-24 21:18:46 +08:00
winlin	a246469173	RTC: Fix log typo	2020-05-22 19:06:38 +08:00
winlin	64eb22b95d	RTC: Support hijack the plaintext RTP packet	2020-05-22 18:44:32 +08:00
winlin	2bd0e1ce43	Kernel: Buffer supports little-endian	2020-05-22 18:14:15 +08:00
winlin	ab2d15d524	RTC: Fix dup release bug	2020-05-21 21:59:30 +08:00
winlin	6dfeb686bf	RTC: Fix session remove bug	2020-05-21 20:23:03 +08:00
winlin	471bb0914f	RTC: disable GSO and sendmmsg. 4.0.27	2020-05-21 19:03:50 +08:00
winlin	aaffb8bbd7	RTC: Rename send_packets api.	2020-05-21 17:00:40 +08:00
winlin	9199e40fc1	RTC: Remove dead macros	2020-05-21 16:52:25 +08:00
winlin	01f05f920f	RTC: Remove sendmmsg	2020-05-21 16:52:25 +08:00
winlin	9dfa0cc099	RTC: Disable padding	2020-05-21 16:52:25 +08:00
winlin	f03bf601e4	RTC: Directly send without sendmmsg	2020-05-21 16:52:24 +08:00
winlin	4f6b24ea12	RTC: Remove GSO for player, no premature optimization	2020-05-21 16:48:32 +08:00
winlin	5bd2812405	RTC: Merge package AV	2020-05-21 16:48:32 +08:00
winlin	690c64e046	RTC: Notify handler when session timeout	2020-05-20 20:23:21 +08:00
winlin	6a191e4077	RTC: Support destroy session	2020-05-20 19:05:00 +08:00
winlin	4c7792f0f3	RTC: Fix config bug	2020-05-20 13:51:24 +08:00
jinxue.cgh	6ce4ff56f8	rtc: rtp packet encode support twcc extension	2020-05-20 11:28:15 +08:00
winlin	eb0667ba08	RTC: Fix build failed	2020-05-19 20:47:01 +08:00
jinxue.cgh	228e2fab94	rtc: on_twcc delete trace log	2020-05-19 20:37:22 +08:00
jinxue.cgh	95596d9c38	rtc: rtpheader decode add extmap parameter	2020-05-19 20:37:16 +08:00
jinxue.cgh	3681c564d0	rtc: fix rtp header parse extension xlen caclulate bug	2020-05-19 20:37:07 +08:00
jinxue.cgh	9840ad8d55	rtc: support publish twcc using twcc config	2020-05-19 20:35:05 +08:00
jinxue.cgh	d5e91694d5	rtc: publisher support twcc	2020-05-19 20:34:45 +08:00
jinxue.cgh	b116632357	rtc: sdp support decode and encode extmap	2020-05-19 20:31:08 +08:00
jinxue.cgh	705843b512	rtc: support parse rtp packet extension	2020-05-19 20:30:38 +08:00
winlin	69e4a1b5e7	RTC: Refactor variable name	2020-05-19 18:06:12 +08:00
winlin	e3d010113f	RTC: Refactor code	2020-05-19 17:49:34 +08:00
winlin	23ddcbdaed	Update authors	2020-05-17 21:49:15 +08:00
winlin	3029394c58	RTC: Refactor code	2020-05-17 21:45:50 +08:00
忘篱	5a998e58f5	RTC: Simulator drop packet before SRTP	2020-05-17 21:33:48 +08:00
忘篱	5257f16796	RTC: Attach detail error info when SRTP error	2020-05-17 21:17:44 +08:00
忘篱	d2b0e73884	RTC: Revert not required modifications	2020-05-17 20:43:49 +08:00
忘篱	e9af081f7b	RTC: Revert not required modifications	2020-05-17 20:43:46 +08:00
jinxue.cgh	4895770214	tenfold: modify nack options	2020-05-17 20:43:04 +08:00
jinxue.cgh	efe90c36a7	tenfold: add nack option desc	2020-05-17 20:42:48 +08:00
jinxue.cgh	347fafec6e	tenfold: refine publish nack send	2020-05-17 20:42:30 +08:00
jinxue.cgh	a3c7be2c75	tenfold: implement nack ringbuffer notify_nack_list_full and notify_drop_seq	2020-05-17 20:42:12 +08:00
jinxue.cgh	c875639eb6	tenfold: use timer send nacks	2020-05-17 20:41:52 +08:00
jinxue.cgh	392e2c8161	tenfold: add publish nack	2020-05-17 20:41:35 +08:00
忘篱	f5ba274019	RTC: Refine RTCP names.	2020-05-17 20:23:57 +08:00
忘篱	d6d2554c7f	RTC: Refine comments for TWCC	2020-05-17 20:20:06 +08:00
忘篱	e1bede91f4	RTC: Add api files.	2020-05-17 19:46:18 +08:00
忘篱	acc53ded89	RTC: Extract RTC api file	2020-05-17 19:40:45 +08:00
忘篱	d603b1580e	RTC: Merge srs_rtp_seq_distance with srs_seq_is_newer	2020-05-17 09:03:40 +08:00
忘篱	3f5ab8dc63	RTC: Add utest for srs_rtp_seq_distance	2020-05-17 00:03:14 +08:00
忘篱	be1b0bf941	RTC: Refactor code	2020-05-15 18:06:25 +08:00
忘篱	d1485c40e4	RTC: Rename APIs	2020-05-15 15:36:55 +08:00
忘篱	99496ed24c	RTC: Remove dead code	2020-05-15 12:07:11 +08:00
忘篱	e20a1d2f39	RTC: Rename RTCP_XXX to RtcpXXX	2020-05-15 12:03:43 +08:00
忘篱	cef8be4a46	RTC: Support RTCP codec.	2020-05-15 11:50:59 +08:00
莫战	9910151feb	add twcc and replace auto method	2020-05-15 09:55:15 +08:00
winlin	f510a94a91	RTC: Rename SrsRtpPacket2.rtp_header to SrsRtpPacket2.header	2020-05-15 08:38:43 +08:00
winlin	ba8f2e2aba	RTC: Remove dead code	2020-05-15 08:34:58 +08:00
winlin	620ca902e2	RTC: Remove dead code	2020-05-15 08:24:26 +08:00
winlin	d8cf9b64c8	RTC: Remove dead code	2020-05-15 08:19:22 +08:00
winlin	c7b88e08e9	RTC: Refactor API, use shared pkt for consumer	2020-05-15 08:11:03 +08:00
winlin	31de2c71d0	RTC: Reorder code for NACK.	2020-05-15 07:57:40 +08:00
winlin	f2951ec46a	RTC: Reorder class, no change	2020-05-14 18:34:33 +08:00
winlin	ab6e3cae52	RTC: Refine NACK, remove dead code	2020-05-14 18:33:31 +08:00
winlin	f81d35d20f	RTC: Rename padding API.	2020-05-14 15:01:12 +08:00
winlin	e8973c2343	RTC: Refactor, rename SrsRtcOutgoingPackets to SrsRtcOutgoingInfo	2020-05-14 14:45:54 +08:00
winlin	5e2a3572eb	RTC: Remove cache for RTP packet	2020-05-14 14:44:24 +08:00
winlin	7b0a9fe95f	RTC: Remove shared bytes, use shared msg	2020-05-14 14:30:32 +08:00
winlin	f794a7d3a7	RTC: Use shared message for RTP packet	2020-05-14 14:26:19 +08:00
winlin	4e1935f678	RTC: Fix GSO build failed in linux	2020-05-14 13:14:52 +08:00
winlin	3cb797dccd	For #307, refine core structure, RTMP base on frame, RTC base on RTP. 4.0.26	2020-05-14 10:47:21 +08:00
winlin	2b1c4a188a	RTC: Refine RTMP bridge to RTC, use RTP packets in consumer	2020-05-14 09:33:00 +08:00
winlin	54d8c36905	RTC: Refine audio to RTP packet base.	2020-05-13 20:13:25 +08:00
winlin	588d17c09d	RTC: Refactor source to accept RTP audio packet.	2020-05-13 18:43:25 +08:00
winlin	377128f4e9	RTC: Rename recode to transcode	2020-05-13 17:56:51 +08:00
winlin	b8b52f28f5	RTC: We should cache the sps/pps in source.	2020-05-13 16:21:42 +08:00
winlin	68de796f77	RTC: Reorder functions	2020-05-13 15:46:49 +08:00
winlin	9b334f91e7	RTC: Fix build failed	2020-05-13 15:27:31 +08:00
winlin	431f852e05	RTC: Remove dead code	2020-05-13 15:23:43 +08:00
winlin	e446cf466f	RTC: Extract video to bridger	2020-05-13 15:15:57 +08:00
winlin	8efbdec2af	RTC: Remove dead code	2020-05-13 15:13:14 +08:00
winlin	c0021ab78a	RTC: Directly use audio transcoder.	2020-05-13 15:09:36 +08:00
winlin	6740a03a9c	RTC: Refactor code	2020-05-13 13:42:55 +08:00
winlin	44c8334b71	RTC: Extract codes from source to bridger.	2020-05-13 13:35:14 +08:00
winlin	16c47056a6	RTC: Remove dead code.	2020-05-13 13:15:41 +08:00
winlin	ede6684f12	Fix build failed bug	2020-05-12 19:59:46 +08:00
winlin	9e417d5416	Refine SrsSource, bridge to RTC.	2020-05-12 19:53:21 +08:00
winlin	d2e5cd7bb7	RTC: Refine code, remove pass_timestamp from SrsSource	2020-05-12 13:51:51 +08:00
winlin	d434dc951d	RTC: Cleanup code, remove RTC from SrsSource	2020-05-12 13:43:09 +08:00
winlin	25496b734b	RTC: Extract RTC Source and Consumer	2020-05-12 13:19:31 +08:00
winlin	0b9887bbcd	RTC: Rename RTC files.	2020-05-11 12:07:55 +08:00
winlin	3a58d9859c	RTC: Extract rtc server in app	2020-05-11 11:45:20 +08:00
winlin	a757b7f903	Support RTC player NACK	2020-05-09 11:11:36 +08:00
winlin	c31ffc40e4	Support filter RTC candidate by ip family, ipv4 by default.	2020-05-09 10:53:52 +08:00
莫战	a72dce494d	add rtcp support	2020-05-09 10:51:57 +08:00
winlin	215b1c234b	Refine the local ip and interface retrieve	2020-05-09 10:40:25 +08:00
winlin	26bcc09017	Refine on_rtcp for RTC	2020-05-08 16:25:09 +08:00
winlin	9614af070c	Support simulator link in DEMO page	2020-05-07 18:28:59 +08:00
winlin	db503975fb	Disable simulator API by default.	2020-05-07 16:29:11 +08:00
winlin	fe01a504b6	Fix RTP decode bug	2020-05-07 16:12:04 +08:00
winlin	6fbd41cff4	Refactor the logs.	2020-05-07 16:01:03 +08:00
winlin	1b08fb6b6e	Remove unused code	2020-05-06 15:13:18 +08:00
winlin	7dd5db261a	Support server as offer	2020-05-06 07:37:00 +08:00
winlin	8933e6f429	Fix utest build failed.	2020-05-05 08:35:16 +08:00
winlin	c4b93b8a38	Refactor RTC video queue, extract RTP video packet	2020-05-05 08:24:49 +08:00
winlin	899dddb624	Refactor RTC publisher, audio/video use its special ring buffer	2020-05-05 08:08:03 +08:00
winlin	80d45e5982	Refine RTP ring buffer, change to template	2020-05-05 07:42:27 +08:00
winlin	42ae71e96c	Refactor RTC publish queue	2020-05-05 06:41:19 +08:00
winlin	8c4b6d3166	Support disable NACK in config	2020-05-04 20:42:30 +08:00
winlin	d125116317	Support simulate NACK for RTC publisher	2020-05-04 17:49:39 +08:00
winlin	4d33070c59	Support NACK for RTC player	2020-05-04 14:47:58 +08:00
winlin	d462b750fb	Add TODO: Should not wait for NACK packets.	2020-05-04 08:14:37 +08:00
winlin	f04e63edbf	Refactor code, support NACK and NACK PLI in SDP	2020-05-04 07:52:29 +08:00
winlin	15955b6cdd	Refactor the RTP packet.	2020-05-04 07:40:02 +08:00
winlin	47df22df9e	Refine RTC, no trickle for ice-lite, disable algorithms right-now	2020-05-03 20:19:45 +08:00
winlin	365e6bb45a	Refine RTC publisher, no cache. 4.0.25	2020-05-03 19:09:48 +08:00
winlin	128fc9d8c7	Refactor publisher ring buffer, allow startup drop frame	2020-05-03 18:07:09 +08:00
winlin	2dc8e8dca1	Refactor RTC publish ring buffer	2020-05-03 17:57:07 +08:00
winlin	45f35e3ec8	Refactor RTC publisher, rename pkt to frame	2020-05-03 17:43:38 +08:00
winlin	47ed16eda1	Refactor RTC publisher queue, covert FU-A to RAW.	2020-05-03 17:41:00 +08:00
winlin	a812183144	Refactor the RTC sender audio queue	2020-05-03 14:28:51 +08:00
winlin	a23f102874	Refactor RTC, rename variables.	2020-05-03 13:49:53 +08:00
winlin	9c8b7279f0	Refactor RTC publisher queue, rename sender to player	2020-05-03 13:37:04 +08:00
winlin	ef64c5e2bd	Refine RTC, reject when config disabled.	2020-05-03 13:11:38 +08:00
winlin	f71b833520	Refine sendmmsg, move to ST	2020-05-03 11:32:54 +08:00
winlin	2a0562da5e	Refine RTC, disable NASM, SENDMMSG, SRTP-NASM	2020-05-03 11:14:11 +08:00
winlin	32c4febafe	Refactor RTC publish packet flags.	2020-05-03 10:15:54 +08:00
winlin	157bc713a9	Refactor RTC session API	2020-05-03 09:55:43 +08:00
winlin	5fb7c4efbc	RTC supports pass-by players PLI to publisher	2020-05-03 09:00:05 +08:00
winlin	1688d53f7d	Refine source, pass-by RTC publisher for player	2020-05-03 07:51:01 +08:00
winlin	20b4984af4	Refine consumer dumps, extract dumps API	2020-05-03 07:43:05 +08:00
winlin	9906d2e859	Refine RTC publish SDP, remove SSRC because it's recvonly.	2020-05-03 07:22:07 +08:00
winlin	780753c0ec	Refine code for RTC publisher	2020-05-02 20:57:36 +08:00
winlin	5c43037190	Remove usused RTP shared packet.	2020-05-02 10:24:31 +08:00
winlin	42ee52fa29	Refactor code, extract nack from queue	2020-05-02 10:07:55 +08:00
winlin	f57e8de3f9	Refactor code, rename rtp_xxx_queue to xxx_queue_	2020-05-02 09:53:49 +08:00
winlin	b3a0284db5	Refactor code to split implementation to cpp	2020-05-02 09:48:04 +08:00
winlin	6f2b78f16a	Refactor code to keep sample function order	2020-05-02 09:15:49 +08:00
winlin	7b5fa0e391	Refactor kernel buffer	2020-04-30 20:46:45 +08:00
winlin	d045ce5d74	Refine kernel buffer API.	2020-04-30 19:33:08 +08:00
winlin	efbc51f6be	Refactor RTC sender, donot cache it.	2020-04-30 18:19:40 +08:00
winlin	fdcff3e6c2	Refactor code, remove skt in param	2020-04-30 14:49:37 +08:00
winlin	5ee5ef6ab2	For #307, support publish RTC with passing opus. 4.0.24	2020-04-30 10:57:03 +08:00
winlin	99f9f566ba	Refactor RTC function names	2020-04-30 10:00:07 +08:00
winlin	583ae52df8	Rename functions for RTC publisher	2020-04-30 09:33:21 +08:00
winlin	f37ffdf740	For RTC publisher, request keyframe when start playing	2020-04-30 08:24:15 +08:00
winlin	ed338f4c0a	Refactor macro SRS_AUTO_XXX to SRS_XXX.	2020-04-29 20:02:28 +08:00
winlin	2fe1874a87	For RTC publish, refine the ring buffer.	2020-04-29 19:07:44 +08:00
winlin	5eba90ded9	Refine build script	2020-04-29 19:07:25 +08:00
winlin	0b62ca02b7	Merge develop	2020-04-27 14:01:33 +08:00
winlin	ded37c6719	Refine build script	2020-04-27 13:59:57 +08:00
winlin	89cdfe2f50	Refactor RTC publisher code	2020-04-27 13:45:50 +08:00
winlin	7692e589ed	For RTC publisher, support black-hole	2020-04-27 09:35:50 +08:00
winlin	028ef56772	Fix sendmmsg build failed bug	2020-04-26 22:41:03 +08:00
winlin	e4329fd1a0	Refactor RTC, create source once	2020-04-26 19:00:36 +08:00
winlin	cef1ba9385	Update doc	2020-04-26 16:16:34 +08:00
winlin	db586903ba	Refactor RTC source create	2020-04-26 16:12:23 +08:00
winlin	eace693ae9	Refactor RTC publish, reorder functions.	2020-04-26 13:30:17 +08:00
winlin	ebdc03416a	Free rtc publish. Refactor TAB to spaces	2020-04-25 22:30:55 +08:00
winlin	cd3c15ec4e	Support RTC publisher.	2020-04-25 20:32:37 +08:00
winlin	70a81b3970	Fix the bug for RTC publisher	2020-04-25 18:59:02 +08:00
xiaozhihong	bb9367f88a	add rtc_publisher.html	2020-04-24 16:22:08 +08:00
xiaozhihong	c068a94f6f	Merge remote-tracking branch 'upstream/feature/rtc' into rtc	2020-04-24 16:19:24 +08:00
xiaozhihong	8dc0746e2d	rtc publish release	2020-04-24 16:19:08 +08:00
winlin	613baa561a	Update script	2020-04-24 09:42:15 +08:00
xiaozhihong	775065175a	rtc session distinguish play and publish	2020-04-24 00:06:59 +08:00
xiaozhihong	1951cc8e5f	remove some debug code	2020-04-23 23:14:30 +08:00
xiaozhihong	a061d5c3db	rtc publish, with debug code	2020-04-23 17:08:21 +08:00
xiaozhihong	c654f1e06e	Merge remote-tracking branch 'upstream/feature/rtc' into rtc	2020-04-22 22:19:41 +08:00
winlin	32082648b6	Merge branch 'feature/rtc' into develop	2020-04-22 11:39:26 +08:00
winlin	ee1002fc3d	Fix OSX utest failed.	2020-04-22 11:39:18 +08:00
winlin	38f7299a51	Remove double check for FFMPEG	2020-04-22 09:28:13 +08:00
winlin	854247e979	Fix GB28181 build failed.	2020-04-21 15:38:31 +08:00
winlin	dabad68f48	Merge branch 'feature/gb28181' into develop	2020-04-21 15:27:40 +08:00
winlin	82396ec112	Refactor GB28181 code	2020-04-21 15:25:50 +08:00
winlin	7bec73f224	Refactor demo pages.	2020-04-21 15:13:46 +08:00
winlin	244fefa8c5	Update utest	2020-04-21 15:06:57 +08:00
winlin	f2b575e841	Merge branch 'feature/rtc' into develop	2020-04-21 14:04:27 +08:00
winlin	20896325ea	Update script	2020-04-21 14:02:26 +08:00
winlin	bff93c3f6a	Update ST doc	2020-04-21 13:30:00 +08:00
kyxlx550	904ce2452b	update srs gb28281 web demo	2020-04-21 12:53:52 +08:00
winlin	74800d0137	Refactor code	2020-04-21 12:18:49 +08:00
winlin	511cf65ec8	Add srs_recvmsg	2020-04-21 12:14:26 +08:00
winlin	0fe9d9e324	Add UDP ZeroCopy research	2020-04-21 12:12:32 +08:00
kyxlx550	6a070a9a64	support sip ptz cmd	2020-04-20 21:34:18 +08:00
winlin	74416e476a	Refine research zerocopy, use batch for reception	2020-04-20 21:18:49 +08:00
winlin	72322836c6	Update demo for zerocopy	2020-04-20 20:25:23 +08:00
winlin	a3de167bc7	For zerocopy research, support delay in server	2020-04-20 08:42:53 +08:00
winlin	8f9cc38f68	Refine zero copy research	2020-04-20 08:02:53 +08:00
winlin	2e9a561acf	Update research zerocopy	2020-04-19 22:16:54 +08:00
winlin	c362bfc3ab	Add msg zerocopy research code	2020-04-19 21:58:39 +08:00
winlin	a579f51e72	Remove ST in research	2020-04-19 20:51:39 +08:00
xiaozhihong	749503a12e	merge upstream feature/rtc, solve conflict	2020-04-19 15:02:21 +08:00
winlin	32879eaf47	Fix double free bug for RTP	2020-04-19 13:16:48 +08:00
winlin	6a4e043349	Fix the double free bug	2020-04-19 11:22:18 +08:00
winlin	b1df04cb09	Fix double free bug for RTP	2020-04-19 09:32:09 +08:00
kyxlx550	167711400a	fix cascade SIP bye failed	2020-04-19 00:18:30 +08:00
winlin	ce36a970ff	Refine perf stat	2020-04-18 22:55:38 +08:00
winlin	c93cd86ce4	For #307, refine performance	2020-04-18 20:37:08 +08:00
winlin	9e031c9932	Update script	2020-04-18 15:34:36 +08:00
winlin	c1464f5aee	Use extra queue when set mw_msgs	2020-04-18 10:35:30 +08:00
winlin	08312ddc42	Support config the mw_sleep and mw_msgs	2020-04-18 10:04:45 +08:00
winlin	b0566d51ef	Refine play consume message for RTC	2020-04-18 08:33:35 +08:00
winlin	170b7453f4	Refine for performance	2020-04-18 08:10:28 +08:00
winlin	cf52390cf2	Support fast padding	2020-04-17 18:04:52 +08:00
kyxlx550	fb23739113	fix use gb28181 log id	2020-04-17 17:03:03 +08:00
winlin	e4eb501c57	Fix the perf stat bytes bug	2020-04-17 16:36:56 +08:00
winlin	36d06edab3	Refine performance	2020-04-17 14:24:24 +08:00
winlin	54b6a9faa7	Refactor for performance	2020-04-17 13:02:54 +08:00
winlin	cac5bbddf6	Refine comments	2020-04-17 12:48:05 +08:00
winlin	14e3ec2fe8	For #307, drop frame when VBR too high	2020-04-17 12:30:53 +08:00
winlin	606f8873b3	Refactor code	2020-04-17 10:42:04 +08:00
winlin	acc471b0a9	For #307, refine the GSO for performance	2020-04-17 07:58:11 +08:00
winlin	21ede1f084	Enable perf stat by default	2020-04-17 07:57:52 +08:00
winlin	f0015a7cc1	For #307, refine GSO performance, alloc iovs	2020-04-17 07:10:16 +08:00
kyxlx550	98c29b2b9a	fix sip stack param check error	2020-04-17 00:17:47 +08:00
winlin	8383f1b27a	Improve performance for GSO	2020-04-16 19:33:10 +08:00
winlin	32f43a9920	For RTC, always try to read message first, to improve performance	2020-04-16 18:52:17 +08:00
winlin	1a6e055f7f	Support config to disable stat to improve performance.	2020-04-16 18:37:37 +08:00
kyxlx550	06412ddddc	fix gb28281 html ret error show	2020-04-16 18:33:43 +08:00
winlin	810b32138e	Refactor code	2020-04-16 18:25:11 +08:00
winlin	634225f92f	Improve perforance of marshaling RTP header	2020-04-16 18:04:56 +08:00
winlin	3bd56bb3a3	For #307, reuse fua cache payload for RTP	2020-04-16 14:51:36 +08:00
winlin	d5c514cdcb	For #307, reuse raw cache payload for RTP	2020-04-16 14:28:59 +08:00
winlin	d906ced5c3	For #307, set cache to about 1.4GB when clients is 2k	2020-04-16 14:13:09 +08:00
winlin	bbe4b3797d	Refactor stat logs for RTC	2020-04-16 13:49:37 +08:00
winlin	e90f0629ed	Refactor RTP cache reset	2020-04-16 13:13:02 +08:00
kyxlx550	b391ed6206	fix gb28281 html rtc player stop	2020-04-16 13:08:42 +08:00
winlin	b4a7566684	Print the rtp packets cache capacity	2020-04-16 12:35:36 +08:00
kyxlx550	33b91cd6f2	fix gb28181 api error code	2020-04-16 12:30:11 +08:00
winlin	cc831be985	Refactor variable name for GSO	2020-04-16 12:18:52 +08:00
winlin	92419f9836	For #307, refine GSO padding algorithm	2020-04-16 11:57:11 +08:00
winlin	34fec09bc0	Refactor padding	2020-04-16 11:22:25 +08:00
winlin	4dced0b077	For #307, fix apdding algorithm bug.	2020-04-16 10:58:20 +08:00
winlin	b91e07f475	For #307, change max padding to 127 for GSO.	2020-04-16 10:25:12 +08:00
winlin	5ad99b119d	Stat bytes	2020-04-16 10:05:17 +08:00
winlin	b7dab00f36	Add debug_id for GSO	2020-04-16 09:25:18 +08:00
winlin	56995db6a5	Refine debug info	2020-04-16 09:09:10 +08:00
winlin	ef48507e80	Support padding max to 127	2020-04-16 09:07:42 +08:00
winlin	a4dbf3ca8a	Fix RTP packet cache bug	2020-04-16 08:43:54 +08:00
winlin	7d1be87124	Fix RTP packet cache bug	2020-04-16 08:30:57 +08:00
winlin	1064429c7e	Cache RTP packets	2020-04-15 22:46:06 +08:00
winlin	7b68f55edc	Refactor GSO mmsghdr alloc	2020-04-15 22:11:03 +08:00
kyxlx550	7950bc586e	add gb28281 demo html	2020-04-15 22:05:32 +08:00
winlin	c96ffd272c	Cache RTP packet vector	2020-04-15 21:59:27 +08:00
winlin	d692f2d9c4	Fix build failed when RTC disabled.	2020-04-15 21:37:46 +08:00
winlin	7c6583684e	RTC: Reorder AV for GSO	2020-04-15 19:53:23 +08:00
winlin	c95a8517e7	For #307, padding to next packet or GSO size	2020-04-15 17:48:52 +08:00
winlin	bbdd2d7eed	For #307, support padding for GSO	2020-04-15 15:58:17 +08:00
winlin	6869ccca50	Fix RTP padding bug	2020-04-15 14:19:00 +08:00
kyxlx550	95b869245b	fix sip message parse error	2020-04-15 12:06:27 +08:00
winlin	bfc70d6482	For #307: Change the RTP payload to 1300	2020-04-15 12:05:27 +08:00
winlin	b5f2c842fe	Fix perf api bug	2020-04-15 10:50:56 +08:00
winlin	ab53c34945	For #307: Change the RTP payload to 1400	2020-04-15 10:44:26 +08:00
winlin	095e7c5a4e	Fix build script	2020-04-15 10:36:39 +08:00
winlin	6e9e0d6ce3	Fix build script	2020-04-15 10:35:38 +08:00
xiaozhihong	e0cd148ad6	merge	2020-04-15 10:31:38 +08:00
winlin	c143c80fd6	Fix GSO stat bug	2020-04-15 07:10:41 +08:00
winlin	dd7b5cf53f	Fix GSO stat bug	2020-04-15 06:44:09 +08:00
winlin	649f2042da	Update perf tool	2020-04-14 22:16:14 +08:00
winlin	6cf9933bf3	For #307, refine gperf api	2020-04-14 21:49:49 +08:00
winlin	a80084289b	Support debug	2020-04-14 20:12:33 +08:00
winlin	8e4ef98629	For #307, correct the RTP packet stat.	2020-04-14 20:12:14 +08:00
winlin	9d5c855727	Update perf api tool	2020-04-14 19:36:43 +08:00
winlin	88b1e14db4	Update perf api tool	2020-04-14 19:30:35 +08:00
winlin	97cfae624c	Fix CentOS8 build warnings	2020-04-14 19:23:15 +08:00
winlin	bda7bdee54	Change RTC realtime to 0 cache	2020-04-14 19:19:46 +08:00
winlin	4be1d785b6	Add tool for GSO	2020-04-14 18:50:21 +08:00
winlin	7c3522dcb1	Add tool for GSO	2020-04-14 18:49:26 +08:00
winlin	de343d6547	Add tool for GSO	2020-04-14 18:48:57 +08:00
winlin	8d5f91f777	For rtc player, use target to overwrite server, vhost and eip.	2020-04-14 18:15:07 +08:00
winlin	ba3d293bfd	Refactor stat for frames	2020-04-14 14:22:30 +08:00
winlin	7574dbefb1	For #307, support sendmmsg, GSO and reuseport. 4.0.23	2020-04-14 14:02:54 +08:00
winlin	fdc0c44b7e	For #307, for realtime, change wait messages from 0 to 2	2020-04-14 13:55:55 +08:00
winlin	03a03e4174	Refine stat for GSO	2020-04-14 13:47:23 +08:00
winlin	5b406d68d6	Refine pithy print	2020-04-14 13:34:24 +08:00
winlin	39853160d1	Refactor default config	2020-04-14 11:49:59 +08:00
winlin	b6a929f9cf	Enable GSO by default	2020-04-14 11:41:23 +08:00
winlin	24eb61156f	Refine logs for GSO	2020-04-14 11:39:22 +08:00
winlin	8ba3d78e86	Refine logs for GSO	2020-04-14 11:30:21 +08:00
winlin	2cd580f500	For #307, disable GSO < linux 4.18.0	2020-04-14 11:26:45 +08:00
winlin	feaf98eb69	For #307, remove dedicate GSO cache	2020-04-14 10:58:53 +08:00
winlin	23c68a922c	Refine GSO for RTC	2020-04-14 10:05:55 +08:00
winlin	8a71ce62db	For #307, allow dedicated cache for GSO.	2020-04-14 09:20:21 +08:00
winlin	89a247d9bc	Remove unused code	2020-04-13 23:57:03 +08:00
winlin	3b7240b8e0	For #307, support linux GSO for RTC	2020-04-13 23:40:30 +08:00
winlin	b1438bf52c	Merge branch 'develop' into feature/rtc	2020-04-13 19:51:35 +08:00
winlin	f072f30854	Merge branch '4.0release' into develop	2020-04-13 19:51:13 +08:00
winlin	bfe40f0115	Check pkg-config	2020-04-13 19:50:40 +08:00
winlin	96059e0d42	For #307, support merge multiple slices/NALUs to one NALU/RTP/FUA	2020-04-13 19:23:17 +08:00
winlin	5d23bb6a8a	Refactor code for merge_nalus	2020-04-13 17:11:46 +08:00
winlin	4400896395	Refactor code for merge_nalus and gso	2020-04-13 16:50:24 +08:00
winlin	048301d9eb	Refactor RTP sender	2020-04-13 15:37:32 +08:00
winlin	756826756a	Refactor RTP encrypt	2020-04-13 15:24:41 +08:00
xiaozhihong	54a887a3d9	solve merge conflict	2020-04-13 14:43:12 +08:00
xiaozhihong	8687c50dc4	merge	2020-04-13 14:29:19 +08:00
winlin	fa21df7bb8	Refactor RTC package RTP packets.	2020-04-13 13:58:34 +08:00
winlin	0bb61f7d98	For #307, RTC RTP support padding	2020-04-13 13:44:55 +08:00
winlin	216b3bf414	Create isolate pithy printer for each RTC FD	2020-04-13 09:32:48 +08:00
winlin	087559813f	For #307, use UDP sender binding to FD for RTC	2020-04-13 09:13:12 +08:00
winlin	863d6b4f15	Refactor pithy print for RTC	2020-04-12 23:11:53 +08:00
winlin	59dc771dd5	Refactor pithy print for RTC	2020-04-12 23:05:07 +08:00
winlin	73a9155686	Refine logs	2020-04-12 18:34:42 +08:00
winlin	82579e4b0c	For #370, use round-trip to send on all fds	2020-04-12 17:19:49 +08:00
winlin	37e2f8896c	Refactor pithy print logs	2020-04-12 16:31:32 +08:00
winlin	d5b3cf9af7	Refactor pithy print logs	2020-04-12 16:10:08 +08:00
winlin	2b132d6d64	Refine RTC server log	2020-04-12 09:17:52 +08:00
winlin	78aad11eeb	For #307, enable REUSEPORT to increase UDP buffer	2020-04-12 08:55:43 +08:00
winlin	a7f2bde8e2	Refine UDP socketopt logs	2020-04-12 08:42:12 +08:00
winlin	edad6ac93d	Fix memory leak. Refine RTC SEND pithy print message	2020-04-12 08:25:57 +08:00
winlin	5e66a0d342	Send SPS/PPS before IDR	2020-04-12 01:13:31 +08:00
winlin	79d46fa2e1	Fix build failed bug	2020-04-12 01:08:21 +08:00
winlin	32efc71ba9	Fix the STAP NRI flag	2020-04-12 01:05:32 +08:00
winlin	acbbdf51d6	Refacor STAP RTP packet	2020-04-12 01:05:11 +08:00
winlin	ca027ca5cb	For #307, zero copy for RTP FUA packet	2020-04-12 01:01:39 +08:00
winlin	aa81b47c9a	For #307, zero copy for RTP STAP packet	2020-04-11 23:57:04 +08:00
winlin	4b2404c203	For #307, zero copy for RTP audio packet	2020-04-11 22:54:44 +08:00
winlin	bf62244908	Free RTP packet for RTC	2020-04-11 21:46:34 +08:00
winlin	a2fdf0d3c7	For #307, package video rtp packets when send message	2020-04-11 21:03:37 +08:00
kyxlx550	7826c743e4	support access to NVR, gb28181 system sub domain	2020-04-11 20:37:07 +08:00
kyxlx550	28bde1d448	fix rtmp send timeout, first key frame wait	2020-04-11 20:36:28 +08:00
kyxlx550	f74a398c1b	add sip query session api	2020-04-11 20:19:54 +08:00
kyxlx550	1e0474e470	support sip query catalog message, parse xml to map, nvr	2020-04-11 20:18:38 +08:00
kyxlx550	769efa87c3	add sip device channel error code	2020-04-11 20:01:35 +08:00
kyxlx550	3d1c34a45e	add gbs log id define	2020-04-11 20:00:31 +08:00
kyxlx550	917b87a1d6	add sip query catalog interval config	2020-04-11 19:56:46 +08:00
kyxlx550	0d593da998	trunk/conf/full.conf ... add sip query catalog interval config	2020-04-11 19:55:42 +08:00
winlin	8121f9ab4e	Refactor variable name	2020-04-11 18:39:46 +08:00
winlin	c6fb5e6fdd	Refactor code, rename variable	2020-04-11 18:01:38 +08:00
winlin	3cccef327c	For #307, package opus when send it.	2020-04-11 17:52:14 +08:00
winlin	1f2db4d746	For #307, refactor aac to opus code	2020-04-11 17:09:55 +08:00
winlin	6ed2a4b6cb	For #307, refine audio transcode buffer	2020-04-11 16:33:47 +08:00
winlin	7ffe4aacb8	For #307, refactor shared msg, add samples and extra payload	2020-04-11 15:26:20 +08:00
winlin	5b9cb7dc3f	For #307, refactor code, parse B-frame by sample.	2020-04-11 15:11:42 +08:00
winlin	719c0ae85b	For #307, refactor SPS/PPS only before IDR, not each FUA	2020-04-11 13:10:27 +08:00
winlin	a695afb368	Refactor code to rename rtp_shared_pkt to packet	2020-04-11 09:56:58 +08:00
winlin	a1371fe93c	Fix utest warnings	2020-04-11 09:11:46 +08:00
winlin	1ecd8bee40	Refactor bframe discard strategy	2020-04-11 09:11:34 +08:00
winlin	fca81f02f5	Refactor code, add comment when string.assign(xx, 0)	2020-04-11 09:00:50 +08:00
winlin	162055f6d0	Refactor variable name	2020-04-10 19:21:47 +08:00
winlin	d6a5651a30	For #307, support reload rtc_server section	2020-04-10 18:14:33 +08:00
winlin	928d863e50	Refactor code, use pithy print for RTC send.	2020-04-10 17:42:54 +08:00
winlin	94afe6c56e	Refactor the print message	2020-04-10 15:44:46 +08:00
winlin	40eb5c0ef5	For #307, disable vappi for FFmpeg-fit	2020-04-10 08:55:04 +08:00
winlin	9b2f429571	Allows empty body metadata.	2020-04-09 20:43:51 +08:00
winlin	c54d5be93c	For #307, refine RTP packet cache.	2020-04-09 19:38:50 +08:00
xiaozhihong	c81bc36712	add rtc stun/dtls log	2020-04-09 14:34:48 +08:00
winlin	1e83749485	For #307, use RTC server to sendmmsg	2020-04-09 09:56:13 +08:00
winlin	cf48a5594d	Refactor code for #1691	2020-04-09 08:37:28 +08:00
winlin	49f88a3326	Merge pull request #1691 from xialixin/dev-28181 ... Dev 28181	2020-04-09 08:28:53 +08:00
winlin	d9a5572531	Refine TAB to spaces.	2020-04-09 08:20:55 +08:00
xiaozhihong	85fcbad778	[1].Add 'stun_strict_check' in conf file ... [2].Try to pickup at least H.264 payload type	2020-04-08 23:24:59 +08:00
xiaozhihong	55f264b704	Merge remote-tracking branch 'upstream/feature/rtc' into rtc	2020-04-08 20:40:23 +08:00
winlin	99614ac585	Support set RTC stun timeout	2020-04-08 15:22:13 +08:00
xiaozhihong	ca7060c005	Add SrsRtpHeader.	2020-04-08 14:45:26 +08:00
winlin	e6e8605304	For #307, support config RTC session timeout	2020-04-08 13:30:28 +08:00
winlin	8e0f83fdd2	Fix CentOS8 build failed	2020-04-07 20:22:18 +08:00
winlin	11bcd0cb27	Merge branch 'develop' into feature/rtc	2020-04-07 20:19:06 +08:00
winlin	737e4fce9f	Merge branch '4.0release' into develop	2020-04-07 20:18:48 +08:00
winlin	61c7443c4b	Merge from SRS3	2020-04-07 20:18:31 +08:00
winlin	c2657bf672	Use isolate cache for different SRS version.	2020-04-07 20:11:56 +08:00
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
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