Commit Graph

447 Commits (03a03e41748d7495d01ca1286626ab7b97b5856c)

Author SHA1 Message Date
winlin ef2b123325 Merge branch '3.0release' into 4.0release 5 years ago
winlin 20b9d6ab02 For #1598, support SLB health checking by TCP. 3.0.123 5 years ago
winlin 388ad61cdc Merge branch '3.0release' into 4.0release 5 years ago
winlin dc0f804452 For #1579, support start/final wait for gracefully quit. 3.0.121 5 years ago
winlin 0c48c42f36 Merge branch '3.0release' into 4.0release 5 years ago
winlin 58b40478b6 For #1579, support force gracefully quit. 3.0.120 5 years ago
winlin eefd74e0e4 Merge branch '3.0release' into develop 5 years ago
winlin 3c597545b1 For #1579, support gracefully quit. 3.0.119 5 years ago
winlin 8b7fbac7d4 SRT supports detail config for DynamicConfig. 4.0.4 5 years ago
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
5 years ago
winlin bdc7973596 Merge branch '3.0release' into develop 5 years ago
winlin f6fa889393 For #1592, default ff_log_level to info 5 years ago
winlin c6d914bc13 Fix #1592, fix terminal echo off by redirect process stdin. 3.0.115 5 years ago
winlin c50c51889a For #1592, support ff_log_level and default to warning 5 years ago
winlin 88c9c13707 Update readme for SRT 5 years ago
winlin 2775a391e0 Fix #878, remove deprecated #EXT-X-ALLOW-CACHE for HLS. 3.0.108 5 years ago
winlin bbc7023f85 Merge SRS3 5 years ago
winlin 235c889e14 Update config 5 years ago
winlin 87ba204a42 Update doc for SRT url. 5 years ago
winlin d88d422794 Update doc for SRT. 5 years ago
winlin c7f6eef4ac Refine config file, link to issue. 5 years ago
runner365 03ef01c635 update configure 5 years ago
runner365 746d188e6f update srt.conf 5 years ago
runner365 5c5fd805c5 add srt mpegts to rtmp 5 years ago
runner365 7b9e3ecdc4 add ts demux 5 years ago
runner365 b53b75ea1e srt pull/push server 5 years ago
runner365 aeee3011ef add srt server file 5 years ago
winlin 8a28a11648 For #299, increase dash segment size for avsync issue. 3.0.89 5 years ago
winlin d7078a72d4 For #1520, add TODO list for configing server itself in coworker. 5 years ago
winlin acfeb8a66f Fix #1520, #1223, bug for origin cluster 3+ servers. 3.0.74 5 years ago
winlin cef7ec79b3 Detect whether flash enabled for srs-bwt. 5 years ago
winlin 6f453e7f46 For #547, #1506, default hls_dts_directly to on. 3.0.71 5 years ago
winlin d908ee73db Make the hls_dipose more specific 5 years ago
winlin b4870a6d6f Fix #1506, support directly turn FLV timestamp to TS DTS. 3.0.68 5 years ago
winlin f6fc31db66 Add config files for go-oryx 5 years ago
winlin d3b142a0d9 Fix #775, Support SO_REUSEPORT. 3.0.54 5 years ago
winlin 5df8f2f6c1 Refine get_pithy_print in time unit 6 years ago
winlin 8e55ef4b60 Refine code 7 years ago
winlin 1e2cca4712 For #1093, Refine HLS encryption wiki 7 years ago
Harlan 22c5af62cf Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release
# Conflicts:
#	trunk/src/kernel/srs_kernel_utility.hpp
7 years ago
Harlan bf12a45274 add configuration instructions for hls encryption 7 years ago
winlin 455a060fa5 Merge 2.0 7 years ago
winlin ee43fc92ae For #1110, Refine conf 7 years ago
winlin 29b74c7220 For #1110, Support params in http callback. 3.0.36 7 years ago
winlin 85d3a5001c For #1110, Support params in http callback. 2.0.251 7 years ago
xialixin aaf2905a9d add: hls configuration adds [duration] variable (#1083) 7 years ago
winlin 449c632e49 For #464: Add example for origin cluster 7 years ago
winlin c70421e656 Fix #464, support origin cluster 7 years ago
winlin 92f2bcd878 For #464, support config origin cluster 7 years ago
winlin d0fbf44d18 For #464, support config for origin cluster. 7 years ago
winlin 0e9e1792fe For #299, write fMP4 for DASH. 8 years ago
winlin 8b7566a007 Refine code 8 years ago
winlin 8ab727f3c5 For #299, write MPD file. 8 years ago
winlin d786d61685 Merge branch '2.0release' into develop 8 years ago
winlin 0059b1cf7a For #783, use directly free to replace auto free 8 years ago
winlin 5e419c66f8 For #299, add dash files. 8 years ago
winlin b0789c54e4 Update HLS wiki to v3 8 years ago
winlin 5fec59ace2 merge from srs2, fix #503 8 years ago
winlin 15570d93ce change conf to console without daemon. 8 years ago
winlin 0a054cd6bd for #738, remove the dvr plan append for it's no use 8 years ago
winlin 8c01f52372 for #738, refine the dvr segmenter. 8 years ago
winlin 8588a10775 Merge branch '2.0release' into develop 8 years ago
winlin a37a14377a fix the example dvr config file error 8 years ago
winlin 1b175b1107 for #730, support config in/out ack size. 3.0.13 8 years ago
winlin d29416a5f0 add conf sample for ingest rtsp 8 years ago
winlin 4709d0214c for #711, support prefile for transcode. 3.0.12 8 years ago
winlin f2efa96015 for #324, always enable hstrs. 3.0.10 8 years ago
winlin b231550c32 fix #717, #691, http api/static/stream support cors. 3.0.9 8 years ago
winlin 664844b5f5 merge from srs2. for #513. 8 years ago
winlin 759c84a395 for #513, remove hls ram from srs2 to srs3+. 2.0.224 8 years ago
winlin 0e308b0fa1 merge srs2, support oryx 9 years ago
winlin b748fac23a support asprocess for oryx. 2.0.218 9 years ago
winlin 2a01540433 support change work_dir for oryx. 9 years ago
winlin 516f33888c refine config 9 years ago
winlin f87646d489 fix typo of config. 9 years ago
winlin 892591f9a6 merge from @mbeacom 9 years ago
winlin d81b2cb140 support hls mount to vhost and reload 9 years ago
winlin f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 9 years ago
winlin 0ab64ccd2a merge from srs2. 9 years ago
winlin 40457e6cab default hls_on_error to continue. 2.0.201 9 years ago
winlin 01c46bdbfd rename org simle-rtmp-server to ossrs 9 years ago
winlin 1ffd5fd455 rename org simple-rtmp-server to ossrs 9 years ago
winlin 8974fe298b connect to kafka and send metadata request. 10 years ago
winlin 29122b6e70 fix #502, transcoder support snapshot. 10 years ago
winlin 2a4ab8a923 add brokers to config 10 years ago
winlin b5ccc35340 add kafka config 10 years ago
winlin 2b9869ee52 update the wiki for dvr 10 years ago
winlin 2a1b2b69a0 for #459, dvr support apply filter for ng-control dvr module. 10 years ago
winlin a7c4b786cf merge from 2.0 10 years ago
winlin 511627abab fix #474, config to donot parse width/height from sps. 2.0.189 10 years ago
winlin 7ae76b579e refine the conf, use srs3 style 10 years ago
winlin a62c82bd46 for #319, api raw update global.listen 10 years ago
winlin 364460f2ab for #319, support raw update global.listen 10 years ago
winlin f8d8c3ace4 use function to dumps the engine. 10 years ago
winlin 01878e5a9c for #319, query vhost detail. 10 years ago
winlin b1b76a4a80 for #319, allow multiple ingest and transcode. 10 years ago
winlin d1336e0d80 refine conf 10 years ago
winlin dc11013c01 for #319, render the detail of vhost 10 years ago
winlin 0109a74840 for #319, refine the config structure. 10 years ago
winlin 2b4fa2d73e for #319, move the edge configs to cluster. 10 years ago