Commit Graph

1893 Commits (8374017329a870621304dab85462e103759ddf70)

Author SHA1 Message Date
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 e6549b261c for #293, support http mp3 streaming 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 15d87537a1 for bug #293, support aac stream. 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 77e43d1813 refine comments of aac publish for #212 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 53d9faf395 for #293, update readme. 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 a1f887f46f refine code, move onMetaData to consts. 10 years ago
winlin 04aa6f8296 drop script data except the onMetaData packet. 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 fae006ca7c 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 6c833902f9 merge http api from tufang. 2.0.92 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 44f5efda21 refine the print info. 10 years ago
winlin 0e9c9db3f4 fix the aggregate bug, adjust to starttime of msg. 2.0.91 10 years ago
winlin 5aa31568ba fix the rtmp dump, parse the aggregate msg. 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
winlin 89a3cf9efe refine code, failed when specified complex but no ssl for srslibrtmp 10 years ago
winlin 0e03d019a8 for bug #215, srs rtmp dump support conn args. 2.0.90 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
winlin 7f60d472e6 remove the change vhost forward. 10 years ago
winlin 45724bfaec update conf for transcode. 10 years ago
winlin 0b9bbdbe74 Merge branch '1.0release' into develop 10 years ago
winlin f9a33fbeee fix the compile failed for utest at 32bits cpus 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 07b207b7e3 remove test code for api-server. 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 518a5a72ab fix #263, srs-librtmp flv read tag should init size. 2.0.82 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 1824e18bd2 fix the comment bug. 10 years ago
winlin 12f4abd553 fix #266, aac profile is object id plus one. 2.0.80 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 5e9ff71740 refine the log verbose 10 years ago
winlin 2d229b09be refine rtmp protocol stack comments 10 years ago
winlin 5a229e89bf refine the rtmp protocol stack comments, the stream id in little-endian. 10 years ago
winlin 9e35664510 refine the simple handshake comment. 10 years ago
winlin 8757473a7a Merge branch '1.0release' into develop 10 years ago