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

3248 Commits (9ae54850bf3f33df544e80981560dc72d44ea110)

Author SHA1 Message Date
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.
winlin d10d57716a Merge branch '2.0release' into develop
winlin e4c27a51b8 fix the hls bug
winlin 4400b12515 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release
winlin 26b76c0e4c fix , remove ts for hls ram mode.
winlin 5dd81d182c Merge branch '2.0release' into develop
winlin af9efe9213 disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls.
winlin 982a937e84 Merge branch '2.0release' into develop
winlin 4e42b9c628 copy the request for hls.
winlin 091b480ac9 Merge branch '2.0release' into develop
winlin 679583dad6 refine comments of ffmpeg.
winlin c1172c9940 Merge branch '2.0release' into develop
winlin 03d951c0fb fix the audio or video pid generate bug.
winlin c3c4cb2f2a Merge branch '2.0release' into develop
winlin 96f8f1f502 fix build bug.
winlin 09750082e5 Merge branch '2.0release' into develop
winlin 0a87b567f6 fix the build failed bug.
winlin 9dce971d57 merge from srs2
winlin 223ae194b1 fix , cleanup hls when stop and timeout. 2.0.173.
winlin 4a80a5a71e for , support cleanup when srs stop.
winlin 860d68e6e7 for , use fast stop for ingesters to stop many FFMPEG.
winlin d611bb6b45 for , server cycle to enable the hls to cleanup. do dispose
winlin 567d84e997 fix : when terminate srs, cleanup to ensure FFMPEG quit.
winlin db57a519a9 for , use SIGINT then SIGKILL to try to kill FFMPEG gracefullly.
winlin 597993d414 support pure video hls.
winlin 5caafadd45 fix : support pure video hls. 2.0.172.
winlin 27a1fee6b9 Merge branch '2.0release' into develop
winlin af4eec90ac for srs-dolphin, support HTTP and RTMP.
winlin b44987fac7 Merge branch '2.0release' into develop
winlin 394e070b2e support dolphin
winlin e5461d2df9 refine code
winlin 60775485c4 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release
winlin 385ee893f5 update readme
zhengfl 4864e796d6 fix #408:Queue丢视频时，不应该丢弃SequenceHeader
winlin 7e04975b8d fix the test configure script
winlin 1150cde829 fix the verbose build failed.
winlin ca01bd407b fix the bug of test configure script.
winlin fec8422d6b fix bug of configure.
winlin eb488e3bde fix the test configure script bug
winlin 02c4741d64 add usage and make jobs support for configure test script
winlin c1b9541b5c support disable all
winlin 9ab579c6e8 refine the configure test script.
winlin 409c1e4823 Merge branch '2.0release' into develop
winlin 2e1ca3c751 fix the build failed bug.
winlin cd162c2848 merge from 2.0
winlin d12fc7fcc5 fix , improve the HTTP FLV performance to 6k. 2.0.171
winlin 4df19ba99a for , improve the http flv to 3k. 2.0.170
winlin 8a9dbaefb7 use cache for flv tag header.
winlin 960341b9b2 for , improve the HTT FLV to 3k. 2.0.169
winlin b53e9814b3 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release
winlin fc995473eb for , improve the HTTP FLV delivery 1k to 2.3k. 2.0.168
winlin 2661e3c419 Merge branch '2.0release' into develop
winlin cf9ee04611 fix the utest build failed bug.
winlin f540ce307b merge from 2.0
winlin 069ee0afc3 fix , register handler then start http thread. 2.0.167.
winlin a45cf38d44 auto detect the sed command for osx.
winlin f510a3d6fb add /api/v1/versions for http server for go-sharp to detect.
winlin 58b336451d Merge branch '2.0release' into develop
winlin 94efe3f727 update wiki
winlin 5840bc1053 add flv cluster confs.
winlin 7571d70f16 fix the build failed bug.
winlin 2f66c8dd09 Merge branch '2.0release' into develop
winlin 93a1d097dc update jwplayer to support play HTTP flv.
winlin 829b3a392b merge from 2.0
winlin e96150b7db update readme
winlin 6b28dec8ec merge from 2.0release. refine the thread, protocol, kbps code. 2.0.166
winlin 5908096fc3 refine the thread, protocol, kbps code. 2.0.166
winlin af172d9593 refine script, use PROTOCOL as RTMP.
winlin 68d835021e refine code, move the kbps to protocol
winlin 478873fdec Merge branch '2.0release' into develop
winlin cfc0877ec9 refine the thread, add all callback.
winlin e5f449ce36 refine the thread to three category.
winlin 2f0ef87d6d refine code, rename the sync call to common class.
winlin 0bb90145ba fix , copy request for async call.
winlin 6bfb743aa0 remove the unused app http file
winlin f0ae66a081 merge the app http to conn.
winlin ce1bb6c605 refine code, extrat the ISrsHttpMessage.
winlin e2955da78f refine code, extract the http protocol sdk to module.
winlin d645411392 refine the kbps comments, add one usage.
winlin 7243cdbff6 merge from 2.0release.
winlin 6ca46e84bc fix , the USER_HZ maybe not 100. 2.0.165
winlin c17a1198cb fix , disconnect when not keep alive.
winlin 46a81372e7 fix , set recv timeout for http connection.
winlin 6f8c076b30 add comments for srs thread, add never quit thread.
winlin 948d200ce1 fix , parse when got entire http header, by feilong. 2.0.164.
winlin 5d7b0edccc merge from bravo code, fix some warnings.
winlin 44bc7976ac merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.
winlin 0f7cafe50b order the xcode project
winlin f6d2fd991b merge from 2.0.162
winlin c617d2aaa5 support push flv stream over HTTP POST to SRS.
winlin 39f5f80b6c Merge branch '2.0release' into develop
winlin 77ee2400df fix the unicode to ascii
winlin 1fd69beea5 Merge branch '2.0release' into develop
winlin 7fc1cda392 add stream status to api.
winlin 7ce9398b41 Merge branch '2.0release' into develop
winlin ac13817aae update donation
winlin 2d61a8cfaf Merge branch '2.0release' into develop
winlin f6252c7f72 enable hls for push flv.
winlin 644454a4f5 Merge branch '2.0release' into develop
winlin ffdabf32ed add push flv conf
winlin f13c4d3a0f Merge branch '2.0release' into develop
winlin e221d002a2 fix the flv caster bug, when nread is 0, disconnect it.
winlin e516c7f7a5 Merge branch '2.0release' into develop
winlin ad32048c1c fix the http flv stream caster.
winlin cba6675560 refine the http message, set the connection if required.
winlin ba6c3132e3 refine code, use decoder to parse flv stream
winlin 411f5a1d2a Merge branch '2.0release' into develop
winlin ea1e015a4e fix the http read chunked encoding bug.
winlin da00b67c76 Merge branch '2.0release' into develop
winlin a95fd6d140 read the http flv stream.
winlin 022b6aa561 refine the http remux for http flv stream.
winlin f0c24eeacc add stream caster for post flv over http.
winlin 91e285b0cd Merge branch '2.0release' into develop
winlin 4b372d8d16 change primary to the primary branch.
winlin 94681702e1 Merge branch '2.0release' into develop
winlin e63b8eda51 migarate to srs org.
winlin 42ddb76544 Merge branch '2.0release' into develop
winlin 8603dba697 migarate to srs org.
winlin 17b15deee6 Merge branch '2.0release' into develop
winlin b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org.
winlin 53e92a17f5 Merge branch '2.0release' into develop
winlin 115daa3cc1 migarate from winlinvip to srs org
winlin 5559fb9842 Merge branch '2.0release' into develop
winlin b3bd007f0d update git commit
winlin ae6d0a5ab1 Merge branch '2.0release' into develop
tufang14 b6d650cdb4 m3u8 mount bug
winlin dbcd7d883b add script check_hls_backup.sh to research hls.
winlin e50996270e fix the config parse error.
winlin 0acb942c3a update on_hls, add ts_url, m3u8 and m3u8_url.
winlin 7b157b0678 refine hls ingester, quit when error.
winlin aabe84046c refine hls ingester, quit when error.
winlin 114f4447bb Merge branch '2.0release' into develop
winlin 4e5ddb51e7 refine the overflow algorithm, prevent smaller piece.
winlin 1d973e2178 refine the overflow algorithm, prevent smaller piece.
winlin d19dfa528e abs overflow also plus the deviation, for pure audio hls.
winlin c514a4ceeb use atc for ingest hls aac time.
winlin 3e0ba172a3 Merge branch '2.0release' into develop
winlin a28eec89b0 support ingest hls with m3u8 in m3u8.
winlin 7d5f1c2be8 Merge branch '2.0release' into develop
winlin ba6736839b support hls ingest, fix the bugs.
winlin 2239e9f1fd support ingest hls live stream to RTMP.
winlin 23b978c0bb merge from github
winlin 623e37e22a Merge branch '2.0release' of github.com:winlinvip/simple-rtmp-server into 2.0release
winlin 6e5c587e0a support aac_adtstoasc filter to copy mode.
J aca02b6d6b for #384,refine code for empty body request.
J 8adbdc39e3 for #384,refine code for empty body request.
J a71db53661 for #384,refine code for empty body request.
J 56f75cbbe9 fix
winlin 6726a88f47 merge from 2.0release
winlin 22ca46350b fix , support mix_correct algorithm. 2.0.161.
winlin 8fbc6526bb for , refine code to support mix correct algorithm.
winlin 542aab4557 fix the hls notify bug, pass the query to get path.
winlin 70c1d3cc7e Merge branch '2.0release' into develop
winlin 02a2cb7e1a for , refine the hls notify, report one by one.
winlin a4216cc582 add todo for ts parse.
winlin 40eab7fc88 for , refine the deviation for hls.
winlin 0c939e7114 merge from 2.0.160:
winlin dcac9c69d5 fix , support reap hls/ts by gop or not. 2.0.160.
winlin 9759b78da8 Merge branch '2.0release' into develop
winlin 0000c945ea refine the proxy api server.
winlin fe1886aa08 add proxy for hls
winlin e5b8e0da01 fix async call and hls_nb_notify bug.
winlin 5d37e47783 support config the hls_nb_notify.
winlin 0a7cea063c refine http read, support c style api
winlin 5c00ce8a96 refine hls on_hls_notify, read a little of ts.
winlin 1f93fb3399 refine hls notify, support timeout.
winlin d8988da0ea refine the hls_on_notify, calc the spent time in ms.
winlin 310157ab77 refine the hls_on_notify, calc the spent time in ms.
winlin e6d6bdfe57 refine the hls_on_notify, only read a chunk.
winlin 17c1423f4a Merge branch '2.0release' into develop
winlin e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts.
winlin 7dbc95e085 refine the hls deviation for floor algorithm.
winlin 425e69e0cd Merge branch '2.0release' into develop
winlin 23b310971e guess again when annexb change to ibmf.
winlin 71e1602458 merge from 2.0.159
winlin bd77f995bf ignore the unknown flv tag.
winlin 546be09219 fix , fix hls bug, keep cc continous between ts files. 2.0.159.
winlin 29ac4c724b change default log tank to file.
winlin cfed8e81c5 merge from 2.0.158
winlin e56d7add44 fix bug of config to parse the default value. 2.0.158
winlin aef97db77a refine the config code.
winlin 931370e9f6 Merge branch '2.0release' into develop
winlin e7fd309cb0 refine hls info, show the deviation in seconds and pieces.
winlin e958305d09 Merge branch '2.0release' into develop
winlin 6e2d756e1b fix the bug of h.264 bit stream demux.
winlin bd7db5aed6 only ignore the aud message.
winlin 61d5b78ae5 refine the h264 parser, one ts message should parsed to one rtmp/flv message.
winlin 4329366c08 for , do not add deviation for absolute overflow.
winlin 4f9df4f1a0 merge from 2.0.157, reap ts on the IDR.
winlin 77c29da26b for , rewrite annexb mux for ts, refer to apple sample. 2.0.157.
winlin 70c59da1bf enhanced avc decode, parse the sps get width+height. 2.0.156.
winlin 7e1749e029 refine the comments.
winlin e458305f81 add utc time format.
winlin 90cd16aae4 Merge branch '2.0release' into develop
winlin 56cd373015 support hls callback with duration.
winlin 64b065e450 for hls callback, add duration of ts.
winlin c4466a8c0c fix crash bug for hls cleanup.
winlin eb54ec25c9 fix compile errors.
winlin cb148e43ee merge from 2.0.155
winlin 17c0a5c470 fix , support transform vhost of edge 2.0.155.
winlin d95e5a3f47 Merge branch '2.0release' into develop
winlin 4d98cbb965 add hls config in api.
winlin fe5783e7a4 merge 2.0.154
winlin 8401d9ac06 fix , config hls to disable cleanup of ts. 2.0.154.
winlin 2d3d628865 merge from 2.0.153
winlin 717d088376 support server cycle handler. 2.0.153.
winlin e75b7e89d6 merge from 2.0.152
winlin 3b4bd194b6 refine http hooks, donot pass the known variable.
winlin c49bc0628e support on_hls for http hooks. 2.0.152.
winlin 97442c56b6 enhance hls in floor mode.
winlin 76c1957260 enhance hls, increase piece one by one.
winlin ef28865991 merge from 2.0.151
winlin b9c21b1e8f enhanced hls, warning when ts dup or jmp.
winlin 9be7fbba7d user smaller deviation to avoid dup ts.
winlin f6e135943f enhanced hls, support deviation for duration. 2.0.151.
winlin 40f186ba82 Merge branch '2.0release' into develop
winlin cd682ae4be update donations. fix hls path bug.
winlin abbed8f66c merge from 2.0release
winlin 692b751da8 for , support config the m3u8/ts path for hls. 2.0.149.
winlin 922adaf59f Merge branch '2.0release' into develop
winlin 85afb6ea6f add donation. fix bug of adts.
winlin 01ee456649 fix the ts parse bug, should never complete message when PES packet length is 0.
winlin 75ca70c619 Merge branch '2.0release' into develop
tufang14 0faaa61be7 seg fault 
seg fault
winlin a5c5befad1 for parse video ts.
winlin 896983c1dc refine the aac codec enum name
winlin 1401f2e0ab ignore when sps/pps consumed all frame.
winlin 12d5431f3b Merge branch '2.0release' into develop
winlin b319e9ff9c ignore when sps/pps consumed all frame.
winlin c250e3e651 Merg branch '2.0release' into develop
winlin e818f36316 fix , fix build bug for centos7.
winlin 713cedfbb4 fix , RTMP/HTTP support bind to <[ip:]port>. 2.0.148
winlin b6feb0742f fix , RTMP/HTTP support bind to <[ip:]port>. 2.0.148
winlin d16ae193f6 Merge branch '2.0release' into develop
winlin fcab17741c fix , the dvr path rule changed.
winlin df3f24403e Merge branch '2.0release' into develop
winlin 02addf61f7 fix , remove the thread unsafe code, no static.
winlin bfa46e7a98 fix , remove the thread unsafe code, no static.
winlin f69fa7273b fix , remove the thread unsafe code, no static.
winlin 09ce6651eb Merge branch '2.0release' into develop
winlin 1cb2992808 refine build for modules, add defines.
winlin 0a7b179e14 Merge branch '2.0release' into develop
winlin 2f2aaf5ee4 for , refine code, donot check network devices for osx.
winlin e7e17cf15d fix osx bug.
winlin 33cca3e027 for , add todo for osx. 2.0.146
winlin e45c62003a Merge branch '2.0release' into develop
winlin bbac2348db for , remove the double underscore functions and variables.
winlin 7065db192c for , remove the double underscore of macro.
winlin 45d9018051 Merge branch '2.0release' into develop
winlin c6817cc422 for , remove the double underscore of macro.
winlin 3ca906d560 Merge branch '2.0release' into develop
winlin 014993ad1e remove the sudo of log.
winlin a4709a6439 for , add comments for the audio overflow ratio.
winlin b1142d83fc Merge branch '2.0release' into develop
winlin 0319e85f99 support config the audio overflow ratio.
winlin b7138ba9c5 merge from 2.0
tufang14 e319da3329 小瑕疵 
小瑕疵
winlin f564c903ac support got uptime and loadavg for osx. 2.0.145
winlin 4a50bf1894 Merge branch '2.0release' into develop
winlin fbd722bf76 refine the fast buffer to more readable.
winlin d25eb0aaa2 merge from 2.0
winlin f36e4a443d refine the fast buffer. 2.0.144
winlin 6a98758435 revert the changes for SRS2.
winlin df2644c850 merge from 2.0release
winlin 6855ab4c52 Merge branch 'develop' of https://github.com/tufang14/simple-rtmp-server into tufang14-develop
winlin 9bf6c9e9c6 Merge branch '2.0release' into develop
winlin cf3becbc17 for , osx(darwin) enable http api and stat, rusage is ok.
winlin 9f81a8b73e for , osx(darwin) support demo with nginx and ffmpeg. 2.0.143.
winlin ab673e1300 for , osx(darwin) support demo with nginx and ffmpeg. 2.0.143.
winlin a28c051c2c osx support build nginx and ffmpeg
winlin f3e5431d0f check what a fuck os for some fresh.
tufang14 1cc3384a19 seg fault 
seg fault
winlin 79fbeeb8c6 Merge branch '2.0release' into develop
winlin 8a4312f4ec fix bug, use size_t for string::npos
winlin 9e407d32fe change verstion to 3.0.0
winlin 2241ba0e34 for , , add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142
winlin 9c43c73d86 Merge branch 'develop' of https://github.com/wenjiegit/simple-rtmp-server into wenjiegit-develop
winlin 33e579599c refine build for osx
wenjie.zhao 65f404fb42 for , refine ts prefix code.
wenjie.zhao 5969f72354 for , refine ts prefix code.
wenjie.zhao 10da182853 add hls prefix of uri supported
wenjie.zhao efe3050d7a fix hls muxer Segmentation fault.
wenjie.zhao 73f13dfc42 fix hls muxer Segmentation fault.
winlin 9a0a8affc5 Merge pull request from tufang14/develop 
可能数组越界
winlin 685a29af83 Merge branch '2.0release' into develop
winlin c92d40e00b for , refine code, use kbps instead skt of rtmp connection.
Nimrod A. Abing (on kohima) a95bd7d30e Modified on_close webhook. 
Pass the send_bytes and recv_bytes count to the web hook.
Nimrod A. Abing (on kohima) bc93147426 for , disable st examples. for , refine the st init and event select.
tufang14 6cf5a6a7a9 可能数组越界 
可能数组越界
winlin 67671e43f9 Merge branch '2.0release' into develop
winlin 8ee0826e9a fix build failed bug.
winlin 0017ee85e0 Merge branch '2.0release' into develop
winlin 59d9af8039 update conf
winlin a21243ea12 merge from 2.0
winlin d349a3dbda update stable version check
winlin 519c25a064 fork srs2 and start srs3. 3.0.0
winlin 636bc574af start 2.0release, 80773 lines.
winlin e6058c1560 update donation
winlin 320f45c6f4 fix , support hstrs(http stream trigger rtmp source) edge mode. 2.0.140.
winlin 27cb62b7aa for , support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.
winlin 995b130090 for , refine code for hstrs, support hijack handler.
winlin 5c6ef6ded6 fix warning for xcode.
winlin 6d15d0ea99 for , refine code, add hstrs config.
winlin 74fa3ba16f fix build failed for linux.
winlin a15ce1147f for , fix all warnings for mac.
wenjie.zhao 643f18abe4 add hds reload supported.#328
winlin 984145de72 for , add todo for hds, check whether disabled, support reload.
winlin 5d12a1ab20 for , add hds specification.
winlin ffef62900f for , support adobe hds. 2.0.138.
winlin da56e4fbb9 for , fix hds compile error on mac.
wenjie.zhao 07d8f060eb refine annotation
wenjie.zhao 570c0d66bd fix path issue.
wenjie.zhao e57bda8908 Merge code. 
Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp
winlin a739b2c555 fix the bug for fork ffmpeg in mac, the local variable is unvailable.
winlin 3e5821efff enable http api for x86_x64
winlin 3732554844 remove the xcode state.
winlin 1ad0c847ce fix http parse bug
winlin f247ac9daf fix the http parse bug.
wenjie.zhao d4198ee8ba add hds supported.
winlin 5370493140 add ingest to mac.dev conf.
winlin 24616e15b5 remove the code for xcode, not required.
winlin b3aed2cb59 fix the bug of configure.
winlin f9767c91b5 fix configure bug, refine code for stream caster.
winlin 6c11207e28 fix http ts bug, the adts use id=1 which indicates the aac encoding.
winlin 5c3c38684b fix the bug of flv stream, metadata type should be 18
winlin 0ff49fd299 for , debug srs on xcode.
winlin db7ddfd510 fix , , support osx(darwin) for mac pro. 2.0.137.
winlin 20fb5f3e8e modify the colorful bash for osx.
winlin b0953c1d3a add comments of audio profile supported by srs.
winlin 5143e3a58d fix , http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136
winlin 2e9f2753c9 for , add stream codec info. 2.0.135
winlin 885b9af122 for , refine code to support he/hev2, use aac object.
winlin 8dbabe3708 fix , refine aac LC, support aac HE/HEv2. 2.0.134.
winlin d3e2838fc6 for , refine the aac profile for adts and aac object for RTMP sequence header.
winlin 04f3f2a8f8 for , add codec info to stream.
winlin 8bf60895a9 refine the kbps of server.
winlin fbbe46d272 refine the config, support directly parse file.
winlin b8e70f8538 support module
winlin ee30e6bb1f Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop
winlin 05d238f860 support modules.
winlin 688890cd7a refine configure, generate objs/makefile first.
winlin a29b8a7a5b refine configure, move auto headers to script.
winlin aaf87cf3d9 add srs module rule.
winlin b360fe279d remove libaacplus.
winlin 496f689de7 fix bug for libfdk aac.
winlin f26e719800 fix , fix http-flv stream bug, support multiple streams. 2.0.133.
winlin 1277968d4a refine http client, use initialize to set host and port.
winlin 2bcb4f811c refine http.
winlin 964e4be9d4 refine http request post. 2.0.132.
winlin 3982ec1d87 refine http request parse. 2.0.132.
winlin 4325809daf refine http
winlin 6fccfa061d refine the http request code.
winlin 025b707330 refine the http request reader.
winlin 3e394a5f06 for , set socket send buffer to smaller macro. 2.0.131
winlin 04dc60ebe1 refine http for srs, rename SrsGoHttp to SrsHttp.
winlin 983ab8fb89 pass all utest for 2.0
winlin e7fd733dc5 fix the long long warning.
winlin 3d47fbdc5c fix build failed of utest.
winlin a47dbf7a92 for , refine code.
winlin 34d6a2ece5 for , support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129
winlin f619f174e6 add readme for ide.
winlin 5d0cb7e68f update conf for rtsp
winlin 012c29e124 for , update the wiki.
winlin fb3fced8d0 for , revert dvr http api. 2.0.128.
winlin 8ed256b7e9 for , wait keyframe for dvr. 2.0.127
winlin 0213cc6466 for , refine dvr, support POST create dvr when publish not start. 2.0.126
winlin b903a7b436 for , dvr suport vhost/app/stream level control. 2.0.125.
winlin 1cb8e44b1b fix , fix hls bug, write pts/dts error. 2.0.124.
winlin a3648063d5 fix , support dvr http api. 2.0.123.
winlin d650118988 fix , dvr support api to start or stop. 2.0.123
winlin 1246989ea9 for , refine dvr, support callback when reap dvr segment.
winlin 849e59b05d for , support http api to start dvr.
winlin c67a4fdf97 for , enable http api crossdomain for dvr api.
winlin 1445086451 for , update the metadata of flv dvr file.
winlin 7077b74d03 for , add dvr plan append.
winlin 95b4baee7c for , refine dvr code to more simple.
winlin 3d225e1bc7 refine dvr, donot append the flv header.
winlin a984eeecab refine dvr, append file when dvr file exists. 2.0.122.
winlin 1102c7a58f refine pithy print to more easyer to use 2.0.121.
winlin 9d233db27e fix , support push rtsp to srs. 2.0.120.
winlin a954040d29 for , rtsp parse aac from rtp packet.
winlin 0cc693a3b8 for , decode the h264 NALU from rtp.
winlin 6a64164985 for , show more info about rtp.
winlin 45c0b12958 for , finish rtsp sdp, start rtp.
winlin f14af45413 for , alloc and free rtp port.
winlin d4ceff649f the join maybe failed, should use a variable to ensure thread terminated. 2.0.119.
winlin ccc30c70c4 the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.
winlin 40fbfd8560 for , rtsp extract tcp/udp listener.
winlin 4807f7850d for , rtsp parse the announce packet, parse the sps/pps and audio sequence header by base64.
winlin 604f4cc57b for , support the rtsp options request and response.
winlin c0e50265bd for , create rtsp framework.
winlin e81e090239 for , add rtsp listener and handler.
winlin 78f34ad46f for , support config default acodec/vcodec. 2.0.118.
winlin 922150b2cf for , rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117.
winlin 3c813847bd rewrite the ts remux of hls. 2.0.117
winlin 1ed3e283ab implements the pat/pmt write ts header.
winlin e88c1e32ee always increasing target duration, for
winlin 25af6c6847 for , use stringstream to generate m3u8, add hls_td_ratio. 2.0.116.
winlin 381e88d698 add release code. ZhouGuowen for SRS2.0
winlin b982b27f6f add dev code for each release. HuKaiqun for SRS1.0
winlin e19ee0cb99 for , set pcr_base to dts. 2.0.114.
winlin 87519aaae8 fix the avc codec bug, the ibmf format may like the annexb, we must guess only one time. 2.0.114
winlin 66931a8890 try to fix hls problem, print the video packets.
winlin b8d4f68a69 try to refine hls, always flush video when reap segment.
winlin 5a3cd235fd refine hls, try to fix the hls ts corrupt problem.
winlin d5e3ac4e7d for , the aac profile must be object plus one. 1.0.26
winlin 4820d455d5 for , workaround to force to LC/MAIN, donot support SSR above. 2.0.113
winlin f8bdd28de6 add comments for hls m3u8, target duration may should not changed.
winlin 693c7a5349 refine hls m3u8, use LR(0x0a, \n) as new line char
winlin 81ea6d34ce add pdf of hls rfc, corrent the content type.
winlin 30b1759aa9 fix bug for memory hls.
winlin bdda337f33 fix aac adts bug, the frame length is 2bits.
winlin 0af6e5e829 fix bug for srs-librtmp
winlin dba983d124 for , update the config for ram hls.
winlin a23191497f fix , support hls without io(in ram). 2.0.112
winlin 89b37d3469 for , refine the conf for hls.
winlin 4d10cc9f59 for , add conf.
winlin 16afe7ddbb fix , support push MPEGTS over UDP to SRS. 2.0.111
winlin 4246be92c9 for , merge avc to codec. use queue to dequeue.
winlin 153a3a6c42 must user pithy print for mpegts print.
winlin 70c8fe13c4 for , support h264 video for push mpegts over udp. 2.0.110
winlin 66fccdbbd1 for , demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109.
winlin bce78fdab6 for , add comments for elemetary stream specifed by stream_id.
winlin a384cc400a for , use udp packet handler.