1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Commit graph

1403 commits

Author SHA1 Message Date
winlin
921b7d239f refine code, use macro for hls resample audio 2014-07-05 23:43:28 +08:00
winlin
63214d0f2b fix #81: support all aac sample rate, for instance, 48000. to 0.9.150 2014-07-05 23:29:45 +08:00
winlin
7805f7b12a add prefix Protocol to AMF0 and Handshake utest 2014-07-05 21:30:11 +08:00
winlin
5a41b1b538 finish kernel utest. to 0.9.149 2014-07-05 21:22:20 +08:00
winlin
ad920915a2 merge handshake to protocol 2014-07-05 17:56:18 +08:00
winlin
b13fd5112b merge buffer to kernel utest 2014-07-05 17:50:36 +08:00
winlin
1e395e7c10 add assert to flv. 2014-07-05 17:30:13 +08:00
winlin
95e73d0be1 remove the config log http api. 0.9.148 2014-07-05 13:02:50 +08:00
winlin
d219a7b67e complete the normal kernel flv utest. 0.9.147 2014-07-05 11:10:42 +08:00
winlin
010eb09a30 Merge branch 'master' of github.com:winlinvip/simple-rtmp-server 2014-07-05 09:32:13 +08:00
winlin
8271bd657b refine flv codec, rename fast encoder to flv vod stream decoder 2014-07-05 07:40:55 +08:00
winlin
032118581a refine http/dvr/hls to use file reader/writer. 0.9.146 2014-07-05 07:33:18 +08:00
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.
2014-07-04 09:53:50 +08:00
winlin
ba2e7bbf76 support create stream twice. 0.9.145 2014-06-30 22:13:42 +08:00
winlin
fb70602f93 fix #111, always use 31bits timestamp. 0.9.143. 2014-06-30 21:23:13 +08:00
winlin
0bd7d268e8 add mock for file reader/writer 2014-06-29 21:25:16 +08:00
winlin
a888e52df1 donot mix the read and write for librtmp 2014-06-29 17:17:50 +08:00
winlin
1eee4d25cf refine the librtmp, open writer then reader. 2014-06-29 17:12:10 +08:00
winlin
1a7735182f refine the file stream, to file reader and writer. 0.9.142 2014-06-29 17:05:26 +08:00
winlin
ed3f9f0a40 add core utest 2014-06-29 16:04:28 +08:00
winlin
f5f54e6008 add utest for kernel codec 2014-06-29 15:43:32 +08:00
winlin
492665e166 refine tcp client connect, extract to utility srs_socket_connect. 0.9.141 2014-06-29 14:39:56 +08:00
winlin
051c9e6268 refine the protocol utility, add utest, 0.9.140 2014-06-29 11:45:31 +08:00
winlin
6a2f0a3dc9 add configure preset --demo 2014-06-29 10:50:58 +08:00
winlin
55989b4bc8 remove the libfreetype for it fullfill with bugs and always cause build failed. 0.9.139 2014-06-29 10:43:53 +08:00
winlin
cb2967c967 refine forward, use utility to generate the tcUrl 2014-06-29 10:32:52 +08:00
winlin
4d45b3305b srs demo requires ffmpeg to transcode. 2014-06-29 10:07:57 +08:00
winlin
18534ecdb2 donot start nginx for demo, use cherrypy to delivery HLS. 2014-06-29 10:06:28 +08:00
winlin
ee07210105 fix demo script, start nginx. fix warning of utest on ubuntu14 2014-06-29 10:03:29 +08:00
winlin
e6f524281c support build on ubuntu14, 0.9.138 2014-06-29 09:11:28 +08:00
winlin
aad42d7941 fix ubuntu14 build warnings 2014-06-29 00:09:55 +08:00
winlin
594c1d8bf7 fix ssl make install on ubuntu 14, change to make install_sw 2014-06-28 23:16:14 +08:00
winlin
bfeb24c52b update call response, add comments. 2014-06-28 21:34:21 +08:00
winlin
fea8755719 response the call message with null. 0.9.137 2014-06-28 16:43:57 +08:00
winlin
53ad510766 add comments for the connection remove 2014-06-28 11:16:45 +08:00
winlin
a3f9aa7e1e fix #110, thread start segment fault, thread cycle stop destroy thread. 0.9.136 2014-06-28 10:57:58 +08:00
winlin
efed34301c add virtual destructor to SrsRefer 2014-06-27 13:40:17 +08:00
winlin
b357504b1d fix #109: fix the system jump time, adjust system startup time. 0.9.135 2014-06-27 13:35:28 +08:00
winlin
6ae6f6e60d add freetype2 to pkg-config path. 2014-06-26 17:14:52 +08:00
winlin
0cd0761508 fix time jitter zero algorithm bug, reset when timestamp overflow. 2014-06-26 10:13:43 +08:00
winlin
1970e18ed6 fix #108: disable the time jitter for encoder non-monotonical stream. 0.9.133 2014-06-25 17:14:11 +08:00
winlin
f173345e15 support report summaries in heartbeat. 0.9.132 2014-06-23 15:44:49 +08:00
winlin
db253bc76b fix fms token traverse bug, always update the token by the latest valid client. 2014-06-23 11:18:55 +08:00
winlin
1ae3e6c64c performance refine, support 3k+ connections(270kbps). 0.9.130 2014-06-22 20:01:25 +08:00
winlin
e9c96af91a add wiki and conf for token traverse auth 2014-06-21 12:58:33 +08:00
winlin
41857edaee support edge token traverse, fix #104. 0.9.129 2014-06-21 12:39:04 +08:00
winlin
10953c9743 support token auth in connect args. 0.9.128 2014-06-21 11:41:00 +08:00
winlin
6ff193c989 donot need to yum install pkg-config, for centos always installed it 2014-06-20 10:40:06 +08:00
winlin
94e5e7070d fix bug of freetype2 build for ffmpeg, depends on pkg-config 2014-06-20 10:25:52 +08:00
winlin
094d82bd06 add connections count to api summaries. 0.9.127 2014-06-19 18:49:05 +08:00
winlin
603b3bcdcc add libfreetype2 for ffmpeg, remove the depends of freetype of build_ffmpeg. 2014-06-19 16:15:49 +08:00
winlin
6ee2ba049b add srs bytes and kbps to api summaries. 0.9.126 2014-06-19 15:28:05 +08:00
winlin
8fabd5d987 refine cubieboard configure, use ubuntu prepare to install tools 2014-06-19 13:32:19 +08:00
winlin
46611ac062 refine configure, add cubieboard. use IProtocolStatistic in kbps. 2014-06-19 11:22:24 +08:00
winlin
46c1367fe8 refine the protocol io reader writer arch. 2014-06-19 10:34:10 +08:00
winlin
b0e4dc8085 refine network bytes of summaries, remove the lo data. 2014-06-18 16:21:33 +08:00
winlin
d0b08d0d51 add network bytes to api summaries. 0.9.125 2014-06-18 16:13:02 +08:00
winlin
f893711499 fix #98: workaround for librtmp ping(fmt=1,cid=2 fresh stream). 2014-06-14 20:44:38 +08:00
winlin
3f9c23d834 fix #101: for ubuntu14 build error. 2014-06-14 16:24:15 +08:00
winlin
cbc1486688 refine message, add license 2014-06-14 14:19:19 +08:00
winlin
55b99c90c7 refine detect tool, support atc stream. 2014-06-11 14:16:44 +08:00
winlin
17cb8c4550 finish the research for python-subprocess 2014-06-11 11:14:43 +08:00
winlin
b7d8be46a1 add research for usage for subprocess 2014-06-11 11:03:22 +08:00
winlin
cccc483ab3 add bytes statistic for librtmp 2014-06-10 17:39:12 +08:00
winlin
a639eb0596 fix bug of buffer assert, erase can accept any value 2014-06-10 16:06:18 +08:00
winlin
d48d739fa7 fix bug of detect rtmp, add error code 2014-06-10 11:57:46 +08:00
winlin
4d9ed6f7fe refine the code, add comments to result to self interpret 2014-06-10 11:44:02 +08:00
winlin
8817823462 add rtmp detecter 2014-06-10 11:34:35 +08:00
winlin
ef6efb821c add rtmp detecter 2014-06-10 10:40:31 +08:00
winlin
0327c85f85 refine kernel codec, remove unused stream 2014-06-09 10:33:35 +08:00
winlin
6286759eaa refine codec, extract avc aac codec to app. 2014-06-08 22:36:17 +08:00
winlin
3dbe8ba9de update configure script 2014-06-08 13:18:34 +08:00
winlin
31b568b013 refine core, move specified functions to kernel utility. 2014-06-08 13:03:03 +08:00
winlin
7c7920698d refine utest, move the mock io to handshake where actually use it. 2014-06-08 12:29:05 +08:00
winlin
94cf0c1069 refine kernel buffer. complete the utest for buffer. 2014-06-07 22:23:17 +08:00
winlin
8992e217a9 refine srs buffer, min interfaces 2014-06-07 21:09:46 +08:00
winlin
e6c03c6d6d complete the amf0 strict array utest 2014-06-07 20:40:02 +08:00
winlin
5a06909d75 update amf0 strict array test, fix bug of count zero init 2014-06-07 20:01:11 +08:00
winlin
373f92551d refine librtmp, remove the ssl functoins, refine the type2string memory alloc to static 2014-06-07 13:44:46 +08:00
winlin
48adeeb1a5 fix the demo player html text 2014-06-06 15:35:47 +08:00
winlin
e227bd3a0e remove the srs community 2014-05-31 17:47:02 +08:00
winlin
7022f48a86 add rtmfp rfc doc 2014-05-30 15:47:27 +08:00
winlin
52971f3f81 update readme, add rtmfp 2014-05-30 10:28:16 +08:00
winlin
7166b666c8 refine http log. 2014-05-30 09:20:51 +08:00
winlin
5273509554 refine log, to 0.9.123 2014-05-29 14:16:34 +08:00
winlin
7ec202ee41 support flv inject and flv http streaming with start=bytes. 0.9.122 2014-05-29 12:09:26 +08:00
winlin
d56f445076 remove research flv codec, to librtmp 2014-05-28 19:02:18 +08:00
winlin
22968c85df supprt inject flv 2014-05-28 19:01:47 +08:00
winlin
4970664e37 move codec to kernel. 2014-05-28 17:37:15 +08:00
winlin
608083d42f add flv injecter, add flv codec to librtmp. 2014-05-28 15:37:06 +08:00
winlin
009de72a01 fix research bug, rename srs_freepa to srs_freep 2014-05-28 10:20:11 +08:00
winlin
6de81fdb1c refine fast id tracer 2014-05-27 19:34:18 +08:00
winlin
978e985519 fix #87: add source id for full trackable log. 0.9.120 2014-05-27 19:18:31 +08:00
winlin
8d99ef27cf fix #84: unpublish source when edge stop, clear gop cache 2014-05-27 17:59:59 +08:00
winlin
7920348e5f extract get_local_ip and get_peer_ip to app utility 2014-05-27 16:45:02 +08:00
winlin
384687a36d add server ip to flash client. 2014-05-27 16:17:40 +08:00
winlin
e39eed6519 add SrsPid and SrsId to client response, add pid to log 2014-05-27 16:11:25 +08:00
winlin
5ff1ce7cba for bug #87, response the server SrsId to flash. 2014-05-27 15:34:55 +08:00
winlin
d74921e1ab fix #89, config to /dev/null to disable ffmpeg log. 0.9.117 2014-05-27 14:10:46 +08:00
winlin
14f0a2e046 for bug #88, add timeout for connect. 2014-05-26 18:21:35 +08:00
winlin
93c9c55fb9 remove the complex handshake of librtmp. refine makefile of librtmp tools 2014-05-26 15:54:39 +08:00
winlin
69248cedaa http streaming support flv start index. 0.9.115 2014-05-26 14:58:08 +08:00
winlin
b13bd70c86 http streaming support flv start index. 2014-05-26 13:57:08 +08:00
winlin
7b69b8b5c4 fix #79: allow edge vhost to add or remove. 0.9.114 2014-05-25 10:08:17 +08:00
winlin
344a49918a fix #79: allow edge vhost to add or remove. 2014-05-25 10:07:57 +08:00
winlin
cf7b6f25f6 add srs community 2014-05-23 22:39:13 +08:00
winlin
0eb9e0af5b fix #78 st joinable thread must be stop by other threads, 0.9.113 2014-05-23 17:23:33 +08:00
winlin
6fba0db9b5 refine http stream server 2014-05-23 14:26:11 +08:00
winlin
9eedf1ac40 the st_thread_exit is ok, not the memory leak cause. 2014-05-23 14:11:50 +08:00
winlin
5f7bacf678 fix st thread exit bug, never implict invoke the st_thread_exit, which may cause memory leak. 0.9.112 2014-05-23 13:56:40 +08:00
winlin
6bc0ecece7 add dvr, http heartbeat conf sample 2014-05-22 17:13:57 +08:00
winlin
25e279b7c8 support amf0 StrictArray(0x0a). 0.9.111. 2014-05-22 16:30:24 +08:00
winlin
7f48590239 support amf0 StrictArray(0x0a). 0.9.111. 2014-05-22 16:29:42 +08:00
winlin
bd24fe7d75 support flv parser, add amf0 to librtmp. 0.9.110 2014-05-22 15:08:25 +08:00
winlin
69eb935505 fix bug of flv parser, librtmp amf0 library 2014-05-22 11:39:10 +08:00
winlin
d4b8fee61a fix bug #73, http callback api support authentication in tcUrl 2014-05-22 10:23:12 +08:00
winlin
f37faf7236 update librtmp, add amf0 parse functions 2014-05-21 18:30:58 +08:00
winlin
efc9f53512 fix rtmp handshake utest bug 2014-05-21 12:50:48 +08:00
winlin
f0b54678ad fix http hooks dvr bug, check dvr macro 2014-05-21 12:02:50 +08:00
winlin
2a8db3ab83 refine the re of ingest flv, re cleanup always sleep 2014-05-21 09:31:38 +08:00
winlin
1d6b096ce9 adjust the deviation. 2014-05-20 18:15:02 +08:00
winlin
2265173c4d donot install tools when ffmpeg is not open, 0.9.108 2014-05-20 18:11:33 +08:00
winlin
ef0f7f4da8 support http heartbeat, 0.9.107 2014-05-19 17:39:01 +08:00
winlin
cb95b5909c add http heartbeat framework 2014-05-19 15:45:04 +08:00
winlin
7c804277b2 add heatbeat url, add stream for api-server 2014-05-19 15:27:05 +08:00
winlin
0186247fee support http api json, to PUT/POST. 0.9.105 2014-05-18 17:57:20 +08:00
winlin
3064e5ec61 fix bug of nx_json parse, to 0.9.104 2014-05-18 16:48:24 +08:00
winlin
d6355efe22 support http api json, to PUT/POST, to 0.9.103 2014-05-18 16:15:35 +08:00
winlin
b60e8418c6 add json base on nxjson(nx-json/nx_json) decoder for http api. 0.9.102 2014-05-18 14:34:45 +08:00
winlin
2c059d3a80 fix bug #72, also need stream_id for send_and_free_message. 0.9.101 2014-05-17 17:53:27 +08:00
winlin
952abbee03 use server ip or name for forward tcurl. 2014-05-17 15:55:58 +08:00
winlin
c59576146b rename struct to class. 0.9.100 2014-05-17 14:59:33 +08:00
winlin
2f89c8b2e8 move some utilities from kernel to app. 0.9.99 2014-05-17 14:53:04 +08:00
winlin
4b8d3fe05f refine log, add overflow log 2014-05-16 13:31:59 +08:00
winlin
47089f0e82 add nxjson 2014-05-16 13:26:04 +08:00
winlin
154f084f1b add comments for json 2014-05-16 11:56:43 +08:00
winlin
07fbd58f39 update api server, add meiyi demo streams. 2014-05-16 10:52:38 +08:00
winlin
cf712b06bb fix bug #67: fix pithy print bug, stage must has a age. 0.9.98 2014-05-14 14:35:29 +08:00
winlin
cbbf53f8f9 fix bug #67: fix pithy print bug, stage must has a age 2014-05-14 14:34:28 +08:00
winlin
b175821b62 refine kbps, provides 30s,1m,5m,60m kbps. 0.9.97 2014-05-14 13:56:12 +08:00
winlin
830f0b5eb6 refine metadata info 2014-05-14 11:46:17 +08:00
winlin
3ebda13802 refine the ptr array free, 0.9.96 2014-05-14 09:58:42 +08:00
winlin
dc66c525fd refine autofree, only free object, never free arrays 2014-05-14 09:41:41 +08:00
winlin
300f264e92 set metadata time equals to sequence header time. 2014-05-13 15:30:20 +08:00
winlin
91eabda7b8 add comments for source, return for sequence header. 2014-05-13 15:15:25 +08:00
winlin
9ba786d1aa fix bug of mem leak, free the left msgs if send error 2014-05-13 14:32:50 +08:00
winlin
befde6acf7 fix mem leak for delete[] SharedPtrMessage array, explicit free elems. remove srs_freepa. 0.9.95 2014-05-13 14:24:39 +08:00
winlin
0a1c0afe8d fix bug of NULL ptr for edge kbps object 2014-05-13 11:34:44 +08:00
winlin
7004510cc7 fix ffmpeg log fd leak, always close log_fd. 0.9.94 2014-05-13 11:16:53 +08:00
winlin
74e6e28993 refine the kbps calc module. 0.9.93 2014-05-12 18:06:13 +08:00
winlin
9006194cd7 refine framework to calc the kbps 2014-05-12 17:27:50 +08:00
winlin
3f33dffdb3 refine the quit and destroy, quit when normal, destroy only for gmc 2014-05-12 13:14:36 +08:00
winlin
1a1527a857 fix bug #64: install_dir=DESTDIR+PREFIX 2014-05-12 12:56:58 +08:00
niesongsong
327f030ef5 Update options.sh
fix options bug like: --prefix=../bin
2014-05-12 10:56:36 +08:00
winlin
add64533e3 add donation user chen.chen 2014-05-12 10:36:37 +08:00
winlin
1c1efd7000 update readme, update api server stream list 2014-05-10 14:01:40 +08:00
winlin
900406cc70 refine api, now to now_ms 2014-05-08 16:13:33 +08:00
winlin
a1fed15789 add uptime, startup time, load to api 2014-05-08 15:45:51 +08:00
winlin
8388da6325 add miss files. fix bug #60: support aggregate message 2014-05-08 14:33:25 +08:00
winlin
f6dd1371bf fix bug #36: never directly use *(int32_t*) to convert, for arm may not support 2014-05-08 12:12:01 +08:00
winlin
fa9870db96 fix bug #59: edge for FMS, always use schema1(digest-key) for FMS, or connect failed. 2014-05-08 11:51:49 +08:00
winlin
b2aab8804b use complex handshake for srs play 2014-05-08 11:48:34 +08:00
winlin
f5f29e486f update code stat 2014-05-07 13:19:25 +08:00
winlin
5e806d62bb add code statistic tool 2014-05-07 11:07:10 +08:00
winlin
cb64d20575 refine core macros 2014-05-06 18:22:01 +08:00
winlin
c4167c66bc Merge pull request #56 from T-bagwell/master
fix problem: cannot build x264 normal minimal Linux
2014-05-06 14:10:39 +08:00
winlin
999e2876b4 revert to try to merge with pull request 2014-05-06 14:09:51 +08:00
winlin
ae372de65e merge from wukong, fix the bug of build x264 on minimal server 2014-05-06 13:51:38 +08:00
Steven Liu
7ba7fd487e fix problem: cannot build x264 normal minimal Linux
parameters:
External library support:
  --disable-avs            disable avisynth support
  --disable-swscale        disable swscale support
  --disable-lavf           disable libavformat support
  --disable-ffms           disable ffmpegsource support
  --disable-gpac           disable gpac support

  There have no ffmpeg or libav when build x264, so no needed
  these parameters.

Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
2014-05-06 13:41:55 +08:00
winlin
94076b3246 fix bug #50, ubuntu14 build error 2014-05-06 11:04:12 +08:00
winlin
90e50da305 update api server, add hiwifi 2014-05-05 18:07:06 +08:00
winlin
e5290725ab fix bug of mips 2014-05-04 19:13:21 +08:00
winlin
0c121f1c9b fix bug of mips 2014-05-04 18:54:57 +08:00
winlin
97f4d81193 fix bug of mips 2014-05-04 18:52:32 +08:00
winlin
a88e95d558 add mips 2014-05-04 18:38:42 +08:00
winlin
1e9561150a add mips 2014-05-04 18:38:08 +08:00
winlin
f8e8c81e50 refine log, simplify it. to 0.9.90 2014-05-04 16:29:57 +08:00
winlin
7b530bf8d8 update signature 2014-05-04 11:28:17 +08:00
winlin
106270c8aa refine log messages. 2014-05-04 11:11:51 +08:00
winlin
a4410a4fa9 update pithy-print to 10s. refine log 2014-05-04 10:45:13 +08:00
winlin
243a2eabf5 explicit exit st-thread, for gmc to analysis mem 2014-05-04 10:01:57 +08:00
winlin
96a5c7b1ab fix mem leak of encoder, edge and source. add destroy for gmc to detect mem leak. to 0.9.89 2014-05-03 22:59:21 +08:00
winlin
45da6b1ef9 refine srs script, use SIGKILL if SIGERM failed. 2014-05-02 14:15:25 +08:00
winlin
e492180b78 fix mem leak detect bug, destroy server when quit 2014-05-02 14:08:48 +08:00
winlin
7465f2d20b fix mem leak in decode message, free the packet and msg 2014-05-02 12:49:11 +08:00
winlin
b53f83acf1 rename __srs_rtmp_expect_message to srs_rtmp_expect_message 2014-05-02 12:45:42 +08:00
winlin
5b98a27256 fix mem leak in recv message error, always free msg 2014-05-02 12:44:38 +08:00
winlin
52d1fa8df5 fix mem leak for send packet, always free in send msg. 2014-05-02 12:34:21 +08:00
winlin
d74f01e2d1 fix signal bug, break for gmc. fix SrsMessage leak, use common message to free payload. to 0.9.88 2014-05-02 12:29:56 +08:00
winlin
daca90db95 disable verbose log for av 2014-04-30 17:37:00 +08:00
winlin
0945c2b441 fix RTMP protocol extended timestamp bug, always trust and use the extended-timestamp for the first chunk of msg 2014-04-30 17:16:28 +08:00
winlin
37476df704 refine log for recv message 2014-04-30 15:42:19 +08:00
winlin
7cbe18902f fix bug of librtmp after RTMP protocol stack refined, never use cid=2 to send data. 2014-04-30 13:20:53 +08:00
winlin
e3be7bfa88 disable detail log 2014-04-30 12:22:06 +08:00
winlin
fc501b050b add atc_auto to disable or enable auto detect atc 2014-04-30 12:08:11 +08:00
winlin
30bb3ff704 add dvr_plan hss to full.conf 2014-04-30 11:56:19 +08:00
winlin
aebff659b6 remove wait interval for signal 2014-04-30 11:29:03 +08:00
winlin
d0dff2d332 fix bug #34: convert signal to io. 0.9.85 2014-04-30 11:26:32 +08:00
winlin
a14220d4fb fix bug of auto bravo atc 2014-04-30 10:31:05 +08:00
winlin
6ee49ee029 bravo auto atc per stream. 0.9.84 2014-04-30 10:17:04 +08:00
winlin
f02ac02a50 auto open atc for bravo_atc set 2014-04-29 18:27:00 +08:00
winlin
0f498acd7b add comments and variable for c3 extended-timestamp. to 0.9.82 2014-04-29 18:16:29 +08:00
winlin
80ddddf823 refine RTMP protocol completed, to 0.9.81 2014-04-29 14:44:07 +08:00
winlin
be4c182d11 refine RTMP protocol stack. 2014-04-29 14:18:10 +08:00
winlin
ebf6203c3b refine rtmp protocol stack, refer to go.rtmp 2014-04-29 13:39:16 +08:00
winlin
2e5337a26e refactor: remove the unused super. 2014-04-29 10:06:52 +08:00
winlin
fd0efecbc8 refine ingester pithy print 2014-04-29 09:57:59 +08:00
winlin
cb2959ae7d fix bug #53, never use msg when sent it 2014-04-29 09:32:30 +08:00
winlin
0622004eff update conf, add todo for edge/forward 2014-04-29 09:10:17 +08:00
winlin
e5720d3906 fix bug of research librtmp tools 2014-04-28 19:05:24 +08:00
winlin
60f319de0c fix bug of package script, donot default os 2014-04-28 19:01:56 +08:00
winlin
e85a46f88e fix bug of package script, donot default os 2014-04-28 18:58:51 +08:00
winlin
6e8c0b9674 fix bug of arm package script 2014-04-28 18:55:19 +08:00
winlin
fe80a4a7d2 remove package script for pi and arm, use param instead 2014-04-28 18:52:18 +08:00
winlin
cdcbca6423 update package script 2014-04-28 18:48:31 +08:00
winlin
555d8b9f1d delete pid file when stop service 2014-04-28 18:07:18 +08:00
winlin
23b04e2a57 completed the edge reload, to 0.9.79 2014-04-28 17:57:59 +08:00
winlin
c681098949 fix bug of edge, one fd for one thread 2014-04-28 17:20:35 +08:00
winlin
241d04b391 update api server for android server vhost changed 2014-04-28 14:54:27 +08:00
winlin
a363e3d293 support basic edge(play/publish) RTMP server. 0.9.78 2014-04-27 15:10:25 +08:00
winlin
bc7648724d use directly send publish edge mode. 2014-04-27 14:57:28 +08:00
winlin
2295ebb346 remove the edge message flag, use directly send mode 2014-04-27 14:23:21 +08:00
winlin
5ddc71685b pre change publish edge to directly send mode 2014-04-27 14:21:19 +08:00
winlin
16319d73fd implements basic edge(play and publish), with bug 2014-04-27 12:28:45 +08:00
winlin
79c9c6dcb7 implements the proxy for edge publish mode 2014-04-27 11:11:15 +08:00
winlin
ec96072472 add publish edge framework 2014-04-27 09:29:37 +08:00
winlin
270b1270af fix bug of edge, refine state to user state. 2014-04-26 22:51:01 +08:00
winlin
2bcaeccc51 edge support play and ingest origin stream. change to 0.9.77 2014-04-26 21:41:18 +08:00
winlin
acba4cfdc6 add edge framework 2014-04-26 18:08:21 +08:00
winlin
b0951d36d3 refine source, rename req to _req 2014-04-26 17:16:18 +08:00
winlin
a2f317a113 add chad.wang to authors for srs-librtmp on windows build project 2014-04-26 14:47:38 +08:00
winlin
a63a3812e3 add srs app edge 2014-04-25 16:35:03 +08:00
winlin
d6948d613f add author byteman for h264 to flv. 2014-04-25 15:27:50 +08:00
winlin
f3b441ba1f add alipay donation page. to 0.9.76 2014-04-25 12:56:48 +08:00
winlin
bfd1d07827 update readme 2014-04-24 17:46:10 +08:00
winlin
3ed59f190b refine srs live flashP2P(integrated by chnvideo) 2014-04-24 17:38:57 +08:00
winlin
67e1988b81 support live flashP2P(integrated by chnvideo VDN). 0.9.75 2014-04-24 16:32:19 +08:00
winlin
b276714573 support chnvideo hss streaming 2014-04-24 14:26:24 +08:00
winlin
35f3a93239 support dvr to hss. change to 0.9.74 2014-04-24 12:22:36 +08:00
winlin
e271cb607f refine plan, add stream start time for atc 2014-04-23 17:53:14 +08:00
winlin
0c0010d529 update dvr, extract flv segment 2014-04-23 16:33:42 +08:00
winlin
7ff8df4d97 refine code, notice api when segment close 2014-04-23 16:25:18 +08:00
winlin
09901d31da fix bug of android api server, fix the dead loop 2014-04-23 13:19:08 +08:00
winlin
580cbb84a9 add threading.Lock for cherrypy, or performance suffer. 2014-04-23 12:17:22 +08:00
winlin
435e02db5d dvr use .tmp and rename to .flv when finished. 2014-04-22 17:50:22 +08:00
winlin
733ca2475d call http api when dvr got keyframe 2014-04-22 17:32:45 +08:00
winlin
36d8fdfc1a move the ts buffer to http message 2014-04-22 12:20:58 +08:00
winlin
a73bf8d4aa optimizm the http server for send ts file 2014-04-22 12:15:13 +08:00
winlin
1af2c9bcc9 update script add librtmp for arm for tools flv/rtmp ingester 2014-04-21 15:46:29 +08:00
winlin
6f984ff54b fix bug of raspberry-pi build, static off 2014-04-21 15:17:45 +08:00
winlin
a158d81085 update raspberry-pi demo api 2014-04-21 13:47:32 +08:00
winlin
b5b5202ed2 update cdn api server. 2014-04-21 10:40:30 +08:00
winlin
b85e667991 update api, select the lowest load of peer 2014-04-21 09:11:08 +08:00
winlin
87bdaa21c9 add nodes for api 2014-04-21 00:03:17 +08:00
winlin
dcb9941ed7 add hls api to api-server 2014-04-20 15:00:34 +08:00
winlin
8bf1f4ad87 add api/v1 summaries/rusages/self_proc_stats/system_proc_stats/meminfos. change to 0.9.72 2014-04-20 00:17:11 +08:00
winlin
a5f4f6bd14 add meminfo 2014-04-20 00:15:26 +08:00
winlin
15aea4d9b3 add cpuinfo 2014-04-19 23:18:00 +08:00
winlin
951a93ab86 get self proc and system proc stat 2014-04-19 21:43:13 +08:00
winlin
117fd67950 add cpu stat 2014-04-19 21:23:34 +08:00
winlin
4c5aae7804 fix bug of ingest for android, init the variable to 0 2014-04-19 12:49:15 +08:00
winlin
5c8aad4fe4 fix bug of ingest for android, init the variable to 0 2014-04-19 12:49:05 +08:00
winlin
c530a8e5fc fix bug of ingest for android, init the variable to 0 2014-04-19 12:47:16 +08:00
winlin
e0e033d847 fix bug for arm cross build 2014-04-19 11:54:14 +08:00
winlin
e42eef422f add ssl and nossl for ingest flv/rtmp over srs-librtmp 2014-04-19 11:40:46 +08:00
winlin
e5fcf80b94 refine ingest flv over srs-librtmp 2014-04-19 11:24:31 +08:00
winlin
fae1c61c3f update readme. change to 0.9.71 2014-04-19 11:21:13 +08:00
winlin
b1835ee2fe add ingest flv to RTMP over srs-librtmp 2014-04-19 11:19:26 +08:00
winlin
f17f5de7d1 ingest rtmp to rtmp by srs-librtmp 2014-04-19 10:30:40 +08:00
winlin
608b28f223 add srs ingest flv/rtmp base on srs-librtmp 2014-04-19 09:47:47 +08:00
winlin
d013801c26 add configure options --disable-all 2014-04-18 15:13:52 +08:00
winlin
6b76e9e665 update test configure script 2014-04-18 14:21:36 +08:00
winlin
25630b5211 fix bug of utest build. 2014-04-18 09:16:43 +08:00
winlin
8651f38b59 update test configure script 2014-04-18 09:12:44 +08:00
winlin
443b9c48f4 update script 2014-04-18 08:57:36 +08:00
winlin
03af43017d update dvr config comments 2014-04-17 18:32:43 +08:00
winlin
67ddc9f5ae support dvr(record live to flv file for vod), change to 0.9.70 2014-04-17 18:23:49 +08:00
winlin
ab9a2ddd6c dvr support segment plan 2014-04-17 18:13:59 +08:00
winlin
2d1c28cff9 update dvr, support segment plan 2014-04-17 17:35:21 +08:00
winlin
6f19a83114 dvr support plan and default session plan 2014-04-17 16:57:04 +08:00
winlin
4b82a4f510 support reload dvr 2014-04-17 16:22:21 +08:00
winlin
9861fc4fe3 refine dvr, add comments 2014-04-17 16:16:17 +08:00
winlin
56ff70cdf8 remove lseek and size of fs stream 2014-04-17 16:10:05 +08:00
winlin
271b969d0b set audio/video flag to 0 in flv header. 2014-04-17 16:08:56 +08:00
winlin
73459547e1 support dvr. change to 0.9.69 2014-04-17 16:06:49 +08:00
winlin
996d042a33 add comments for file stream 2014-04-17 12:59:35 +08:00
winlin
a63fa20e53 extract flv format from f4v/flv specification 2014-04-17 12:07:44 +08:00
winlin
9ef7a83415 update server, add rtmp pc url 2014-04-17 10:08:04 +08:00
winlin
f5ff9c7241 update dvr comments 2014-04-16 17:54:41 +08:00
winlin
fdd0678bcb add thread cid to log 2014-04-16 16:58:54 +08:00
winlin
28231cadda add transcode for demo meeting hls. 2014-04-16 16:40:54 +08:00
winlin
ae3f7d9cb8 change meeting hls to an 2014-04-16 16:18:02 +08:00
winlin
5af1da17ed change to 0.9.68 2014-04-16 15:59:32 +08:00
winlin
0c91fa6bed fix dvr mem leak, free msg when not use it. 2014-04-16 15:58:06 +08:00
winlin
36c2c37b42 add srs.test for configure test and utest. 2014-04-16 15:22:12 +08:00
winlin
7a66dd8186 update test scripts. 2014-04-16 15:11:54 +08:00
winlin
f0a2fe235f refine scripts, use configure presets. 2014-04-16 15:09:31 +08:00
winlin
88094af97a refine log, add user original configure 2014-04-16 15:04:38 +08:00
winlin
78e7a31ddb refine option, add --use-sys-ssl, change to 0.9.67 2014-04-16 14:27:34 +08:00
winlin
406a30e533 add configure preset, add test for configure 2014-04-16 14:14:48 +08:00