Commit Graph

889 Commits (a95fd6d1400ddf900b8c55e4988e0896b20b09a7)

Author SHA1 Message Date
winlin 133cc62b51 for bug #194, use play fd poll, create the singleton poll 10 years ago
winlin efc85ed6df refine config, check the connections more precise 10 years ago
winlin de5e2d0a40 Revert "Revert "for bug #194, refine the config""
This reverts commit b4c1d55311.
10 years ago
winlin b4c1d55311 Revert "for bug #194, refine the config"
This reverts commit 2a55ae4317.
10 years ago
winlin e87eacd499 Revert "add srs pipe for bug #194"
This reverts commit f9756ea14c.
10 years ago
winlin 73abb1a31d Revert "for bug #194, add pipe to consumer."
This reverts commit 1e601a6efc.
10 years ago
winlin 306f75b267 Revert "for bug#194, open pipe for each connection."
This reverts commit ade81bb244.
10 years ago
winlin ade81bb244 for bug#194, open pipe for each connection. 10 years ago
winlin 1e601a6efc for bug #194, add pipe to consumer. 10 years ago
winlin f9756ea14c add srs pipe for bug #194 10 years ago
winlin 2a55ae4317 for bug #194, refine the config 10 years ago
winlin 36d12dd8ea for bug #194, change server main cycle to 1s. 10 years ago
winlin 8cc9a11b81 for bug #194, set the server main cycle to 1s 10 years ago
winlin 46330dd196 fix #195: remove the confuse code st_usleep(0). 2.0.13. 10 years ago
winlin 3358570be6 refine for bug#66, implements the usage. 10 years ago
winlin 72ad6894ca move the annexb decode utility to protocol. 10 years ago
winlin 59f68a2655 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 11 years ago
winlin e46e7fc596 update readme, rename wiki/xxx to wiki/v1_xxx 11 years ago
winlin 57e8356221 fix #184, support AnnexB in RTMP body for HLS. 2.0.2 11 years ago
winlin d24e2fd0cc remove supports for OSX. 2.0.1. 11 years ago
winlin f3002144fc fix #180: crash for multiple edge publishing the same stream. 0.9.220. 11 years ago
winlin bc6616bd1f refine code according to inspect of clion. 0.9.219 11 years ago
winlin bcd1b3d2d4 refine code, remove unused code of dvr. 11 years ago
winlin 20ebf68ea5 fix hls bug, refine config and log, according to clion of jetbrains. 0.9.216. 11 years ago
winlin 002facb85b refine code, fix bug of hls, following jetbrains clion code-inspector. 0.9.215 11 years ago
winlin 83f266b9e2 fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213. 11 years ago
winlin 1d454cd5fb add bug for http-mp4. 11 years ago
winlin 9dd0939327 fix the bug for gmc. 0.9.211 11 years ago
winlin 61728118ab donot destroy the source and connections of gmc. 11 years ago
winlin 79938f3214 add comments for gmc. 11 years ago
zhengfl c2ac11201b amendment srs_verbose info in the get_peer_ip 11 years ago
winlin 901c9590e4 refine log, log important to file. 1.0.210 11 years ago
winlin 728b749384 fix #167, add openssl includes to utest. 0.9.209. 11 years ago
winlin 53011808fb add sysctl vm.max_map_count for mmap. 11 years ago
winlin d0c585af86 max connections is 32756, for st use mmap default. 0.9.209 11 years ago
winlin 839101a036 reorder the config functions. add comments for st to support 100k threads, use MALLOC_STACK macro. 11 years ago
winlin 42a43c69cd fix #150, forward should forward the sequence header when retry. 0.9.208. 11 years ago
winlin 4d5414faec update log, add dsu(debug_srs_upnode), 0.9.204 11 years ago
winlin e656a65b6c for bug #162, add conf and connections limit. 11 years ago
winlin ab965655aa refine forwarder, add tracable debug info. 0.9.202 11 years ago
winlin e9e0cd757c fix #160, support forward/edge to flussonic, disable debug_srs_upnode to make flussonic happy. 0.9.201. 11 years ago
winlin c24e68dd70 refine the stat, use one ok. 1.0.200 11 years ago
winlin 6103b1c3ce refine options, add --with-stat. 0.9.199 11 years ago
winlin 3111870316 for bug #155, refine for osx, with ssl/http, disable statistics. 0.9.198. 11 years ago
winlin cf7504826b fix reload ingest bug, remove when disabled. 0.9.196 11 years ago
winlin 08bc34e0df refine wiki, cluster to forward. 11 years ago
winlin a9d28122f4 refine code, refine the handshake, refine the log of source_id 11 years ago
winlin 5b28355a0b fix #147, support identify the srs edge. 0.9.190. 11 years ago
winlin 33bc8755ab refine code, add comments for ossrs.net monitor. 11 years ago
winlin 67403bdbf1 fix #79, fix the reload remove edge assert bug. 0.9.189. 11 years ago
winlin ade2376da0 fix #57, use lock(acquire/release publish) to avoid duplicated publishing. 0.9.188. 11 years ago
winlin 6dd065bcc3 fix #85, fix the segment-dvr sequence header missing. 0.9.187. 11 years ago
winlin 5a95d594e7 fix #145, refine ffmpeg log, check abitrate for libaacplus. 0.9.186. 11 years ago
winlin d5ba529d32 fix #143, fix retrieve sys stat bug for all linux. 0.9.185. 11 years ago
winlin 7b24788445 for bug #143, build on centos5. 11 years ago
winlin 84450e1588 fix #138, fix http hooks bug, regression bug. 0.9.184. 11 years ago
winlin 721acc350a fix #142, tcp stat slow bug, use /proc/net/sockstat instead, refer to 'ss -s'. 0.9.183. 11 years ago
winlin d5f03200a7 revert tcp stat. need more refine. 0.9.182 11 years ago
winlin f7fdbe6848 update get connections thread to sleep 10ms per 1000 connectios. 0.9.181 11 years ago
winlin 15d4993cc3 slowdown the cpu usage for srs to calc connections when too many connections. 0.9.180 11 years ago
winlin 6539ce69f4 fix #141, support tun0(vpn network device) ip retrieve. 0.9.179. 11 years ago
winlin f0ffdcc0ae fix #141, support tun0(vpn network device) ip retrieve. 0.9.179. 11 years ago
winlin 79c641e8d6 remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178 11 years ago
winlin 792a6f944f refine utility of cpu, add comment for cpu percent 11 years ago
winlin c16d3585a5 refine utility of cpu, add comment for cpu percent 11 years ago
winlin b198d17ab9 Merge pull request #135 from T-bagwell/master
Support porting srs on MacOS OSX system Platform
11 years ago
Steven Liu b50ecd6dbe Support porting srs on MacOS OSX system Platform
Add the OSX platform cross complie options into srs
11 years ago
winlin 9c11001391 refine log for stats network and disk 11 years ago
winlin 6f700f3f40 rename network_device_index to network 11 years ago
winlin f4ea48adcb rename network_device_index to network 11 years ago
winlin b8ae5c63fc add disk io test command 11 years ago
winlin 42464cbe1f add disk io test command 11 years ago
winlin 4f4b15f500 refine the disk iops stat, get cpu info. 11 years ago
winlin ef7a02e643 refine the disk io busy, can >1 11 years ago
winlin df8414af63 api connections add udp, add disk iops. 0.9.176 11 years ago
winlin b334021836 add config item for the stat disk device name 11 years ago
winlin 7c1dd97513 refine system stat, use fgets and sscanf. 11 years ago
winlin a7a009212b refine the cpu stat, use fgets and sscanf. 11 years ago
winlin f53bfcea54 add udp stat to nb_conn_sys as nb_conn_sys_udp 11 years ago
winlin e76036f40b refine config heartbeat, add new stats. 0.9.175 11 years ago
winlin 02f7c85710 add total system in and out KBps disk stat. 0.9.174 11 years ago
winlin d2f125b6d6 refine the cpu usage calc, add total_delta. 11 years ago
winlin d0bc0884d1 refine rtmp client, add comments for the dumps_packets() 11 years ago
winlin a645b403c8 add comments for utility, the USER_HZ for /proc/stat 11 years ago
winlin 6d9d9ee3c5 updte forwarder comments 11 years ago
winlin 6ee9ea341a refine code, rename SrsSocket to SrsStSocket 11 years ago
winlin b19d2e8e2d refine code, rename srs_app_socket.cpp to srs_app_st_socket.cpp 11 years ago
winlin fbddfbc8a3 fix #134, not fix for the shrink to clear the queue. 11 years ago
winlin b10d95205a fix #134, not fix for the shrink to clear the queue. 11 years ago
winlin 30ebba0673 add config check utest 11 years ago
winlin ebf9e560b1 refine the max connections, compare the system ulimit max open files, error when exeed limit 11 years ago
winlin 5f7ff37e64 fix the utest mock config bug 11 years ago
winlin 9f2da4e095 refine log, can be used when _srs_config is NULL. 11 years ago
winlin 7241fa8744 fix #126, srs_publiser add warnings. refine config utest. 11 years ago
winlin b17c736f3f fix #124, gop cache support disable video in publishing. 0.9.171. 11 years ago
winlin 50cd1d2360 refine the config 11 years ago
winlin 7865b0e935 refine config, check chunk size. 11 years ago
winlin 630bdf0c80 refine config, check the value of http api/stream. 11 years ago
winlin 7207c2f435 refine config, check all config item name. 11 years ago
winlin 1c27f3b913 refine config, warning when feature disabled. 11 years ago
winlin 91d2296836 fix #121, srs_info detail log compile failed. 0.9.168. 11 years ago
winlin 2e58fac5eb fix #122: edge forwarder(push to origin) assert failed, init client when connect to server. 0.9.167 11 years ago
winlin 2c9e16a9e7 add utest for config vhosts, transcode/dvr/hls 11 years ago
winlin d612597a8f refine log of edge push/pull 11 years ago
winlin 77236920b6 add config utest, for default vhost 11 years ago
winlin f1b1dc0c64 add utest for config full.conf, fix the chunk-size bug 11 years ago
winlin 0db2e6b8e9 fix the empty config error 11 years ago
winlin 75bfe2af78 refine the LF,CR 11 years ago
winlin 8cd9be4fce add comments for LF,CR 11 years ago
winlin c65a6b5d63 fix the conf_line bug of parse config directive. 11 years ago
winlin 86ad39f001 finish basic utest for config 11 years ago
winlin 8497b22d4a complete the consts refine 11 years ago
winlin 1afa6ed607 refine consts. 11 years ago
winlin 2667815123 refine consts, move http consts to kernel consts 11 years ago
winlin c46b3bd193 refie http consts. 11 years ago
winlin 573952e2fc refine macros of HTTP 11 years ago
winlin 198a7f1e9d refine the rtmp consts name 11 years ago
winlin a9f7f1ecfe refine the consts to kernel consts 11 years ago
winlin baa20b2f31 refine the config consts 11 years ago
winlin 736ec48c71 move some consts to kernel consts 11 years ago
winlin 073d900674 add consts to kernel 11 years ago
winlin f8423dfa90 fix #119: use iformat and oformat for ffmpeg transcode. 11 years ago
winlin 9bf7b722db fix #119: use iformat and oformat for ffmpeg transcode. 11 years ago
winlin 2f0a72d7d1 refine config, add comments 11 years ago
winlin a5f4323ea8 refine config, add comments 11 years ago
winlin b4e2d70390 refine config comments, return the engines of transcode. 11 years ago
winlin 2293700728 refine config, remove the const string& 11 years ago
winlin 1accd8c790 refine config, add comments. 11 years ago
winlin f572531eca refine config, return the vhosts vector. 11 years ago
winlin 96e0e699dd refine the get port, return a vector<string> contains ports. 11 years ago
winlin 1243d962b8 update comments of utility 11 years ago
winlin b37aeff8d5 refine config, check name 11 years ago
winlin 25180c51b4 refine the config comments. 11 years ago
winlin 1e8981eb08 extracta parse_buffer for config 11 years ago
winlin 784d7499cf refine config, add error line log 11 years ago
winlin 9f7d488fa4 refine config, add comments. 11 years ago
winlin f6b084b679 remove the reload create function. 11 years ago
winlin f4ffe0aaee refine config, move file buffer to internal namespace 11 years ago
winlin 654c3c6d71 refine server, add comments 11 years ago
winlin 88dc1523d8 refine code, add comments for bandwidth; remove the bwtc configure script test item. 11 years ago
winlin 7945a42770 refine code, add the video tag comments. 11 years ago
winlin 26bfbaeb82 refine code. 11 years ago
winlin 465ff88b1f refine hls avc/aac codec, move metadata to it. 11 years ago
winlin e50968f404 refine the hls codec, add comments. 11 years ago
winlin a4d3283cdd refine hls codec sample info. 0.9.161 11 years ago
winlin f020690ed7 add comments for the FLV/RTMP enums 11 years ago
winlin 5c4398f4a9 refine bandwidth check/test, flash publish test is ok. 11 years ago
winlin 9135aa117c use librtmp to implemnts the bandwidth linux tool. 0.9.158 11 years ago
winlin cc62d254f0 add librtmp bandwidth check/test client. 11 years ago
winlin ccd99381e6 fix bug, when disable all, some code of HLS must be exported. 11 years ago
winlin 0322dbbfb2 big refine code, add author to bandwidth test/check. 11 years ago
winlin b33a61a8da finish refine bandwidth check/test server-side. 11 years ago
winlin 0fb51413f4 refine bandwidth test, use function ptr. 11 years ago
winlin 539b595604 refine the bandwidth server-side, use kbps limit and sample. 0.9.157 11 years ago
winlin e220596675 refine bandwidth server-side, use sample and kbps limit 11 years ago
winlin 79e7e2d6cc refine bandwidth server-side, use bandwidth sample and kbps limit service 11 years ago
winlin 3a1b3dd142 fix bandwidth bug, config item interval to float. 11 years ago
winlin c319cc6a40 refine bandwidth test client, provides js and as library 11 years ago
winlin b1dd0218be refactor bandwidth test, refactor the interface of bandwidth server object. 11 years ago
winlin 88c94193a3 rename rtmp_stack to stack. remove the global templte function to member function. 11 years ago
winlin 9556790a5e finish utest of protocol stack. 0.9.156 11 years ago
winlin 6a4b177475 refine shared ptr message, rename initialize to create 11 years ago
winlin 96e0273e99 refine hls, extract the flv/aac sample rates 11 years ago
winlin dc7b952043 change HLS audio delay to 100ms. 0.9.153 11 years ago
winlin f895523ac6 fix hls media codec info bug, ignore nal_unit_type 7/8/9. 0.9.152 11 years ago
winlin 21a75924ad fix hls media codec info bug, ignore nal_unit_type 7/8/9. 0.9.152 11 years ago
winlin aefff75d08 fix #103, support all aac sample rate, add detail codec logs. 11 years ago
winlin f53abfa1d1 update comments for aac he or he-v2 11 years ago
winlin b2303c5704 refine code, use macro for hls resample audio 11 years ago
winlin 921b7d239f refine code, use macro for hls resample audio 11 years ago
winlin 63214d0f2b fix #81: support all aac sample rate, for instance, 48000. to 0.9.150 11 years ago
winlin 5a41b1b538 finish kernel utest. to 0.9.149 11 years ago
winlin 95e73d0be1 remove the config log http api. 0.9.148 11 years ago
winlin d219a7b67e complete the normal kernel flv utest. 0.9.147 11 years ago
winlin 010eb09a30 Merge branch 'master' of github.com:winlinvip/simple-rtmp-server 11 years ago
winlin 8271bd657b refine flv codec, rename fast encoder to flv vod stream decoder 11 years ago
winlin 032118581a refine http/dvr/hls to use file reader/writer. 0.9.146 11 years ago
wenjiegit d7454134c9 Update srs_app_hls.cpp
for hls, srs should not allow player to cache m3u8 list.

add #EXT-X-ALLOW-CACHE:NO to m3u8 file.
11 years ago
winlin 1a7735182f refine the file stream, to file reader and writer. 0.9.142 11 years ago
winlin 492665e166 refine tcp client connect, extract to utility srs_socket_connect. 0.9.141 11 years ago
winlin cb2967c967 refine forward, use utility to generate the tcUrl 11 years ago
winlin aad42d7941 fix ubuntu14 build warnings 11 years ago
winlin bfeb24c52b update call response, add comments. 11 years ago
winlin fea8755719 response the call message with null. 0.9.137 11 years ago
winlin 53ad510766 add comments for the connection remove 11 years ago
winlin a3f9aa7e1e fix #110, thread start segment fault, thread cycle stop destroy thread. 0.9.136 11 years ago
winlin efed34301c add virtual destructor to SrsRefer 11 years ago
winlin b357504b1d fix #109: fix the system jump time, adjust system startup time. 0.9.135 11 years ago
winlin 0cd0761508 fix time jitter zero algorithm bug, reset when timestamp overflow. 11 years ago
winlin 1970e18ed6 fix #108: disable the time jitter for encoder non-monotonical stream. 0.9.133 11 years ago
winlin f173345e15 support report summaries in heartbeat. 0.9.132 11 years ago
winlin db253bc76b fix fms token traverse bug, always update the token by the latest valid client. 11 years ago
winlin 1ae3e6c64c performance refine, support 3k+ connections(270kbps). 0.9.130 11 years ago
winlin 41857edaee support edge token traverse, fix #104. 0.9.129 11 years ago
winlin 10953c9743 support token auth in connect args. 0.9.128 11 years ago
winlin 094d82bd06 add connections count to api summaries. 0.9.127 11 years ago
winlin 6ee2ba049b add srs bytes and kbps to api summaries. 0.9.126 11 years ago
winlin 46611ac062 refine configure, add cubieboard. use IProtocolStatistic in kbps. 11 years ago
winlin b0e4dc8085 refine network bytes of summaries, remove the lo data. 11 years ago
winlin d0b08d0d51 add network bytes to api summaries. 0.9.125 11 years ago
winlin cbc1486688 refine message, add license 11 years ago
winlin 55b99c90c7 refine detect tool, support atc stream. 11 years ago
winlin ef6efb821c add rtmp detecter 11 years ago
winlin 6286759eaa refine codec, extract avc aac codec to app. 11 years ago
winlin 31b568b013 refine core, move specified functions to kernel utility. 11 years ago
winlin 94cf0c1069 refine kernel buffer. complete the utest for buffer. 11 years ago
winlin 8992e217a9 refine srs buffer, min interfaces 11 years ago
winlin 7166b666c8 refine http log. 11 years ago
winlin 5273509554 refine log, to 0.9.123 11 years ago
winlin 4970664e37 move codec to kernel. 11 years ago
winlin 608083d42f add flv injecter, add flv codec to librtmp. 11 years ago
winlin 978e985519 fix #87: add source id for full trackable log. 0.9.120 11 years ago
winlin 8d99ef27cf fix #84: unpublish source when edge stop, clear gop cache 11 years ago
winlin 7920348e5f extract get_local_ip and get_peer_ip to app utility 11 years ago
winlin e39eed6519 add SrsPid and SrsId to client response, add pid to log 11 years ago
winlin d74921e1ab fix #89, config to /dev/null to disable ffmpeg log. 0.9.117 11 years ago
winlin 14f0a2e046 for bug #88, add timeout for connect. 11 years ago
winlin b13bd70c86 http streaming support flv start index. 11 years ago
winlin 344a49918a fix #79: allow edge vhost to add or remove. 11 years ago
winlin 0eb9e0af5b fix #78 st joinable thread must be stop by other threads, 0.9.113 11 years ago
winlin 6fba0db9b5 refine http stream server 11 years ago
winlin 9eedf1ac40 the st_thread_exit is ok, not the memory leak cause. 11 years ago
winlin 5f7bacf678 fix st thread exit bug, never implict invoke the st_thread_exit, which may cause memory leak. 0.9.112 11 years ago
winlin bd24fe7d75 support flv parser, add amf0 to librtmp. 0.9.110 11 years ago
winlin d4b8fee61a fix bug #73, http callback api support authentication in tcUrl 11 years ago
winlin f0b54678ad fix http hooks dvr bug, check dvr macro 11 years ago
winlin ef0f7f4da8 support http heartbeat, 0.9.107 11 years ago
winlin cb95b5909c add http heartbeat framework 11 years ago
winlin 7c804277b2 add heatbeat url, add stream for api-server 11 years ago
winlin 0186247fee support http api json, to PUT/POST. 0.9.105 11 years ago
winlin 3064e5ec61 fix bug of nx_json parse, to 0.9.104 11 years ago
winlin d6355efe22 support http api json, to PUT/POST, to 0.9.103 11 years ago
winlin b60e8418c6 add json base on nxjson(nx-json/nx_json) decoder for http api. 0.9.102 11 years ago
winlin 2c059d3a80 fix bug #72, also need stream_id for send_and_free_message. 0.9.101 11 years ago
winlin 952abbee03 use server ip or name for forward tcurl. 11 years ago
winlin c59576146b rename struct to class. 0.9.100 11 years ago
winlin 2f89c8b2e8 move some utilities from kernel to app. 0.9.99 11 years ago
winlin 4b8d3fe05f refine log, add overflow log 11 years ago
winlin 47089f0e82 add nxjson 11 years ago
winlin 154f084f1b add comments for json 11 years ago
winlin cf712b06bb fix bug #67: fix pithy print bug, stage must has a age. 0.9.98 11 years ago
winlin cbbf53f8f9 fix bug #67: fix pithy print bug, stage must has a age 11 years ago
winlin b175821b62 refine kbps, provides 30s,1m,5m,60m kbps. 0.9.97 11 years ago
winlin 830f0b5eb6 refine metadata info 11 years ago
winlin 3ebda13802 refine the ptr array free, 0.9.96 11 years ago
winlin dc66c525fd refine autofree, only free object, never free arrays 11 years ago
winlin 300f264e92 set metadata time equals to sequence header time. 11 years ago
winlin 91eabda7b8 add comments for source, return for sequence header. 11 years ago
winlin 9ba786d1aa fix bug of mem leak, free the left msgs if send error 11 years ago
winlin befde6acf7 fix mem leak for delete[] SharedPtrMessage array, explicit free elems. remove srs_freepa. 0.9.95 11 years ago
winlin 0a1c0afe8d fix bug of NULL ptr for edge kbps object 11 years ago
winlin 7004510cc7 fix ffmpeg log fd leak, always close log_fd. 0.9.94 11 years ago
winlin 74e6e28993 refine the kbps calc module. 0.9.93 11 years ago
winlin 9006194cd7 refine framework to calc the kbps 11 years ago
winlin 3f33dffdb3 refine the quit and destroy, quit when normal, destroy only for gmc 11 years ago
winlin 900406cc70 refine api, now to now_ms 11 years ago
winlin a1fed15789 add uptime, startup time, load to api 11 years ago
winlin 8388da6325 add miss files. fix bug #60: support aggregate message 11 years ago
winlin f8e8c81e50 refine log, simplify it. to 0.9.90 11 years ago
winlin 106270c8aa refine log messages. 11 years ago
winlin a4410a4fa9 update pithy-print to 10s. refine log 11 years ago
winlin 243a2eabf5 explicit exit st-thread, for gmc to analysis mem 11 years ago
winlin 96a5c7b1ab fix mem leak of encoder, edge and source. add destroy for gmc to detect mem leak. to 0.9.89 11 years ago
winlin e492180b78 fix mem leak detect bug, destroy server when quit 11 years ago
winlin b53f83acf1 rename __srs_rtmp_expect_message to srs_rtmp_expect_message 11 years ago
winlin d74f01e2d1 fix signal bug, break for gmc. fix SrsMessage leak, use common message to free payload. to 0.9.88 11 years ago
winlin fc501b050b add atc_auto to disable or enable auto detect atc 11 years ago
winlin 30bb3ff704 add dvr_plan hss to full.conf 11 years ago
winlin aebff659b6 remove wait interval for signal 11 years ago
winlin d0dff2d332 fix bug #34: convert signal to io. 0.9.85 11 years ago
winlin a14220d4fb fix bug of auto bravo atc 11 years ago
winlin 6ee49ee029 bravo auto atc per stream. 0.9.84 11 years ago
winlin f02ac02a50 auto open atc for bravo_atc set 11 years ago
winlin 80ddddf823 refine RTMP protocol completed, to 0.9.81 11 years ago
winlin be4c182d11 refine RTMP protocol stack. 11 years ago
winlin ebf6203c3b refine rtmp protocol stack, refer to go.rtmp 11 years ago
winlin fd0efecbc8 refine ingester pithy print 11 years ago
winlin cb2959ae7d fix bug #53, never use msg when sent it 11 years ago
winlin 23b04e2a57 completed the edge reload, to 0.9.79 11 years ago
winlin c681098949 fix bug of edge, one fd for one thread 11 years ago
winlin a363e3d293 support basic edge(play/publish) RTMP server. 0.9.78 11 years ago
winlin bc7648724d use directly send publish edge mode. 11 years ago
winlin 2295ebb346 remove the edge message flag, use directly send mode 11 years ago
winlin 5ddc71685b pre change publish edge to directly send mode 11 years ago
winlin 16319d73fd implements basic edge(play and publish), with bug 11 years ago
winlin 79c9c6dcb7 implements the proxy for edge publish mode 11 years ago
winlin ec96072472 add publish edge framework 11 years ago
winlin 270b1270af fix bug of edge, refine state to user state. 11 years ago
winlin 2bcaeccc51 edge support play and ingest origin stream. change to 0.9.77 11 years ago
winlin acba4cfdc6 add edge framework 11 years ago
winlin b0951d36d3 refine source, rename req to _req 11 years ago
winlin a2f317a113 add chad.wang to authors for srs-librtmp on windows build project 11 years ago
winlin a63a3812e3 add srs app edge 11 years ago
winlin d6948d613f add author byteman for h264 to flv. 11 years ago
winlin 3ed59f190b refine srs live flashP2P(integrated by chnvideo) 11 years ago
winlin 67e1988b81 support live flashP2P(integrated by chnvideo VDN). 0.9.75 11 years ago
winlin b276714573 support chnvideo hss streaming 11 years ago
winlin 35f3a93239 support dvr to hss. change to 0.9.74 11 years ago
winlin e271cb607f refine plan, add stream start time for atc 11 years ago
winlin 0c0010d529 update dvr, extract flv segment 11 years ago
winlin 7ff8df4d97 refine code, notice api when segment close 11 years ago
winlin 435e02db5d dvr use .tmp and rename to .flv when finished. 11 years ago
winlin 733ca2475d call http api when dvr got keyframe 11 years ago
winlin 36d8fdfc1a move the ts buffer to http message 11 years ago
winlin a73bf8d4aa optimizm the http server for send ts file 11 years ago
winlin a5f4f6bd14 add meminfo 11 years ago
winlin 15aea4d9b3 add cpuinfo 11 years ago
winlin 951a93ab86 get self proc and system proc stat 11 years ago
winlin 117fd67950 add cpu stat 11 years ago
winlin 67ddc9f5ae support dvr(record live to flv file for vod), change to 0.9.70 11 years ago
winlin ab9a2ddd6c dvr support segment plan 11 years ago
winlin 2d1c28cff9 update dvr, support segment plan 11 years ago
winlin 6f19a83114 dvr support plan and default session plan 11 years ago
winlin 4b82a4f510 support reload dvr 11 years ago
winlin 9861fc4fe3 refine dvr, add comments 11 years ago
winlin 56ff70cdf8 remove lseek and size of fs stream 11 years ago
winlin 271b969d0b set audio/video flag to 0 in flv header. 11 years ago
winlin 73459547e1 support dvr. change to 0.9.69 11 years ago
winlin 996d042a33 add comments for file stream 11 years ago
winlin f5ff9c7241 update dvr comments 11 years ago
winlin fdd0678bcb add thread cid to log 11 years ago
winlin ae3f7d9cb8 change meeting hls to an 11 years ago
winlin 0c91fa6bed fix dvr mem leak, free msg when not use it. 11 years ago
winlin 005502a07e update comments for HLS on_hls_start 11 years ago
winlin fd0002e499 add dvr framework 11 years ago
winlin 96115ac4f7 fix bug of config params. x86/x64/pi never use static 11 years ago
winlin 90dee0924d fix bug of build script 11 years ago
winlin 23a1b29935 add dvr option. refine macros of auto headers 11 years ago
winlin 1ae9178605 add favicon.ico, change to 0.9.65 11 years ago
winlin b86c83b0e0 refine the info for log to file. 11 years ago
winlin ce64dafc3c use stream time for live duration. change to 0.9.64 11 years ago
winlin 2c6b6c6846 fix bug #47: use stream time to stop for duration of rtmpdump 11 years ago
winlin 73c310cd2e refine the macro. 11 years ago
winlin 9a036958d7 fix bug #45, support duration for live. change to 0.9.62 11 years ago
winlin 04a526b340 change SRS_TRANSCODE macro to SRS_RTMP_TRANSCODE 11 years ago
winlin a0472f256d support test config file. change to 0.9.61 11 years ago
winlin f980340e89 refine config option 11 years ago
winlin aa784377fd refine reload, ignore if parse config file failed. 11 years ago
winlin cfee761899 support full reload. change to 0.9.60 11 years ago
winlin bb87272c39 refine reload, rename some vhost specified to add vhost prefix 11 years ago
winlin dc3c3cff8e support reload http_stream 11 years ago
winlin c33ff4fdb8 support reload http_api 11 years ago
winlin 17ac29d160 refine code for reload http api/stream 11 years ago
winlin 821b58af03 support reload atc 11 years ago
winlin eda1ddc03d support reload log level/logfile/tank 11 years ago
winlin f652c28485 support reload pid. 11 years ago
winlin 0a016e58bf add comments for main 11 years ago
winlin b38df9cd1a refine main object(server, config, log, context), handler reload in intialize(), change to 0.9.59 11 years ago
winlin 15f651bccd update demo, support acodec 11 years ago
winlin 3a26b23fba change ffmpeg log to ./objs 11 years ago
winlin ccba9ba9ba move log level parse to app utility 11 years ago
winlin f2f30dcc52 add utility, change log to trace 11 years ago
winlin 94874e77af refine reload config 11 years ago
winlin 6c5d8b4851 refine reload config 11 years ago
winlin bc61b1de18 fix bug of reload ingest 11 years ago
winlin e0a6fe63cc fix bug of reload ffmpeg, support multiple transcode, change to 0.9.57 11 years ago
winlin 9ed3421586 rename from get_ingest to get_ingest_by_id of config 11 years ago
winlin e432fe931f support reload ingesters(added/removed/updated). change to 0.9.57. 11 years ago
winlin e6d8bc1e5c ingest reload: support disable vhost 11 years ago
winlin 5e504944dc add comments for http conn 11 years ago
winlin dc71eef394 support ingest reload: add new vhost with ingester 11 years ago
winlin e5646e3bb5 refine ingester, add vhost/id info to ingester 11 years ago
winlin 9372a7065a refine the ingest log 11 years ago
winlin ccf0a423be change sleep time from 3s to 0.6s for ingester. 11 years ago
winlin 509504f27d change sleep time from 3s to 0.6s 11 years ago
winlin eba35e2ac0 refine the macro SRS_FFMPEG to SRS_FFMPEG_STUB, SRS_FFMPEG_TOOL to build ffmpeg tool 11 years ago
winlin 70e73bc281 add comments for bug #39 11 years ago
winlin d124772d6a add http server/api to srs.conf. add comments for bug #6. 11 years ago
winlin c11e266d5c update readme 11 years ago
winlin 4f445f2f60 support ingest stream 11 years ago
winlin e89ab84e4e implements ingest, change to 0.9.53 11 years ago
winlin 2742679354 implements the ingest framework 11 years ago
winlin 92281548b6 add ingest config 11 years ago
winlin 9107831b0e add config to read ingesters 11 years ago
winlin f5c4f492da add comments for ffmpeg 11 years ago
winlin c759a7c6b5 refine log of ffmpeg 11 years ago
winlin 4f7cfeed37 change to 0.9.52, refine encoder and ffmpeg 11 years ago
winlin 72c330d47c refine ffmepg and encoder, extract ffmpeg. 11 years ago
winlin 095364a72b refine ingest, start/stop ingest in server 11 years ago
winlin eea2310b07 refine consts 11 years ago
winlin 4a7378b77a ingest stream when server cycle 11 years ago
winlin adfbbbfd68 add ingest files 11 years ago
winlin 983fe46ce2 use --with-ffmpeg to compile FFMPEG tool only, use --with-transcode for transcoding 11 years ago
winlin c4524484e6 add comments for aac encoder 11 years ago
winlin 7916cab50e donot check the aac encoder, ensure aac is ok 11 years ago
winlin 30e3323fe4 update readme, add SampleHTTP link 11 years ago
winlin 4e3fe36ae2 refine http server pages. change to 0.9.51 11 years ago
winlin ced050829e fix bug of http, change to 0.9.50 11 years ago
winlin c5d3b11a6e update http stream. change to 0.9.49 11 years ago
winlin 17ce21348d implements the http stream module. change to 0.9.49 11 years ago
winlin ef26e77560 implements the http stream module. 11 years ago
winlin 00eda0d7b2 implements the http stream module. 11 years ago
winlin 83f35d10b1 add http delivery framework 11 years ago
winlin 8d7877ebd1 refine config, group by sections. 11 years ago
winlin b7093246e4 fix forward conf file bug, change pid file. change to 0.9.48 11 years ago
winlin 6d32ad1828 refine log and thread function name 11 years ago
winlin 3f13726544 add log level in conf. change to 0.9.45 11 years ago
winlin 4984631cd6 refine the http crossdomain, send it only required 11 years ago
winlin 133a6f0dbf add crossdomain support for http error 11 years ago
winlin b71eb0d49a support more splash in http url. remove the strip of SrsRequest, use srs_string_remove instead, change to 0.9.44 11 years ago
winlin f2216691f9 remove the duplicated http status line when error 11 years ago
winlin 818c1f1520 support http error code, check url 11 years ago
winlin 0ae23d7556 rename version to versions 11 years ago
winlin 4a40075f68 add contributors to api/v1/authors 11 years ago
winlin 5c019c7938 implements api/v1/version, change to 0.9.43 11 years ago
winlin 9c3ba680d8 fix http hooks json encode bug, remove the JFIELD_CONT for the last field 11 years ago
winlin a14267d2b4 refine the http url handler match. refine json encode 11 years ago
winlin bfa07465f0 implements basic http response framework 11 years ago
winlin 341b5151d9 create http handler framework 11 years ago
winlin eae9b94153 add api framework code 11 years ago
winlin 0ba0c14fb8 refine code, donot listen if not enabled http 11 years ago
winlin ec6d696565 refine http framework, use http message 11 years ago
winlin e70609cea3 refine code, extract http hooks. 11 years ago
winlin 5bbb76a59d remove the namespace srs, use http prefix 11 years ago
winlin 1922d62ff7 add --with-http-api option 11 years ago
winlin 52263457bf fix bug of no http-server feature 11 years ago
winlin 6ca9b774c1 support http methods, support js crossdomain request 11 years ago
winlin 51c1615173 change to 0.9.42, add http parse framework 11 years ago
winlin b0d77c4697 move wiki images to srs.release 11 years ago
winlin c7a4dd8863 move wiki images to srs.release 11 years ago
winlin 41f5217360 refine http code, define CRLF consts for http 11 years ago
winlin 6913efe127 implements the http api/stream framework 11 years ago
winlin ab3c6c92a0 rename srs-client to srs-rtmp-conn 11 years ago
winlin aa89f9f51e change to 0.9.37, for http api/stream 11 years ago
winlin 4c8d6d2eb1 fix bug of hls and rename demo player stream to live/demo. change to 0.9.36 11 years ago
winlin 0858bd8b6f Support RTMP ATC for HLS/HDS to support backup(failover). change to 0.9.35 11 years ago
winlin ebf1139582 fix the forward loop detect bug. change to 0.9.34 11 years ago
winlin 644dfa1a6d fix bug of librtmp 11 years ago
winlin ade3630fa6 add package and install script 11 years ago
winlin ed20bd7078 default write log to file. 11 years ago
winlin 76290a5a12 fix bug of get daemon 11 years ago
winlin 7930add7f9 add log tank config, default to console. 11 years ago
winlin b290a00de7 refine log 11 years ago
winlin 3ec3c1f532 support daemon 11 years ago
winlin 2c1354b9b9 fix bug of log message 11 years ago
winlin 56679b3c82 add srs_log_file to write log to file. change to 0.9.27 11 years ago
winlin d94b9f44b3 add srs_log_file to write log to file. change to 0.9.27 11 years ago
winlin 3c920b933c add ./etc/init.d/srs, refine configure to support make clean then make. 11 years ago
winlin fdad7c25f0 fix isse #35: the gettimeofday jitter, log warn message 11 years ago
winlin 4f284b20f0 drop ts segment when duration is too small 11 years ago
winlin 5758551508 support hls republish 11 years ago
winlin f25c6558a5 write pid to ./objs/srs.pid. 11 years ago
winlin 0686b8fa5a update readme, add product wiki link 11 years ago
winlin a0c0c94cf0 refine conf, add comments for other listen type 11 years ago
winlin 2cebaff9d8 refine hls, ts temp file use ext .tmp 11 years ago
winlin e0fb1029c9 support pure audio hls. change to 0.9.24 11 years ago
winlin b708f588fc refine the hls module, clear logic dead code, rename TSCache to HlsCache, M3u8Muxer to HlsMuxer. that is, make it to more readable. 11 years ago
winlin b7d40b5aba support vn/an to disable video/audio, for radio streaming 11 years ago
winlin 1ffbdbc098 refine log, donot show error when client gracefully close it 11 years ago
winlin c85dde7f3f substitute all TAB with 4spaces. 11 years ago