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

2871 Commits (46a31f4884be02a24a6bc50ee1d72e3c85cda68d)

Author SHA1 Message Date
winlin 1de2bb0801 add kafka protocol files.
winlin b5996567e8 refine the role of srs, to cluster.
winlin e4e36a0166 merge from srs2, fix openssl build
winlin d8a64aaab5 fix , hotfix the openssl build script 2.0.190
winlin b471c6e61c refine code, use json integter rather than number.
winlin c5cd58761c move the srs thread to st.
winlin 3042115385 refine json to_str to dumps.
winlin b59d9ba6a1 support amf0 and json to convert with each other.
winlin 3f7e69b617 json objects support dumps to string.
winlin b78781707e update the srs player
winlin 5073a6fa08 merge from srs2
winlin 225e742657 add args3
winlin 1fd83d9314 refine the order.
没——问题 e8680527c3 allow domain * 
在使用时，srs_player可能和所在页面部署在不同的域名下。

所以在此处添加跨域许可。
winlin 7b2b11e932 async call worker fast execute tasks.
没——问题 c548ab5019 function set_srs_player_url(url, params) 
在实际环境中，player.swf 等静态资源 和页面可能部署到不同的域名或路径下。

所以在此处提供设置 srs_player.swf 的url的方法。
winlin 087f7740b7 fix the build failed bug
winlin 256459e1ec fix the utest bug
winlin 240a1bfadb rename kafka protocol
winlin c4e4711b93 add kafka protocol
winlin 8a90e76637 fix , support dvr raw api. 3.0.4
winlin 2b9869ee52 update the wiki for dvr
winlin 2a1b2b69a0 for , dvr support apply filter for ng-control dvr module.
winlin 8f9cfcdcf4 fix , http raw api support update global and vhost. 3.0.4
winlin e8a00de4a3 for , support enable or disable vhost.
winlin 631e76cd32 for , support update and delete the disabled vhost
winlin a7c4b786cf merge from 2.0
winlin 511627abab fix , config to donot parse width/height from sps. 2.0.189
winlin eb578b4a39 refine the thread, set to disposed when terminate normally
winlin 83a9ff9f5d for , refine the hls publish, donot fetch from source when publish
winlin 44bcb4045f for , decode the sequence header before hls.
winlin 07ef8160a3 clear the queue when edge republish.
winlin 704624c9ec clear the queue when edge republish.
winlin 8be3c875af donot release stream when busy
winlin 3da25f3aee when thread terminated normally, set the tid to NULL.
winlin a994191ddc for , always release publish for source.
winlin eb9aa47ab1 merge from 2.0
winlin 0d57ef9373 fix , http hooks use source thread cid. 2.0.188
winlin 3b483094bd merge from 2.0
winlin 6d50aa1aa2 , fix http hooks crash for st context switch. 2.0.187
winlin adb74dc74e Merge branch '2.0release' into develop
winlin f0fc093b19 fix the http zero content length bug.
winlin 01308ecc98 for , support initialize the parser to whether use jsonp
winlin 491ec11833 for , raw api support add new vhost
winlin 0d6c24581d refine json number, use int64 when number is int.
winlin 7ae76b579e refine the conf, use srs3 style
winlin a88f321d8b for , merge from 2.0release
winlin abd7ee227c support reload utc_time. 2.0.186
winlin c4feb8f6ed for , raw api support update all globals.
winlin 6aafd072db for , raw api support update srs log tank, level and file.
winlin 8107e5f9a6 for , raw api support set the ff_log_dir
winlin c8466c36bd for , raw api support update the global RTMP chunk_size.
winlin 2cfb71616e for , copy all data to request for source.
winlin 2bdd974227 for , reorder the ingesters.
winlin 342483bf04 for , when reload the listen, restart all ingesters.
winlin 310b5a14cb for , support minimal query api
winlin 06c7ae62ee for , refine the error code for RAW APi.
winlin 11c409688b for , http raw api support query. 3.0.3
winlin 8a2709dd2c for , do not apply when config not changed.
winlin a62c82bd46 for , api raw update global.listen
winlin 364460f2ab for , support raw update global.listen
winlin f8d8c3ace4 use function to dumps the engine.
winlin 01878e5a9c for , query vhost detail.
winlin b1b76a4a80 for , allow multiple ingest and transcode.
winlin 873aa7bf9f for , refine the query global, only show true options.
winlin d1336e0d80 refine conf
winlin dc11013c01 for , render the detail of vhost
winlin 0109a74840 for , refine the config structure.
winlin 2b4fa2d73e for , move the edge configs to cluster.
winlin 6bd05f9cfc for , refine the config forward.
winlin bc24c0407b for , move smi and rsh to play
winlin f7c893d907 for , move gop_cache and queue_length to play
winlin 06ae74dd3f for , move mw_latency to play.
winlin 4eb1874955 for , the vhost scope config is enabled, chunk_size, tcp_nodelay and min_latency.
winlin 9c4340f789 for , move atc and atc_auto to play
winlin d6b0aa3a5b for , move time_jitter and mix_correct to play
winlin 738642073e for , refine config, collect the mr and publish timeout
winlin bc100c2867 refine the log, move default to each functions.
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.
synote 9b01aad220 fix bug for build failure when configure with --log-info 
wrong use of size in SrsStream::initialize of  srs_kernel_stream.cpp
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
zhengfl 2263f2a610 refine code: 
优化 判断重复推流 及 推流流程
winlin 404bc565a1 refine the pithy print mechenism.
winlin 97b8c99682 Merge branch '2.0release' into develop
winlin bed540bac9 fix : http remux support reload
winlin da47f1648b refine file mode to 644
zhengfl f6a2cea716 refine code: 删除srs_app_edge中的user_stat相关代码。因为没有任何作用。
winlin 3dadad2dbc Merge branch '2.0release' into develop
winlin 0aed408855 refine code, to 644 and unix encoding.
winlin 210d0a67cb Merge branch '2.0release' into develop
winlin c6c90e2643 refine code, add comments for stat on_disconnect.
zhengfl db9ea4e66e rewrite
zhengfl f9257b89e7 fix 
问题：edge模式，推流时异常断开。
    解决方法：增加edge模式推流检测。
zhengfl 120033e0a2 fix 
edge模式，重新从源站拉流时，导致forwarders异常
winlin f39faa78bb refine config default values of srs, prepare to move each default values to functions.
winlin 9c716d4791 Merge branch '2.0release' into develop
winlin 3b8daafc03 use local openssl header files to avoid warnings on osx.
winlin c8fef99cb6 merge from 2.0release
winlin 438914c481 fix , fix the sps parse bug. 2.0.176
winlin 312366bba2 add srs_recvi_bytes for intranet bytes stat.
winlin 750399ace4 fix network device compare bug.
winlin 8cd68a1eb3 ignore any intranet bandwidth.
zhengfl 52110990c1 修正编码风格问题
zhengfl b4ff9cfba1 fix bug 
某种情况下，当客户端全部断开后，边缘服务器回源线程（EdgeIngester/EdgeForwarder）没有被断开。
winlin 8951752086 Merge branch '2.0release' into develop
winlin 8102a22606 add comments for async call.
winlin 6f685e66b1 Merge branch '2.0release' into develop
winlin 3211282b0c refine the http code.
winlin f8f6e438cc extract http static and http stream from http conn.
winlin e743795f3d Merge branch '2.0release' into develop
winlin baa892a762 merge srs_app_st_socket to srs_app_st.
winlin c58b7231e2 Merge branch '2.0release' into develop
winlin 17c276113e refine the hls dispose, when not cycle always dispose it.
winlin ec90ae2082 refine the space of code.
winlin 2f44a29b76 Merge branch '2.0release' into develop
winlin d103557a8b merge the rtmp sdk to stack.
winlin 0d66e92ab5 refine code, support configure to enable --memory-watch
winlin 69b7c57511 Merge branch '2.0release' into develop
winlin 0d6a574216 fix the hls_dispose bug, ignore for 0.
winlin b0ce38dc8f merge from 2.0
winlin 56938efdbd fix , refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175
winlin 12eab8a128 merge from srs2.
winlin 6941f2c072 fix , fix aggregate timestamp bug. 2.0.174
winlin 8e8c8108fc refine the time jitter code.
winlin 1f1776a0d8 fix the export project bug. wakeup connection when dispose server.
winlin bf9166dbec Merge branch '2.0release' into develop
winlin 969ed7b0ae refine build summary.
winlin 66837ffa6e fix the thread stop bug, must wait when not joinable.
winlin d317528af9 refine the signal manager.
winlin 7996b3b789 add warning for gmp, use gmc to detect memory leak.
winlin f347099fd1 for memory leak detect, move the payload create to message.
winlin 863dddde09 fix typo of code.
winlin 19e1f610a3 merge from bravo, parse the http reponse in json of bravo system.
winlin 00d1fdded0 Merge branch '2.0release' into develop
winlin 574cf6a094 use libfdk_aac for srs2.
winlin 00a25ee5c5 cleanup connections when terminate server.
winlin d7e5df2578 cleanup connections when terminate server.
winlin 573495a19f refine the memory watcher.
winlin bb4db61192 add srs memory watcher.
winlin 811ef4bcf6 dispose the gop cache
winlin 600e8e10d0 Merge branch '2.0release' into develop
winlin beb0431746 detect the monotonically increase and warn to use mix_correct
winlin 57f01185f5 Merge branch '2.0release' into develop
winlin 2d9f258eaf refine the mix correct algorithm, mix when got 10+ av or got 1 video and 1 audio.
winlin 17d6016bf6 Merge branch '2.0release' into develop
winlin ec24533955 use smaller value for publish timeout.
winlin a6dd8fb3a1 fix , when mix correct on, must check the type of dequeue msg.
winlin 5d75e32e1d Merge branch '2.0release' into develop
winlin a1dd734318 fix , drop video for unkown RTMP header.
winlin 679b4317d8 fix the build failed bug.
winlin 0fbfad4172 fix gop cache, drop video only when video and not h.264
winlin 2a1db36750 refine the pithy print of ingesters.