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
5139 commits 13 branches 107 tags 375 MiB
Commit graph

3965 commits

Author SHA1 Message Date
winlin
ea96e414ca Cover protocol stack RTMP. 3.0.63 2019-11-08 09:26:57 +08:00
winlin
78e5f46ff7 Cover protocol stack RTMP. 3.0.63 2019-11-05 14:00:00 +08:00
winlin
466f99a1c8 Cover protocol stack RTMP. 3.0.63 2019-11-05 10:31:21 +08:00
winlin
ce8f778fe6 Cover protocol stack RTMP. 3.0.63 2019-11-05 10:17:06 +08:00
winlin
918a2943c9 Cover protocol stack RTMP. 3.0.63 2019-11-05 09:55:45 +08:00
winlin
9067786bd3 Cover protocol stack RTMP. 3.0.63 2019-11-04 09:31:30 +08:00
winlin
a726a14b37 Cover protocol stack RTMP. 3.0.63 2019-10-29 10:02:03 +08:00
winlin
8c214dc967 Cover protocol stack RTMP. 3.0.63 2019-10-28 08:57:11 +08:00
winlin
cf9a6b4f48 Cover protocol stack RTMP. 3.0.63 2019-10-28 08:41:49 +08:00
winlin
1583f6cc3f Cover protocol stack RTMP. 3.0.63 2019-10-25 08:18:21 +08:00
winlin
2b2a62ccba Cover protocol stack RTMP. 0.6.63 2019-10-23 09:26:10 +08:00
winlin
f99ca04bd5 Cover JSON codec. 3.0.62 2019-10-23 08:59:30 +08:00
winlin
1b2449ca3f Cover JSON codec. 3.0.62 2019-10-23 08:47:02 +08:00
winlin
48970389ba Cover JSON codec. 3.0.62 2019-10-22 10:06:12 +08:00
winlin
e816ac28d2 Cover JSON codec. 3.0.62 2019-10-22 10:02:37 +08:00
winlin
1ebec34d5b Cover JSON codec. 3.0.62 2019-10-22 09:58:09 +08:00
winlin
e683f07715 Cover JSON codec. 3.0.62 2019-10-22 09:01:29 +08:00
winlin
c7602d8cee Cover JSON codec. 3.0.62 2019-10-22 08:54:29 +08:00
winlin
aee704fd1f Cover AMF0 codec. 3.0.61 2019-10-22 08:30:46 +08:00
winlin
0a9659b749 Cover AMF0 codec. 3.0.61 2019-10-21 09:29:42 +08:00
winlin
232024ef67 AMF0: Refine utest 2019-10-18 08:54:59 +08:00
winlin
9542cd2ba5 AMF0: Refine utest 2019-10-18 08:54:13 +08:00
winlin
026b2a2a1e Cover AMF0 codec. 3.0.61 2019-10-18 00:48:49 +00:00
winlin
da46091d3c Cover AMF0 codec. 3.0.61 2019-10-12 09:27:32 +08:00
winlin
99ca2b9567 Cover AMF0 codec. 3.0.61 2019-10-12 08:56:04 +08:00
winlin
f8943f8f7d Cover AMF0 codec. 3.0.61 2019-10-12 08:39:40 +08:00
winlin
ebe8fa44e5 Cover AMF0 codec. 3.0.61 2019-10-12 00:36:52 +00:00
winlin
9d1249e256 Cover AMF0 codec. 3.0.61 2019-10-12 00:32:25 +00:00
winlin
b2e4a5f834 Cover AMF0 codec. 3.0.61 2019-10-11 09:28:53 +08:00
winlin
f24d82fada Cover AMF0 codec. 3.0.61 2019-10-10 08:49:57 +08:00
winlin
8ca7f7e5a4 Support log rotate by init.d command. 3.0.60 2019-10-07 17:44:25 +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
b0227e0d22 Fix bug for package script 2019-10-05 20:46:44 +08:00
winlin
7af087652f Add uninstall script 2019-10-05 20:43:04 +08:00
winlin
254549e3f4 Add uninstall script 2019-10-05 20:40:45 +08:00
winlin
5d9bc0658e Fix package bug 2019-10-05 20:37:25 +08:00
winlin
64288d1f1e Support systemctl service for CentOS7. 3.0.58 2019-10-05 20:33:26 +08:00
winlin
f6fc31db66 Add config files for go-oryx 2019-10-05 17:02:25 +08:00
winlin
9d90a8177f Disable SO_REUSEPORT if not supported. 3.0.57 2019-10-04 20:02:51 +08:00
winlin
88df9a2497 Support go-oryx rtmplb with proxy protocol. 3.0.56 2019-10-04 19:03:34 +08:00
winlin
130c545f9a Refine origin cluster log 2019-10-04 06:51:15 +08:00
winlin
d3b142a0d9 Fix #775, Support SO_REUSEPORT. 3.0.54 2019-10-03 16:10:22 +08:00
winlin
1a65927b1b Remvoe HSTRS warning. 2019-10-03 13:18:28 +08:00
winlin
0741b64b25 Remove KAFKA. 3.0.53 2019-10-03 12:49:22 +08:00
winlin
306ed8dbc8 Remove KAFKA. 3.0.53 2019-10-03 12:49:01 +08:00
winlin
5d17bb8bb0 Remove KAFKA. 3.0.53 2019-10-03 12:45:38 +08:00
winlin
bb3e8a41d1 Cover all kernel flv. 2019-05-23 07:53:03 +08:00
winlin
32b53de46d Cover FLV decoder 2019-05-21 08:51:58 +08:00
winlin
8311f0dc5a Cover FLV decoder 2019-05-21 08:45:53 +08:00
winlin
ea9c4f89af Covert FLV Vod decoder. 2019-05-21 08:43:20 +08:00
winlin
3bd7978b59 Cover FLV decoder. 2019-05-21 08:31:00 +08:00
winlin
7aa5fbee85 Cover FLV transmux. 2019-05-21 08:20:04 +08:00
winlin
f760c04340 Cover FLV vod open 2019-05-20 09:00:16 +08:00
winlin
dd4ccfab79 Cover shared ptr message. 2019-05-20 08:45:42 +08:00
winlin
9cdd506b4f Deprecated srs-librtmp. 2019-05-17 08:14:26 +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
77cc148608 Refine utest 2019-05-14 08:42:46 +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
13c4498e11 Cover mp4 header. 2019-05-14 08:17:39 +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
6ac5b0a006 Cover tcp socket IO. 2019-05-13 08:08:41 +08:00
winlin
467d5e5f50 Fix build failed bug. 2019-05-09 08:51:14 +08:00
winlin
ccba55cdd8 Migrate is_never_timeout to utility. 2019-05-09 08:42:53 +08:00
winlin
1b37b90b8f Covert tcp read, write and readfully. 2019-05-09 08:38:54 +08:00
winlin
38a6f5e6cf Support TCP server utest. 2019-05-09 08:05:27 +08:00
winlin
9366161871 Refine utest for tcp connection. 2019-05-09 07:54:21 +08:00
winlin
5d8fb01b45 Fix #1352, fix typo of daemon. 2019-05-07 07:46:20 +08:00
winlin
ffe391aa49 Fix HLS no PMT/PAT bug. 2019-05-07 07:40:19 +08:00
winlin
1d3afa5ab9 Add utest for tcp server 2019-05-06 09:53:55 +08:00
winlin
c71b867b4f Refine comments. 2019-05-06 07:43:05 +08:00
winlin
3d57c1c9bc Refine ST service. 2019-05-05 08:45:11 +08:00
winlin
202a584aab Refine ST service. 2019-05-05 08:17:48 +08:00
winlin
a4160308f5 Refine comments. 2019-05-05 07:55:55 +08:00
winlin
6730f08f45 Refine core.hpp 2019-05-05 07:44:39 +08:00
winlin
b02527dec0 Refine usage. 2019-04-30 09:15:06 +08:00
winlin
2de3045b25 Remove noisy informations. 2019-04-30 08:53:51 +08:00
winlin
6dbe79ad02 Remove noisy informations. 2019-04-30 08:43:12 +08:00
winlin
ad3749a4d5 Remove noisy informations. 2019-04-30 08:38:57 +08:00
winlin
0564cdedec Refine typo in comments. 2019-04-30 08:31:36 +08:00
winlin
6b2c71d385 Refine typo in files. 3.0.51 2019-04-30 08:30:13 +08:00
winlin
45009785fb Refine typo in app. 2019-04-30 08:24:52 +08:00
winlin
aac8a13f42 Refine typo in app. 2019-04-28 09:08:05 +08:00
winlin
4d25520f99 Refine typo in service. 2019-04-28 08:23:16 +08:00
winlin
224d7c539f Refine typo in service. 2019-04-28 08:21:48 +08:00
winlin
fbe40dc42c Refine code 2019-04-25 11:04:10 +08:00
winlin
c933f8a870 Upgrade http-parser from 2.1 to 2.9.2 and cover it. 3.0.50 2019-04-25 10:41:59 +08:00
winlin
8a94ac4b49 Upgrade http-parser to 2.9.2 2019-04-25 10:39:38 +08:00
winlin
0ee386b656 Refine http parser code. 2019-04-25 08:51:38 +08:00
winlin
cfc92d5e93 Use http-parser 2.9.2 2019-04-24 09:37:25 +08:00
winlin
646d490a18 Reset http-parser 2.1 2019-04-23 08:31:21 +08:00
winlin
6e9bba4220 Refine SrsHttpUri. 2019-04-23 08:26:15 +08:00
winlin
b285029e15 Refine SrsHttpUri.get_uri_field, without depends on http parser. 2019-04-23 08:17:59 +08:00
winlin
8bc77387ff Refine typo in protocol. 2019-04-23 08:06:50 +08:00
winlin
35fe05d62c Refine typo in kernel. 2019-04-22 09:19:05 +08:00
winlin
735176cab4 Refine typo for core 2019-04-22 08:21:56 +08:00
winlin
98adbc4130 Refine typo. 2019-04-22 08:19:03 +08:00
winlin
394cdb5f04 Refine in time unit. 3.0.49 2019-04-22 08:12:17 +08:00
winlin
b2f598dede Refine SrsStSocket in time unit. 2019-04-22 08:07:37 +08:00
winlin
e436cc5665 Refine SrsBasicRtmpClient in time unit. 2019-04-22 08:03:12 +08:00
winlin
c6dcc76fea Refine SrsRequest.duration in time unit. 2019-04-19 08:48:44 +08:00
winlin
cfab73b552 Refine SrsWallClock and SrsKbps in time unit. 2019-04-19 08:39:38 +08:00
winlin
5560b529a7 Remove unused macros in ts. 2019-04-19 08:06:44 +08:00
winlin
73e71d26ea Refine SrsGopCache::start_time in time unit. 2019-04-19 08:04:09 +08:00
winlin
1626942d29 Fix SrsHlsMuxer::segment_close bug, reopen segment when close failed. 2019-04-18 09:28:08 +08:00
winlin
d306ee7506 Refine ms in time unit 2019-04-18 08:50:43 +08:00
winlin
5af572ab50 Refine SrsRtmpConn.duration in time unit. 2019-04-18 08:46:42 +08:00
winlin
f6f49c68da Refine SrsRecvThread timeout in time unit 2019-04-18 08:42:43 +08:00
winlin
6b587c5e0f Refine SrsUdpPacketRecvCycleInterval in time unit. 2019-04-18 08:17:37 +08:00
winlin
283c4c7449 Refine SrsPithyPrint.age or SrsIngesterFFMPEG.alive in time unit. 2019-04-18 08:15:55 +08:00
winlin
522cbf1df8 Refine SrsHourGlass in time unit. 2019-04-18 08:11:16 +08:00
winlin
f5a1f9b774 Refine SrsFragment.start_dts in time unit 2019-04-18 08:01:17 +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
5505eceeac Refine SrsTcpClient.timeout in time unit. 2019-04-18 07:43:51 +08:00
winlin
feb34ed225 Refine SrsStSocket in time unit 2019-04-17 09:21:38 +08:00
winlin
5a45fd98c3 Refine get_recv_timeout and is_never_timeout in time unit 2019-04-17 08:38:34 +08:00
winlin
d3dc45f357 Refine set_recv_timeout in time unit 2019-04-17 08:31:53 +08:00
winlin
38bbf6b111 Refine get_send_timeout in time unit 2019-04-17 08:23:15 +08:00
winlin
f4bee37e76 Refine set_send_timeout in time unit 2019-04-17 08:18:37 +08:00
winlin
a1398892d0 Refine const timeouts in time unit 2019-04-17 08:08:31 +08:00
winlin
61afca7160 Refine SrsTcpClient timeout in time unit 2019-04-17 07:56:28 +08:00
winlin
e9770933a6 Refine dash controller publish or unpublish 2019-04-17 07:34:01 +08:00
winlin
6380e8f1c0 Fix HLS segment close bug 2019-04-16 09:32:26 +08:00
winlin
138d1e3cad Refine get_vhost_http_remux_fast_cache in time unit 2019-04-16 08:50:48 +08:00
winlin
010e35bec2 Refine get_hds_fragment and get_hds_window in time unit 2019-04-16 08:24:11 +08:00
winlin
917f6d066d Refine get_hls_window in time unit 2019-04-16 08:20:32 +08:00
winlin
ca705a6f62 Refine get_hls_fragment in time unit 2019-04-16 08:14:12 +08:00
winlin
402e614471 Refine get_send_min_interval in time unit 2019-04-16 07:59:27 +08:00
winlin
c1b64ba24f Refine get_queue_length and set_queue_size in time unit 2019-04-16 07:55:19 +08:00
ME_Kun_Han
af49e218ce for #1349, use correct value for SRS_CONF_DEFAULT_HLS_ON_ERROR_IGNORE and SRS_CONF_DEFAULT_HLS_ON_ERROR (#1351) 2019-04-15 08:17:35 +08:00
winlin
465d255940 Refine SRS_AUTO_HLS_SEGMENT_MIN_DURATION_MS in time unit 2019-04-15 07:56:16 +08:00
winlin
980c32aee6 Refine on_hls duration in time unit 2019-04-15 07:53:29 +08:00
winlin
5f3d09c8a0 Refine hls muxer duration in time duration. 2019-04-15 07:47:37 +08:00
winlin
41d1e91540 Fix start and end time bug 2019-04-12 10:00:39 +08:00
winlin
9b91c10e52 Fix timeout bug, use 30s as RTMP default timeout 2019-04-12 08:29:10 +08:00
winlin
bc1189caee Refine SrsFragment.duration in time unit. 2019-04-12 08:04:06 +08:00
winlin
0879bef9b2 Refine SRS_CONSTS_NO_TMMS to SRS_UTIME_NO_TIMEOUT 2019-04-11 09:33:26 +08:00
winlin
f8e6de71f3 Refine headers 2019-04-11 09:28:51 +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
9b1222a79c Refine get_publish_normal_timeout in time unit 2019-04-10 07:58:39 +08:00
winlin
170872135d Refine get_publish_1stpkt_timeout in time unit 2019-04-10 07:53:09 +08:00
winlin
d6828a3e58 Refine get_mw_sleep in time unit 2019-04-09 09:39:16 +08:00
winlin
839a496d50 Refine get_mr_sleep in time unit 2019-04-09 09:20:44 +08:00
winlin
5df8f2f6c1 Refine get_pithy_print in time unit 2019-04-09 08:55:54 +08:00
winlin
60f9561d2d Refine get_heartbeat_interval in time unit 2019-04-09 08:47:18 +08:00
winlin
5937304717 Refine get_dash_timeshift in time unit 2019-04-08 09:20:02 +08:00
winlin
12cf17ef6b Refine get_dash_update_period in time unit 2019-04-08 09:10:06 +08:00
winlin
4302ab7708 Refine get_dash_fragment to time unit 2019-04-08 09:02:39 +08:00
winlin
bb6389143f Refine get_bw_check_interval in time unit 2019-04-08 08:46:22 +08:00
winlin
74c1944e15 Refine config, allow parse multiple times. 2019-04-08 08:31:58 +08:00
winlin
6239dfa489 Apply time unit 2019-04-07 16:25:52 +08:00
winlin
7037f6a197 Cover more ST Coroutine code 2019-04-07 15:22:09 +08:00
winlin
1ce040cc2c Cover more ST Coroutine code 2019-04-07 14:35:11 +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
f2b4bc7110 Fix #1304, Fix ST coroutine pull error. 3.0.47 2019-04-06 16:10:33 +08:00
winlin
23a2d8eefd Support HTTP-FLV params. 3.0.46 2019-04-06 15:42:24 +08:00
winlin
a8781aee3e For #1304, Default HSTRS to on. 2.0.264 2019-04-06 15:35:12 +08:00
winlin
a554dd85e1 Fix GCC7 build error, this statement may fall through. 2.0.263 2019-04-05 19:54:32 +08:00
winlin
633a9a0d35 Merge #1324, Remove dead code 2019-04-05 18:55:33 +08:00
winlin
b9750baa52 For #1339, Support HTTP-FLV params. 2019-04-05 18:44:50 +08:00
winlin
91c462b6ba For #1339, Support HTTP-FLV params. 2.0.262 2019-04-05 18:16:05 +08:00
YLX
ab833943e1 fix: support parse flv query params to http callback (#1339) 2019-04-05 15:44:00 +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
a8408de972 CI: Cover kernel mp4 2019-02-05 20:15:32 +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
36c41715e7 CI: Cover kernel ts 2019-02-05 09:57:06 +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
572ce5ccff CI: Cover kernel mp3 2019-02-04 14:24:31 +08:00
winlin
39541b51a1 CI: Cover all kernel log 2019-02-04 13:41:09 +08:00
winlin
492db1a904 CI: Cover kernel flv 2019-02-04 13:15:11 +08:00
winlin
2fec88b769 CI: Fix kernel file case failed. 2019-02-04 12:54:31 +08:00
winlin
ec16e53802 CI: Cover kernel file 2019-02-04 12:48:56 +08:00
winlin
3064b941d5 CI: Cover kernel codec av frame and format 2019-02-04 12:05:07 +08:00
winlin
2bdba63b0b CI: Cover kernel codec 2019-02-03 22:21:52 +08:00
winlin
c2a938473a CI: Cover kernel codec 2019-02-03 22:03:15 +08:00
winlin
1df1d84766 CI: Cover kernel LB round robin 2019-02-03 21:23:06 +08:00
winlin
5b311a06b7 CI: Verify kernel aac write ADTS packet 2019-02-03 21:14:14 +08:00
winlin
917cb4a299 CI: Cover all kernel aac 2019-02-03 20:58:04 +08:00
winlin
2ae3440128 CI: Cover all kernel error 2019-02-03 12:56:29 +08:00
winlin
3cd3739433 CI: Cover all kernel error 2019-02-03 12:51:48 +08:00
winlin
8c9857ff6f CI: Remove macros for utest 2019-02-03 12:38:07 +08:00
winlin
bfeea72eac CI: Cover all kernel buffer 2019-02-03 12:28:18 +08:00
winlin
a2b0767874 Fix build failed. 2019-02-03 09:38:20 +08:00
winlin
c646e3f287 CI: Research support codecov 2019-02-03 09:27:08 +08:00
winlin
a25efa3764 CI: Update codecov badge 2019-02-02 21:51:08 +08:00
winlin
7243d8e7b8 CI: Support codecov 2019-02-02 21:42:03 +08:00
winlin
b4619e3393 Kbps: Remove the union for kbps slice 2019-02-02 18:20:19 +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
66198b6f78 Add utest for RTMP protocol 2019-01-01 21:05:52 +08:00
winlin
a2d6566019 Add kernel utility utest 2019-01-01 20:19:44 +08:00
winlin
6e44aa4a4f Cover Kbps statistic 2019-01-01 18:22:11 +08:00
winlin
6e9c7dd11e Add utest for SrsKbps as RAW statistics 2019-01-01 17:44:39 +08:00
winlin
6234905532 Refactor ISrsKbpsDelta 2019-01-01 17:36:27 +08:00
winlin
dcebf8a31f Refine kbps 2019-01-01 14:04:50 +08:00
winlin
aef838338c Add utest for kbps connections 2018-12-23 21:19:17 +08:00
winlin
c26b475bae Refine kbps, stub wall clock 2018-12-23 20:47:17 +08:00
winlin
4c40370986 Refine kbps more testable 2018-12-23 20:30:12 +08:00
winlin
16fa4c588a Rename ISrsProtocolReaderWriter to ISrsProtocolReadWriter 2018-12-23 20:08:04 +08:00
winlin
6e75993e7f Change public virtual to virtual public 2018-12-23 19:54:08 +08:00
winlin
5d959661e7 No sudoer 2018-12-22 20:51:57 +08:00
winlin
2e9bf2af83 Always enable SRS_StreamCaster 2018-12-22 20:45:25 +08:00
winlin
1dc95cba78 Always enable SRS_Ingest 2018-12-22 20:31:47 +08:00
winlin
aa1a5442f9 Always enable SRS_Ingest 2018-12-22 20:30:13 +08:00
winlin
c6844527fb Always enable SRS_SSL 2018-12-22 20:23:39 +08:00
winlin
e4e6dd2169 Always enable SRS_SSL 2018-12-22 20:08:42 +08:00
winlin
0bc7fdbb35 Always enable SRS_SSL 2018-12-22 20:03:40 +08:00
winlin
8e294709b0 Always enable SRS_STAT 2018-12-22 19:58:36 +08:00
winlin
71f1ccbf90 Always enable SRS_HLS 2018-12-22 19:54:10 +08:00
winlin
f003ba9a29 Always enable SRS_DVR 2018-12-22 19:50:57 +08:00
winlin
330100769f Always enable SRS_TRANSCODE 2018-12-22 19:48:55 +08:00
winlin
0626bc5982 Use openssl in docker 2018-12-10 14:27:55 +08:00
winlin
432a575c7a Use docker for #1274 and #1250 2018-12-10 00:07:38 +08:00
winlin
b0e91e8fe9 Use docker for #1274 and #1250 2018-12-10 00:05:23 +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
572a2806c1 Refine utest 2018-12-09 20:36:31 +08:00
winlin
a8be5f8f27 Allow OSX for utest 2018-12-09 19:41:59 +08:00
winlin
f2a93755c2 Allow OSX for utest 2018-12-09 19:39:36 +08:00
winlin
f1033296bb Upgrade to FFMPEG 4.1 and X264 157. 2.0.261 2018-12-01 20:21:35 +08:00
winlin
acaae0d5c9 Update SRS3 2018-11-27 21:45:57 +08:00
winlin
ba4ef34d27 Merge 2.0release 2018-11-27 21:24:51 +08:00
Steven Liu
78cf3d4b58 upgrade x264 and ffmpeg to newest version (#1274) 
The ffmpeg and x264 in srs is too old.

Signed-off-by: Steven Liu lq@chinaffmpeg.org
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2018-11-27 21:17:42 +08:00
winlin
ff82ca1233 Merge branch 2.0release into 3.0release 2018-11-11 16:24:09 +08:00
winlin
99430d2edb For #1250, Not support macOS 10.14 2018-11-11 16:24:00 +08:00
winlin
24f46f5085 #1261, Support _definst_ for Wowza. 3.0.44 2018-11-11 13:51:10 +08:00
winlin
99aa249f3a #1261, Support _definst_ for Wowza. 2.0.260 2018-11-11 13:33:47 +08:00
MakarovYaroslav
e62ac29f48 add ignoring _definst_ at the end of app (#1261) 2018-11-11 13:31:29 +08:00
winlin
b2066cbf68 #1263, Fix string trim bug. 2.0.259 2018-11-11 13:30:12 +08:00
MakarovYaroslav
a2480a6c94 fix bug with for loop (#1263) 2018-11-11 13:27:33 +08:00
winlin
39f1629168 Merge from SRS2 2018-10-28 14:24:18 +08:00
winlin
58e501ee24 Fix #1250, Support build on OSX10.14 Mojave. 2.0.258 2018-10-28 14:09:55 +08:00
winlin
63ac93a642 Merge #1236 from 2.0release 2018-10-08 07:22:21 +08:00
winlin
a5b452f965 Merge #1236, Fix sleep bug in us. 2.0.257 2018-10-08 07:16:07 +08:00
RocFang
768fe68ca3 fix st_usleep param from us to ms. (#1236) 
fix st_usleep param from us to ms.
 2018-10-08 07:14:14 +08:00
winlin
3f009937ee Merge #1237 from 2.0release 2018-10-08 07:10:29 +08:00
winlin
9859fa9e6f Merge #1237, Support param for transcoder. 2.0.256 2018-10-08 07:09:31 +08:00
Mirko Velic
70ad16ff6a Add request stream param to encoder output format parameters. (#1237) 2018-10-08 07:01:49 +08:00
winlin
8e55ef4b60 Refine code 2018-08-26 14:29:45 +08:00
winlin
1e2cca4712 For #1093, Refine HLS encryption wiki 2018-08-25 21:59:56 +08:00
winlin
5945fb5a24 Fix #1093, Support HLS encryption. 3.0.42 2018-08-25 21:17:33 +08:00
winlin
ee068cf120 For #1109, Support without ssl for HLS key. 2018-08-25 21:15:26 +08:00
winlin
522fba99aa Merge branch 3.0release into harlanc-3.0release 2018-08-25 18:12:39 +08:00
winlin
e73e30de3a Fix #1051, Drop ts when republishing stream. 3.0.41 2018-08-25 18:10:55 +08:00
winlin
74d5d15c9f Merge branch 3.0release of https://github.com/harlanc/srs into harlanc-3.0release 2018-08-25 12:43:52 +08:00
winlin
1e054d2bcc Fix #354, Rename impl__SrsAutoFree to impl_SrsAutoFree 2018-08-25 12:20:52 +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
bf12a45274 add configuration instructions for hls encryption 2018-08-12 14:18:05 +08:00
Harlan
ac6b37de4b rewrite ff_data_to_hex 2018-08-12 14:10:18 +08:00
winlin
a9b5d65ca7 For #1202, Support auth_key param for srs player 2018-08-12 11:52:18 +08:00
winlin
728ddd133b For #1202, Support edge/forward to Aliyun CDN. 3.0.40 2018-08-12 10:46:06 +08:00
winlin
74a87d54f2 For #1202, Support edge/forward to Aliyun CDN. 2.0.255 2018-08-12 10:44:55 +08:00
winlin
1cc72df134 Fix #910, Support HTTP FLV with HTTP callback. 3.0.39 2018-08-11 19:23:51 +08:00
winlin
1e7c12a6dd For #910, Support HTTP FLV with HTTP callback. 2.0.254 2018-08-11 19:09:56 +08:00
winlin
928c6ab091 For #1181, Add utest 2018-08-11 13:16:59 +08:00
winlin
01d8bba455 For #1181, Refine code to write utest 2018-08-11 12:33:03 +08:00
winlin
6cea551c64 For #1110, Refine params in http callback. 2.0.253 2018-08-11 10:12:40 +08:00
winlin
d607c7f905 Refine HTTP-FLV latency, support realtime mode.3.0.38 2018-08-05 20:30:04 +08:00
winlin
03ac48f8fa Merge 2.0, for FLV latency 2018-08-05 20:25:28 +08:00
winlin
c45f72ef7b Refine HTTP-FLV latency, support realtime mode. 2.0.252 2018-08-05 20:23:17 +08:00
winlin
580c94c8c0 Refine code 2018-08-05 18:58:23 +08:00
winlin
31945c244d For #1110, Refine code. 2018-08-05 11:09:48 +08:00
winlin
455a060fa5 Merge 2.0 2018-08-05 10:52:37 +08:00
winlin
ee43fc92ae For #1110, Refine conf 2018-08-05 10:47:01 +08:00
winlin
ae99131512 Fix #1087, Ignore iface without address. 3.0.37 2018-08-05 10:41:31 +08:00
winlin
82699ff616 Refine code for librtmp 2018-08-05 10:39:52 +08:00
winlin
29b74c7220 For #1110, Support params in http callback. 3.0.36 2018-08-04 19:51:04 +08:00
winlin
85d3a5001c For #1110, Support params in http callback. 2.0.251 2018-08-04 19:36:42 +08:00
winlin
68a1656e07 Fix #1031, Always use vhost in stream query, the unify uri. 3.0.35 2018-08-02 09:17:49 +08:00
winlin
09dbda5b18 For #1031, SRS forwarder support douyu.com. 2018-08-02 07:24:08 +08:00
winlin
a66d450ec1 For #1031, SRS edge support douyu.com. 3.0.34 2018-08-02 07:14:06 +08:00
winlin
586899a010 For #1031, SRS edge support douyu.com. 2.0.250 2018-08-02 06:59:57 +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
551863a7ed Refine code 2018-07-21 17:34:31 +08:00
winlin
693194dffe Merge 2.0release 2018-07-18 19:26:53 +08:00
winlin
d27db215df For #1176, should not close fd when success. 2018-07-18 19:21:29 +08:00
winlin
e4742ddac7 Merge 2.0release 2018-07-17 13:59:51 +08:00
winlin
2d49b9d1a7 Merge #1176, fix scaned issues. 2.0.248 2018-07-17 13:44:01 +08:00
Hui Zhang (huzhang2)
01ed485cf3 fix #1172 #1173 #1174 #1175 
security scan report issue
 2018-07-17 10:03:13 +08:00
Harlan
e9cb8210fc fix default value error 2018-05-15 11:20:52 +08:00
Harlan
45a57acbb4 fix bug 2018-04-06 10:05:13 +08:00
Harlan
43ebd5958d fix bug that only one stream can be encrypted.. 2018-04-03 22:00:32 +08:00
winlin
dba44c7c3f Merge branch 'develop' into 3.0release 2018-03-25 20:00:33 +08:00
xialixin
bb4e16ae3c fix create dir success result check (#1080) 2018-03-25 17:48:07 +08:00
xialixin
aaf2905a9d add: hls configuration adds [duration] variable (#1083) 2018-03-25 17:47:37 +08:00
Harlan
52596a0b04 add HLS encryption feature 2018-03-25 12:05:52 +08:00
winlin
0d78b908a7 Fix client tools resolve dns failed bug 2018-03-20 19:50:46 +08:00
winlin
449c632e49 For #464: Add example for origin cluster 2018-03-03 10:01:01 +08:00
winlin
bd797ad385 Fix utest build failed for ::atoi 2018-03-03 09:33:15 +08:00
winlin
459272b94c Merge #1077 from 2.0release 2018-02-28 14:10:09 +08:00
winlin
0fe17c3e34 Merge #1077, fix crash for edge HLS. 2.0.247 2018-02-28 13:37:30 +08:00
RocFang
fd016ed91a use hls->initialize to set req of hls (#1077) 2018-02-28 13:35:33 +08:00
winlin
4bf5ab2044 Fix #464, support RTMP origin cluster. 3.0.29 2018-02-16 16:40:48 +08:00
winlin
c70421e656 Fix #464, support origin cluster 2018-02-16 16:39:07 +08:00
winlin
2f09ec4353 For #464, refine result of origin cluster api 2018-02-16 14:13:14 +08:00
winlin
92f2bcd878 For #464, support config origin cluster 2018-02-16 10:31:19 +08:00
winlin
55c96192e2 For #464, refine code 2018-02-16 10:19:48 +08:00
winlin
ec362b2774 For #464, query origin info and ip addresses 2018-02-16 09:37:31 +08:00
winlin
469250f850 For #464, support origin cluster api 2018-02-15 20:55:34 +08:00
winlin
d0fbf44d18 For #464, support config for origin cluster. 2018-02-14 21:52:40 +08:00
winlin
db6b8cf914 Fix #1057, switch to simple handshake. 3.0.28 2018-02-13 09:05:01 +08:00
winlin
a2cefe4dbd For #1059, show more information from stream 2018-02-13 09:02:46 +08:00
winlin
681138d2af Fix #1059, merge from 2.0, supports url with vhost in stream. 3.0.27 2018-02-13 08:52:57 +08:00
winlin
1721e4ea4b Fix #1059, support vhost in stream parameters. 2.0.246 2018-02-13 08:31:25 +08:00
winlin
93d3e1464a For #1045, revert macro for TCP keepalive detection, use system macro 2018-01-07 17:49:57 +08:00
winlin
366309ce2d For #1045, revert macro for TCP keepalive detection, use system macro 2018-01-07 17:49:14 +08:00
winlin
049e7c82c0 Merge #1044, for #1045, set TCP SO_KEEPALIVE 2018-01-07 17:23:36 +08:00
winlin
911cd448f1 Merge #1045, for #1044, TCP connection alive detection. 2.0.245 2018-01-07 17:18:43 +08:00
juntaoliu
a6871052af set tcp keepalive for tcp socket (#1045) 2018-01-07 17:03:13 +08:00
winlin
82457cda4b Change date from 2017 to 2018 2018-01-07 11:00:58 +08:00
winlin
ca1395a807 Change date from 2017 to 2018 2018-01-07 10:58:53 +08:00
winlin
d9e37d2f54 Merge branch '2.0release' into 3.0release 2018-01-04 13:49:55 +08:00
RocFang
d22d7afd83 update init.d file (#1039) 2018-01-04 13:45:56 +08:00
winlin
5730bf8e43 Fix #913, support complex error. 3.0.26 2018-01-01 23:03:42 +08:00
winlin
b426036832 Merge #1033, allow user to add some specific flags. 2.0.244 2018-01-01 23:01:13 +08:00
RocFang
015e76cb3f Update configure (#1033) 
allow user to add some specific flags.
 2018-01-01 22:57:44 +08:00
winlin
922a8f3a5c For #988, refine code. 2018-01-01 22:45:22 +08:00
winlin
823dc2df21 Refine help 2018-01-01 22:44:48 +08:00
Thomas Dreibholz
feaae341b9 IPv6 support (for 3.0 release) (#988) 
* IPv6 support, part 1.

* IPv6 support, part 2.

* Some more IPv6 work.

* Made functions for address:port paŕsing IPv6-capable.

* Fixed type (compile warning).

* Fixed formatting.

* Reverted option change.

* Replaced abort() by proper error handling.

* Also retrieving local IPv6 addresses now.
 2018-01-01 22:43:58 +08:00
winlin
db08f1586c For #913, APP support complex error. 2018-01-01 22:32:54 +08:00
winlin
e2c1f58674 For #913, APP support complex error. 2018-01-01 21:20:57 +08:00
winlin
6eae93258a For #913, APP support complex error. 2018-01-01 19:39:57 +08:00
winlin
aebbbadf42 For #913, Service support complex error. 2018-01-01 11:41:15 +08:00
winlin
15aea686c3 For #913, KAFKA, RTSP support complex error. 2018-01-01 10:30:31 +08:00
winlin
70a20ffadb For #913, RTMP support complex error. 2018-01-01 09:38:22 +08:00
winlin
60accb6e54 For #913, AMF0 and RTMP support complex error. 2017-12-31 20:52:04 +08:00
winlin
204ef041da For #913, Kernel MP4 FLV HTTP support complex error. 2017-12-31 12:11:48 +08:00
winlin
9802dc326e For #913, source support complex error 2017-09-23 22:12:33 +08:00
winlin
abcaba33ee For #913: TS/HLS/MPEGTS support complex error 2017-09-22 21:50:54 +08:00
winlin
20a42599f3 For #913, http callback use complex error 2017-09-22 19:54:50 +08:00
winlin
fd91df9411 For #913, reload use complex error 2017-09-22 16:14:30 +08:00
ME_Kun_Han
3744606c9b fix bug: parsing Exp-Golomb codes failed (#978) 2017-09-19 18:57:37 +08:00
winlin
baa55f14b9 Change stable release to SRS2 2017-08-19 20:19:35 +08:00
winlin
9f5224c34a For #913, use complex error for http 2017-07-29 21:39:57 +08:00
winlin
661eb8b37c For #913, use complex error for reload utc time 2017-07-29 20:02:38 +08:00
winlin
5c9a12e72a For #913, use complex error for listener 2017-07-29 12:45:17 +08:00
winlin
71dd3f3137 For #913, use complex error for server handler. 2017-07-18 20:24:07 +08:00
winlin
e135ab59d9 Fix the utest failed for chunk_size 2017-06-28 09:44:10 +08:00
winlin
6d4315fc3c Disable valgrind by default 2017-06-28 09:08:19 +08:00
winlin
0ad4b65a56 Disable valgrind for osx. 2017-06-13 16:20:00 +08:00
winlin
b3825c4021 Fix warnings 2017-06-13 16:10:46 +08:00
winlin
9db2a04c3b For #913, coroutine support complex error. 2017-06-11 18:44:20 +08:00
winlin
b5c14938d9 For #913, config and log support complex error. 2017-06-11 14:03:19 +08:00
winlin
860aac3e50 For #913, config reload and persistence 2017-06-11 09:54:09 +08:00
winlin
7cac35a289 For #913, source cycle error 2017-06-11 09:40:07 +08:00
winlin
7275fd5397 Fix #916, build failed for headers for error. 2017-06-11 09:03:29 +08:00
winlin
a20e2c3ef6 For #913, refine server utility 2017-06-10 15:20:48 +08:00
winlin
ca9f0bdb1e For #913, refine server initialize st 2017-06-10 14:29:41 +08:00
winlin
4e4091231e Refine object create in server. 2017-06-10 14:19:10 +08:00
winlin
372a9e5cb3 Fix #915, string ends with 2017-06-10 08:42:42 +08:00
winlin
93710c7489 For #913, refine the error mechanism 2017-06-09 13:29:23 +08:00
winlin
bb200b5d2d For #913, add complex error. 2017-06-09 11:50:35 +08:00
winlin
58521751c3 Fix #299, support experimental MPEG-DASH. 3.0.25 2017-06-04 19:56:29 +08:00
winlin
69374c8d6d For #299, use format for v/a sequence header. 2017-06-04 19:35:52 +08:00
winlin
9ca36970aa Fix #908, use empty coroutine to avoid NULL pointer. 2017-06-04 19:13:56 +08:00
winlin
0e9e1792fe For #299, write fMP4 for DASH. 2017-06-04 15:10:35 +08:00
winlin
baed1cc043 For #821, support parse dash video segment 2017-06-03 23:12:54 +08:00
winlin
8cc3ab2fa2 For #821, print mdat and udat 2017-06-03 19:00:19 +08:00
winlin
beae090d67 Refine logger header 2017-05-31 13:52:21 +08:00
winlin
4f6f8a8244 Fix verbose bug, for #821 2017-05-30 19:42:20 +08:00
winlin
6c64297264 Fix #821, support MP4 file parser. 3.0.24 2017-05-30 19:40:03 +08:00
winlin
12a55cd0c2 Fix build failed. 2017-05-30 09:58:14 +08:00
winlin
86f3bd7a0f Fix build failed. 2017-05-30 09:57:57 +08:00
winlin
121eadbc07 Fix build failed. 2017-05-30 09:54:38 +08:00
winlin
1bf99e8f3e For #907, Wrap ST, only use in service ST. 2017-05-30 09:05:02 +08:00
winlin
54411e0768 Fix #904, replace NXJSON(LGPL) with json-parser(BSD). 3.0.23 2017-05-30 07:40:18 +08:00
winlin
6993ac226f For #906, #902, use coroutine for reusable2 thread 2017-05-29 20:49:29 +08:00
winlin
ea9a5f26d9 For #906, #902, use coroutine for reusable thread 2017-05-29 20:33:32 +08:00
winlin
2ed2513f08 For #906, #902, use coroutine for one cycle thread 2017-05-29 19:45:19 +08:00
winlin
b21f92f97a For #906, #902, remove the thread start and stop event 2017-05-29 18:42:36 +08:00
winlin
3ffb0980f5 For #906, #902, use connection manager to remove connection 2017-05-29 18:34:41 +08:00
winlin
44f542f77f For #906, #902, replace the endless thread with coroutine 2017-05-29 17:56:26 +08:00
winlin
fc380fe48d For #906, #902, refine thread object. 2017-05-29 17:19:06 +08:00
winlin
5792c462b8 Merge branch 'develop' into 3.0release 2017-05-29 12:17:25 +08:00
winlin
c4966484e1 For #893, #899, merge SRS2 2017-05-29 12:17:16 +08:00