Commit Graph

1906 Commits (c34b0c86e1b48d6f3e477bffe1a3117d046f609b)

Author SHA1 Message Date
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 a242aa35dc add pid to srs rtmp dump
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 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