Commit Graph

2211 Commits (b20a68ad68f8a44f39cf73c2a0bfdf5deda33869)

Author SHA1 Message Date
haofz 52b6823a90 fix #826, fix memory leak in streamCasterFlv (#836) 8 years ago
winlin 33375db401 Merge from SRS2, for #834 8 years ago
winlin b11ddc7f41 Fix #834, crash for TS context corrupt. 2.0.235 8 years ago
winlin 7d618fed43 For #820, fix utest failed. 8 years ago
winlin e3526c0cf6 For #820, modules use service only. 8 years ago
winlin ff822b55cd For #820, extract service module. 8 years ago
winlin 0a57a46016 Refine LICENSE 8 years ago
winlin f32aab3d92 For #299, refine code. 8 years ago
winlin 2980e7d3ef For #813, refine code. 8 years ago
Chengdong Zhang 8ad934a8a4 srs_info use not available variable (#813)
srs_info use not available variable.
Variable has been removed or changed.
8 years ago
winlin 9ab5e6a916 For #299, fix bug of fragment url 8 years ago
winlin c71e8fa947 For #299, fragment reap workflow 8 years ago
winlin 721a8457c2 For #299, Refine init mp4, use fragment 8 years ago
winlin 8d679a6f9a For #299, use fragment for dvr FLV/MP4 8 years ago
winlin da4c390d69 For #299, extract fragment and fragment window for hls 8 years ago
winlin 6da6e0511d For #803, should refine code. 8 years ago
Chengdong Zhang a6eebacc99 Streams API is not correct. (#800)
HTTP API for streams is not correct. When stream stopped, API does not
remove it.
8 years ago
winlin 3ec9df6578 For #299, A/V init mp4 are fine. 8 years ago
winlin 886930c22a For #299, refine the comments. 8 years ago
winlin 308c6fee18 Fix #786, simply don't reuse object. 3.0.20 8 years ago
winlin 44014683e1 Refine thread. 8 years ago
winlin c849010fe2 Refine api for srs-librtmp 8 years ago
winlin 747d6f2f52 For #299, write legal MPD, fix CORS. 8 years ago
winlin 8ab727f3c5 For #299, write MPD file. 8 years ago
winlin d786d61685 Merge branch '2.0release' into develop 8 years ago
winlin 0059b1cf7a For #783, use directly free to replace auto free 8 years ago
ljx0305 b0d16840b5 fix Repeated release (#783)
fix  Repeated release
8 years ago
winlin cee9d736a4 for #299, refine code. 8 years ago
winlin ede1c34a25 for #299, refine the signature of api for hls/dash 8 years ago
winlin 2fcd3972c1 for #299, refine the encoder object name 8 years ago
winlin 2a4f57a587 Fix #301, User must config the codec in right way for HLS. 3.0.18 8 years ago
winlin d612a21bad for #299, refine audio codec object name 8 years ago
winlin caf69f193d for #299, refine the codec object name 8 years ago
winlin d7458c4e72 For #299, refine the codec to format-frame-sample chain. 8 years ago
winlin c4a510b834 For #299, refine the codec info structure. 8 years ago
winlin 5e419c66f8 For #299, add dash files. 8 years ago
winlin 7fd221ef63 Always enable DVR 8 years ago
winlin 8e5d4dc73d always enable http and hls 8 years ago
winlin 477414106a add dash files. 8 years ago
winlin 5fec59ace2 merge from srs2, fix #503 8 years ago
winlin 99bffea328 fix #503, disable utilities when reload a source. 2.0.233 8 years ago
winlin afbc3443f3 fix #738, support DVR general mp4. 3.0.17 8 years ago
winlin 3209ad29e0 for #738, refine code for DVR mp4. 8 years ago
winlin 0a054cd6bd for #738, remove the dvr plan append for it's no use 8 years ago
winlin 8c01f52372 for #738, refine the dvr segmenter. 8 years ago
winlin 733ba73d54 for #738, write mp4 samples. 8 years ago
winlin 9d21a8bb33 for #738, use reader and seeker for mp4 demuxer to seek for general mp4(ftyp-mdat-moov). 8 years ago
winlin ac7ee10b60 fix #751,#756, refine code 8 years ago
Chengdong Zhang 80540e4dc1 change TAB space
change TAB space for line 794
8 years ago
eagle-zhang 7b02e3543f Clients Api support start and count
Clients Api support start and count
line 794~810 && line 830
8 years ago
winlin eaa222f034 for #742, refine the file reader and writer interface. 8 years ago
winlin b16ab038ce for #742, refine the u_intxx_t to uintxx_t 8 years ago
winlin 136a7ef488 for #299, refine docs. 8 years ago
winlin a1fcf66f32 for #742, always enable http utilities. 8 years ago
winlin 79def81792 for #742, refine the rtmp conn, use info as data cluster. 8 years ago
winlin 39aee2b318 for #742, fix publish recv thread bug. 8 years ago
winlin 954bb186c1 identify the flash and fmle for recv thread. 8 years ago
winlin 4583a63789 for #742, refine code for recv thread. 8 years ago
winlin a07986f4ee for #742, refine code 8 years ago
winlin 5c959fc781 merge from srs2, for kbps free io 8 years ago
winlin 6706bda42c for #752, release the io then free it for kbps. 2.0.232 8 years ago
winlin a3ea83f504 directly free the transport, not need to close for maybe NULL 8 years ago
winlin 99c13fb1c1 convert ms to us for st 8 years ago
winlin 7bfb648bd8 refine the meta cache name 8 years ago
winlin 4cff49afd2 for #742, refine source, meta and origin hub. 3.0.16 8 years ago
winlin 310032d8d8 merge srs2, timestamp overflow for ATC. 8 years ago
winlin d76419e3bb fix #749, timestamp overflow for ATC. 2.0.230 8 years ago
cenxinwei 762d7a8884 fix publish_normal_timeout 配置读取错误 8 years ago
winlin 3fe338d1c5 for #742, use ms for application clock tbn. 8 years ago
winlin dca9749f37 for #742, refine the object live cycle. 3.0.15 8 years ago
winlin f4c0af8bfc refine code remove dup api for #742 8 years ago
winlin 1ed5118246 refine the spaces, no TABS 8 years ago
winlin 750f4413c8 merge srs2 for #536 8 years ago
winlin 142a9733b2 refine encoder code for #536. 8 years ago
winlin ccb250f3bc merge srs2. convert ts aac audio private stream 1 to common. 8 years ago
winlin e6eafd3b97 fix #740, convert ts aac audio private stream 1 to common. 2.0.229 8 years ago
winlin 7fe60b5bbf fix #735 config transform refer_publish invalid. 3.0.14 8 years ago
winlin 7bbb3bae42 merge srs2 8 years ago
winlin e3aa34ec5f fix #736, recovery the hls dispose. 2.0.227 8 years ago
Himer afa704bca5 Update srs_app_source.cpp
enabled 为true才进行转发实例创建
8 years ago
winlin a1ae48f4ac Merge branch '2.0release' into develop 8 years ago
winlin 6fbda2ae3f for #635, refine hls open/close gop. 8 years ago
winlin ae1920e91a Merge branch '2.0release' into develop 8 years ago
winlin 4104f25069 for #635, support IDR and NonIDR(open-gop). 8 years ago
winlin 1dd877c0d6 merge srs2 8 years ago
winlin c9a71b7fb2 fix #635, hls support NonIDR(open gop). 2.0.226 8 years ago
winlin d49f195bbf fix #734, log format error. 8 years ago
winlin 1b175b1107 for #730, support config in/out ack size. 3.0.13 8 years ago
winlin 4709d0214c for #711, support prefile for transcode. 3.0.12 8 years ago
winlin 8bdf50b14d update feature list 8 years ago
winlin f2efa96015 for #324, always enable hstrs. 3.0.10 8 years ago
winlin 7ac932cfa0 update to 2013-2017 8 years ago
winlin b231550c32 fix #717, #691, http api/static/stream support cors. 3.0.9 8 years ago
winlin f6661989af fix typo for #513, #691 8 years ago
winlin 664844b5f5 merge from srs2. for #513. 8 years ago
winlin 759c84a395 for #513, remove hls ram from srs2 to srs3+. 2.0.224 8 years ago
winlin f30b3073a2 refine the cros of api for flv 8 years ago
winlin 3df8f11884 refine thread stop 8 years ago
winlin 8935fe8897 merge srs2. 8 years ago
winlin aca8a79d95 fix #713, disable the source cleanup. 2.0.223 8 years ago
winlin 9ba4bed648 merge srs2 8 years ago
winlin cb1d47bfef fix #713, refine source to avoid critical fetch and create. 2.0.222 8 years ago
winlin 439c67018d remove unused macros. 8 years ago
winlin 2955b1fd2d support log rotate signal SIGUSR1. 3.0.8 8 years ago
winlin 2d387035cd refine the global variables. 8 years ago
winlin b06203e777 dispose kafka 8 years ago
winlin 9a3674c624 refine kafka 8 years ago
winlin f6c8e02cca Merge branch '2.0release' into develop 8 years ago
ME_Kun_Han ec4d1b3b4f fix bug: run srs at startup failed. (#454) 8 years ago
winlin 0a8d40925f merge from 2.0 8 years ago
ME_Kun_Han f107f404ea fix bug for issues #654 (#426) 8 years ago
winlin 5796e4bf89 merge from srs2 8 years ago
hankun 4f09bcce9f fix the bug: when trying to push same stream more than twice, to play it through http-flv will cause a core dump(#666) 9 years ago
winlin 112d98ffdb merge srs2. 9 years ago
ME_Kun_Han 7058411cb8 fix the core dump when trying to close srs (#386) 9 years ago
winlin 3659eec9d1 update the cwd 9 years ago
winlin 0e308b0fa1 merge srs2, support oryx 9 years ago
winlin 07fe35f11d support asprocess for oryx. 2.0.218 9 years ago
winlin b748fac23a support asprocess for oryx. 2.0.218 9 years ago
winlin 2a01540433 support change work_dir for oryx. 9 years ago
winlin b5d466f3d2 update utest 9 years ago
winlin 09895fcfc2 Merge branch '2.0release' into develop 9 years ago
Star Brilliant a164c90e28 Flush the stdout buffer after logging to console
Normally if the stdout is connected to a PTY, the stdout buffer is flushed automatically after each \n.
However if I run SRS under Docker, the stdout is not connected to a PTY (unless I ask it to), causing the last log line to be incomplete (showing only half).
By adding fflush, we could make sure each log line is completely shown, whenever the stdout is connected to a PTY or not.
9 years ago
winlin b24d1de377 Merge branch '2.0release' into develop 9 years ago
winlin 590e951739 fix memory leak of source. 9 years ago
winlin 0e9318e5d8 merge from 2.0 9 years ago
winlin c7b97aa1c3 fix memory leak at source. 2.0.214 9 years ago
winlin 8ad7da1cb6 merge from 2.0 9 years ago
xubin 49853d2b8a 修复forward崩溃 9 years ago
winlin 7d96a33207 Merge branch '2.0release' into develop 9 years ago
winlin e2865c6ac1 workaround for #511, the fly stfd in close. 2.0.211 9 years ago
winlin 36eb0981ec merge from 2.0release 9 years ago
intliang 3fbe9d2442 fixed crash by improper srs_info use. 9 years ago
winlin eed4626c35 use larger limit 9 years ago
winlin 8db25a0bf5 fix the log for mmap. 9 years ago
winlin 214eda745d open null dev, not close stdout or stderr. 9 years ago
winlin 03469fc37d refine code for process fork. 9 years ago
winlin ce8f3b4478 refine the dup2 of stdout and stderr. 9 years ago
winlin ae8bd4c2aa should never close the fd 3+, for it myabe used. 9 years ago
winlin a6dc17a67d support redirect stdout by > 9 years ago
winlin dfe5306327 fix process bug. 9 years ago
winlin 61c0c168b9 merge from srs2. 9 years ago
winlin 266397acee merge from srs2 9 years ago
winlin 28080efec8 fix http reader bug, support infinite chunkted. 2.0.209 9 years ago
winlin f971538cf3 refine http, support no host. 9 years ago
winlin 2941328ee8 rtmp edge support 302 redirect. 9 years ago
winlin d81b2cb140 support hls mount to vhost and reload 9 years ago
winlin 041040b846 ignore ingester when vhost disabled. 9 years ago
winlin eac5440559 merge from srs2 #558 #559 9 years ago
winlin da722b5b5d Merge pull request #559 from tufang14/2.0release
srs reusable thread need join
9 years ago
tufang14 56bffb6646 Update srs_app_thread.cpp 9 years ago
flowerwrong d42a58faf4 Keep blank of line 9 years ago
tufang14 233ff11172 srs reusable thread need join 9 years ago
flowerwrong 9ddd0054a1 Add tcUrl to on_publish http hook for issue #548 9 years ago
winlin f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 9 years ago
winlin 5338f21439 merge from srs2 9 years ago
winlin 8155e97b84 add keyword XCORE for coredump to identify the version. 2.0.207 9 years ago
winlin dc38ae1687 show first message when not show version. 9 years ago
winlin 9d22d09646 show signature of server. 9 years ago
winlin 973194c663 merge from srs2. 9 years ago
winlin 26211abf2e refine code. 9 years ago
winlin f516636448 refine code for hooks and http core. 9 years ago
winlin 79fdc4e766 fix bug for rtmp client use NULL ptr. 9 years ago
winlin 96a4428bdb refine the http request parse. edge retry timeout. 9 years ago
winlin 86a7db0adb refine edge ingester, use upstream adapter. 9 years ago
winlin 7ae2c6bf50 merge from srs2. 9 years ago
winlin eca46c03d2 refine code for consumer to refer the rtmp connection. 9 years ago
winlin 11e11005ac specifies the try default vhost 9 years ago
winlin d267b8fa19 fix bug for create connection with ip. 9 years ago
winlin a7bf4bfda5 refine code, ignore client when no ip. 9 years ago
winlin d0c74fa7cd update 2015 to 2016 9 years ago
winlin b881166f9a merge from srs2 9 years ago
winlin c7850570c1 fix #546, thread terminate normally dispose bug. 2.0.203 9 years ago
winlin e124aeb614 Merge branch '2.0release' into develop 9 years ago
winlin 69d191e53f refine the hls error log. 9 years ago
winlin 0ab64ccd2a merge from srs2. 9 years ago
winlin 40457e6cab default hls_on_error to continue. 2.0.201 9 years ago
winlin f6ff116505 refine code, persistence use isolate method. 9 years ago
winlin b486f6fe6b refine /api/v1/summaries, with code and server id. 9 years ago
winlin 26d328e7f2 fix bug for api, level should be string. 9 years ago
winlin ffef3905af merge from srs2. 9 years ago
winlin 5660e24953 fast stop server. 9 years ago
winlin 2830ee12c1 fix the on_hls.ts_url bug. 9 years ago
winlin 1e4c8f8bf3 fast stop server. 9 years ago
winlin 3ab5892863 refine comments. 9 years ago
winlin 5ac8177ce6 fix bugs 9 years ago
winlin b2ae1acaa4 copy http-parser-2.1 into srs http stack. 9 years ago
winlin 17bb31cab1 fix the config bug. 9 years ago
winlin 18eb8c81b3 merge from srs2 9 years ago
winlin 2310b2da59 fix #518, fix fd leak bug when fork. 2.0.200 9 years ago
YueHonghui eb4ca9ff5d fix bug of fd leek in srs_app_server 9 years ago
winlin 01c46bdbfd rename org simle-rtmp-server to ossrs 9 years ago
winlin 1ffd5fd455 rename org simple-rtmp-server to ossrs 9 years ago
winlin 97f5bb8b99 merge from srs2 9 years ago
zhengfl 1dae8fc987 fix #511, fix the bug of thread stop invalid. 9 years ago
winlin 4b5eb5ea2d fix the parse rtmp url bug for ingest. 9 years ago
winlin ec225b2108 quit child process when fork failed. 9 years ago
winlin 9d7826c681 quit child process when fork failed. 9 years ago
winlin f57e537686 for #515, merge from srs2, use SrsAutoFreeA. 9 years ago
winlin f4f76cd196 for #515, use SrsAutoFreeA to free the array. 9 years ago
winlin 8cec06e898 merge srs2, use srs_freepa for array 9 years ago
winlin 2af7749771 for #515, use srs_freepa to free the array. 9 years ago
winlin cef1ae5a8e fix the config bug. 10 years ago
winlin 9ebb77d711 fix the warnings 10 years ago
winlin e9e202dbf1 merge srs2 10 years ago
winlin ef00005ab4 for ExoPlayer, remove duration for live. 10 years ago
winlin 59f5c5d6a5 Merge branch '2.0release' into develop 10 years ago
winlin 3b0bf1e10b for #512, make the segment more acceptable, when in [min, max_td * 2], it's ok. 10 years ago
winlin 1d57e53910 merge from 2.0release 10 years ago
winlin d1979c760f for #512, partical hotfix the hls pure audio. 2.0.196 10 years ago
winlin 3683f06e4d for #512, write audio frame by frame for video+audio hls. 10 years ago
winlin b8f2ba4f0d complete kafka 10 years ago
winlin cbe4252b4d refine code. 10 years ago
winlin d2ca51ac50 notify kafka when client close 10 years ago
winlin 71451878c9 refine kafka, simplify code. 10 years ago
winlin 8e344f1c26 add producer api messages. 10 years ago
winlin 7a0aaf5900 kafka refine code 10 years ago
winlin f9f5b56951 kakfa erase messages when wrote. 10 years ago
winlin 22fa9a0f1f kafka use temp transport to fetch metadata. 10 years ago
winlin 531b658f8e retry when metadata empty 10 years ago
winlin 61486a82aa kafka use topic and partition cache 10 years ago
winlin 7013993c7a kafka send the accept message. 10 years ago
winlin de41c1c9d2 kafka refine comments. 10 years ago
winlin 31a77a83ed convert metadata to partitions 10 years ago
winlin f0e39cc330 support show the summary of kafka metadata. 10 years ago
winlin 33a015329d add function to convert kafka array to vector 10 years ago
winlin 7106934c3a kafka producer use async interface to request metadata. 10 years ago
winlin 8974fe298b connect to kafka and send metadata request. 10 years ago
winlin a9fdb630d9 refine code, replace all rtmp connect by simple rtmp client. 10 years ago
winlin a08d8f83d6 refine mpegts code, use simple rtmp client 10 years ago
winlin ad9b377d96 refine forwarder code, use simple rtmp client. 10 years ago
winlin 0f4cb8ee00 refine code, remove the rtmp recv/send macro, use one macro. 10 years ago
winlin 12e013142d refine code, use simple rtmp client. 10 years ago
winlin bc27481886 refine code, use simple rtmp client. 10 years ago
winlin e4c852945f refine code, support override vhost 10 years ago
winlin a9ad7b211b refine simple rtmp client for post flv stream. 10 years ago
winlin adb8f243bf use simple rtmp client for raw connect app 10 years ago
winlin 24b3899972 use SrsTcpClient instead raw socket. 10 years ago
winlin a9bb6061c3 use tcp client for raw connect. 10 years ago
winlin 20fcfb3eee fix bug, use system utility 10 years ago
winlin 69cc01b696 use system utilities 10 years ago
winlin 908365a61a use string for const char* 10 years ago
winlin d9f991ed2f use system utility for string finds 10 years ago
winlin 29122b6e70 fix #502, transcoder support snapshot. 10 years ago
winlin 9eebb89432 Merge branch '2.0release' into develop 10 years ago
winlin 91e9fc7e5b fix typo of INVLIAD to INVALID 10 years ago
winlin ed80d9d281 merge from srs2 10 years ago
winlin 0c8209cccd fix #448, fix the bug of response of http hooks. 2.0.195 10 years ago
winlin 6587c5b2f1 merge from srs2 10 years ago
winlin 7811b4f3f7 fix #497, response error when client not found to kickoff. 2.0.194 10 years ago
winlin d8f18aee37 use the right int type for port. 10 years ago
winlin 1c7d5f1852 Merge branch '2.0release' into develop 10 years ago
winlin 353e3260b8 remove duplicated code 10 years ago
winlin 9ead08725d use kernel utility int2str and float2str 10 years ago
winlin 6efd2dd27e add load balance round robin for brokers. 10 years ago
winlin 2a4ab8a923 add brokers to config 10 years ago
winlin f187a7deef refine the startup logs. 10 years ago
winlin afd6428366 refine code of server. 10 years ago
winlin 9a9483e7d5 support without kafka 10 years ago
winlin abb5c5ad31 add kafka producer 10 years ago
winlin b5ccc35340 add kafka config 10 years ago
winlin df6ac8842c rename rtmp utility to protocol utility 10 years ago
winlin 82ff05c1d4 rename rtmp io to protocol io 10 years ago
winlin 168625dce2 rename rtmp amf0 to protocol amf0. 10 years ago
winlin d32632ee8a rename SrsFastBuffer to SrsFastStream 10 years ago
winlin 4f3d2c8607 rename SrsSimpleBuffer to SrsSimpleStream 10 years ago
winlin 0e52fc6d5b rename SrsStream to SrsBuffer 10 years ago
winlin ca3577e11b rename temp to stream 10 years ago
winlin a4f51564db rename kernel stream to buffer 10 years ago
winlin ac2b03a3ed rename srs_kernel_buffer to temp 10 years ago
winlin b471c6e61c refine code, use json integter rather than number. 10 years ago
winlin c5cd58761c move the srs thread to st. 10 years ago
winlin 3042115385 refine json to_str to dumps. 10 years ago
winlin b59d9ba6a1 support amf0 and json to convert with each other. 10 years ago
winlin 3f7e69b617 json objects support dumps to string. 10 years ago
winlin 225e742657 add args3 10 years ago
winlin 1fd83d9314 refine the order. 10 years ago
winlin 7b2b11e932 async call worker fast execute tasks. 10 years ago
winlin 087f7740b7 fix the build failed bug 10 years ago
winlin 256459e1ec fix the utest bug 10 years ago
winlin 8a90e76637 fix #459, support dvr raw api. 3.0.4 10 years ago
winlin 2a1b2b69a0 for #459, dvr support apply filter for ng-control dvr module. 10 years ago
winlin 8f9cfcdcf4 fix #319, http raw api support update global and vhost. 3.0.4 10 years ago
winlin e8a00de4a3 for #319, support enable or disable vhost. 10 years ago
winlin 631e76cd32 for #319, support update and delete the disabled vhost 10 years ago
winlin a7c4b786cf merge from 2.0 10 years ago
winlin 511627abab fix #474, config to donot parse width/height from sps. 2.0.189 10 years ago
winlin eb578b4a39 refine the thread, set to disposed when terminate normally 10 years ago
winlin 83a9ff9f5d for #474, refine the hls publish, donot fetch from source when publish 10 years ago
winlin 44bcb4045f for #474, decode the sequence header before hls. 10 years ago
winlin 07ef8160a3 clear the queue when edge republish. 10 years ago
winlin 704624c9ec clear the queue when edge republish. 10 years ago
winlin 8be3c875af donot release stream when busy 10 years ago
winlin 3da25f3aee when thread terminated normally, set the tid to NULL. 10 years ago
winlin a994191ddc for #474, always release publish for source. 10 years ago
winlin eb9aa47ab1 merge from 2.0 10 years ago
winlin 0d57ef9373 fix #458, http hooks use source thread cid. 2.0.188 10 years ago
winlin 3b483094bd merge from 2.0 10 years ago
winlin 6d50aa1aa2 #475, fix http hooks crash for st context switch. 2.0.187 10 years ago
winlin adb74dc74e Merge branch '2.0release' into develop 10 years ago
winlin f0fc093b19 fix the http zero content length bug. 10 years ago
winlin 01308ecc98 for #319, support initialize the parser to whether use jsonp 10 years ago
winlin 491ec11833 for #319, raw api support add new vhost 10 years ago
winlin a88f321d8b for #319, merge from 2.0release 10 years ago
winlin abd7ee227c support reload utc_time. 2.0.186 10 years ago
winlin c4feb8f6ed for #319, raw api support update all globals. 10 years ago
winlin 6aafd072db for #319, raw api support update srs log tank, level and file. 10 years ago
winlin 8107e5f9a6 for #319, raw api support set the ff_log_dir 10 years ago
winlin c8466c36bd for #319, raw api support update the global RTMP chunk_size. 10 years ago
winlin 2bdd974227 for #319, reorder the ingesters. 10 years ago
winlin 342483bf04 for #319, when reload the listen, restart all ingesters. 10 years ago
winlin 310b5a14cb for #319, support minimal query api 10 years ago
winlin 06c7ae62ee for #319, refine the error code for RAW APi. 10 years ago
winlin 11c409688b for #319, http raw api support query. 3.0.3 10 years ago
winlin 8a2709dd2c for #319, do not apply when config not changed. 10 years ago
winlin a62c82bd46 for #319, api raw update global.listen 10 years ago
winlin 364460f2ab for #319, support raw update global.listen 10 years ago
winlin f8d8c3ace4 use function to dumps the engine. 10 years ago
winlin 01878e5a9c for #319, query vhost detail. 10 years ago
winlin b1b76a4a80 for #319, allow multiple ingest and transcode. 10 years ago
winlin 873aa7bf9f for #319, refine the query global, only show true options. 10 years ago
winlin dc11013c01 for #319, render the detail of vhost 10 years ago
winlin 2b4fa2d73e for #319, move the edge configs to cluster. 10 years ago
winlin 6bd05f9cfc for #319, refine the config forward. 10 years ago
winlin bc24c0407b for #319, move smi and rsh to play 10 years ago
winlin f7c893d907 for #319, move gop_cache and queue_length to play 10 years ago
winlin 06ae74dd3f for #319, move mw_latency to play. 10 years ago
winlin 4eb1874955 for #319, the vhost scope config is enabled, chunk_size, tcp_nodelay and min_latency. 10 years ago
winlin 9c4340f789 for #319, move atc and atc_auto to play 10 years ago
winlin d6b0aa3a5b for #319, move time_jitter and mix_correct to play 10 years ago
winlin 738642073e for #319, refine config, collect the mr and publish timeout 10 years ago
winlin bc100c2867 refine the log, move default to each functions. 10 years ago
winlin 7ef3ff90c0 refine the config structure, compatible with SRS1/2 10 years ago
winlin a79e19599c for #319, support query the vhost info. 10 years ago
winlin bdfd0ae09e for #319, dumps the http static, remux and globals. 10 years ago
winlin 1b1a2a1e63 fix #471, api response the width and height. 3.0.2 10 years ago
winlin 04bea781ca use amf0 encode for json encode. 10 years ago
winlin e0219bd7aa refine code, merge json encode to amf0. 10 years ago
winlin 66ffcad635 for #319, always allow raw query. 10 years ago
winlin f167616379 rename the config_query to query 10 years ago
winlin 75ca759e5d fix the reload http api bug. 10 years ago
winlin 2dcf3bc606 for #319, support rpc raw api to query the HTTP RAW API configs. 10 years ago
winlin af0a76e51a fix the build failed bug on centos 10 years ago
winlin e03d8a0115 fix the build failed bug on centos 10 years ago
winlin 555a3fbf5f for #319, support render HTTP RAW API in console. 10 years ago
winlin 8e635d9749 for #319, support HTTP RAW API config_query global data. 10 years ago
winlin d921d59e57 for #319, support HTTP RAW API reload. 10 years ago
winlin f74dc62046 fix the process restart bug. 10 years ago
winlin e39e006d63 fix the exec clear bug. 10 years ago
winlin c081a5370b Merge branch '2.0release' into develop 10 years ago
winlin fe4cdceb15 always wait for process to terminated when SIGKILL. 10 years ago
winlin 1e0481a2d0 for #319, support signal to persistence config 10 years ago
winlin 980e3921e4 for #319, add signal to write config to file. 10 years ago
winlin cdde293785 add todo for reload the source components. 10 years ago
winlin c34b0c86e1 fix #367, support nginx-rtmp exec. 3.0.1 10 years ago
winlin 7de181004f Merge branch '2.0release' into develop 10 years ago
lovecat 9c2beffe8f statistic connection bytes before remove client. 10 years ago
winlin 039af7243c for #367, refine the comments for process. 10 years ago
winlin 6fe88d088c for #367, process support redirect stdout and stderr. 10 years ago
winlin 0e1861b084 for #367: extract the process from ffmpeg to exec programs. 10 years ago
winlin e43d4e46b4 support JSONP DELTE/POST/PUT 10 years ago
winlin baa70d4ddd add nb_streams for vhost 10 years ago
winlin 6e5143449e HTTP API support JSONP by specifies the query string callback=xxx. 10 years ago
winlin aeebddb269 for #442, add more information for client for api. 10 years ago
winlin 94641c812b fix #442, support kickoff client. 10 years ago
winlin b37797b13a for #442, add publish connection in stream.publish api 10 years ago
winlin 529803ed04 refine code for api. 10 years ago
winlin 6b6d951298 add api /api/v1/features 10 years ago
winlin 4763f205a2 add kbps for vhost and stream 10 years ago
winlin 20a8818a8e refine the error response. 10 years ago
winlin 2edcf1d4ff support query specified vhost 10 years ago
winlin 66a26bdce8 move json from app to protocol 10 years ago
winlin a7589b9ad3 refine code for api, add clients and parse_rest_id 10 years ago
winlin ab4620870d refine the stat api, support query specified stream. 10 years ago
winlin c75f05c88b fix the log cid display error, merge the publish recv thread log to publish connection. 10 years ago
winlin 3c402cb908 refine the tcp nodelay, effect connected connections. 10 years ago
winlin c31a546eec support vhost for http flv. 10 years ago
winlin ec87dd9cd6 refine code for srs rtmp dump 10 years ago
winlin 785a5907a8 set the default get_publish_normal_timeout to 5s 10 years ago
winlin 0bbfc5526a set the default get_publish_normal_timeout to 5s 10 years ago
winlin 7273c33c35 support publish_1stpkt_timeout and publish_normal_timeout 10 years ago
winlin e7714cd445 add packets interval in ms to set the right send_min_interval 10 years ago
winlin de48b477ae drop the metadata when drop sequence header 10 years ago
winlin f691dddc1a drop metadata when drop sequence header. support PCUC 0x1a 10 years ago
winlin 2cf526ffc7 close #454, support obs restart publish. 2.0.184 10 years ago
winlin 01be68fe58 refine code, donot remove the detail when hls disabled. 10 years ago
winlin afd05f71c3 refine code, use size cache for performance issue. 10 years ago
winlin 3b0b2e0b85 fix the bug to support dump packets with count. 10 years ago
winlin a0a89a8ca6 use reduce_sequence_header for stream control. 10 years ago
winlin ae37fa8f3e use send_min_interval for stream control. 2.0.183 10 years ago
winlin 9fb4640a8f enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182 10 years ago
winlin 1261916eab refine the mount and dir to /console 10 years ago
winlin f28c9b7eb5 merge from 2.0release 10 years ago
winlin 3a6854fc2e refine code. 10 years ago
lovacat e8c0ca7af0 fix #442: HTTP API kickoff client. 10 years ago
winlin d761ebfa55 refine the api, move the requests and errors to rest. 10 years ago
winlin c5bf397295 fix the http error header. 10 years ago
winlin fbcc07d85a fix the typo of AUTIO. 10 years ago
winlin 65b2ed7ac5 refine code, move the order of functions. 10 years ago
winlin 71f2726b31 fix bug of merge code for reload http_remux for vhost 10 years ago
winlin ccf6a4de1e remove the on_reload_vhost_http_remux_updated for vhost added. 10 years ago
winlin bc033d5de3 refine code, move default to config function. 10 years ago
winlin c85f92c229 fix #169, support default values for transcode. 2.0.180 10 years ago
winlin 31d2de3f23 fix #435, add pageUrl for HTTP callback on_play. 10 years ago
winlin 3b65af9bd2 fix the hstrs bug on edge. 10 years ago
winlin 99db2888e7 refine code for hstrs. 10 years ago
winlin c2ef779523 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 10 years ago
winlin 366d3a3f56 for #441, use 30s timeout for first msg. 2.0.178 10 years ago
zhengfl a5a9f7c8c5 refine code:优化edge模式回源播放线程启动流程 10 years ago
winlin d995726fee fix the http flv mount bug. 10 years ago
winlin 9743e02541 refine the mix correct algorithm. 10 years ago
winlin 6fe36afcfa when hls timestamp jump, reset it. 10 years ago
winlin 99574bb77b ignore when no segments for there must no m3u8 10 years ago
winlin 40c264a316 always reset the max target duration for hls. 10 years ago
winlin 54bb42483b change time jitter to off for hls and forward. 10 years ago
winlin b3b6df365e fix the stream caster build failed bug. 10 years ago
winlin 50feaacdde refine code for http remux reload. 10 years ago
winlin 0aa053433c fix #132: build failed when enable the info or verbose log. 10 years ago
zhengfl 2567a89599 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 10 years ago
zhengfl 2263f2a610 refine code:
优化 判断重复推流 及 推流流程
10 years ago
winlin 404bc565a1 refine the pithy print mechenism. 10 years ago
winlin bed540bac9 fix #439: http remux support reload 10 years ago
winlin da47f1648b refine file mode to 644 10 years ago
zhengfl f6a2cea716 refine code: 删除srs_app_edge中的user_stat相关代码。因为没有任何作用。 10 years ago
winlin 0aed408855 refine code, to 644 and unix encoding. 10 years ago
winlin c6c90e2643 refine code, add comments for stat on_disconnect. 10 years ago
zhengfl db9ea4e66e rewrite #438 10 years ago
zhengfl f9257b89e7 fix #438
问题:edge模式,推流时异常断开。
    解决方法:增加edge模式推流检测。
10 years ago
zhengfl 120033e0a2 fix #437
edge模式,重新从源站拉流时,导致forwarders异常
10 years ago
winlin f39faa78bb refine config default values of srs, prepare to move each default values to functions. 10 years ago
zhengfl 52110990c1 修正编码风格问题 10 years ago
zhengfl b4ff9cfba1 fix bug
某种情况下,当客户端全部断开后,边缘服务器回源线程(EdgeIngester/EdgeForwarder)没有被断开。
10 years ago
winlin 312366bba2 add srs_recvi_bytes for intranet bytes stat. 10 years ago
winlin 750399ace4 fix network device compare bug. 10 years ago
winlin 8cd68a1eb3 ignore any intranet bandwidth. 10 years ago
winlin 8102a22606 add comments for async call. 10 years ago
winlin 3211282b0c refine the http code. 10 years ago
winlin f8f6e438cc extract http static and http stream from http conn. 10 years ago
winlin baa892a762 merge srs_app_st_socket to srs_app_st. 10 years ago
winlin 17c276113e refine the hls dispose, when not cycle always dispose it. 10 years ago
winlin d103557a8b merge the rtmp sdk to stack. 10 years ago
winlin 0d66e92ab5 refine code, support configure to enable --memory-watch 10 years ago
winlin 0d6a574216 fix the hls_dispose bug, ignore for 0. 10 years ago
winlin 56938efdbd fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175 10 years ago
winlin 6941f2c072 fix #424, fix aggregate timestamp bug. 2.0.174 10 years ago
winlin 8e8c8108fc refine the time jitter code. 10 years ago
winlin 1f1776a0d8 fix the export project bug. wakeup connection when dispose server. 10 years ago
winlin 66837ffa6e fix the thread stop bug, must wait when not joinable. 10 years ago
winlin d317528af9 refine the signal manager. 10 years ago
winlin 863dddde09 fix typo of code. 10 years ago
winlin 19e1f610a3 merge from bravo, parse the http reponse in json of bravo system. 10 years ago
winlin 574cf6a094 use libfdk_aac for srs2. 10 years ago
winlin 00a25ee5c5 cleanup connections when terminate server. 10 years ago
winlin d7e5df2578 cleanup connections when terminate server. 10 years ago
winlin 573495a19f refine the memory watcher. 10 years ago
winlin 8b3bd5b4b9 add srs memory watcher. 10 years ago
winlin 811ef4bcf6 dispose the gop cache 10 years ago
winlin beb0431746 detect the monotonically increase and warn to use mix_correct 10 years ago
winlin 2d9f258eaf refine the mix correct algorithm, mix when got 10+ av or got 1 video and 1 audio. 10 years ago
winlin ec24533955 use smaller value for publish timeout. 10 years ago
winlin a6dd8fb3a1 fix #421, when mix correct on, must check the type of dequeue msg. 10 years ago
winlin a1dd734318 fix #421, drop video for unkown RTMP header. 10 years ago
winlin 679b4317d8 fix the build failed bug. 10 years ago
winlin 0fbfad4172 fix gop cache, drop video only when video and not h.264 10 years ago
winlin 2a1db36750 refine the pithy print of ingesters. 10 years ago
winlin e4c27a51b8 fix the hls bug 10 years ago
winlin 4400b12515 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 10 years ago
winlin 26b76c0e4c fix #420, remove ts for hls ram mode. 10 years ago
winlin af9efe9213 disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls. 10 years ago
winlin 4e42b9c628 copy the request for hls. 10 years ago
winlin 679583dad6 refine comments of ffmpeg. 10 years ago
winlin 96f8f1f502 fix build bug. 10 years ago
winlin 0a87b567f6 fix the build failed bug. 10 years ago
winlin 223ae194b1 fix #209, cleanup hls when stop and timeout. 2.0.173. 10 years ago
winlin 4a80a5a71e for #209, support cleanup when srs stop. 10 years ago
winlin 860d68e6e7 for #374, use fast stop for ingesters to stop many FFMPEG. 10 years ago
winlin d611bb6b45 for #209, server cycle to enable the hls to cleanup. do dispose 10 years ago
winlin 567d84e997 fix #374: when terminate srs, cleanup to ensure FFMPEG quit. 10 years ago
winlin db57a519a9 for #374, use SIGINT then SIGKILL to try to kill FFMPEG gracefullly. 10 years ago
winlin 5caafadd45 fix #409: support pure video hls. 2.0.172. 10 years ago
winlin af4eec90ac for srs-dolphin, support HTTP and RTMP. 10 years ago
winlin 394e070b2e support dolphin 10 years ago
winlin e5461d2df9 refine code 10 years ago
winlin 60775485c4 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 10 years ago
winlin 385ee893f5 update readme 10 years ago
zhengfl 4864e796d6 fix #408:Queue丢视频时,不应该丢弃SequenceHeader 10 years ago
winlin 1150cde829 fix the verbose build failed. 10 years ago
winlin fec8422d6b fix bug of configure. 10 years ago
winlin c1b9541b5c support disable all 10 years ago
winlin 2e1ca3c751 fix the build failed bug. 10 years ago
winlin d12fc7fcc5 fix #405, improve the HTTP FLV performance to 6k. 2.0.171 10 years ago
winlin 4df19ba99a for #405, improve the http flv to 3k. 2.0.170 10 years ago
winlin 960341b9b2 for #405, improve the HTT FLV to 3k. 2.0.169 10 years ago
winlin fc995473eb for #405, improve the HTTP FLV delivery 1k to 2.3k. 2.0.168 10 years ago
winlin 069ee0afc3 fix #404, register handler then start http thread. 2.0.167. 10 years ago
winlin f510a3d6fb add /api/v1/versions for http server for go-sharp to detect. 10 years ago
winlin 5908096fc3 refine the thread, protocol, kbps code. 2.0.166 10 years ago
winlin 68d835021e refine code, move the kbps to protocol 10 years ago
winlin cfc0877ec9 refine the thread, add all callback. 10 years ago
winlin e5f449ce36 refine the thread to three category. 10 years ago
winlin 2f0ef87d6d refine code, rename the sync call to common class. 10 years ago
winlin 0bb90145ba fix #391, copy request for async call. 10 years ago
winlin 6bfb743aa0 remove the unused app http file 10 years ago
winlin f0ae66a081 merge the app http to conn. 10 years ago
winlin ce1bb6c605 refine code, extrat the ISrsHttpMessage. 10 years ago
winlin e2955da78f refine code, extract the http protocol sdk to module. 10 years ago
winlin d645411392 refine the kbps comments, add one usage. 10 years ago
winlin 6ca46e84bc fix #397, the USER_HZ maybe not 100. 2.0.165 10 years ago
winlin c17a1198cb fix #399, disconnect when not keep alive. 10 years ago
winlin 46a81372e7 fix #398, set recv timeout for http connection. 10 years ago
winlin 6f8c076b30 add comments for srs thread, add never quit thread. 10 years ago
winlin 948d200ce1 fix #400, parse when got entire http header, by feilong. 2.0.164. 10 years ago
winlin 5d7b0edccc merge from bravo code, fix some warnings. 10 years ago
winlin 44bc7976ac merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163. 10 years ago
winlin c617d2aaa5 support push flv stream over HTTP POST to SRS. 10 years ago
winlin 77ee2400df fix the unicode to ascii 10 years ago
winlin 7fc1cda392 add stream status to api. 10 years ago
winlin e221d002a2 fix the flv caster bug, when nread is 0, disconnect it. 10 years ago
winlin ad32048c1c fix the http flv stream caster. 10 years ago
winlin cba6675560 refine the http message, set the connection if required. 10 years ago
winlin ba6c3132e3 refine code, use decoder to parse flv stream 10 years ago
winlin ea1e015a4e fix the http read chunked encoding bug. 10 years ago
winlin a95fd6d140 read the http flv stream. 10 years ago
winlin 022b6aa561 refine the http remux for http flv stream. 10 years ago
winlin f0c24eeacc add stream caster for post flv over http. 10 years ago
winlin b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 10 years ago
winlin 115daa3cc1 migarate from winlinvip to srs org 10 years ago
tufang14 b6d650cdb4 m3u8 mount bug 10 years ago
winlin e50996270e fix the config parse error. 10 years ago
winlin 0acb942c3a update on_hls, add ts_url, m3u8 and m3u8_url. 10 years ago
winlin 4e5ddb51e7 refine the overflow algorithm, prevent smaller piece. 10 years ago
winlin 1d973e2178 refine the overflow algorithm, prevent smaller piece. 10 years ago
winlin d19dfa528e abs overflow also plus the deviation, for pure audio hls. 10 years ago
winlin 2239e9f1fd support ingest hls live stream to RTMP. 10 years ago
winlin 623e37e22a Merge branch '2.0release' of github.com:winlinvip/simple-rtmp-server into 2.0release 10 years ago
winlin 6e5c587e0a support aac_adtstoasc filter to copy mode. 10 years ago
J aca02b6d6b for #384,refine code for empty body request. 10 years ago
J 8adbdc39e3 for #384,refine code for empty body request. 10 years ago
J a71db53661 for #384,refine code for empty body request. 10 years ago
J 56f75cbbe9 fix #384 10 years ago
winlin 22ca46350b fix #383, support mix_correct algorithm. 2.0.161. 10 years ago
winlin 8fbc6526bb for #383, refine code to support mix correct algorithm. 10 years ago
winlin 542aab4557 fix the hls notify bug, pass the query to get path. 10 years ago
winlin 02a2cb7e1a for #381, refine the hls notify, report one by one. 10 years ago
winlin a4216cc582 add todo for ts parse. 10 years ago
winlin 40eab7fc88 for #381, refine the deviation for hls. 10 years ago
winlin dcac9c69d5 fix #381, support reap hls/ts by gop or not. 2.0.160. 10 years ago
winlin e5b8e0da01 fix async call and hls_nb_notify bug. 10 years ago
winlin 5d37e47783 support config the hls_nb_notify. 10 years ago
winlin 0a7cea063c refine http read, support c style api 10 years ago
winlin 5c00ce8a96 refine hls on_hls_notify, read a little of ts. 10 years ago
winlin 1f93fb3399 refine hls notify, support timeout. 10 years ago
winlin 310157ab77 refine the hls_on_notify, calc the spent time in ms. 10 years ago
winlin e6d6bdfe57 refine the hls_on_notify, only read a chunk. 10 years ago
winlin e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts. 10 years ago
winlin 7dbc95e085 refine the hls deviation for floor algorithm. 10 years ago
winlin 546be09219 fix #375, fix hls bug, keep cc continous between ts files. 2.0.159. 10 years ago
winlin 29ac4c724b change default log tank to file. 10 years ago
winlin e56d7add44 fix bug of config to parse the default value. 2.0.158 10 years ago
winlin aef97db77a refine the config code. 10 years ago
winlin e7fd309cb0 refine hls info, show the deviation in seconds and pieces. 10 years ago
winlin bd7db5aed6 only ignore the aud message. 10 years ago
winlin 61d5b78ae5 refine the h264 parser, one ts message should parsed to one rtmp/flv message. 10 years ago
winlin 4329366c08 for #304, do not add deviation for absolute overflow. 10 years ago
winlin 77c29da26b for #304, rewrite annexb mux for ts, refer to apple sample. 2.0.157. 10 years ago
winlin 7e1749e029 refine the comments. 10 years ago
winlin e458305f81 add utc time format. 10 years ago
winlin 56cd373015 support hls callback with duration. 10 years ago
winlin 64b065e450 for hls callback, add duration of ts. 10 years ago
winlin c4466a8c0c fix crash bug for hls cleanup. 10 years ago
winlin eb54ec25c9 fix compile errors. 10 years ago
winlin 17c0a5c470 fix #372, support transform vhost of edge 2.0.155. 10 years ago
winlin 4d98cbb965 add hls config in api. 10 years ago
winlin 8401d9ac06 fix #366, config hls to disable cleanup of ts. 2.0.154. 10 years ago
winlin 717d088376 support server cycle handler. 2.0.153. 10 years ago
winlin 3b4bd194b6 refine http hooks, donot pass the known variable. 10 years ago
winlin c49bc0628e support on_hls for http hooks. 2.0.152. 10 years ago
winlin 97442c56b6 enhance hls in floor mode. 10 years ago
winlin 76c1957260 enhance hls, increase piece one by one. 10 years ago
winlin b9c21b1e8f enhanced hls, warning when ts dup or jmp. 10 years ago
winlin 9be7fbba7d user smaller deviation to avoid dup ts. 10 years ago
winlin f6e135943f enhanced hls, support deviation for duration. 2.0.151. 10 years ago
winlin cd682ae4be update donations. fix hls path bug. 10 years ago
winlin 692b751da8 for #351, support config the m3u8/ts path for hls. 2.0.149. 10 years ago
winlin 01ee456649 fix the ts parse bug, should never complete message when PES packet length is 0. 10 years ago
tufang14 0faaa61be7 seg fault
seg fault
10 years ago
winlin a5c5befad1 for parse video ts. 10 years ago
winlin 1401f2e0ab ignore when sps/pps consumed all frame. 10 years ago
winlin b319e9ff9c ignore when sps/pps consumed all frame. 10 years ago
winlin e818f36316 fix #360, fix build bug for centos7. 10 years ago
winlin b6feb0742f fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148 10 years ago
winlin fcab17741c fix #222, the dvr path rule changed. 10 years ago
winlin f69fa7273b fix #302, remove the thread unsafe code, no static. 10 years ago
winlin 2f2aaf5ee4 for #155, refine code, donot check network devices for osx. 10 years ago
winlin 33cca3e027 for #155, add todo for osx. 2.0.146 10 years ago
winlin bbac2348db for #354, remove the double underscore functions and variables. 10 years ago
winlin 7065db192c for #354, remove the double underscore of macro. 10 years ago
winlin c6817cc422 for #354, remove the double underscore of macro. 10 years ago
winlin a4709a6439 for #151, add comments for the audio overflow ratio. 10 years ago
winlin 0319e85f99 support config the audio overflow ratio. 10 years ago
tufang14 e319da3329 小瑕疵
小瑕疵
10 years ago
winlin f564c903ac support got uptime and loadavg for osx. 2.0.145 10 years ago
winlin 6855ab4c52 Merge branch 'develop' of https://github.com/tufang14/simple-rtmp-server into tufang14-develop 10 years ago
winlin cf3becbc17 for #155, osx(darwin) enable http api and stat, rusage is ok. 10 years ago
tufang14 1cc3384a19 seg fault
seg fault
10 years ago
winlin 8a4312f4ec fix bug, use size_t for string::npos 10 years ago
winlin 2241ba0e34 for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142 10 years ago
wenjie.zhao 65f404fb42 for #340, refine ts prefix code. 10 years ago
wenjie.zhao 5969f72354 for #340, refine ts prefix code. 10 years ago
wenjie.zhao 10da182853 add hls prefix of uri supported 10 years ago
wenjie.zhao efe3050d7a fix hls muxer Segmentation fault. 10 years ago
wenjie.zhao 73f13dfc42 fix hls muxer Segmentation fault. 10 years ago
winlin c92d40e00b for #334, refine code, use kbps instead skt of rtmp connection. 10 years ago
Nimrod A. Abing (on kohima) a95bd7d30e Modified on_close webhook.
Pass the send_bytes and recv_bytes count to the web hook.
10 years ago
Nimrod A. Abing (on kohima) bc93147426 for #308, disable st examples. for #334, refine the st init and event select. 10 years ago
winlin 8ee0826e9a fix build failed bug. 10 years ago
winlin e6058c1560 update donation 10 years ago
winlin 320f45c6f4 fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140. 10 years ago
winlin 27cb62b7aa for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139. 10 years ago
winlin 995b130090 for #324, refine code for hstrs, support hijack handler. 10 years ago
winlin 5c6ef6ded6 fix warning for xcode. 10 years ago
winlin 6d15d0ea99 for #324, refine code, add hstrs config. 10 years ago
winlin a15ce1147f for #155, fix all warnings for mac. 10 years ago
wenjie.zhao 643f18abe4 add hds reload supported.#328 10 years ago
winlin 984145de72 for #328, add todo for hds, check whether disabled, support reload. 10 years ago
winlin ffef62900f for #328, support adobe hds. 2.0.138. 10 years ago
winlin da56e4fbb9 for #328, fix hds compile error on mac. 10 years ago
wenjie.zhao 07d8f060eb refine annotation 10 years ago
wenjie.zhao 570c0d66bd fix path issue. 10 years ago
wenjie.zhao e57bda8908 Merge code.
Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp
10 years ago
winlin a739b2c555 fix the bug for fork ffmpeg in mac, the local variable is unvailable. 10 years ago
winlin 1ad0c847ce fix http parse bug 10 years ago
winlin f247ac9daf fix the http parse bug. 10 years ago
wenjie.zhao d4198ee8ba add hds supported. 10 years ago
winlin f9767c91b5 fix configure bug, refine code for stream caster. 10 years ago
winlin 5c3c38684b fix the bug of flv stream, metadata type should be 18 10 years ago
winlin db7ddfd510 fix #155, #135, support osx(darwin) for mac pro. 2.0.137. 10 years ago
winlin 5143e3a58d fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136 10 years ago
winlin 2e9f2753c9 for #316, add stream codec info. 2.0.135 10 years ago
winlin 885b9af122 for #310, refine code to support he/hev2, use aac object. 10 years ago
winlin d3e2838fc6 for #310, refine the aac profile for adts and aac object for RTMP sequence header. 10 years ago
winlin 04f3f2a8f8 for #316, add codec info to stream. 10 years ago
winlin 8bf60895a9 refine the kbps of server. 10 years ago
winlin fbbe46d272 refine the config, support directly parse file. 10 years ago
winlin f26e719800 fix #322, fix http-flv stream bug, support multiple streams. 2.0.133. 10 years ago
winlin 1277968d4a refine http client, use initialize to set host and port. 10 years ago
winlin 2bcb4f811c refine http. 10 years ago
winlin 964e4be9d4 refine http request post. 2.0.132. 10 years ago
winlin 3982ec1d87 refine http request parse. 2.0.132. 10 years ago
winlin 4325809daf refine http 10 years ago
winlin 6fccfa061d refine the http request code. 10 years ago
winlin 025b707330 refine the http request reader. 10 years ago
winlin 3e394a5f06 for #320, set socket send buffer to smaller macro. 2.0.131 10 years ago
winlin 04dc60ebe1 refine http for srs, rename SrsGoHttp to SrsHttp. 10 years ago
winlin a47dbf7a92 for #320, refine code. 10 years ago
winlin 34d6a2ece5 for #320, support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129 10 years ago
winlin fb3fced8d0 for #179, revert dvr http api. 2.0.128. 10 years ago
winlin 8ed256b7e9 for #179, wait keyframe for dvr. 2.0.127 10 years ago
winlin 0213cc6466 for #179, refine dvr, support POST create dvr when publish not start. 2.0.126 10 years ago
winlin b903a7b436 for #179, dvr suport vhost/app/stream level control. 2.0.125. 10 years ago
winlin 1cb8e44b1b fix #304, fix hls bug, write pts/dts error. 2.0.124. 10 years ago
winlin a3648063d5 fix #179, support dvr http api. 2.0.123. 10 years ago
winlin d650118988 fix #179, dvr support api to start or stop. 2.0.123 10 years ago
winlin 1246989ea9 for #179, refine dvr, support callback when reap dvr segment. 10 years ago
winlin 849e59b05d for #179, support http api to start dvr. 10 years ago
winlin c67a4fdf97 for #179, enable http api crossdomain for dvr api. 10 years ago
winlin 1445086451 for #179, update the metadata of flv dvr file. 10 years ago
winlin 7077b74d03 for #179, add dvr plan append. 10 years ago
winlin 95b4baee7c for #179, refine dvr code to more simple. 10 years ago
winlin 3d225e1bc7 refine dvr, donot append the flv header. 10 years ago
winlin a984eeecab refine dvr, append file when dvr file exists. 2.0.122. 10 years ago
winlin 1102c7a58f refine pithy print to more easyer to use 2.0.121. 10 years ago
winlin 9d233db27e fix #133, support push rtsp to srs. 2.0.120. 10 years ago
winlin 0cc693a3b8 for #133, decode the h264 NALU from rtp. 10 years ago
winlin 6a64164985 for #133, show more info about rtp. 10 years ago
winlin 45c0b12958 for #133, finish rtsp sdp, start rtp. 10 years ago
winlin f14af45413 for #133, alloc and free rtp port. 10 years ago
winlin d4ceff649f the join maybe failed, should use a variable to ensure thread terminated. 2.0.119. 10 years ago
winlin ccc30c70c4 the join maybe failed, should use a variable to ensure thread terminated. 1.0.28. 10 years ago
winlin 40fbfd8560 for #133, rtsp extract tcp/udp listener. 10 years ago
winlin 4807f7850d for #133, rtsp parse the announce packet, parse the sps/pps and audio sequence header by base64. 10 years ago
winlin 604f4cc57b for #133, support the rtsp options request and response. 10 years ago
winlin c0e50265bd for #133, create rtsp framework. 10 years ago
winlin e81e090239 for #133, add rtsp listener and handler. 10 years ago
winlin 78f34ad46f for #304, support config default acodec/vcodec. 2.0.118. 10 years ago
winlin 922150b2cf for #304, rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117. 10 years ago
winlin 3c813847bd rewrite the ts remux of hls. 2.0.117 10 years ago
winlin e88c1e32ee always increasing target duration, for #304 10 years ago
winlin 25af6c6847 for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116. 10 years ago
winlin 381e88d698 add release code. ZhouGuowen for SRS2.0 10 years ago
winlin b982b27f6f add dev code for each release. HuKaiqun for SRS1.0 10 years ago
winlin 66931a8890 try to fix hls problem, print the video packets. 10 years ago
winlin b8d4f68a69 try to refine hls, always flush video when reap segment. 10 years ago
winlin 5a3cd235fd refine hls, try to fix the hls ts corrupt problem. 10 years ago
winlin d5e3ac4e7d for #310, the aac profile must be object plus one. 1.0.26 10 years ago
winlin 4820d455d5 for #310, workaround to force to LC/MAIN, donot support SSR above. 2.0.113 10 years ago
winlin f8bdd28de6 add comments for hls m3u8, target duration may should not changed. 10 years ago
winlin 693c7a5349 refine hls m3u8, use LR(0x0a, \n) as new line char 10 years ago
winlin 81ea6d34ce add pdf of hls rfc, corrent the content type. 10 years ago
winlin 30b1759aa9 fix bug for memory hls. 10 years ago
winlin dba983d124 for #136, update the config for ram hls. 10 years ago
winlin a23191497f fix #136, support hls without io(in ram). 2.0.112 10 years ago
winlin 16afe7ddbb fix #250, support push MPEGTS over UDP to SRS. 2.0.111 10 years ago
winlin 4246be92c9 for #250, merge avc to codec. use queue to dequeue. 10 years ago
winlin 153a3a6c42 must user pithy print for mpegts print. 10 years ago
winlin 70c8fe13c4 for #250, support h264 video for push mpegts over udp. 2.0.110 10 years ago
winlin 66fccdbbd1 for #250, demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109. 10 years ago
winlin bce78fdab6 for #250, add comments for elemetary stream specifed by stream_id. 10 years ago
winlin a384cc400a for #250, use udp packet handler. 10 years ago
winlin 35ab0ea627 for #250, use buffer to cache bytes, for system will split the udp packet. 10 years ago
winlin 1685cdd48e for #250, parse pes packet ok, ts message ok. 10 years ago
winlin 52b62918d9 for #250, decode the PAT of PSI ts packet. 10 years ago
winlin 51aecb8fde for #250, decode the ts packet header and adaptation field. 10 years ago
winlin 919a85b103 for #301, hls support h.264+mp3, ok for vlc. 2.0.107 10 years ago
winlin 2c42350489 for #301, http ts stream support h.264+mp3. 2.0.106 10 years ago
winlin 9cbc753e8e for #151, #268, refine the pcr start at 0, dts/pts plus delay. 1.0.25 10 years ago
winlin c9d270fbe0 refine code for #250, ts remux 10 years ago
winlin 1835957a2b for #151, refine pcr=dts-800ms and use dts/pts directly. 1.0.24 10 years ago
winlin ea85ad2e20 for #293, #250, move the ts codec to kernel ts. 10 years ago
winlin d22e4e86d8 update projects for rtmp renamed to protocol 10 years ago
winlin 711b6ca277 for #250, basic stream caster framework. 2.0.104 10 years ago
winlin 6463d22a14 for #250, add mpegts over udp stream caster class. 10 years ago
winlin 7f02bfa3a4 for #250, the mpegts over udp stream caster framework. 10 years ago
winlin 52891b491a listen and serve stream caster mpegts over udp. 10 years ago
winlin f9d1e1111a merge from feilong, consumer directly sleep when paused. 10 years ago
winlin 8ace73f30d for #151, use absolutely overflow to make jwplayer happy. 2.0.103 10 years ago
winlin 4f5cc9c403 for #151, use absolutely overflow to make jwplayer happy. 1.0.23 10 years ago
winlin 73cfdea332 for #299, srs http server support dash vod stream over mp4 range. 2.0.103 10 years ago
winlin e0ee8de2fb for #299, srs http server support dash, flash request range in range or bytes. 10 years ago
winlin a4ba40952a for #250, rename rtmp to protocol dir. 10 years ago
winlin 2a05783d5c for #293, support http ts stream. 2.0.101 10 years ago
winlin dfe385d0c9 for #293, move the simple buffer to kernel. 10 years ago
winlin 0f59073400 refine code, rename the pts to dts although both ok for audio. 10 years ago
winlin 913f98b902 for bug #293, http ts stream, move the avc codec from app to kernel. 10 years ago
winlin dc6299171f refine http stream code. 10 years ago
winlin 7d86c6d9e9 for bug #293, refine for fast cache of http stream. 10 years ago
winlin 25807298ad alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux 10 years ago
panda1986 797c1b0762 support all acodec. not forced to aac. 10 years ago
panda1986 e7d54c2ca9 Update srs_app_ffmpeg.cpp
srs develop 新增支持mp3转码后,需要添加新的acodec-libmp3lame.所以去掉srs_app_ffmpeg.cpp中对acodec的判断
10 years ago
winlin 5f194bc87c merge from feilong, the crash for cosumer wait. 10 years ago
winlin b7b268dfbf fix #293, support http live flv/aac/mp3 stream with fast cache. 2.0.100. 10 years ago
winlin 29a8932b49 for bug #293, use http stream cache for android weixin to happy. 10 years ago
winlin f9f2fcbb9c for #293, add http stream cache for audio mp3/aac stream. 10 years ago
winlin d364a81d8f for #293, support http mp3 streaming 10 years ago
winlin 99bf397487 for bug #293, add mp3 id3 spec 10 years ago
winlin b04888a35d for #293, #277, support http chunked encoding 10 years ago
winlin 3244c083c7 for bug #293, support http aac stream 10 years ago
winlin 7674524c31 for #239, empty the aac encoder 10 years ago
winlin c0233542bf for #293, add aac encoder for http aac stream. 10 years ago
winlin c0a7752718 for #293, add aac mime audio/x-aac 10 years ago
winlin d546827b1c for #293, refine the mime of content type. 10 years ago
winlin 3b853a6dbd fix #293, support rtmp remux to http flv live stream. 10 years ago
winlin eea31ef4f3 for #293, support rtmp remux to http flv live stream. 10 years ago
winlin faaa9187f2 for #293, mount http flv stream when publish. 10 years ago
winlin 2698e6dbae for bug #293, http live streaming framework. 10 years ago
winlin eff2d81016 for #293, add http flv stream 10 years ago
winlin c4302b9b61 for bug #277, the http server subscribe the reload. 10 years ago
winlin f1393ee43f for bug #277, use http not found when no file. 10 years ago
winlin 398b212bfa for bug #277, refine code, support default http vhost. 10 years ago
winlin 2742c0d3c2 for #277, support http vhost mount. 10 years ago
winlin 4513486266 refine http server, support mount dir for vhost. 10 years ago
winlin bfff8413b6 refine code for #277, the copy first param is the dest. 10 years ago
winlin c695a8fcbd refine code for #277, extract the flv vod stream. 10 years ago
winlin e71bc0cbc5 for bug #277, refine the http server. 10 years ago
winlin bbe96a4b31 for bug #277, support flv stream. 10 years ago
winlin cbed2bbca4 fix #277, refine http server refer to go http-framework. 2.0.98 10 years ago
winlin 9bbbaad288 for bug #277, refine http api refer to go http-framework. 2.0.97 10 years ago
winlin cc22ca4890 hotfix #290, use iformat only for rtmp input. 2.0.95 10 years ago
winlin 4449a8d7b0 fix #290, use iformat only for rtmp input. 1.0.22 10 years ago
winlin 29be14dd37 merge from feilong, fix memory leak. 10 years ago
winlin a4b61081cc merge from feilong, fix memory leak. 10 years ago
winlin 63309a0538 refine for bug #288, drop info frame without error. 10 years ago
winlin b705ed0b90 for bug #288, refine the codec decode info frame failed. 1.0.21 10 years ago
winlin 964668dc73 merge from feilong, print format error. 10 years ago
winlin b3225100e7 Merge pull request #282 from tufang14/develop
add client num in statistic with traverse every client for #227
10 years ago
qiang.li 310e49e7f3 add client num in statistic with traverse every client 10 years ago
winlin 982e9555bd merge from feilong, fix hls msg memory leak bug. 10 years ago
winlin b466756931 merge from feilong for bug #281. 10 years ago
winlin 27e0521ace fix #281, fix hls bug ignore type-9 send aud. 1.0.20 10 years ago
winlin ac584a4db2 Merge pull request #279 from tufang14/develop
add client num for stream in statistic for #227
10 years ago
qiang.li 46d716612c add client num for stream in statistic 10 years ago
winlin 0e9c9db3f4 fix the aggregate bug, adjust to starttime of msg. 2.0.91 10 years ago
winlin 5661fc2676 refine dvr and rtmp dump, write the original data. 10 years ago
winlin a402ca7120 refine code, the consumer always alive longer than queue recv thread. 10 years ago
qiang.li 08e9f6ef42 add play client num in statistic 10 years ago
winlin f1efdcd000 refine code, use global virtual id to generate the id of vhost and stream. 10 years ago
winlin ae63af6a4a refine code, implements the stat.: 10 years ago
winlin 97bea51499 refine the api, response the error code and data. 10 years ago
winlin cc796a433a refine the statistic arch. 10 years ago
winlin 40ed2249e8 refine code to use the one coding style. 10 years ago
winlin 4bb17f0c81 replace the TAB with 4spaces 10 years ago
winlin 344ff24f66 add srs_app_statistic to upp project. 10 years ago
winlin 67adc8dc61 merge with security bug fix. 10 years ago
qiang.li a4a93613d0 add statistic for stream 10 years ago
winlin dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 10 years ago
winlin dd2c7e0b4d hotfix to remove the pageUrl for http callback. 2.0.88 10 years ago
winlin 247b772449 hotfix to remove the pageUrl for http callback. 1.0.19 10 years ago
qiang.li 8d534d3470 get stream info use http api #227 10 years ago
winlin f881bc43b5 fix #179: dvr support custom filepath by variables. 2.0.87 10 years ago
winlin f89941254a refine code of security deny check 10 years ago
winlin 18b15b9099 refine comments of security deny check 10 years ago
winlin 75f2607685 fix #211, support security allow/deny publish/play all/ip. 2.0.86 10 years ago
winlin f8ec7c706d merge from 1.0.18, hotfix #207, trim the last 0 of log. 2.0.85 10 years ago
winlin e590537dca fix #207, trim the last 0 of log. 1.0.18 10 years ago
winlin 9d34820c80 fix #158: http-callback check http status code ok(200). 2.0.84 10 years ago
winlin 8df0f724d6 fix #216, http-callback post in application/json content-type. 2.0.83 10 years ago
winlin ca977ef739 hotfix #216, http-callback post in application/json content-type. 1.0.17 10 years ago
winlin c1c01ec802 hotfix #270, memory leak for http client post. 2.0.81 10 years ago
winlin bb6dfe40c1 fix #270, memory leak for http client post. 1.0.16 10 years ago
winlin 569596c10d update copyright, from 2013 to 2015 10 years ago
winlin c0a6c3efa3 merge from 1.0release, hotfix #267, the forward dest ep should use server. 2.0.79 10 years ago
winlin d9aca8ab82 hotfix #267, the forward dest ep should use server. 1.0.15 10 years ago
winlin e27c95b0e8 merge from 1.0release for #268, the hls pcr is negative when startup. 2.0.78 10 years ago
winlin 513c1ec6d5 fix #268, the hls pcr is negative when startup. 1.0.14 10 years ago
winlin 28eedfc177 merge from 1.0release for #264, ignore the video NALU which is actually a sequence header to make HLS happy. 2.0.75 10 years ago
winlin 2e43a63bf4 fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12 10 years ago
winlin eef8034632 merge from 1.0release for bug #264. 2.0.74 10 years ago
winlin 7737042795 fix #264, remove the test code. 1.0.11 10 years ago
winlin 1dfac0bf1d fix #264, support disconnect publish connect when hls error. 1.0.11 10 years ago
winlin db13c725a6 refine #259, rename the on_dispose to wakeup. 2.0.73 10 years ago
winlin 61a648f1d2 refine for #259, chmod -x files. 10 years ago
winlin 24815e4efe refine code for bug #239 10 years ago
tufang14 3d0d43c5dc token bug
多级origin-edge模式,edge上功能不生效
10 years ago
winlin 44962c9142 update PRIMARY, AUTHORS, CONTRIBUTORS rule 10 years ago
winlin eba1740ed5 hotfix #200, deadloop when read/write 0 and ETIME. 1.0.6. 10 years ago
winlin fe59783d83 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 11 years ago
winlin 6da21364f6 update readme, rename wiki/xxx to wiki/v1_xxx 11 years ago
winlin bd158ec838 hotfix for bug #183, donot support AnnexB when decoding RTMP body for HLS. 1.0.1. 11 years ago
winlin 2ed794ad52 refine macro, use ffmpeg_stub and ffmpeg_tool, 0.9.224 11 years ago
winlin 9789335d0b fix #151, always reap ts whatever audio or video packet. 0.9.223. 11 years ago
winlin 13b092704d refine code for bug #151, refine the source functions, add comments. 11 years ago
winlin b830b995e6 fix bug #162, requires epoll. 0.9.222 11 years ago
zhengfl 2317f0e767 refine 11 years ago
zhengfl bafdd83122 last 11 years ago
zhengfl 1e34d2a5cd client connection no disconnect 11 years ago
winlin 0d6b91039d fix #257, refine latency, send when got one+ msgs, 2.0.72 10 years ago
winlin cbad7a3074 fix #257, server latency is 0.1s+, the bottleneck is encoder. 2.0.71 10 years ago
winlin 5529813fcb for bug #257, support NULL msg in msgs to send. 10 years ago
winlin dac9f9c45c refine the log level. 10 years ago
winlin 10297fab51 fix #257, support 0.1s+ latency. 2.0.70 10 years ago
winlin 68ade0a267 add log info for rtmp conn. change the mw_latency to 100 for realtime. 10 years ago
winlin 6bdd0af728 for bug #251, remove the queue fast cache for it's too complex, use queue fast vector instead. 2.0.69 10 years ago
winlin 7150a99f41 for bug #251, remove the mic(message iovs cache), no use. 10 years ago
winlin 438ee30ac1 for bug #251, refine the queue fast vector. 2.0.66 10 years ago
winlin 5a2b8afead for bug #251, add queue fast vector. 2.0.66 10 years ago
winlin 8f72f79504 for bug #251, add queue fast cache. 2.0.65 10 years ago
winlin bba6063492 for bug #251, the shared ptr message share the header. 2.0.64 10 years ago
winlin d53fd7f570 for bug #251, support mic(message iovs cache). 2.0.61 10 years ago
winlin 32d537b96b for bug #251, refine code before mic. 10 years ago
winlin d827928eeb for bug #251, merge the performance refines. 10 years ago