2775 commits

Author	SHA1	Message	Date
winlin	7ad1dfbbb8	Merge SRS 4.0	2020-07-19 10:13:48 +08:00
winlin	8ae3ab0ba7	Merge SRS 4.0	2020-07-19 10:09:28 +08:00
winlin	715c70b6e0	RTC: Fix log issue	2020-07-19 10:07:43 +08:00
winlin	1beb24b48d	Remove dead code	2020-07-16 13:21:55 +08:00
winlin	52a3f36b39	RTC: Support offer by server	2020-07-16 12:29:40 +08:00
winlin	f33a62e3bd	Remove dead code	2020-07-15 13:56:46 +08:00
winlin	991672bf41	RTC: Refine stream/ssrc/sdp structure	2020-07-15 13:11:35 +08:00
winlin	dc8a63fb3c	RTC: Refine config code	2020-07-14 14:01:38 +08:00
winlin	66aaad7805	Log: Refine context	2020-07-13 13:52:23 +08:00
winlin	254529d946	RTC: Print offer and answer	2020-07-12 19:52:15 +08:00
winlin	041abe43fa	Log: Support large log for RTC SDP.	2020-07-12 19:52:03 +08:00
winlin	b20a68ad68	RTC: Refine log	2020-07-12 09:55:35 +08:00
winlin	6ee49c27ae	Merge branch 'feature/las' into develop	2020-07-11 21:36:47 +08:00
liulichuan	4048869bce	[bugfix]:clear cache_header_index when clear LasCache	2020-07-11 21:34:53 +08:00
winlin	d68b6b8609	Log: Fix source context print bug	2020-07-11 13:43:26 +08:00
winlin	b143717cbd	Build: Change warning to -Wno-deprecated-declarations	2020-07-11 11:48:36 +08:00
winlin	22ed55e2e5	Log: Server use the root context	2020-07-09 18:30:48 +08:00
winlin	bbc168d980	RTC: Refine generate_id, never set the cid for current thread	2020-07-09 18:11:49 +08:00
winlin	742826a655	Log: Use 8 bytes random string as context id	2020-07-09 16:51:20 +08:00
winlin	5b199249d0	RTC: Rename SrsRtcSource to SrsRtcStream	2020-07-08 19:01:33 +08:00
winlin	428b9f14c0	RTC: Rename SrsRtcPlayer to SrsRtcPlayStream, SrsRtcPublisher to SrsRtcPublishStream	2020-07-07 17:20:15 +08:00
winlin	4c73b9a819	RTC: Rename ISrsRtcPublisher to ISrsRtcPublishStream	2020-07-07 16:57:33 +08:00
winlin	0cdfd062f2	RTC: Rename SrsRtcSession to SrsRtcConnection	2020-07-07 16:37:34 +08:00
winlin	f551ff5ae8	Log: Use string compare function	2020-07-05 23:49:47 +08:00
winlin	6624b8acca	Log: Use object as context id for complex context	2020-07-05 23:26:55 +08:00
winlin	81a7c252d6	TCP: Log the remote port for client.	2020-07-04 17:19:08 +08:00
liulichuan	c1f98ddcc8	supprot LAS(live adaptive stream) ... Change-Id: I2f9fd889fc924a3b080667bd2114f4632be461a0	2020-07-03 11:18:10 +08:00
winlin	34e7db5a93	RTC: Fix the DTLS bug	2020-07-03 10:46:35 +08:00
winlin	c62479b112	Merge branch 'feature/rtc' into develop	2020-07-03 09:23:27 +08:00
xiaozhihong	3bab0ad345	rtc merge_nalu default value off	2020-07-02 21:59:51 +08:00
winlin	5d561b1915	RTC: Fix build fail	2020-07-02 16:28:37 +08:00
winlin	545a0efea3	RTC: Refine code	2020-07-02 14:51:32 +08:00
winlin	69fc1ba711	RTC: Prevent DTLS ARQ packet to dup play/publish	2020-07-02 14:51:11 +08:00
kyxlx550	65a23418ed	notes w_ps_file define	2020-07-02 09:06:05 +08:00
kyxlx550	1bbf5c8126	fix ps to h264 frame_size < 0 checkt	2020-07-02 09:06:05 +08:00
kyxlx550	83c2586d79	support audio g711	2020-07-02 09:06:05 +08:00
kyxlx550	6bf1eee2bc	fix ps buffer dynamic increase according to stream size	2020-07-02 09:06:05 +08:00
kyxlx550	e506191484	fix rtmp muxer cycle sleep	2020-07-02 09:06:05 +08:00
winlin	a273298e63	HTTP: Enable infinite_chunked by default	2020-06-30 19:29:23 +08:00
winlin	3510c74cd4	RTC: Support drop for specified PT	2020-06-29 10:59:39 +08:00
winlin	b9bd12192b	Update comment	2020-06-28 19:39:42 +08:00
jinxue.cgh	848a073c5c	RTC: send twcc in hourglass notify	2020-06-28 19:32:09 +08:00
winlin	75fbcba71d	RTC: Always keep and use original sequence.	2020-06-28 11:40:49 +08:00
jinxue.cgh	6662568c11	RTC: sdp surpport ssrc group encode and decode	2020-06-28 11:30:38 +08:00
winlin	5b54ceadb1	RTC: Refactor code	2020-06-27 16:14:11 +08:00
winlin	e9731fe0c1	RTC: Support ignore padding for RTP header	2020-06-27 16:12:08 +08:00
jinxue.cgh	6ff048ed35	RTC: process twcc before srtp unprotected	2020-06-27 15:59:47 +08:00
winlin	121266ecbf	Refine code	2020-06-27 11:17:37 +08:00
winlin	94ebcf6306	RTC: Support config the DTLS role and version	2020-06-27 11:13:53 +08:00
winlin	5cc0f70f62	RTC: Refine the extensions for RTP.	2020-06-26 15:24:37 +08:00
jinxue.cgh	99016af42a	RTC: transport use single srtp	2020-06-25 21:04:18 +08:00
jinxue.cgh	acf9c9d25b	RTC: refine get_srtp_key parameter name	2020-06-25 21:04:13 +08:00
jinxue.cgh	b6ecb0a18f	RTC: refine srtp layer	2020-06-25 21:04:09 +08:00
winlin	81d2e10f65	Refactor ISrsContext and ISrsLog	2020-06-25 13:14:59 +08:00
jinxue.cgh	2948b90f43	RTC: refine rtc dtls	2020-06-25 12:29:03 +08:00
jinxue.cgh	9addade2b4	RTC: delete SrsDTLS single instance	2020-06-24 20:54:16 +08:00
jinxue.cgh	f3f9636d80	RTC: refine dtls certificate	2020-06-24 20:54:06 +08:00
winlin	0bf0a61401	RTC: Refine DTLS code.	2020-06-24 18:03:09 +08:00
jinxue.cgh	6807299ed2	rtc: refine get dtls_context according request	2020-06-24 17:40:16 +08:00
winlin	c8892c4009	Fix build failed for no ffmpeg-fit	2020-06-24 13:52:36 +08:00
winlin	7c572dbae3	Merge branch 'feature/rtc' into develop	2020-06-24 13:46:12 +08:00
winlin	be5d76009e	RTC: Support build without RTMP2RTC bridger, no FFmpeg fit.	2020-06-24 12:44:13 +08:00
winlin	1c72a89fca	Merge branch 'feature/rtc' into develop	2020-06-23 18:58:37 +08:00
winlin	acb8793140	RTC: Change reuseport to 1	2020-06-23 18:31:27 +08:00
kyxlx550	d01955443e	remove sip device list locker, add sip session locker	2020-06-19 00:46:59 +08:00
jinxue.cgh	83ce78a015	tfsfu: fix compile error for bind, and warning	2020-06-18 11:48:10 +08:00
winlin	8a0c2e01f8	Log: Change cid from int to string	2020-06-18 11:45:43 +08:00
winlin	bca4ec1da1	RTC: Support set the sequence in query string	2020-06-17 15:18:14 +08:00
winlin	cfa74a0715	UDP: Refine context id	2020-06-16 19:45:55 +08:00
winlin	ab4dfbf755	RTC: Fix log typo	2020-06-16 16:50:33 +08:00
winlin	c30565b4c0	RTC: Support keep original seq	2020-06-16 16:41:04 +08:00
winlin	29661802b6	RTC: If NACK disabled, print a log.	2020-06-16 16:17:33 +08:00
winlin	cf738754ae	RTC: Generate timestamp only when transcode opus to aac.	2020-06-16 13:39:02 +08:00
winlin	2c1bd6da3e	Merge SRS	2020-06-14 12:35:03 +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	0992eb4580	Remove unused files	2020-06-03 18:00:21 +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	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	1c5ccaffc7	RTC: Fix memory leak	2020-05-29 17:07:49 +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	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	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	aaffb8bbd7	RTC: Rename send_packets api.	2020-05-21 17:00:40 +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
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	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
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	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
忘篱	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
忘篱	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
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
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	db503975fb	Disable simulator API by default.	2020-05-07 16:29:11 +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	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	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	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	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	e4329fd1a0	Refactor RTC, create source once	2020-04-26 19:00:36 +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	8dc0746e2d	rtc publish release	2020-04-24 16:19:08 +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	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	74800d0137	Refactor code	2020-04-21 12:18:49 +08:00
kyxlx550	6a070a9a64	support sip ptz cmd	2020-04-20 21:34:18 +08:00
winlin	72322836c6	Update demo for zerocopy	2020-04-20 20:25:23 +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	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	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
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
winlin	810b32138e	Refactor code	2020-04-16 18:25:11 +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	bbe4b3797d	Refactor stat logs for RTC	2020-04-16 13:49:37 +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
winlin	c96ffd272c	Cache RTP packet vector	2020-04-15 21:59:27 +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
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	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	6cf9933bf3	For #307, refine gperf api	2020-04-14 21:49:49 +08:00
winlin	8e4ef98629	For #307, correct the RTP packet stat.	2020-04-14 20:12:14 +08:00
winlin	de343d6547	Add tool for GSO	2020-04-14 18:48:57 +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	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	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	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	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	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	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	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	11bcd0cb27	Merge branch 'develop' into feature/rtc	2020-04-07 20:19:06 +08:00
winlin	61c7443c4b	Merge from SRS3	2020-04-07 20:18:31 +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	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	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	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	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	c70ed1cd74	add sip session status check	2020-04-05 13:49:47 +08:00
xialixin	8ac39cb22f	del print_sip_message config	2020-04-05 13:45:52 +08:00
winlin	55a4052d90	For #307, support sendmmsg to improve RTC performance	2020-04-04 22:43:44 +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	573449f1b0	For #307, refine RTC latency from 600ms to 200ms. 4.0.20	2020-04-04 15:36:35 +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	862c211acd	Support openssl 1.0 and 1.1, RSA and ECDSA	2020-04-03 13:43:13 +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	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
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	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
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
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	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	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	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	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
bepartofyou	923209b070	Merge remote-tracking branch 'srs/feature/codec' into feature/rtc_audio	2020-03-22 20:16:24 +08:00
bepartofyou	766da5188b	Merge remote-tracking branch 'srs/feature/codec' into feature/rtc_audio	2020-03-22 19:55:29 +08:00
bepartofyou	4a17259471	err wrap change to new	2020-03-22 19:36:11 +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
xiaozhihong	734e848741	Update RtcSession peer address when changed.	2020-03-22 16:54:31 +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	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	de9a004ff7	Merge branch 'dev-28181' of https://github.com/xialixin/srs into feature/gb28281-2	2020-03-20 21:39:04 +08:00
xialixin	8b4f84e336	fix push.gb28181.conf, gb28181conn repeat call serve()	2020-03-20 10:38:38 +08:00
xialixin	cbe9c1dabc	Support gb28181 sip over udp, ps steam over rtp	2020-03-20 00:01:48 +08:00
winlin	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	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	60c8b37f05	For #1638, #307, merge john, add NACK suport, remove debug code, verbose log	2020-03-14 22:51:35 +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	51af2b4779	For #1638, #307, rtc conf support ENV.	2020-03-14 17:15:46 +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	027d34bbd3	add rtp shared packet	2020-03-13 20:34:40 +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
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
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
xiaozhihong	9d5495c0c2	"stun and dtls done"	2020-03-06 23:01:48 +08:00
xiaozhihong	30d8b2209f	parse sdp	2020-03-02 22:47:40 +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
winlin	ea305790df	For #1579, refactor log for gracefully quit.	2020-02-26 16:38:06 +08:00
winlin	90afd06c85	For #1615, support default app(live) for vmix SRT. 4.0.9	2020-02-25 13:22:44 +08:00
xiaozhihong	51abb0844e	rtp session manager, stun codding	2020-02-23 23:19: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	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	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	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
Alex.CR	9dad53691e	solve latency parameter error (#1600) ... * solve latency parameter error	2020-02-13 10:54:24 +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
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	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	c51c378869	For #1186, refactor security check. 3.0.114	2020-02-04 19:07:54 +08:00
winlin	59439cf8b5	Merge branch '3.0release' into develop	2020-02-04 17:05:19 +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	77114c7df0	Merge SRS3	2020-01-29 20:30:06 +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	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	88c9c13707	Update readme for SRT	2020-01-26 14:17:42 +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	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	5f174552f3	Merge SRT	2020-01-24 16:10:40 +08:00
winlin	7c9b31815f	Refactor code, add stop for hybrid server to do cleanup.	2020-01-23 21:16:34 +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	1959d1d920	Extract hybrid server for SRT	2020-01-23 18:21:11 +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
runner365	5c5fd805c5	add srt mpegts to rtmp	2020-01-21 19:20:09 +08:00
winlin	a6fe4e80d3	For #1547, remove the SRS_OSX macro in code	2020-01-20 11:25:39 +08:00
winlin	9dbd049e79	For #1568, extract SrsSourceManager from SrsSource.	2020-01-16 17:56:55 +08:00
winlin	0e750ab3eb	For #1575, use RTMP redirect as tcUrl and redirect2 as RTMP URL. 3.0.100	2020-01-16 14:28:05 +08:00
winlin	7240fe3040	For #1509, decrease the fast vector init size from 64KB to 64B. 3.0.99	2020-01-15 21:26:02 +08:00
winlin	857c783efc	For #1509, release coroutine when source is idle. 3.0.98	2020-01-15 19:51:33 +08:00
runner365	aeee3011ef	add srt server file	2020-01-11 23:05:10 +08:00
winlin	6c1067d56a	Merge from 2.0	2020-01-09 10:20:49 +08:00
winlin	dd46a4f700	Fix #1554, support logrotate copytruncate. 2.0.272	2020-01-09 10:03:17 +08:00
winlin	c08b6f1961	Merge 2.0, support logrotate copytruncate. 3.0.96	2020-01-08 18:05:42 +08:00
winlin	731e87876e	Fix #1554, support logrotate copytruncate. 2.0.271	2020-01-08 17:57:04 +08:00
Michael.Ma	459488bcf8	fix logrotate empty file hole issue (#1561) ... * fix logrotate empty file hole issue refer to https://github.com/ossrs/srs/issues/1554	2020-01-08 17:54:06 +08:00
winlin	10464a5fbe	Always use string instance to avoid crash risk. 3.0.95	2020-01-05 22:17:15 +08:00
winlin	bc6c61e546	Fix #1543, use getpeername to retrieve client ip. 3.0.92	2020-01-05 20:06:25 +08:00
winlin	45aa325722	Improve test coverage for config.	2020-01-01 21:01:14 +08:00
winlin	0fd0114ee6	Improve test coverage for config.	2020-01-01 17:14:59 +08:00
winlin	7136c7c9b8	Improve test coverage for config.	2020-01-01 14:21:24 +08:00
winlin	de87b64f59	Improve test coverage for config.	2020-01-01 14:12:36 +08:00
winlin	a71d93188b	Improve test coverage for config.	2020-01-01 13:41:19 +08:00
winlin	d783a12f89	Happy 2020	2019-12-30 10:10:35 +08:00
winlin	8a28a11648	For #299, increase dash segment size for avsync issue. 3.0.89	2019-12-29 18:21:45 +08:00
winlin	d11a7b2e00	For #299, fix some bugs in dash, it works now. 3.0.88	2019-12-27 20:47:33 +08:00
winlin	b9d720c927	For #1105, http server support mp4 range.	2019-12-26 18:33:52 +08:00
winlin	7584c47aaf	Fix #1105, dvr mp4 supports playing on Chrome/Safari/Firefox. 3.0.86	2019-12-26 18:05:17 +08:00
winlin	2115d5d22a	For #1488, add test and improve coverage for parsing client ip.	2019-12-26 12:07:52 +08:00
winlin	316cab794a	For #1488, pass client ip to http callback.3.0.85	2019-12-26 11:42:19 +08:00
winlin	d367730883	For #1488, support parsing original ip from header for proxy	2019-12-26 11:33:26 +08:00
winlin	09b65aff96	For #1488, pass client ip to http callback. 2.0.269	2019-12-26 10:37:16 +08:00
winlin	a11461905b	Remove FFMPEG and NGINX, please use srs-docker instead . 3.0.82	2019-12-25 18:29:07 +08:00
winlin	e6e4bd7fb4	Remove useless warning log for reloading.	2019-12-24 19:26:22 +08:00
winlin	7eccc9da26	For #1508, support chunk length and content in multiple parts.	2019-12-24 14:58:35 +08:00
winlin	4382ced3bf	For #1508, Refactor srs_is_digital, support all zeros.	2019-12-20 14:49:25 +08:00
winlin	d7078a72d4	For #1520, add TODO list for configing server itself in coworker.	2019-12-19 14:15:21 +08:00
winlin	acfeb8a66f	Fix #1520, #1223, bug for origin cluster 3+ servers. 3.0.74	2019-12-19 14:04:26 +08:00
winlin	cef7ec79b3	Detect whether flash enabled for srs-bwt.	2019-12-18 11:50:43 +08:00
winlin	dc1afc142f	Fix HTTP CORS bug when sending response for OPTIONS. 3.0.72	2019-12-17 20:52:10 +08:00
winlin	191b07668d	Refactor HTTP stream to disconnect client when unpublish	2019-12-17 16:54:06 +08:00
winlin	1e83da7812	Refactor HTTP recv request timeout to 15s.	2019-12-17 16:37:00 +08:00
winlin	2df1dcb05a	Fix HTTP-FLV and VOD-FLV conflicting bug.	2019-12-17 16:01:04 +08:00
winlin	d9842b0371	Refactor HttpResponseWriter.write, default to single text mode.	2019-12-17 15:14:59 +08:00