github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,488 Commits
14 Branches
107 Tags
345 MiB
Commit Graph

2642 Commits (b5ccc35340785f02e441d20a93d0dd91c70e365b)

Author SHA1 Message Date
winlin 7ef3ff90c0 refine the config structure, compatible with SRS1/2
winlin a79e19599c for , support query the vhost info.
winlin bdfd0ae09e for , dumps the http static, remux and globals.
winlin 1b1a2a1e63 fix , api response the width and height. 3.0.2
winlin 04bea781ca use amf0 encode for json encode.
winlin e0219bd7aa refine code, merge json encode to amf0.
winlin 66ffcad635 for , always allow raw query.
winlin f167616379 rename the config_query to query
winlin 75ca759e5d fix the reload http api bug.
winlin 2dcf3bc606 for , support rpc raw api to query the HTTP RAW API configs.
winlin af0a76e51a fix the build failed bug on centos
winlin e03d8a0115 fix the build failed bug on centos
winlin 555a3fbf5f for , support render HTTP RAW API in console.
winlin 8e635d9749 for , support HTTP RAW API config_query global data.
winlin d921d59e57 for , support HTTP RAW API reload.
winlin f74dc62046 fix the process restart bug.
winlin e39e006d63 fix the exec clear bug.
winlin c081a5370b Merge branch '2.0release' into develop
winlin fe4cdceb15 always wait for process to terminated when SIGKILL.
winlin 1e0481a2d0 for , support signal to persistence config
winlin 980e3921e4 for , add signal to write config to file.
winlin cdde293785 add todo for reload the source components.
winlin 53f4ce3604 for , update wiki to v3
winlin c34b0c86e1 fix , support nginx-rtmp exec. 3.0.1
winlin 7de181004f Merge branch '2.0release' into develop
lovecat 9c2beffe8f statistic connection bytes before remove client.
winlin 039af7243c for , refine the comments for process.
winlin 6fe88d088c for , process support redirect stdout and stderr.
winlin 0e1861b084 for : extract the process from ffmpeg to exec programs.
winlin 3a8c03a471 Merge branch '2.0release' into develop
winlin a242aa35dc add pid to srs rtmp dump
winlin 15102a7345 refine commit script
winlin 2a4b448cce Merge branch '2.0release' into develop
winlin a7f4104d45 fix bug of commit script
winlin d8030faabe Merge branch '2.0release' into develop
winlin 064031cac1 refine commit script
winlin 8e259eb0c2 refine the commit script
winlin 4118138cf0 update commit script
winlin b25c45c643 refine srs player, support set the bufferTimeMax.
winlin 74d4c96423 for , design the config for exec.
winlin cbfe438e73 for , design the config for exec.
winlin 28791fd14a release 2.0alpha0, the 2.0a0, 2.0.185
winlin 5721bc371c Merge branch '2.0release' into develop
winlin e43d4e46b4 support JSONP DELTE/POST/PUT
winlin baa70d4ddd add nb_streams for vhost
winlin 7a2836ae2a Merge branch '2.0release' into develop
winlin 6e5143449e HTTP API support JSONP by specifies the query string callback=xxx.
winlin 22485ce5e9 Merge branch '2.0release' into develop
winlin aeebddb269 for , add more information for client for api.
winlin 94641c812b fix , support kickoff client.
winlin b37797b13a for , add publish connection in stream.publish api
winlin 529803ed04 refine code for api.
winlin 1962449770 Merge branch '2.0release' into develop
winlin 6b6d951298 add api /api/v1/features
winlin 4763f205a2 add kbps for vhost and stream
winlin 0a4d78383c Merge branch '2.0release' into develop
winlin 20a8818a8e refine the error response.
winlin 2edcf1d4ff support query specified vhost
winlin 66a26bdce8 move json from app to protocol
winlin a7589b9ad3 refine code for api, add clients and parse_rest_id
winlin ab4620870d refine the stat api, support query specified stream.
winlin 32a484164a Merge branch '2.0release' into develop
winlin c75f05c88b fix the log cid display error, merge the publish recv thread log to publish connection.
winlin 9528243b81 Merge branch '2.0release' into develop
winlin 3c402cb908 refine the tcp nodelay, effect connected connections.
winlin 71aacebcbc Merge branch '2.0release' into develop
winlin c31a546eec support vhost for http flv.
winlin 0afe4963bc Merge branch '2.0release' into develop
winlin dd21eee7f0 srs player show current time and url
winlin ce8f446494 Merge branch '2.0release' into develop
winlin dfecfb65b1 support fluency and stream empty count
winlin fcd2d3d445 refine code for link generation from rtmp url.
winlin fe87bf1b61 support generate link page for rtmp url
winlin 018af55d65 refine the demo pages, move scripts after body.
winlin 77765b463a Merge branch '2.0release' into develop
winlin 575a698820 fix , srs-librtmp send sequence header when sps or pps changed.
winlin f10e399991 Merge branch '2.0release' into develop
winlin ec87dd9cd6 refine code for srs rtmp dump
winlin 785a5907a8 set the default get_publish_normal_timeout to 5s
winlin 0bbfc5526a set the default get_publish_normal_timeout to 5s
winlin 7273c33c35 support publish_1stpkt_timeout and publish_normal_timeout
winlin 170ad05148 add gfps and nb_packets
winlin a5dd3a8e7b Merge branch '2.0release' into develop
winlin e7714cd445 add packets interval in ms to set the right send_min_interval
winlin de48b477ae drop the metadata when drop sequence header
winlin 22491b0c99 merge from 2.0
winlin f691dddc1a drop metadata when drop sequence header. support PCUC 0x1a
winlin 2cf526ffc7 close , support obs restart publish. 2.0.184
winlin 0cb7ddfe8c Merge branch '2.0release' into develop
winlin ccc4c05da9 fix , support vs2010 for srslibrtmp.
winlin f53b2556bb Merge branch '2.0release' into develop
winlin 01be68fe58 refine code, donot remove the detail when hls disabled.
winlin 53351cd645 Merge branch '2.0release' into develop
winlin afd05f71c3 refine code, use size cache for performance issue.
winlin 0b90af7e46 Merge branch '2.0release' into develop
winlin 3b0b2e0b85 fix the bug to support dump packets with count.
winlin 8d3d5dd10b Merge branch '2.0release' into develop
winlin a0a89a8ca6 use reduce_sequence_header for stream control.
winlin 9fbff4b8f9 Merge branch '2.0release' into develop
winlin b79d830e2c refine the default smi
winlin 807299589e merge from srs2.
winlin ae37fa8f3e use send_min_interval for stream control. 2.0.183
winlin 0b84c1d962 Merge branch '2.0release' into develop
winlin 7dcba040eb refine config.
winlin 653afd0700 merge from 2.0
winlin 9fb4640a8f enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182
winlin 1261916eab refine the mount and dir to /console
winlin b27bb48447 refine the version
winlin eab538d2e4 fix the version of srs2
winlin f28c9b7eb5 merge from 2.0release
winlin 3a6854fc2e refine code.
lovacat e8c0ca7af0 fix : HTTP API kickoff client.
winlin d761ebfa55 refine the api, move the requests and errors to rest.
winlin c5bf397295 fix the http error header.
winlin fbcc07d85a fix the typo of AUTIO.
winlin 0e3128d3e3 Merge branch '2.0release' into develop
winlin 65b2ed7ac5 refine code, move the order of functions.
winlin 71f2726b31 fix bug of merge code for reload http_remux for vhost
winlin ccf6a4de1e remove the on_reload_vhost_http_remux_updated for vhost added.
winlin bfe0f97edd refine params nameing and SrsStream.
winlin 8d86eb6516 refine code naming or comments.
winlin c2d9c98678 Merge branch '2.0release' into develop
winlin bc033d5de3 refine code, move default to config function.
zhengfl 39a2d51c66 fix , 修正由skip(-4)引起的assert错误
winlin 94569b181f merge from 2.0
winlin c85f92c229 fix , support default values for transcode. 2.0.180
winlin 48c040c92b Merge branch '2.0release' into develop
winlin 31d2de3f23 fix , add pageUrl for HTTP callback on_play.
winlin 146a44a2ce merge from 2.0
winlin b54f9b0f94 refine the hls, ignore packet when no sequence header. 2.0.179
winlin fdb17a1864 merge from 2.0
winlin 3b65af9bd2 fix the hstrs bug on edge.
winlin 99db2888e7 refine code for hstrs.
winlin c2ef779523 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release
winlin 366d3a3f56 for , use 30s timeout for first msg. 2.0.178
zhengfl a5a9f7c8c5 refine code:优化edge模式回源播放线程启动流程
winlin 5f77724021 refine hls disable the time jitter, support not mix monotonically increase. 2.0.177
winlin 5f91fbc970 merge from 2.0release
winlin d995726fee fix the http flv mount bug.
winlin 9743e02541 refine the mix correct algorithm.
winlin 6fe36afcfa when hls timestamp jump, reset it.
winlin 99574bb77b ignore when no segments for there must no m3u8
winlin 40c264a316 always reset the max target duration for hls.
winlin 54bb42483b change time jitter to off for hls and forward.
winlin be342178c0 fix ingest flv tool, support non monotonically timestamp.
winlin b3b6df365e fix the stream caster build failed bug.
winlin 50feaacdde refine code for http remux reload.
winlin 677567d9f2 Merge branch '2.0release' into develop
winlin 0aa053433c fix : build failed when enable the info or verbose log.
zhengfl 2567a89599 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release