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

685 commits

Author SHA1 Message Date
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
xiaozhihong
bb9367f88a add rtc_publisher.html 2020-04-24 16:22:08 +08:00
winlin
dabad68f48 Merge branch 'feature/gb28181' into develop 2020-04-21 15:27:40 +08:00
winlin
7bec73f224 Refactor demo pages. 2020-04-21 15:13:46 +08:00
kyxlx550
904ce2452b update srs gb28281 web demo 2020-04-21 12:53:52 +08:00
winlin
0fe9d9e324 Add UDP ZeroCopy research 2020-04-21 12:12:32 +08:00
kyxlx550
6a070a9a64 support sip ptz cmd 2020-04-20 21:34:18 +08:00
winlin
74416e476a Refine research zerocopy, use batch for reception 2020-04-20 21:18:49 +08:00
winlin
72322836c6 Update demo for zerocopy 2020-04-20 20:25:23 +08:00
winlin
a3de167bc7 For zerocopy research, support delay in server 2020-04-20 08:42:53 +08:00
winlin
8f9cc38f68 Refine zero copy research 2020-04-20 08:02:53 +08:00
winlin
2e9a561acf Update research zerocopy 2020-04-19 22:16:54 +08:00
winlin
c362bfc3ab Add msg zerocopy research code 2020-04-19 21:58:39 +08:00
winlin
a579f51e72 Remove ST in research 2020-04-19 20:51:39 +08:00
kyxlx550
06412ddddc fix gb28281 html ret error show 2020-04-16 18:33:43 +08:00
kyxlx550
b391ed6206 fix gb28281 html rtc player stop 2020-04-16 13:08:42 +08:00
kyxlx550
7950bc586e add gb28281 demo html 2020-04-15 22:05:32 +08:00
winlin
8d5f91f777 For rtc player, use target to overwrite server, vhost and eip. 2020-04-14 18:15:07 +08:00
winlin
574ae58adc For #307, support mock server eip by API 2020-04-07 11:36:26 +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
57c23d93c1 Refactor url for rtc player 2020-03-23 13:36:17 +08:00
winlin
4c63319b5d Release rtc_player to ossrs.net 2020-03-23 10:36:15 +08:00
winlin
8a7f35dc6d Release rtc_player to ossrs.net 2020-03-22 22:52:51 +08:00
winlin
6edca6147c Release rtc_player to ossrs.net 2020-03-22 22:51:09 +08:00
winlin
f8b4ba1e5a Release rtc_player to ossrs.net 2020-03-22 22:48:51 +08:00
winlin
98d372bd40 Release rtc_player to ossrs.net 2020-03-22 21:54:18 +08:00
winlin
3360db7b77 Refactor api, follow https://github.com/rtcdn/rtcdn-draft 2020-03-21 17:56:26 +08:00
winlin
532750f18a Refactor api data, url to api 2020-03-21 17:33:54 +08:00
winlin
979d7c3f4f For #1638, #307, refactor rtc player. 2020-03-18 17:21:50 +08:00
winlin
c210c0b2f5 For #1638, #307, refactor rtc player. 2020-03-18 10:03:20 +08:00
winlin
4b23d04635 For #1638, #307, fix rtc player demo bug 2020-03-14 23:22:25 +08:00
winlin
c2916acd92 For #1638, #307, define webrtc:// url for play 2020-03-14 22:48:02 +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
HuyaJohn
b730458d51 add candidates ip list, add rtc_upload.html to test 2020-03-06 23:28:15 -08:00
xiaozhihong
a36ed6954f add rtc.html temp 2020-03-06 23:59:59 +08:00
xiaozhihong
bc22ebe949 add rtc http request and response, exchange sdp. 2020-02-21 23:50:22 +08:00
winlin
4276bea463 Migrating streaming service from ossrs.net to r.ossrs.net 2020-02-14 22:00:58 +08:00
winlin
23324cde31 Migrating streaming service from ossrs.net to r.ossrs.net 2020-02-14 21:57:02 +08:00
winlin
be0cb164ec Add links for flv.js, hls.js and dash.js 2019-12-27 10:40:44 +08:00
winlin
c2e9e96e28 Change the default page to srs_player 2019-12-27 09:11:26 +08:00
winlin
6eec7c1dfe Refactor the query string for srs-player 2019-12-18 14:46:21 +08:00
winlin
b52628ce01 Refactor the comments to use flash publisher 2019-12-18 14:37:39 +08:00
winlin
931496e3b9 Refactor the comments to use flash publisher 2019-12-18 14:37:10 +08:00
winlin
4e3650b8c7 Refactor the comments to use flash publisher 2019-12-18 14:35:43 +08:00
winlin
dd44d76d72 Refactor the comments to use flash publisher 2019-12-18 14:35:07 +08:00
winlin
7497df7a15 Refactor the comments to enable flash 2019-12-18 13:59:05 +08:00
winlin
4a5afe3428 Add tips when flash is disabled. 2019-12-18 12:06:32 +08:00
winlin
901c69b381 Update srs-player version 2019-12-18 11:54:17 +08:00
winlin
cef7ec79b3 Detect whether flash enabled for srs-bwt. 2019-12-18 11:50:43 +08:00
winlin
c830dc6700 Detect whether flash enabled for srs-publisher. 2019-12-18 11:33:34 +08:00
winlin
b0afc00733 Detect whether flash enabled for srs-player. 3.0.73 2019-12-18 11:06:01 +08:00
winlin
33c7f6d0e4 Temporarily disable chat demo page. 2019-12-18 09:16:56 +08:00
winlin
65c66592e9 Refine statistic url 2019-12-04 10:47:02 +08:00
winlin
2d85b036cb Refine stat for player index 2019-12-03 18:26:01 +08:00
winlin
643d06473f Refine player with statistics. 2019-12-03 10:18:13 +08:00
winlin
c646e3f287 CI: Research support codecov 2019-02-03 09:27:08 +08:00
winlin
a9b5d65ca7 For #1202, Support auth_key param for srs player 2018-08-12 11:52:18 +08:00
winlin
31945c244d For #1110, Refine code. 2018-08-05 11:09:48 +08:00
winlin
82457cda4b Change date from 2017 to 2018 2018-01-07 11:00:58 +08:00
ME_Kun_Han
3744606c9b fix bug: parsing Exp-Golomb codes failed (#978) 2017-09-19 18:57:37 +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
54411e0768 Fix #904, replace NXJSON(LGPL) with json-parser(BSD). 3.0.23 2017-05-30 07:40:18 +08:00
winlin
609605a50b Fix #820, extract service for modules. 3.0.21 2017-03-26 17:05:50 +08:00
winlin
0a57a46016 Refine LICENSE 2017-03-25 21:29:29 +08:00
winlin
f32aab3d92 For #299, refine code. 2017-03-25 17:21:39 +08:00
winlin
14765c2ba5 For #790, play or publish is not neccessary for bandwidth test. 2017-03-04 14:46:48 +08:00
ME_Kun_Han
3562424ee3 fix bug, add param for generating tc url and add play stream to make-bandwidth checking success (#790) 2017-03-04 14:44:34 +08:00
winlin
72c4ae4a8c Refine srs-librtmp API, change print to format 2017-03-01 10:52:57 +08:00
winlin
68a5407b3a Remove using of connect_app2. 2017-02-28 20:35:56 +08:00
winlin
c849010fe2 Refine api for srs-librtmp 2017-02-28 19:46:09 +08:00
winlin
ca43bfe6d9 Fix build failed, for srs librtmp API changed. 2017-02-28 14:54:53 +08:00
winlin
764cf245e9 For #774, build librtmp exmaples failed for -lpthread 2017-02-25 12:13:12 +08:00
HungMingWu
01d5e4da17 Replace openssl from l-1.0.1f to 1.10e (#774) 
DUe to API breakchange, add a wrapper for backward compatibility
 2017-02-25 12:06:39 +08:00
winlin
733ba73d54 for #738, write mp4 samples. 2017-02-05 09:15:46 +08:00
winlin
253ac40312 for #738, parse avcc/sps/pps/asc from mp4. 2017-02-04 14:57:07 +08:00
winlin
128a1fd3db for #738, decode mp4 video track boxes. 2017-02-02 15:10:11 +08:00
winlin
b6bb3f2446 fix c99 build failed. 2017-01-31 22:17:27 +08:00
winlin
858951da49 for #738, add srs ingest mp4 2017-01-31 21:36:51 +08:00
winlin
34a8eb6113 for #738, add srs ingest mp4 tool 2017-01-31 20:43:48 +08:00
winlin
b16ab038ce for #742, refine the u_intxx_t to uintxx_t 2017-01-30 17:32:18 +08:00
winlin
136a7ef488 for #299, refine docs. 2017-01-26 17:28:49 +08:00
winlin
c5fcc15989 update the date info 2017-01-18 16:41:47 +08:00
winlin
78aa518ecc merge srs2 2016-09-27 11:00:13 +08:00
winlin
b19702f669 update srs player 2016-09-27 10:58:04 +08:00
winlin
0596550a72 Merge branch '2.0release' into develop 2016-09-15 13:31:28 +08:00
winlin
99d87f9f9c fix sys-ssl librtmp build bug. 2016-09-15 13:17:58 +08:00
winlin
4bcd90d747 fix sys-ssl librtmp build bug. 2016-09-15 13:11:42 +08:00
winlin
c231f45fe8 Merge branch '2.0release' into develop 2016-09-09 14:57:58 +08:00
winlin
bd652e4607 fix build failed for stdc++ 2016-09-09 14:41:02 +08:00
winlin
eb915413ad Merge branch '2.0release' into develop 2016-09-09 14:14:22 +08:00
winlin
0015b303a6 librtmp: refine comment for NALU process. 2016-09-09 14:14:12 +08:00
winlin
93eb961b4c Merge branch '2.0release' into develop 2016-09-09 11:33:58 +08:00
winlin
4c6c2c28b8 refine h264 raw publish with fps 2016-09-09 11:32:24 +08:00
winlin
14760003ba merge from 2.0 2016-08-10 22:05:21 +08:00
winlin
e00928557e fix the timeout for librtmp 2016-08-10 22:04:01 +08:00
winlin
499fc07db1 refine the hls m3u8 refresh interval. 2016-08-02 16:52:23 +08:00
winlin
5fa500646e update srs player version 2016-08-02 16:37:52 +08:00
winlin
ec57e2170d refine hls m3u8 refresh interval and buffer time 2016-08-02 16:31:59 +08:00
winlin
c746753c6a update player, add pst(player startup time) 2016-04-22 13:33:29 +08:00
winlin
2e75c9f45f add more buffer 2016-04-19 18:15:47 +08:00
winlin
9312d77c20 default not to preview the stream for publisher. 2016-04-12 11:32:13 +08:00
winlin
6b5c880ff9 refine player to support status change. 2016-03-22 18:35:44 +08:00
winlin
4841435b14 fix default http port bug. 2016-03-19 22:45:39 +08:00
winlin
a2d235f015 refresh js cache. 2016-03-19 22:14:56 +08:00
winlin
d7a28059ed remove jwplayer and osmf 2016-03-19 22:09:36 +08:00
winlin
d9f1ced732 change srs player to 1.28 2016-03-19 22:00:22 +08:00
winlin
77167f3331 refine srs player for hls, extract a HlsNetStream. 2016-03-19 21:54:46 +08:00
winlin
2492562d25 use xpsid X-Playback-Session-Id to more useful. 2016-03-19 19:48:01 +08:00
winlin
b2bd63e833 refine srs player to play hls. 2016-03-19 19:11:31 +08:00
winlin
46a31f4884 support play hls 2016-03-19 16:35:13 +08:00
winlin
69ec66ee36 refine js for player. 2016-03-19 11:08:25 +08:00
winlin
0a2e00f8c5 dump logs 2016-03-19 10:18:11 +08:00
winlin
9ab5039b36 extract iplayer for srs-player. 2016-03-19 10:06:08 +08:00
winlin
10ce961a00 update version for bwtc 2016-03-14 10:23:20 +08:00
winlin
b3c13f2550 refine the bwtc, to compatible with bms4. 2016-03-12 20:53:37 +08:00
winlin
a3038b1274 fix the rtmp url parse bug. 2016-03-10 12:16:51 +08:00
winlin
82aa9d120c for #5114, display metadata. 2016-03-07 16:02:37 +08:00
winlin
00c60db7c3 Merge branch '2.0release' into develop 2016-01-31 22:47:48 +08:00
winlin
f7d9ed5ae4 update api 2016-01-31 21:49:53 +08:00
winlin
0cd15068de set default buffer time to 0.5 for srs player. 2016-01-18 18:02:56 +08:00
winlin
f8358da316 refine ingester log. 2016-01-13 16:20:05 +08:00
winlin
d24aef50ba for #369, support RTMP 302 api at protocol level. 2016-01-08 18:17:37 +08:00
winlin
f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 2016-01-08 13:58:19 +08:00
winlin
9d22d09646 show signature of server. 2016-01-04 17:28:18 +08:00
winlin
f516636448 refine code for hooks and http core. 2015-12-29 18:33:02 +08:00
winlin
49308dddfb update 2015 to 2016 2015-12-23 11:41:41 +08:00
winlin
eec2c34b5c refine publisher. 2015-12-01 10:42:13 +08:00
winlin
01c46bdbfd rename org simle-rtmp-server to ossrs 2015-11-11 10:45:45 +08:00
winlin
1ffd5fd455 rename org simple-rtmp-server to ossrs 2015-11-11 10:37:50 +08:00
winlin
7db7d43aea Merge branch '2.0release' into develop 2015-11-09 15:25:55 +08:00
winlin
18b50d961f support query server by id. 2015-11-09 15:19:50 +08:00
winlin
aca9fe805c Merge branch '2.0release' into develop 2015-11-09 14:51:47 +08:00
winlin
d916c53702 refine the api server. 2015-11-09 14:51:41 +08:00
winlin
fe27e76492 support schema 2015-10-26 18:34:55 +08:00
winlin
2bae6e09d3 for #502, snapshot 1 image per 1 seconds, choose best from 5 images. 2015-10-20 14:10:14 +08:00
winlin
1aa4502d5f for snapshot, choose the best to link to the [stream]-best.png 2015-10-20 13:38:03 +08:00
winlin
33a282e576 support snapshot by http hooks for #152. 2015-10-20 12:30:57 +08:00
winlin
3ab0ccaa27 Merge branch '2.0release' into develop 2015-09-23 18:23:17 +08:00
winlin
7cdcf41d26 refine the api server 2015-09-23 18:23:09 +08:00
winlin
4e88262512 merge from srs2 to check cpus. 2015-09-23 15:11:33 +08:00
winlin
cfe2082353 fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192 2015-09-23 15:09:59 +08:00
winlin
b78781707e update the srs player 2015-09-17 18:07:02 +08:00
winlin
5073a6fa08 merge from srs2 2015-09-17 18:06:03 +08:00
没——问题
e8680527c3 allow domain * 
在使用时，srs_player可能和所在页面部署在不同的域名下。

所以在此处添加跨域许可。
 2015-09-17 12:09:29 +08:00
没——问题
c548ab5019 function set_srs_player_url(url, params) 
在实际环境中，player.swf 等静态资源 和页面可能部署到不同的域名或路径下。

所以在此处提供设置 srs_player.swf 的url的方法。
 2015-09-17 11:44:45 +08:00
winlin
b25c45c643 refine srs player, support set the bufferTimeMax. 2015-08-24 07:55:30 +08:00
winlin
dd21eee7f0 srs player show current time and url 2015-08-20 18:33:33 +08:00
winlin
dfecfb65b1 support fluency and stream empty count 2015-08-20 18:13:07 +08:00
winlin
fcd2d3d445 refine code for link generation from rtmp url. 2015-08-20 16:18:32 +08:00
winlin
fe87bf1b61 support generate link page for rtmp url 2015-08-20 16:11:17 +08:00
winlin
018af55d65 refine the demo pages, move scripts after body. 2015-08-20 15:19:43 +08:00
winlin
170ad05148 add gfps and nb_packets 2015-08-19 15:31:19 +08:00
winlin
e7714cd445 add packets interval in ms to set the right send_min_interval 2015-08-19 15:14:26 +08:00
winlin
ae37fa8f3e use send_min_interval for stream control. 2.0.183 2015-08-14 11:13:40 +08:00
winlin
31d2de3f23 fix #435, add pageUrl for HTTP callback on_play. 2015-07-21 10:50:57 +08:00
winlin
be342178c0 fix ingest flv tool, support non monotonically timestamp. 2015-07-13 22:09:01 +08:00
winlin
93a1d097dc update jwplayer to support play HTTP flv. 2015-05-23 19:22:37 +08:00
winlin
ac13817aae update donation 2015-05-08 07:04:31 +08:00
winlin
b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 2015-04-29 17:38:23 +08:00
winlin
115daa3cc1 migarate from winlinvip to srs org 2015-04-29 17:06:32 +08:00
winlin
dbcd7d883b add script check_hls_backup.sh to research hls. 2015-04-23 16:58:00 +08:00
winlin
23b978c0bb merge from github 2015-04-20 11:28:46 +08:00
winlin
8fbc6526bb for #383, refine code to support mix correct algorithm. 2015-04-15 16:17:52 +08:00
winlin
0000c945ea refine the proxy api server. 2015-04-10 16:07:45 +08:00
winlin
fe1886aa08 add proxy for hls 2015-04-10 15:50:12 +08:00
winlin
e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts. 2015-04-10 12:01:45 +08:00
winlin
bd77f995bf ignore the unknown flv tag. 2015-04-09 12:35:17 +08:00
winlin
64b065e450 for hls callback, add duration of ts. 2015-04-03 13:46:44 +08:00
winlin
c49bc0628e support on_hls for http hooks. 2.0.152. 2015-03-31 17:42:12 +08:00
winlin
97442c56b6 enhance hls in floor mode. 2015-03-31 17:03:14 +08:00
winlin
76c1957260 enhance hls, increase piece one by one. 2015-03-31 16:58:20 +08:00
winlin
bbac2348db for #354, remove the double underscore functions and variables. 2015-03-21 11:55:28 +08:00
winlin
a15ce1147f for #155, fix all warnings for mac. 2015-03-13 12:53:01 +08:00
winlin
a739b2c555 fix the bug for fork ffmpeg in mac, the local variable is unvailable. 2015-03-11 15:54:31 +08:00
winlin
f247ac9daf fix the http parse bug. 2015-03-11 14:48:51 +08:00
winlin
1246989ea9 for #179, refine dvr, support callback when reap dvr segment. 2015-02-22 10:45:13 +08:00
winlin
1685cdd48e for #250, parse pes packet ok, ts message ok. 2015-01-29 22:58:02 +08:00
winlin
77e43d1813 refine comments of aac publish for #212 2015-01-18 22:11:38 +08:00
winlin
a1f887f46f refine code, move onMetaData to consts. 2015-01-17 13:29:11 +08:00
winlin
04aa6f8296 drop script data except the onMetaData packet. 2015-01-17 13:23:30 +08:00
winlin
44f5efda21 refine the print info. 2015-01-07 15:46:00 +08:00
winlin
5aa31568ba fix the rtmp dump, parse the aggregate msg. 2015-01-07 15:35:01 +08:00
winlin
89a3cf9efe refine code, failed when specified complex but no ssl for srslibrtmp 2015-01-07 13:37:23 +08:00
winlin
0e03d019a8 for bug #215, srs rtmp dump support conn args. 2.0.90 2015-01-07 13:29:30 +08:00
winlin
dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 2015-01-03 15:33:23 +08:00
winlin
45724bfaec update conf for transcode. 2015-01-03 14:46:29 +08:00
winlin
07b207b7e3 remove test code for api-server. 2015-01-02 10:30:25 +08:00
winlin
9d34820c80 fix #158: http-callback check http status code ok(200). 2.0.84 2015-01-02 10:21:04 +08:00
winlin
569596c10d update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
winlin
10297fab51 fix #257, support 0.1s+ latency. 2.0.70 2014-12-12 21:51:06 +08:00
winlin
d171a26758 disable gop cache when not h.264. fix some warning. 2014-12-01 21:34:35 +08:00
winlin
c5dd334645 fix the warning of ts_info 2014-12-01 20:54:19 +08:00
winlin
ff5cdb1cc1 for bug #215, add srs_rtmp_dump tool. 2.0.37. 2014-11-28 12:26:36 +08:00
winlin
e11fa383ca udpate the srs_bwt. 2014-11-25 11:09:28 +08:00