external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity
6173 commits 13 branches 107 tags 375 MiB
Commit graph

4917 commits

Author SHA1 Message Date
winlin
5f88dc357e RTC: Support address switch 2020-07-21 11:10:20 +08:00
winlin
38f935ead8 Support get hostname 2020-07-20 20:59:28 +08:00
winlin
26f73e7593 RTC: Refine log 2020-07-20 14:39:28 +08:00
winlin
cc03449379 RTC: Remove dead code 2020-07-20 14:29:02 +08:00
winlin
c3219d5431 RTC: Allow dup play. Parse RED desc. 2020-07-20 14:15:08 +08:00
winlin
ef62cab817 RTC: Fail if callback is NULL 2020-07-20 13:55:36 +08:00
winlin
6dd77923ca RTC: Fix rtmp to rtc bug 2020-07-19 10:26:05 +08:00
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
2934673d3f RTC: Create file if not exists for append 2020-07-18 09:49:27 +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
426938cc8a JSON: Filter string filed with special char 2020-07-14 19:51:06 +08:00
winlin
dc8a63fb3c RTC: Refine config code 2020-07-14 14:01:38 +08:00
winlin
deb54b8866 Core: Refine utility string/hex 2020-07-13 14:30:44 +08:00
winlin
66aaad7805 Log: Refine context 2020-07-13 13:52:23 +08:00
winlin
0a057a0427 Log: Refine log context, use const 2020-07-13 11:19:34 +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
70c3fc78af Refine log context with random string. 4.0.35 2020-07-11 22:24:17 +08:00
winlin
778e546a11 Merge branch 'feature/rtc' into develop 2020-07-11 22:23:18 +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
yajun18
cfd6ca8ce5 fix, getsockopt SRTO_MAXBW memory overflow 2020-07-11 21:28:30 +08:00
winlin
0a16b1c1e3 Log: Refine log context. 2020-07-11 20:58:25 +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
a6b2e28d50 RTC: Refine the api for context. 2020-07-10 18:06:07 +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
7052a1fafb Log: Refine context id 2020-07-09 17:16:59 +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
bff7ef085d Log: Allow log verbose and info 2020-07-05 22:01:03 +08:00
winlin
5f951ca126 HTTP: Fix the http parser fail bug, always reset the parser. 2020-07-04 21:25:56 +08:00
winlin
f8823dab8f ST: add srs_cond_broadcast 2020-07-04 21:18:35 +08:00
winlin
81a7c252d6 TCP: Log the remote port for client. 2020-07-04 17:19:08 +08:00
winlin
e01b98c91e HTTP: Add utest for http infinite chunked 2020-07-04 11:38:09 +08:00
winlin
671af4369b HTTP: Only enable infinite chunked for HTTP_REQUEST 2020-07-03 17:05:01 +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
d453c6c22e Fix some bugs for RTC. 4.0.34 2020-07-03 09:24:13 +08:00
winlin
c62479b112 Merge branch 'feature/rtc' into develop 2020-07-03 09:23:27 +08:00
winlin
62cadd244a RTC: Disable merge_nalus by default 2020-07-03 09:23:02 +08:00
winlin
4146346243 Merge #1830 to fix bugs in GB28181. 4.0.33 2020-07-03 09:20:02 +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
1c3e4c71ee Fix utest fail 2020-07-02 16:28:26 +08:00
winlin
df9efb6486 RTC: Infinite chunk handle read error as EOF. 2020-07-02 16:20:32 +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
winlin
9ff8bff601 RTC: Fix the OPTIONS read, no infinited chunked mode 2020-07-02 12:41:08 +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
9e447e541b Fix utest failed 2020-06-30 10:05:01 +08:00
winlin
b72cfd2405 Refine options 2020-06-30 09:53:47 +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
747be9047c RTC: refine twcc encode_chunk_two_bit 2020-06-28 19:32:17 +08:00
jinxue.cgh
848a073c5c RTC: send twcc in hourglass notify 2020-06-28 19:32:09 +08:00
winlin
b9355c1cc3 Fix memory leak 2020-06-28 16:58:14 +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
f514dd78c1 Merge branch '4.0release' into develop 2020-06-28 10:28:39 +08:00
winlin
78e28dcfde Merge branch '3.0release' into 4.0release 2020-06-28 10:28:14 +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
e3f1aee6c1 Release 3.0 r0, 3.0.141 2020-06-27 11:47:36 +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
a6ade57ce5 Refine comments 2020-06-26 15:25:11 +08:00
winlin
5cc0f70f62 RTC: Refine the extensions for RTP. 2020-06-26 15:24:37 +08:00
winlin
62b70943d4 RTC: Fix TWCC delta bug. 2020-06-26 15:20:24 +08:00
winlin
94a4eaffda Ignore any dump files 2020-06-26 15:19:48 +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
98924943a6 Build: Refine the options for configure 2020-06-24 17:03:56 +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
6314c273ff Support static link c++ libraries. 4.0.32 2020-06-24 13:36:18 +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
ab6bc39676 Change log cid from int to string. 4.0.31 2020-06-23 18:35:59 +08:00
winlin
acb8793140 RTC: Change reuseport to 1 2020-06-23 18:31:27 +08:00
winlin
89c0748234 Fix the empty cid issue 2020-06-23 17:39:16 +08:00
winlin
a822c841cb Merge branch '3.0release' into develop 2020-06-20 21:48:24 +08:00
winlin
ac69889b3a Link FFmpeg if exists 2020-06-20 21:48:04 +08:00
winlin
0aea46ac8b Merge remote-tracking branch 'lixin/dev-28181' into feature/gb28181 2020-06-19 13:30:13 +08:00
winlin
7627c290c9 Fix context string ID bug 2020-06-19 08:57:18 +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
winlin
e75f28a327 GB28181 with JitterBuffer support. 4.0.29 2020-06-13 13:17:23 +08:00
winlin
1343d4f605 RTC: Disable c++14 2020-06-11 18:16:48 +08:00
莫战
db8d91cbee add c++14 support 2020-06-11 18:15:45 +08:00
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