external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-24 06:54:22 +00:00
Code Issues Releases Wiki Activity
5927 commits 14 branches 107 tags 376 MiB
Commit graph

699 commits

Author SHA1 Message Date
winlin
e19b927f92 Merge GB28181 2020-03-31 22:45:20 +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
xialixin
c99fb99ab6 refactor gb28181, supporting SIP server enable, multiplex, API interface 2020-03-31 00:39:10 +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
c1e124786c For #307, fix build warnings for rtc 2020-03-28 20:57:03 +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
caf7e9e6ea Merge branch 'feature/rtc' into develop 2020-03-22 18:53:39 +08:00
winlin
602a478e1b For #1659, #307, add switch to disable rtc 2020-03-22 18:17:05 +08:00
winlin
955de3dac9 Merge branch '3.0release' into 4.0release 2020-03-21 19:36:16 +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
018577e685 For #1638, #307, fix error new bug for rtc 2020-03-18 18:12:37 +08:00
xiaozhihong
e2233027b8 fix h264 rtp packet error 2020-03-18 08:45:20 +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
2f0b150588 For #1638, #307, accept srs_string_dumps_hex to app utility. 2020-03-16 18:05:42 +08:00
winlin
8db2c3d821 For #1635, refine inotify watch for relative path 2020-03-16 11:39:20 +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
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
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
HuyaJohn
da72caf8b9 h264 packet done, chrome play well 2020-03-11 04:21:44 -07: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
xiaozhihong
bc22ebe949 add rtc http request and response, exchange sdp. 2020-02-21 23:50:22 +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
winlin
a2a6ca8258 For #939, always enable fast FLV streaming. 2020-02-04 16:13:48 +08:00
l
86d04a70ed Fix #1580, fix cid range problem. 3.0.102 2020-01-19 18:21:28 +08:00
winlin
9ac8585cf9 Fix codec check 2020-01-19 13:16:49 +08:00
winlin
3900179685 For #307, #1070, define FLV CodecID for AV1 and Opus. 3.0.101 2020-01-19 11:22:35 +08:00
winlin
10464a5fbe Always use string instance to avoid crash risk. 3.0.95 2020-01-05 22:17:15 +08:00
winlin
b794c9e4ec For #460, fix ipv6 hostport parsing bug. 3.0.94 2020-01-05 22:16:21 +08:00
winlin
76d92792b7 For #460, fix ipv6 intranet address filter bug. 3.0.93 2020-01-05 21:25:51 +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
d2052fd4cd Support sequence header only for mp4 2020-01-01 11:54:53 +08:00
winlin
c3e0dcfa9e Improve test coverage for mp4 decoder 2019-12-31 19:37:48 +08:00
winlin
7597a956ed Improve test coverage for dash init encoder 2019-12-31 19:17:40 +08:00
winlin
1cfadfed3a Improve test coverage for mp4 boxes 2019-12-31 18:59:30 +08:00
winlin
e8dbee1474 Refine url/urn box dumps 2019-12-31 15:55:34 +08:00
winlin
9cb2449175 Fix mp4 url/urn bug. 2019-12-31 15:35:45 +08:00
winlin
adad90d316 Refactor the mock file reader/writer 2019-12-31 15:15:56 +08:00
winlin
d32a7e9770 Improve test coverage for mp4 box 2019-12-30 20:50:58 +08:00
winlin
f3831d2d5b Improve test coverage for mp4 dumps 2019-12-30 16:36:11 +08:00
winlin
b63f2f283d Fix mp4 security issue, check buffer when required size is variable. 2019-12-30 14:34:23 +08:00
winlin
9140e0f19d Improve test coverage for kernel mp4. 2019-12-30 13:50: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
043781fe81 Fix #1544, fix memory leaking for complex error. 3.0.87 2019-12-27 11:46:07 +08:00
winlin
76a7985cbe For #1105, fix dash mp4 bug. 2019-12-26 18:39:14 +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
dffc96d2fe For #1537, disable crossbuild for ARM/MIPS. 2019-12-25 13:17:49 +08:00
winlin
e2def1b24f Ignore some coverage for mp4. 2019-12-24 17:42:00 +08:00
winlin
e2f86464c5 Ignore some coverage for ts. 2019-12-24 17:29:46 +08:00
winlin
0c20a45f5c Ignore test coverage for some lines for mp4 2019-12-24 15:41:36 +08:00
winlin
a119305b31 Ignore coverage for codec sps-pps parsing. 2019-12-24 15:36:22 +08:00
winlin
aa4a27b9fa Ignore coverage for codec sps-pps parsing. 2019-12-24 15:35:19 +08:00
winlin
a35a7f915e Fix bug for HTTP write jsonp for srs-console. 2019-12-24 10:32:52 +08:00
winlin
40f6ecaee2 Merge SRS2 for running srs-librtmp on Windows. 3.0.80 2019-12-23 21:09:00 +08:00
winlin
01a4503ceb Support build srs-librtmp by VS2015. 2.0.267 2019-12-23 18:12:45 +08:00
winlin
316628632b Support build srs-librtmp by VS2015. 2.0.267 2019-12-23 17:01:02 +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
fa362607b2 Add test for http basic handler 2019-12-16 19:32:41 +08:00
winlin
2731fe1f3e SrsPacket supports converting to message, so can be sent by one API. 2019-12-12 15:11:31 +08:00
winlin
4f298134af Fix #1445, limit the createStream recursive depth. 3.0.70 2019-12-11 17:56:31 +08:00
winlin
e5285ecabf Fix #1501, use request ip for origin cluster. 3.0.66 2019-11-30 18:50:24 +08:00
winlin
ba02640c46 Refine tid in error log 2019-11-29 12:33:32 +08:00
winlin
7bd704e695 Cover protocol stack RTMP. 3.0.63 2019-11-22 12:06:15 +08:00
winlin
9067786bd3 Cover protocol stack RTMP. 3.0.63 2019-11-04 09:31:30 +08:00
winlin
e045b0a619 We prefer ipv4, only use ipv6 if ipv4 is disabled. 3.0.59 2019-10-07 10:34:55 +08:00
winlin
88df9a2497 Support go-oryx rtmplb with proxy protocol. 3.0.56 2019-10-04 19:03:34 +08:00
winlin
5d17bb8bb0 Remove KAFKA. 3.0.53 2019-10-03 12:45:38 +08:00
winlin
ea9c4f89af Covert FLV Vod decoder. 2019-05-21 08:43:20 +08:00
winlin
7aa5fbee85 Cover FLV transmux. 2019-05-21 08:20:04 +08:00
winlin
dd4ccfab79 Cover shared ptr message. 2019-05-20 08:45:42 +08:00
winlin
8b595c4cdf Cover more kernel time. 2019-05-15 08:57:46 +08:00
winlin
f7994b85eb Cover more kernel codec. 2019-05-15 08:44:38 +08:00
winlin
58561b9f76 Refine utest 2019-05-14 08:40:22 +08:00
winlin
c10671cbb3 Cover all kernel file. 2019-05-14 08:24:43 +08:00
winlin
1605000817 Covert Kernel File reader/writer. 3.0.52 2019-05-14 08:13:27 +08:00
winlin
d5661dcc4e Cover kernel file writer. 2019-05-13 08:49:38 +08:00
winlin
a7e0d672a7 Cover kernel file writer. 2019-05-13 08:48:53 +08:00
winlin
c71b867b4f Refine comments. 2019-05-06 07:43:05 +08:00
winlin
202a584aab Refine ST service. 2019-05-05 08:17:48 +08:00
winlin
35fe05d62c Refine typo in kernel. 2019-04-22 09:19:05 +08:00
winlin
5560b529a7 Remove unused macros in ts. 2019-04-19 08:06:44 +08:00
winlin
288bed6e26 Refine SrsTcpClient.timeout in time unit. 2019-04-18 07:58:37 +08:00
winlin
33c66b64c5 Refine name TMMS to TIMEOUT 2019-04-18 07:47:35 +08:00
winlin
61afca7160 Refine SrsTcpClient timeout in time unit 2019-04-17 07:56:28 +08:00
winlin
9b91c10e52 Fix timeout bug, use 30s as RTMP default timeout 2019-04-12 08:29:10 +08:00
winlin
0879bef9b2 Refine SRS_CONSTS_NO_TMMS to SRS_UTIME_NO_TIMEOUT 2019-04-11 09:33:26 +08:00
winlin
53357e92fe Refine headers 2019-04-11 09:27:16 +08:00
winlin
92980a0ca2 Refine SRS_CONSTS_RTMP_TMMS in time unit 2019-04-11 09:18:20 +08:00
winlin
5b0e0d0838 Refine SRS_CONSTS_RTMP_PULSE_TMMS in time unit 2019-04-11 08:43:42 +08:00
winlin
695d430dcf Refine SrsMessageQueue.duration in time unit. 2019-04-11 08:35:57 +08:00
winlin
170cca1f58 Refine srs_get_system_startup_time in time unit 2019-04-10 09:11:54 +08:00
winlin
6c12aa0eca Refine srs_update_system_time in time unit 2019-04-10 09:07:03 +08:00
winlin
9b7c0802a9 Refine srs_update_system_time in time unit 2019-04-10 08:32:46 +08:00
winlin
6239dfa489 Apply time unit 2019-04-07 16:25:52 +08:00
winlin
3d5508e088 Cover more ST Coroutine code 2019-04-07 13:52:16 +08:00
winlin
a9a720e32f Cover ST Coroutine and time unit. 3.0.48 2019-04-07 12:59:37 +08:00
winlin
251f19718e CI: Cover kernel mp4 print box 2019-02-07 22:49:41 +08:00
winlin
f7b2ee4cc9 CI: Cover kernel utility 2019-02-07 20:58:33 +08:00
winlin
a0ba17b397 CI: Cover kernel ts 2019-02-05 16:49:29 +08:00
winlin
073d42ca7d CI: Refine hls ts context writer 2019-02-05 16:26:43 +08:00
winlin
8eccfeceb9 CI: Cover kernel ts 2019-02-05 08:33:29 +08:00
winlin
3f59c7885e CI: Cover kernel ts 2019-02-04 16:12:37 +08:00
winlin
4187fa0068 CI: Cover kernel utility 2019-02-04 15:11:41 +08:00
winlin
3064b941d5 CI: Cover kernel codec av frame and format 2019-02-04 12:05:07 +08:00
winlin
c2a938473a CI: Cover kernel codec 2019-02-03 22:03:15 +08:00
winlin
98706f793e Support Opus audio-level 2019-01-17 16:01:43 +08:00
winlin
f1b1f78c4e Parse Opus for tools 2019-01-17 11:35:15 +08:00
winlin
e77b570636 Add codec OPUS/HEVC to FLV 2019-01-17 09:24:17 +08:00
winlin
b2d1d84634 Change to 2019 2019-01-01 21:37:28 +08:00
winlin
a2d6566019 Add kernel utility utest 2019-01-01 20:19:44 +08:00
winlin
0bc7fdbb35 Always enable SRS_SSL 2018-12-22 20:03:40 +08:00
winlin
f1ab8fecac Fix build warning 2018-12-09 22:48:47 +08:00
winlin
ef3e35f173 Fix build warning 2018-12-09 21:04:43 +08:00
winlin
4d157f2148 Fix build warning 2018-12-09 21:00:38 +08:00
winlin
dcc2a73e7a Refine kernel aac 2018-12-09 20:58:40 +08:00
winlin
24f46f5085 #1261, Support _definst_ for Wowza. 3.0.44 2018-11-11 13:51:10 +08:00
MakarovYaroslav
e62ac29f48 add ignoring _definst_ at the end of app (#1261) 2018-11-11 13:31:29 +08:00
MakarovYaroslav
a2480a6c94 fix bug with for loop (#1263) 2018-11-11 13:27:33 +08:00
winlin
ee068cf120 For #1109, Support without ssl for HLS key. 2018-08-25 21:15:26 +08:00
Harlan
22c5af62cf Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release 
# Conflicts:
#	trunk/src/kernel/srs_kernel_utility.hpp
 2018-08-15 07:37:12 +08:00
Harlan
ac6b37de4b rewrite ff_data_to_hex 2018-08-12 14:10:18 +08:00
winlin
d607c7f905 Refine HTTP-FLV latency, support realtime mode.3.0.38 2018-08-05 20:30:04 +08:00
winlin
41c6e833b9 Replace hex to string to match MIT license. 3.0.33 2018-07-22 18:47:38 +08:00
winlin
84f81983aa Replace base64 to match MIT license. 3.0.32 2018-07-22 17:56:38 +08:00
winlin
0a63448b86 Replace crc32 MPEG and IEEE by pycrc to match MIT license. 3.0.31 2018-07-22 15:21:05 +08:00
winlin
e395878916 Replace crc32 IEEE by golang to match MIT license. 3.0.30 2018-07-21 20:58:20 +08:00
winlin
dea5e5bb48 Add utest or CRC32 IEEE, refine TABs of code 2018-07-21 19:09:32 +08:00
winlin
608c88b8f2 Merge 2.0release 2018-07-21 17:52:12 +08:00
winlin
6d7c7418a8 Merge #1119, fix memory leak. 2.0.249 2018-07-21 17:49:46 +08:00
winlin
e4742ddac7 Merge 2.0release 2018-07-17 13:59:51 +08:00
Hui Zhang (huzhang2)
01ed485cf3 fix #1172 #1173 #1174 #1175 
security scan report issue
 2018-07-17 10:03:13 +08:00
Harlan
45a57acbb4 fix bug 2018-04-06 10:05:13 +08:00