external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity
1799 commits 13 branches 107 tags 375 MiB
Commit graph

1399 commits

Author SHA1 Message Date
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
winlin
47927ab460 refine options, change to 0.9.66 2014-04-16 13:24:00 +08:00
winlin
cc338fdb7c fix bug for default configure 2014-04-16 12:37:19 +08:00
winlin
005502a07e update comments for HLS on_hls_start 2014-04-16 11:11:53 +08:00
winlin
642fc19f9d update api server demo 2014-04-16 11:03:58 +08:00
winlin
fd0002e499 add dvr framework 2014-04-16 09:28:02 +08:00
winlin
96115ac4f7 fix bug of config params. x86/x64/pi never use static 2014-04-15 16:07:25 +08:00
winlin
90dee0924d fix bug of build script 2014-04-15 14:24:03 +08:00
winlin
23a1b29935 add dvr option. refine macros of auto headers 2014-04-15 14:01:57 +08:00
winlin
1ae9178605 add favicon.ico, change to 0.9.65 2014-04-15 11:19:15 +08:00
winlin
b1877db405 fix typo of full.conf. fix api server bug 2014-04-14 17:31:59 +08:00
winlin
b86c83b0e0 refine the info for log to file. 2014-04-14 12:14:01 +08:00
winlin
ce64dafc3c use stream time for live duration. change to 0.9.64 2014-04-14 10:55:46 +08:00
winlin
2c6b6c6846 fix bug #47: use stream time to stop for duration of rtmpdump 2014-04-14 10:51:31 +08:00
winlin
bcfe82f88f update options for configure help 2014-04-14 10:02:50 +08:00
winlin
73c310cd2e refine the macro. 2014-04-14 09:10:36 +08:00
winlin
bc756d6ad9 fix simple handshake bug #46, copy c1 to s2. change to 0.9.63 2014-04-13 21:55:01 +08:00
winlin
9a036958d7 fix bug #45, support duration for live. change to 0.9.62 2014-04-13 21:37:26 +08:00
winlin
04a526b340 change SRS_TRANSCODE macro to SRS_RTMP_TRANSCODE 2014-04-13 17:14:33 +08:00
winlin
a0472f256d support test config file. change to 0.9.61 2014-04-13 16:55:42 +08:00
winlin
f980340e89 refine config option 2014-04-13 13:57:39 +08:00
winlin
aa784377fd refine reload, ignore if parse config file failed. 2014-04-13 13:50:58 +08:00
winlin
cfee761899 support full reload. change to 0.9.60 2014-04-13 13:35:03 +08:00
winlin
bb87272c39 refine reload, rename some vhost specified to add vhost prefix 2014-04-13 13:31:59 +08:00
winlin
dc3c3cff8e support reload http_stream 2014-04-13 13:27:51 +08:00
winlin
c33ff4fdb8 support reload http_api 2014-04-13 13:08:10 +08:00
winlin
17ac29d160 refine code for reload http api/stream 2014-04-12 22:16:39 +08:00
winlin
821b58af03 support reload atc 2014-04-12 22:00:27 +08:00
winlin
eda1ddc03d support reload log level/logfile/tank 2014-04-12 21:35:26 +08:00
winlin
f652c28485 support reload pid. 2014-04-12 20:46:32 +08:00
winlin
0a016e58bf add comments for main 2014-04-12 20:37:16 +08:00
winlin
b38df9cd1a refine main object(server, config, log, context), handler reload in intialize(), change to 0.9.59 2014-04-12 20:35:40 +08:00
winlin
7c64a893f5 add demo.m3u8 and demo.html 2014-04-11 15:26:37 +08:00
winlin
9eb76cb1eb update demo.conf 2014-04-11 14:40:38 +08:00
winlin
189da7e12e fix bug of demo.conf 2014-04-11 14:23:19 +08:00
winlin
15f651bccd update demo, support acodec 2014-04-11 14:13:14 +08:00
winlin
acdd5a827e update api server, support servers 2014-04-11 11:29:17 +08:00
winlin
ff90278048 add speex1.2 to transcode flash encoder stream. change to 0.9.58 2014-04-11 10:40:21 +08:00
winlin
64727ce616 add bandwidth test conf 2014-04-10 17:41:55 +08:00
winlin
3a26b23fba change ffmpeg log to ./objs 2014-04-10 17:19:49 +08:00
winlin
ca02cfe1bf update server.py 2014-04-10 16:33:45 +08:00
winlin
c3c2767363 update api server, add servers 2014-04-10 15:06:18 +08:00
winlin
8295169e0e refine code, unify the coding style 2014-04-10 14:22:09 +08:00
winlin
ccba9ba9ba move log level parse to app utility 2014-04-10 14:20:02 +08:00
winlin
f2f30dcc52 add utility, change log to trace 2014-04-10 14:12:22 +08:00
winlin
94874e77af refine reload config 2014-04-10 14:06:23 +08:00
winlin
6c5d8b4851 refine reload config 2014-04-10 14:05:01 +08:00
winlin
bc61b1de18 fix bug of reload ingest 2014-04-10 11:47:38 +08:00
winlin
e0a6fe63cc fix bug of reload ffmpeg, support multiple transcode, change to 0.9.57 2014-04-10 11:40:06 +08:00
winlin
9ed3421586 rename from get_ingest to get_ingest_by_id of config 2014-04-10 11:24:27 +08:00
winlin
e432fe931f support reload ingesters(added/removed/updated). change to 0.9.57. 2014-04-10 11:21:47 +08:00
winlin
e6d8bc1e5c ingest reload: support disable vhost 2014-04-10 10:35:02 +08:00
winlin
5e504944dc add comments for http conn 2014-04-10 10:22:22 +08:00
winlin
dc71eef394 support ingest reload: add new vhost with ingester 2014-04-10 10:09:30 +08:00
winlin
e5646e3bb5 refine ingester, add vhost/id info to ingester 2014-04-10 09:20:23 +08:00
winlin
017b96f9b5 fix the heartbleed bug, see: http://www.openssl.org/news/secadv_20140407.txt 2014-04-09 11:51:05 +08:00
winlin
056895a978 add comments for the heartbleed bug, see: http://www.openssl.org/news/secadv_20140407.txt 2014-04-09 11:06:53 +08:00
winlin
9372a7065a refine the ingest log 2014-04-08 18:01:14 +08:00
winlin
4af7b6e383 update conf file, add id for ingest. 2014-04-08 15:51:43 +08:00
winlin
5a3b59d3c8 update conf file, add id for ingest. 2014-04-08 15:47:52 +08:00
winlin
ccf0a423be change sleep time from 3s to 0.6s for ingester. 2014-04-08 15:43:47 +08:00
winlin
509504f27d change sleep time from 3s to 0.6s 2014-04-08 15:43:18 +08:00
winlin
5aded78272 change to 0.9.56, for macro changed 2014-04-08 15:32:13 +08:00
winlin
eba35e2ac0 refine the macro SRS_FFMPEG to SRS_FFMPEG_STUB, SRS_FFMPEG_TOOL to build ffmpeg tool 2014-04-08 15:28:34 +08:00
winlin
70e73bc281 add comments for bug #39 2014-04-08 13:56:45 +08:00
winlin
d124772d6a add http server/api to srs.conf. add comments for bug #6. 2014-04-08 13:54:16 +08:00
winlin
3b59a6c687 fix bug of package for arm 2014-04-07 17:03:56 +08:00
winlin
667191913b fix bug of package for arm 2014-04-07 17:01:48 +08:00
winlin
5c9941989e fix bug of package for arm 2014-04-07 16:57:05 +08:00
winlin
503fb93d4e fix bug of package for arm 2014-04-07 16:56:45 +08:00
winlin
5fd582cd26 fix bug of package for arm 2014-04-07 16:52:38 +08:00
winlin
a8c5db3fc7 fix bug of package for arm 2014-04-07 16:51:39 +08:00
winlin
6e88634c5c add transcode to package 2014-04-07 16:35:24 +08:00
winlin
9a8eeb685d update package, add http server and api. 2014-04-07 16:33:31 +08:00
winlin
98809862f7 change to 0.9.55, for 1.0 mainline 2014-04-07 16:05:18 +08:00
winlin
12ba02238d update readme, add ingest 2014-04-07 15:56:19 +08:00
winlin
05e22e9530 fix script run/build/stop bug 2014-04-07 15:26:21 +08:00
winlin
c11e266d5c update readme 2014-04-07 15:04:31 +08:00
winlin
3d073f9ef6 update demo script, remove ffmpeg publish. use ingest instead 2014-04-07 14:33:27 +08:00
winlin
4f445f2f60 support ingest stream 2014-04-07 14:28:06 +08:00
winlin
45d8f4346f implements ingest, change to 0.9.53 2014-04-07 14:20:26 +08:00
winlin
e89ab84e4e implements ingest, change to 0.9.53 2014-04-07 14:20:03 +08:00
winlin
2742679354 implements the ingest framework 2014-04-07 13:32:00 +08:00
winlin
92281548b6 add ingest config 2014-04-07 13:13:57 +08:00
winlin
9107831b0e add config to read ingesters 2014-04-07 11:57:24 +08:00
winlin
f5c4f492da add comments for ffmpeg 2014-04-07 11:49:20 +08:00
winlin
c759a7c6b5 refine log of ffmpeg 2014-04-07 11:20:03 +08:00
winlin
4f7cfeed37 change to 0.9.52, refine encoder and ffmpeg 2014-04-07 10:15:44 +08:00
winlin
72c330d47c refine ffmepg and encoder, extract ffmpeg. 2014-04-07 09:34:36 +08:00
winlin
095364a72b refine ingest, start/stop ingest in server 2014-04-07 09:27:30 +08:00
winlin
eea2310b07 refine consts 2014-04-07 09:07:12 +08:00
winlin
4a7378b77a ingest stream when server cycle 2014-04-07 08:41:32 +08:00
winlin
adfbbbfd68 add ingest files 2014-04-07 08:32:28 +08:00
winlin
7384ad0caa add ingest config section of full.conf 2014-04-06 21:26:57 +08:00
winlin
5e6c490ba0 add ingest compile feature 2014-04-06 21:05:18 +08:00
winlin
e80abac4f0 add ingest feature to readme 2014-04-06 20:59:58 +08:00
winlin
983fe46ce2 use --with-ffmpeg to compile FFMPEG tool only, use --with-transcode for transcoding 2014-04-06 20:30:51 +08:00
winlin
5ff1d589f7 change warn to trace for nginx disabled 2014-04-06 19:19:13 +08:00
winlin
d546f815df update build/run/stop script 2014-04-06 19:13:29 +08:00
winlin
c4524484e6 add comments for aac encoder 2014-04-06 18:48:39 +08:00
winlin
7916cab50e donot check the aac encoder, ensure aac is ok 2014-04-05 15:01:41 +08:00
winlin
7de8bd7595 allow pi to use ffmpeg 2014-04-05 14:38:19 +08:00
winlin
2949c751f6 update install, create http root 2014-04-05 14:17:49 +08:00
winlin
43979f7505 add htt.hls sample 2014-04-05 13:56:14 +08:00
winlin
30e3323fe4 update readme, add SampleHTTP link 2014-04-05 13:38:05 +08:00
winlin
4e3fe36ae2 refine http server pages. change to 0.9.51 2014-04-05 13:14:59 +08:00
winlin
1c02f4551c always use 64bits for lseek 2014-04-04 23:28:31 +08:00
winlin
ced050829e fix bug of http, change to 0.9.50 2014-04-04 23:25:32 +08:00
winlin
c5d3b11a6e update http stream. change to 0.9.49 2014-04-04 23:16:31 +08:00
winlin
3c63cf0a86 update demo page, change http port to 8080 2014-04-04 23:09:58 +08:00
winlin
17ce21348d implements the http stream module. change to 0.9.49 2014-04-04 23:06:46 +08:00
winlin
ef26e77560 implements the http stream module. 2014-04-04 23:06:27 +08:00
winlin
00eda0d7b2 implements the http stream module. 2014-04-04 23:04:38 +08:00
winlin
83f35d10b1 add http delivery framework 2014-04-04 18:55:21 +08:00
winlin
8d7877ebd1 refine config, group by sections. 2014-04-04 17:01:34 +08:00
winlin
b7093246e4 fix forward conf file bug, change pid file. change to 0.9.48 2014-04-04 15:35:17 +08:00
winlin
28b0c3a27f refine log and thread function name. change to 0.9.47. 2014-04-04 12:18:26 +08:00
winlin
6d32ad1828 refine log and thread function name 2014-04-04 12:18:05 +08:00
winlin
1117f78587 support arm build for http api and server 2014-04-04 11:36:22 +08:00
winlin
f089eafd9f fix bug #38, remove app slash of jwplayer, change to 0.9.46 2014-04-04 10:12:34 +08:00
winlin
3f13726544 add log level in conf. change to 0.9.45 2014-04-03 18:32:51 +08:00
winlin
4984631cd6 refine the http crossdomain, send it only required 2014-04-03 16:39:55 +08:00
winlin
133a6f0dbf add crossdomain support for http error 2014-04-03 15:55:48 +08:00
winlin
b71eb0d49a support more splash in http url. remove the strip of SrsRequest, use srs_string_remove instead, change to 0.9.44 2014-04-03 15:53:56 +08:00
winlin
f2216691f9 remove the duplicated http status line when error 2014-04-03 15:20:24 +08:00
winlin
818c1f1520 support http error code, check url 2014-04-03 15:17:02 +08:00
winlin
0ae23d7556 rename version to versions 2014-04-03 14:17:00 +08:00
winlin
4a40075f68 add contributors to api/v1/authors 2014-04-03 13:48:52 +08:00
winlin
5c019c7938 implements api/v1/version, change to 0.9.43 2014-04-03 12:08:22 +08:00
winlin
9c3ba680d8 fix http hooks json encode bug, remove the JFIELD_CONT for the last field 2014-04-03 11:52:06 +08:00
winlin
a14267d2b4 refine the http url handler match. refine json encode 2014-04-03 11:49:14 +08:00
winlin
bfa07465f0 implements basic http response framework 2014-04-02 19:10:22 +08:00
winlin
341b5151d9 create http handler framework 2014-04-02 18:07:34 +08:00
winlin
eae9b94153 add api framework code 2014-04-02 12:55:10 +08:00
winlin
0ba0c14fb8 refine code, donot listen if not enabled http 2014-04-02 12:12:27 +08:00
winlin
ec6d696565 refine http framework, use http message 2014-04-02 12:03:49 +08:00
winlin
e70609cea3 refine code, extract http hooks. 2014-04-01 18:40:24 +08:00
winlin
5bbb76a59d remove the namespace srs, use http prefix 2014-04-01 17:30:55 +08:00
winlin
1922d62ff7 add --with-http-api option 2014-04-01 16:06:32 +08:00
winlin
52263457bf fix bug of no http-server feature 2014-04-01 15:42:27 +08:00
winlin
d28458d5fa fix script build bug 2014-04-01 15:33:09 +08:00
winlin
6ca9b774c1 support http methods, support js crossdomain request 2014-04-01 14:28:19 +08:00
winlin
51c1615173 change to 0.9.42, add http parse framework 2014-04-01 12:36:56 +08:00
winlin
5aa0043934 add rfc822 for http1.1 2014-03-31 13:14:10 +08:00
winlin
b0d77c4697 move wiki images to srs.release 2014-03-31 11:35:22 +08:00
winlin
c7a4dd8863 move wiki images to srs.release 2014-03-31 11:35:00 +08:00
winlin
27029679e9 donot ensure transaction-id===1 for connect req/res, change to 0.9.41 2014-03-31 10:22:00 +08:00
winlin
e3254377ce update depends, allow pi/dev to enable gprof/gperf 2014-03-31 10:08:00 +08:00
winlin
64a8dfb09a refine rtmp send protocol, use the same cache for header 2014-03-31 10:04:44 +08:00
winlin
4dfbbcdff4 force st to use epoll, change to 0.9.39 2014-03-30 23:42:29 +08:00
winlin
234ce08ed3 force st to use epoll 2014-03-30 23:42:05 +08:00
winlin
b8f6ef59c5 update readme, refine the chinese summary 2014-03-30 19:09:04 +08:00
winlin
b95e1cab30 update readme, refine the title 2014-03-30 18:58:17 +08:00
winlin
17739e459b update readme, add csdn mirror 2014-03-30 18:47:49 +08:00
winlin
104c143dbe add csdn auto sync script 2014-03-30 18:41:46 +08:00
winlin
c6cdc4ad54 refine package for raspberry. 2014-03-30 12:33:47 +08:00
winlin
be8aa92ab0 refine package for raspberry. 2014-03-30 12:31:50 +08:00
winlin
37fe08a302 support debian and raspbian 2014-03-30 11:14:57 +08:00
winlin
3932cf1334 update build, always patch st, for we need to build in raspberrypi directly 2014-03-29 14:25:47 +08:00
winlin
917f1ea9e1 fix bug of typo of readme. update package to support --help and options 2014-03-29 13:39:57 +08:00
winlin
41f5217360 refine http code, define CRLF consts for http 2014-03-27 17:13:26 +08:00
winlin
6913efe127 implements the http api/stream framework 2014-03-27 13:25:08 +08:00
winlin
ab3c6c92a0 rename srs-client to srs-rtmp-conn 2014-03-27 12:27:47 +08:00
winlin
aa89f9f51e change to 0.9.37, for http api/stream 2014-03-27 12:14:04 +08:00
winlin
041a07dfda add http config in srs conf 2014-03-26 23:19:50 +08:00
winlin
4c8d6d2eb1 fix bug of hls and rename demo player stream to live/demo. change to 0.9.36 2014-03-26 18:13:33 +08:00
winlin
ea3561de08 change script log dir to objs 2014-03-26 17:18:28 +08:00
winlin
97435c6bb4 fix demo.conf bug, remove the log_dir, because it's renamed to ff_log_dir 2014-03-26 16:57:20 +08:00
winlin
0858bd8b6f Support RTMP ATC for HLS/HDS to support backup(failover). change to 0.9.35 2014-03-26 16:25:02 +08:00
winlin
ebf1139582 fix the forward loop detect bug. change to 0.9.34 2014-03-26 12:34:35 +08:00
winlin
e02293d94d fix bug of handshake with nginx-rtmp for forward, change to 0.9.33 2014-03-26 11:39:10 +08:00
winlin
1386e7a8ab fix bug of handshake with nginx, simple hs 2014-03-26 11:12:34 +08:00
winlin
e56c52ceba change to 0.9.32 2014-03-26 10:05:34 +08:00
winlin
7b3bc8f741 fix bug of bwtc 2014-03-26 10:05:07 +08:00
winlin
644dfa1a6d fix bug of librtmp 2014-03-26 09:03:57 +08:00
winlin
a9d11df3a3 update arm tool chain 2014-03-25 14:36:30 +08:00
winlin
a6d9da5e43 fix bug of script, support both abs and relative path 2014-03-25 11:04:36 +08:00
winlin
c3e750e90f add version to log 2014-03-24 18:07:32 +08:00
winlin
bcb54e6587 fix bug of package arm 2014-03-24 13:15:22 +08:00
winlin
4992a9979a add package arm 2014-03-24 13:13:52 +08:00
winlin
7431c110fe package support arm package 2014-03-24 10:51:37 +08:00
winlin
0e54967fb8 fix bug of package, use uname hardware platform 2014-03-24 09:15:26 +08:00
winlin
3035e2b46a refine package, add os machine 2014-03-24 09:03:27 +08:00
winlin
494894a846 remove dev.sh 2014-03-23 22:55:53 +08:00
winlin
ade3630fa6 add package and install script 2014-03-23 22:52:08 +08:00
winlin
34efa15118 change to 0.9.30, first release for srs1 2014-03-23 21:15:52 +08:00
winlin
9055d8eecf update readme. 2014-03-23 18:03:24 +08:00
winlin
cb1499fcb6 change log strategy, write log to file. change to 0.9.29 2014-03-23 14:53:31 +08:00
winlin
ed20bd7078 default write log to file. 2014-03-23 14:51:35 +08:00
winlin
76290a5a12 fix bug of get daemon 2014-03-23 14:47:09 +08:00
winlin
7930add7f9 add log tank config, default to console. 2014-03-23 14:40:55 +08:00
winlin
b290a00de7 refine log 2014-03-23 13:53:07 +08:00
winlin
d9104f3b5e fix bug of make file 2014-03-23 12:45:24 +08:00
winlin
f1477dc4fe support daemon, default start in daemon. change to 0.9.28 2014-03-23 12:42:42 +08:00
winlin
3ec3c1f532 support daemon 2014-03-23 12:42:05 +08:00
winlin
2c1354b9b9 fix bug of log message 2014-03-23 12:23:23 +08:00
winlin
56679b3c82 add srs_log_file to write log to file. change to 0.9.27 2014-03-23 12:22:01 +08:00
winlin
d94b9f44b3 add srs_log_file to write log to file. change to 0.9.27 2014-03-23 12:21:36 +08:00
winlin
4ddb5256ac fix bug of init.d script 2014-03-23 11:25:42 +08:00
winlin
2e1aed5403 rename init.d script to srs and srs-api 2014-03-23 10:25:14 +08:00
winlin
29fe53e21b fix bug of build cherrypy 2014-03-22 23:10:02 +08:00
winlin
73f1762122 fix bug of build cherrypy 2014-03-22 22:55:18 +08:00
winlin
f3e4c16a2f copy ffmpeg when install-demo 2014-03-22 22:53:02 +08:00
winlin
22603b7465 add api-server init.d script 2014-03-22 22:48:08 +08:00
winlin
d63cbb3c46 add reload support. add make install and uninstall, change to 0.9.26 2014-03-22 22:07:49 +08:00