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

3227 commits

Author SHA1 Message Date
winlin
4c6c2c28b8 refine h264 raw publish with fps 2016-09-09 11:32:24 +08:00
winlin
09895fcfc2 Merge branch '2.0release' into develop 2016-09-09 11:03:39 +08:00
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.
 2016-09-08 07:58:52 -05:00
winlin
17df61724d Merge branch '2.0release' into develop 2016-09-08 19:56:17 +08:00
winlin
7aaa74b9e0 TODO: FIXME: for librtmp, must group NALUs to frame. 2016-09-08 19:56:06 +08:00
winlin
2cf077abe9 Merge branch '2.0release' into develop 2016-09-08 18:55:40 +08:00
winlin
80a98cf836 refine annexb parse 2016-09-08 18:55:35 +08:00
winlin
b24d1de377 Merge branch '2.0release' into develop 2016-09-05 14:56:41 +08:00
winlin
590e951739 fix memory leak of source. 2016-09-05 14:56:31 +08:00
winlin
0e9318e5d8 merge from 2.0 2016-09-05 14:16:24 +08:00
winlin
c7b97aa1c3 fix memory leak at source. 2.0.214 2016-09-05 14:13:37 +08:00
winlin
815f2491a4 merge from 2.0 2016-09-05 09:39:20 +08:00
winlin
6ec60b0a21 fix memory leak at handshake. 2.0.213 2016-09-05 09:38:30 +08:00
winlin
39a46f7b97 Merge branch '2.0release' into develop 2016-09-03 23:11:58 +08:00
winlin
1214af643e refine comments for arm 2016-09-03 23:11:51 +08:00
winlin
c0498c82ee merge 2.0 2016-09-03 18:48:19 +08:00
winlin
e775eb3ff2 support all arm for patched st. 2.0.212 2016-09-03 18:47:46 +08:00
winlin
8ad7da1cb6 merge from 2.0 2016-09-02 15:25:20 +08:00
xubin
49853d2b8a 修复forward崩溃 2016-09-02 15:10:43 +08:00
winlin
7d96a33207 Merge branch '2.0release' into develop 2016-09-01 16:51:18 +08:00
winlin
e2865c6ac1 workaround for #511, the fly stfd in close. 2.0.211 2016-09-01 16:51:09 +08:00
winlin
b49cb3d379 Merge branch '2.0release' into develop 2016-08-30 19:30:05 +08:00
winlin
a0890fe06a comment the pcr 2016-08-30 19:29:59 +08:00
winlin
5d5fa7204d Merge branch '2.0release' into develop 2016-08-18 12:22:30 +08:00
winlin
d919668b61 don't ignore aud 2016-08-18 12:22:04 +08:00
winlin
bf22acd689 Merge branch '2.0release' into develop 2016-08-18 11:29:22 +08:00
winlin
a4bb03b9d6 ignore other 264 frame except sps,pps,idr,nonidr 2016-08-18 11:27:11 +08:00
winlin
31a1b7bed2 Merge branch '2.0release' into develop 2016-08-10 22:30:05 +08:00
winlin
304ff02aef default to 30s timeout for librtmp 2016-08-10 22:29:56 +08:00
winlin
d68a459198 Merge branch '2.0release' into develop 2016-08-10 22:13:30 +08:00
winlin
02fb0779be fix the microsec calc bug for librtmp 2016-08-10 22:13:24 +08:00
winlin
14760003ba merge from 2.0 2016-08-10 22:05:21 +08:00
winlin
e00928557e fix the timeout for librtmp 2016-08-10 22:04:01 +08:00
winlin
516f33888c refine config 2016-08-09 12:37:48 +08:00
winlin
36eb0981ec merge from 2.0release 2016-08-08 14:09:10 +08:00
intliang
3fbe9d2442 fixed crash by improper srs_info use. 2016-08-08 14:07:19 +08:00
winlin
f87646d489 fix typo of config. 2016-08-08 13:58:42 +08:00
winlin
abeb4f46a9 merge 2.0 2016-08-06 17:28:43 +08:00
winlin
ec6e77992e 2.0.210 2016-08-06 16:38:18 +08:00
winlin
499fc07db1 refine the hls m3u8 refresh interval. 2016-08-02 16:52:23 +08:00
winlin
5fa500646e update srs player version 2016-08-02 16:37:52 +08:00
winlin
ec57e2170d refine hls m3u8 refresh interval and buffer time 2016-08-02 16:31:59 +08:00
winlin
b463e4a2f4 Merge branch '2.0release' into develop 2016-05-17 10:54:34 +08:00
weiyabo
8df7135dee for bug #5064, success parse 264 sps 2016-05-17 10:53:56 +08:00
winlin
c746753c6a update player, add pst(player startup time) 2016-04-22 13:33:29 +08:00
winlin
892591f9a6 merge from @mbeacom 2016-04-22 10:18:13 +08:00
winlin
2e75c9f45f add more buffer 2016-04-19 18:15:47 +08:00
winlin
9312d77c20 default not to preview the stream for publisher. 2016-04-12 11:32:13 +08:00
winlin
6b5c880ff9 refine player to support status change. 2016-03-22 18:35:44 +08:00
winlin
4841435b14 fix default http port bug. 2016-03-19 22:45:39 +08:00
winlin
a2d235f015 refresh js cache. 2016-03-19 22:14:56 +08:00
winlin
d7a28059ed remove jwplayer and osmf 2016-03-19 22:09:36 +08:00
winlin
d9f1ced732 change srs player to 1.28 2016-03-19 22:00:22 +08:00
winlin
77167f3331 refine srs player for hls, extract a HlsNetStream. 2016-03-19 21:54:46 +08:00
winlin
2492562d25 use xpsid X-Playback-Session-Id to more useful. 2016-03-19 19:48:01 +08:00
winlin
b2bd63e833 refine srs player to play hls. 2016-03-19 19:11:31 +08:00
winlin
46a31f4884 support play hls 2016-03-19 16:35:13 +08:00
winlin
69ec66ee36 refine js for player. 2016-03-19 11:08:25 +08:00
winlin
0a2e00f8c5 dump logs 2016-03-19 10:18:11 +08:00
winlin
9ab5039b36 extract iplayer for srs-player. 2016-03-19 10:06:08 +08:00
winlin
10ce961a00 update version for bwtc 2016-03-14 10:23:20 +08:00
winlin
b3c13f2550 refine the bwtc, to compatible with bms4. 2016-03-12 20:53:37 +08:00
winlin
eed4626c35 use larger limit 2016-03-10 12:28:46 +08:00
winlin
a3038b1274 fix the rtmp url parse bug. 2016-03-10 12:16:51 +08:00
winlin
82aa9d120c for #5114, display metadata. 2016-03-07 16:02:37 +08:00
winlin
a8ee3162d4 Merge branch '2.0release' into develop 2016-03-03 15:30:38 +08:00
winlin
d72b93e58b fix the sed bug, to compatible with osx 2016-03-03 10:57:26 +08:00
winlin
00c60db7c3 Merge branch '2.0release' into develop 2016-01-31 22:47:48 +08:00
winlin
f7d9ed5ae4 update api 2016-01-31 21:49:53 +08:00
winlin
8db25a0bf5 fix the log for mmap. 2016-01-21 16:18:42 +08:00
winlin
214eda745d open null dev, not close stdout or stderr. 2016-01-20 14:53:25 +08:00
winlin
03469fc37d refine code for process fork. 2016-01-20 14:09:14 +08:00
winlin
ce8f3b4478 refine the dup2 of stdout and stderr. 2016-01-20 14:05:48 +08:00
winlin
ae8bd4c2aa should never close the fd 3+, for it myabe used. 2016-01-20 14:01:18 +08:00
winlin
a6dc17a67d support redirect stdout by > 2016-01-20 14:00:01 +08:00
winlin
0cd15068de set default buffer time to 0.5 for srs player. 2016-01-18 18:02:56 +08:00
winlin
f8358da316 refine ingester log. 2016-01-13 16:20:05 +08:00
winlin
dfe5306327 fix process bug. 2016-01-13 16:18:50 +08:00
winlin
61c0c168b9 merge from srs2. 2016-01-13 12:52:19 +08:00
winlin
266397acee merge from srs2 2016-01-13 12:46:23 +08:00
winlin
28080efec8 fix http reader bug, support infinite chunkted. 2.0.209 2016-01-13 12:44:51 +08:00
winlin
f971538cf3 refine http, support no host. 2016-01-12 11:53:52 +08:00
winlin
2941328ee8 rtmp edge support 302 redirect. 2016-01-11 15:46:23 +08:00
winlin
e2e6e76f92 for #558 and #559, 2.0.208 2016-01-11 13:21:28 +08:00
winlin
d81b2cb140 support hls mount to vhost and reload 2016-01-11 13:15:46 +08:00
winlin
041040b846 ignore ingester when vhost disabled. 2016-01-11 13:11:14 +08:00
winlin
eac5440559 merge from srs2 #558 #559 2016-01-09 16:06:22 +08:00
winlin
da722b5b5d Merge pull request #559 from tufang14/2.0release 
srs reusable thread need join
 2016-01-09 16:00:58 +08:00
tufang14
56bffb6646 Update srs_app_thread.cpp 2016-01-09 15:54:23 +08:00
flowerwrong
d42a58faf4 Keep blank of line 2016-01-09 15:10:24 +08:00
tufang14
233ff11172 srs reusable thread need join 2016-01-09 14:58:40 +08:00
winlin
d24aef50ba for #369, support RTMP 302 api at protocol level. 2016-01-08 18:17:37 +08:00
flowerwrong
9ddd0054a1 Add tcUrl to on_publish http hook for issue #548 2016-01-08 15:10:25 +08:00
winlin
f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 2016-01-08 13:58:19 +08:00
winlin
5338f21439 merge from srs2 2016-01-05 16:58:21 +08:00
winlin
8155e97b84 add keyword XCORE for coredump to identify the version. 2.0.207 2016-01-05 16:49:27 +08:00
winlin
dc38ae1687 show first message when not show version. 2016-01-04 17:41:16 +08:00
winlin
9d22d09646 show signature of server. 2016-01-04 17:28:18 +08:00
winlin
973194c663 merge from srs2. 2015-12-31 16:02:01 +08:00
winlin
26211abf2e refine code. 2015-12-31 15:57:16 +08:00
winlin
f516636448 refine code for hooks and http core. 2015-12-29 18:33:02 +08:00
winlin
79fdc4e766 fix bug for rtmp client use NULL ptr. 2015-12-28 18:13:40 +08:00
winlin
96a4428bdb refine the http request parse. edge retry timeout. 2015-12-28 18:02:20 +08:00
winlin
190db75835 refine code for nx_json modify the data when loads. 2015-12-28 17:39:24 +08:00
winlin
86a7db0adb refine edge ingester, use upstream adapter. 2015-12-28 17:15:44 +08:00
winlin
7ae2c6bf50 merge from srs2. 2015-12-26 12:17:51 +08:00
winlin
eca46c03d2 refine code for consumer to refer the rtmp connection. 2015-12-26 12:13:17 +08:00
winlin
11e11005ac specifies the try default vhost 2015-12-24 19:14:23 +08:00
winlin
d267b8fa19 fix bug for create connection with ip. 2015-12-24 17:38:49 +08:00
winlin
a7bf4bfda5 refine code, ignore client when no ip. 2015-12-24 17:25:05 +08:00
winlin
49308dddfb update 2015 to 2016 2015-12-23 11:41:41 +08:00
winlin
d0c74fa7cd update 2015 to 2016 2015-12-23 11:35:40 +08:00
winlin
714c13d88d merge from srs2 2015-12-22 19:19:28 +08:00
winlin
5d3a183f43 fix #509, always alloc big object at heap. 2.0.205 2015-12-22 19:18:46 +08:00
winlin
65b81a4e68 merge from srs2 2015-12-22 17:01:06 +08:00
winlin
8b24319ffb fix #418, ignore null connect props to make RED5 happy. 2.0.204 2015-12-22 17:00:22 +08:00
winlin
8d378cda2e for #418, when simple handshake, copy s1 to c2. 2015-12-22 16:48:06 +08:00
winlin
b881166f9a merge from srs2 2015-12-22 16:18:09 +08:00
winlin
c7850570c1 fix #546, thread terminate normally dispose bug. 2.0.203 2015-12-22 16:13:49 +08:00
winlin
5f915aa959 merge from srs2 2015-12-22 15:40:03 +08:00
winlin
cee8c3d07d fix #541, failed when chunk size too small. 2.0.202 2015-12-22 15:39:12 +08:00
winlin
e124aeb614 Merge branch '2.0release' into develop 2015-12-15 16:25:27 +08:00
winlin
69d191e53f refine the hls error log. 2015-12-15 16:25:21 +08:00
winlin
0ab64ccd2a merge from srs2. 2015-12-15 16:06:40 +08:00
winlin
40457e6cab default hls_on_error to continue. 2.0.201 2015-12-15 16:02:02 +08:00
winlin
f6ff116505 refine code, persistence use isolate method. 2015-12-15 14:27:49 +08:00
winlin
b486f6fe6b refine /api/v1/summaries, with code and server id. 2015-12-15 12:46:47 +08:00
winlin
26d328e7f2 fix bug for api, level should be string. 2015-12-14 18:43:20 +08:00
winlin
ffef3905af merge from srs2. 2015-12-11 11:35:56 +08:00
winlin
5660e24953 fast stop server. 2015-12-11 11:30:36 +08:00
winlin
2830ee12c1 fix the on_hls.ts_url bug. 2015-12-11 11:29:10 +08:00
winlin
1e4c8f8bf3 fast stop server. 2015-12-11 10:30:13 +08:00
winlin
3ab5892863 refine comments. 2015-12-10 18:02:23 +08:00
winlin
5ac8177ce6 fix bugs 2015-12-08 18:32:37 +08:00
winlin
fabcc91a0e refine codes. 2015-12-07 18:22:55 +08:00
winlin
b2ae1acaa4 copy http-parser-2.1 into srs http stack. 2015-12-07 11:35:05 +08:00
winlin
fba1122835 private the srs_vhost_resolve 2015-12-07 10:15:08 +08:00
winlin
17bb31cab1 fix the config bug. 2015-12-04 15:22:13 +08:00
winlin
eec2c34b5c refine publisher. 2015-12-01 10:42:13 +08:00
winlin
cfe230438a revert test code 2015-11-30 19:07:52 +08:00
winlin
6191e0af90 s1 compute key. 2015-11-30 19:05:25 +08:00
winlin
18eb8c81b3 merge from srs2 2015-11-16 18:10:06 +08:00
winlin
2310b2da59 fix #518, fix fd leak bug when fork. 2.0.200 2015-11-16 18:06:44 +08:00
YueHonghui
eb4ca9ff5d fix bug of fd leek in srs_app_server 2015-11-16 15:47:17 +08:00
winlin
c77cefb6fa refine the position of log script 2015-11-11 17:49:46 +08:00
winlin
44b26271bf Merge branch '2.0release' into develop 2015-11-11 17:12:34 +08:00
winlin
c4c63f7825 fix build failed bug for osx. 2015-11-11 17:06:12 +08:00
winlin
01c46bdbfd rename org simle-rtmp-server to ossrs 2015-11-11 10:45:45 +08:00
winlin
1ffd5fd455 rename org simple-rtmp-server to ossrs 2015-11-11 10:37:50 +08:00
winlin
6c7a51d310 Merge branch '2.0release' into develop 2015-11-10 12:16:08 +08:00
winlin
1d8318d2fc change simple-rtmp-server org to ossrs 2015-11-10 12:16:01 +08:00
winlin
d2ccc4f661 Merge branch '2.0release' into develop 2015-11-10 12:15:00 +08:00
winlin
8c04b17d08 use /usr/local/bin for osx. 2015-11-10 12:03:52 +08:00
winlin
7db7d43aea Merge branch '2.0release' into develop 2015-11-09 15:25:55 +08:00
winlin
18b50d961f support query server by id. 2015-11-09 15:19:50 +08:00
winlin
aca9fe805c Merge branch '2.0release' into develop 2015-11-09 14:51:47 +08:00
winlin
d916c53702 refine the api server. 2015-11-09 14:51:41 +08:00
winlin
a89ed68aa3 update readme for #511. 2015-11-06 10:51:32 +08:00
winlin
75be18133d fix build failed for utest. 2015-11-06 10:26:18 +08:00
winlin
6df4d1f05a merge from srs2. 2015-11-05 15:12:49 +08:00
winlin
98e25def6c fix utest build failed for osx. 2015-11-05 15:11:59 +08:00
winlin
97f5bb8b99 merge from srs2 2015-11-05 14:48:25 +08:00
zhengfl
38b81ce312 允许操作SrsStream中的函数时，长度为0. 2015-11-05 14:37:21 +08:00
zhengfl
1dae8fc987 fix #511, fix the bug of thread stop invalid. 2015-11-05 13:52:59 +08:00
winlin
49d77b3f09 for #515, use srs_freepa and SrsAutoFreeA for array. 2.0.198 2015-11-02 13:42:05 +08:00
winlin
4b5eb5ea2d fix the parse rtmp url bug for ingest. 2015-11-02 13:37:44 +08:00
winlin
ec225b2108 quit child process when fork failed. 2015-11-02 11:46:33 +08:00
winlin
9d7826c681 quit child process when fork failed. 2015-11-02 11:44:22 +08:00
winlin
f57e537686 for #515, merge from srs2, use SrsAutoFreeA. 2015-11-02 11:29:20 +08:00
winlin
f4f76cd196 for #515, use SrsAutoFreeA to free the array. 2015-11-02 11:26:37 +08:00
winlin
604486b0a3 for #515, use srs_freepa to free array. 2015-11-02 11:11:49 +08:00
winlin
8cec06e898 merge srs2, use srs_freepa for array 2015-11-02 11:05:39 +08:00
winlin
2af7749771 for #515, use srs_freepa to free the array. 2015-11-02 11:02:27 +08:00
winlin
cef1ae5a8e fix the config bug. 2015-10-28 12:55:16 +08:00
winlin
9ebb77d711 fix the warnings 2015-10-28 11:58:49 +08:00
winlin
e9e202dbf1 merge srs2 2015-10-28 11:51:32 +08:00
winlin
ef00005ab4 for ExoPlayer, remove duration for live. 2015-10-28 11:51:03 +08:00
winlin
8c96472cea merge srs2 2015-10-28 11:03:15 +08:00
winlin
50a7b9c1ff for ExoPlayer, add av tag in flv header. 2.0.197 2015-10-28 11:01:20 +08:00
winlin
59f5c5d6a5 Merge branch '2.0release' into develop 2015-10-27 18:21:04 +08:00
winlin
3b0bf1e10b for #512, make the segment more acceptable, when in [min, max_td * 2], it's ok. 2015-10-27 18:20:57 +08:00
winlin
390f58e186 fix compile failed. 2015-10-27 17:57:58 +08:00
winlin
a416e891b4 fix compile failed. 2015-10-27 17:54:07 +08:00
winlin
1d57e53910 merge from 2.0release 2015-10-27 17:45:14 +08:00
winlin
d1979c760f for #512, partical hotfix the hls pure audio. 2.0.196 2015-10-27 17:44:10 +08:00
winlin
3683f06e4d for #512, write audio frame by frame for video+audio hls. 2015-10-27 16:20:02 +08:00
winlin
fe27e76492 support schema 2015-10-26 18:34:55 +08:00
winlin
a501f5bd7a update htbt script 2015-10-26 14:54:41 +08:00
winlin
dd2945add1 update htbt script 2015-10-26 14:53:54 +08:00
winlin
6f6d495a19 update htbt script 2015-10-26 14:50:16 +08:00
winlin
3933819686 add htbt script 2015-10-26 14:18:19 +08:00
winlin
0a8cb8a391 add heartbeat script 2015-10-26 14:17:24 +08:00
winlin
11979229e6 Merge branch '2.0release' into develop 2015-10-26 13:34:44 +08:00
winlin
e08beba89e fix the sed command for arm 2015-10-26 13:34:28 +08:00
winlin
45385241bb fix the sed command for arm 2015-10-26 13:29:59 +08:00
winlin
b8f2ba4f0d complete kafka 2015-10-23 14:42:05 +08:00
winlin
cbe4252b4d refine code. 2015-10-23 14:42:04 +08:00
winlin
d2ca51ac50 notify kafka when client close 2015-10-23 14:42:04 +08:00
winlin
71451878c9 refine kafka, simplify code. 2015-10-23 14:42:04 +08:00
winlin
9a47390253 fix #467, support write log to kafka. 3.0.6 2015-10-23 14:42:04 +08:00
winlin
76cd3f8749 kafka convert json to producer message. 2015-10-23 14:42:04 +08:00
winlin
8e344f1c26 add producer api messages. 2015-10-23 14:42:04 +08:00
winlin
7a0aaf5900 kafka refine code 2015-10-23 14:42:04 +08:00
winlin
f9f5b56951 kakfa erase messages when wrote. 2015-10-23 14:42:04 +08:00
winlin
22fa9a0f1f kafka use temp transport to fetch metadata. 2015-10-23 14:42:04 +08:00
winlin
531b658f8e retry when metadata empty 2015-10-23 14:42:04 +08:00
winlin
61486a82aa kafka use topic and partition cache 2015-10-23 14:42:04 +08:00
winlin
7013993c7a kafka send the accept message. 2015-10-23 14:42:04 +08:00
winlin
de41c1c9d2 kafka refine comments. 2015-10-23 14:42:04 +08:00
winlin
31a77a83ed convert metadata to partitions 2015-10-23 14:42:04 +08:00
winlin
f0e39cc330 support show the summary of kafka metadata. 2015-10-23 14:42:04 +08:00
winlin
d013374871 rename ISrsCodec size to nb_bytes. 2015-10-23 14:42:03 +08:00
winlin
33a015329d add function to convert kafka array to vector 2015-10-23 14:42:03 +08:00
winlin
84b3981d47 refs #1670: support decode the metadata response. 2015-10-23 14:42:03 +08:00
winlin
7106934c3a kafka producer use async interface to request metadata. 2015-10-23 14:42:03 +08:00
winlin
a108fa8d01 kafka recv and decode message. 2015-10-23 14:42:03 +08:00
winlin
493d282255 kafka refine array, to decode and create object. 2015-10-23 14:42:03 +08:00
winlin
c4862878d1 kafka rename message set to raw message set. 2015-10-23 14:42:03 +08:00
winlin
6e5ed11a00 for kafka, support correlation id cache. 2015-10-23 14:42:03 +08:00
winlin
2e67eb8786 refine comments for kafka messages. 2015-10-23 14:42:03 +08:00
winlin
3c64e4b957 kafka encode and send packet. 2015-10-23 14:42:03 +08:00
winlin
9117e1e918 extract ISrsCodec for code and decode object. 2015-10-23 14:42:03 +08:00
winlin
45755fd1e7 refine code for kakfa request/response, string/bytes. 2015-10-23 14:42:03 +08:00
winlin
8a4ec49064 add graph comments for size of request and response. 2015-10-23 14:42:03 +08:00
winlin
8974fe298b connect to kafka and send metadata request. 2015-10-23 14:42:03 +08:00
winlin
a9fdb630d9 refine code, replace all rtmp connect by simple rtmp client. 2015-10-23 14:42:02 +08:00
winlin
a08d8f83d6 refine mpegts code, use simple rtmp client 2015-10-23 14:42:02 +08:00
winlin
ad9b377d96 refine forwarder code, use simple rtmp client. 2015-10-23 14:42:02 +08:00
winlin
0f4cb8ee00 refine code, remove the rtmp recv/send macro, use one macro. 2015-10-23 14:42:02 +08:00
winlin
12e013142d refine code, use simple rtmp client. 2015-10-23 14:42:02 +08:00
winlin
bc27481886 refine code, use simple rtmp client. 2015-10-23 14:42:02 +08:00
winlin
e4c852945f refine code, support override vhost 2015-10-23 14:42:02 +08:00
winlin
a9ad7b211b refine simple rtmp client for post flv stream. 2015-10-23 14:42:02 +08:00
winlin
adb8f243bf use simple rtmp client for raw connect app 2015-10-23 14:42:02 +08:00
winlin
24b3899972 use SrsTcpClient instead raw socket. 2015-10-23 14:42:02 +08:00
winlin
a9bb6061c3 use tcp client for raw connect. 2015-10-23 14:42:02 +08:00
winlin
20fcfb3eee fix bug, use system utility 2015-10-23 14:42:02 +08:00
winlin
69cc01b696 use system utilities 2015-10-23 14:42:02 +08:00
winlin
908365a61a use string for const char* 2015-10-23 14:42:02 +08:00
winlin
d9f991ed2f use system utility for string finds 2015-10-23 14:42:02 +08:00
winlin
ca73534d7e refine comments for api key 2015-10-23 14:42:01 +08:00
winlin
29122b6e70 fix #502, transcoder support snapshot. 2015-10-20 14:52:34 +08:00
winlin
2bae6e09d3 for #502, snapshot 1 image per 1 seconds, choose best from 5 images. 2015-10-20 14:10:14 +08:00
winlin
1aa4502d5f for snapshot, choose the best to link to the [stream]-best.png 2015-10-20 13:38:03 +08:00
winlin
33a282e576 support snapshot by http hooks for #152. 2015-10-20 12:30:57 +08:00
winlin
9eebb89432 Merge branch '2.0release' into develop 2015-10-20 10:17:54 +08:00
winlin
91e9fc7e5b fix typo of INVLIAD to INVALID 2015-10-20 10:17:48 +08:00
winlin
57a3b11b86 merge from srs2 2015-10-13 11:48:02 +08:00
winlin
5de65d41f4 Merge pull request #499 from synote/2.0release 
fix bug for build failure when configure with --log-info
 2015-10-12 10:07:08 +08:00
winlin
b5ba1043e8 Merge branch '2.0release' into develop 2015-10-08 16:07:54 +08:00
winlin
9c2eafc244 refine the git command 2015-10-08 15:53:49 +08:00
winlin
ed80d9d281 merge from srs2 2015-10-04 08:10:57 +08:00
winlin
0c8209cccd fix #448, fix the bug of response of http hooks. 2.0.195 2015-10-04 08:09:39 +08:00
winlin
6587c5b2f1 merge from srs2 2015-10-01 13:22:51 +08:00
winlin
7811b4f3f7 fix #497, response error when client not found to kickoff. 2.0.194 2015-10-01 13:20:13 +08:00
winlin
8862ec1988 merge from srs2 2015-10-01 13:05:25 +08:00
winlin
a3c229472e fix #495, decrease the srs-librtmp size. 2.0.193 2015-10-01 13:04:28 +08:00
winlin
070ada1d6e Merge branch '2.0release' into develop 2015-10-01 12:30:55 +08:00
winlin
65e4bf2e77 fix compile failed bug. 2015-10-01 12:30:38 +08:00
winlin
d8f18aee37 use the right int type for port. 2015-09-24 18:33:07 +08:00
winlin
1c7d5f1852 Merge branch '2.0release' into develop 2015-09-24 17:55:33 +08:00
winlin
353e3260b8 remove duplicated code 2015-09-24 17:55:27 +08:00
winlin
9ead08725d use kernel utility int2str and float2str 2015-09-24 17:54:58 +08:00
winlin
6efd2dd27e add load balance round robin for brokers. 2015-09-24 17:20:04 +08:00
winlin
2a4ab8a923 add brokers to config 2015-09-24 14:53:22 +08:00
winlin
f187a7deef refine the startup logs. 2015-09-24 12:15:12 +08:00
winlin
3ab0ccaa27 Merge branch '2.0release' into develop 2015-09-23 18:23:17 +08:00
winlin
7cdcf41d26 refine the api server 2015-09-23 18:23:09 +08:00
winlin
afd6428366 refine code of server. 2015-09-23 17:21:57 +08:00
winlin
8b6c78b862 Merge branch '2.0release' into develop 2015-09-23 16:42:47 +08:00
winlin
d1de097f5e fix make clean bug, donot rm when no dir 2015-09-23 16:42:41 +08:00
winlin
396bb43672 Merge branch '2.0release' into develop 2015-09-23 15:46:58 +08:00
winlin
8b1198562a show cpu info. 2015-09-23 15:46:51 +08:00
winlin
4e88262512 merge from srs2 to check cpus. 2015-09-23 15:11:33 +08:00
winlin
cfe2082353 fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192 2015-09-23 15:09:59 +08:00
winlin
f6e655396c for #485, support cross build for arm 2015-09-23 11:54:53 +08:00
winlin
d94a88a797 merge from srs2 for pi and cubie. 2015-09-23 11:23:55 +08:00
winlin
16730ea031 refine code for cross build 2015-09-23 11:21:51 +08:00
winlin
6990508e58 for #485, srs for respberrypi and cubieboard. 2.0.191 2015-09-23 11:05:56 +08:00
winlin
f75058413d Merge branch '2.0release' into develop 2015-09-23 10:39:24 +08:00
winlin
7dcdb18588 support build on pi and cubie 2015-09-23 10:27:57 +08:00
winlin
a8829e0a8b support build on pi or cubie. 2015-09-23 10:22:58 +08:00
winlin
9a9483e7d5 support without kafka 2015-09-22 17:46:07 +08:00
winlin
abb5c5ad31 add kafka producer 2015-09-22 17:40:05 +08:00
winlin
b5ccc35340 add kafka config 2015-09-22 15:10:43 +08:00
winlin
ab1e62a886 create the metadata request message 2015-09-22 14:33:17 +08:00
winlin
ca3b89aa7d add kafka array, use c++ template. 2015-09-22 14:09:24 +08:00
winlin
8a6edac4e8 add --x86-64 alias for --x86-x64. 2015-09-22 13:52:14 +08:00
winlin
edead21a25 refine the options 2015-09-22 12:51:29 +08:00
winlin
e415824576 refine the options 2015-09-22 12:43:22 +08:00
winlin
2d5cc7a3e4 add structures for kafka 2015-09-22 12:38:07 +08:00
winlin
83f40697e2 refine the hpp macro defines. 2015-09-22 09:15:51 +08:00
winlin
df6ac8842c rename rtmp utility to protocol utility 2015-09-22 09:11:07 +08:00
winlin
82ff05c1d4 rename rtmp io to protocol io 2015-09-22 09:07:07 +08:00
winlin
168625dce2 rename rtmp amf0 to protocol amf0. 2015-09-22 09:05:21 +08:00
winlin
1310c0f577 rename srs_protocol_buffer to srs_protocol_stream 2015-09-22 09:02:37 +08:00
winlin
d32632ee8a rename SrsFastBuffer to SrsFastStream 2015-09-22 09:01:47 +08:00
winlin
4f3d2c8607 rename SrsSimpleBuffer to SrsSimpleStream 2015-09-22 08:59:52 +08:00
winlin
dadfe101b4 rename SrsBitStream to SrsBitBuffer 2015-09-22 08:59:21 +08:00
winlin
0e52fc6d5b rename SrsStream to SrsBuffer 2015-09-22 08:57:31 +08:00
winlin
ca3577e11b rename temp to stream 2015-09-22 08:52:00 +08:00
winlin
f33d736442 rename kernel stream to buffer 2015-09-22 08:50:14 +08:00
winlin
a4f51564db rename kernel stream to buffer 2015-09-22 08:48:55 +08:00
winlin
495f575ac3 rename kernel buffer to temp 2015-09-22 08:43:56 +08:00
winlin
ac2b03a3ed rename srs_kernel_buffer to temp 2015-09-22 08:42:54 +08:00
winlin
faf6d15878 add replace script. 2015-09-21 18:32:17 +08:00
winlin
1de2bb0801 add kafka protocol files. 2015-09-21 17:12:28 +08:00
winlin
b5996567e8 refine the role of srs, to cluster. 2015-09-21 12:09:09 +08:00
winlin
e4e36a0166 merge from srs2, fix openssl build 2015-09-21 12:03:47 +08:00
winlin
d8a64aaab5 fix #484, hotfix the openssl build script 2.0.190 2015-09-21 12:01:48 +08:00
winlin
b471c6e61c refine code, use json integter rather than number. 2015-09-19 14:40:32 +08:00
winlin
c5cd58761c move the srs thread to st. 2015-09-19 13:46:55 +08:00
winlin
3042115385 refine json to_str to dumps. 2015-09-19 13:37:56 +08:00
winlin
b59d9ba6a1 support amf0 and json to convert with each other. 2015-09-19 13:31:57 +08:00
winlin
3f7e69b617 json objects support dumps to string. 2015-09-19 12:27:31 +08:00
winlin
b78781707e update the srs player 2015-09-17 18:07:02 +08:00
winlin
5073a6fa08 merge from srs2 2015-09-17 18:06:03 +08:00
winlin
225e742657 add args3 2015-09-17 14:03:25 +08:00
winlin
1fd83d9314 refine the order. 2015-09-17 13:36:02 +08:00
没——问题
e8680527c3 allow domain * 
在使用时，srs_player可能和所在页面部署在不同的域名下。

所以在此处添加跨域许可。
 2015-09-17 12:09:29 +08:00
winlin
7b2b11e932 async call worker fast execute tasks. 2015-09-17 11:57:17 +08:00
没——问题
c548ab5019 function set_srs_player_url(url, params) 
在实际环境中，player.swf 等静态资源 和页面可能部署到不同的域名或路径下。

所以在此处提供设置 srs_player.swf 的url的方法。
 2015-09-17 11:44:45 +08:00
winlin
087f7740b7 fix the build failed bug 2015-09-17 11:41:23 +08:00
winlin
256459e1ec fix the utest bug 2015-09-17 11:37:35 +08:00
winlin
240a1bfadb rename kafka protocol 2015-09-16 13:56:52 +08:00
winlin
c4e4711b93 add kafka protocol 2015-09-16 13:55:11 +08:00
winlin
8a90e76637 fix #459, support dvr raw api. 3.0.4 2015-09-15 23:00:00 +08:00
winlin
2b9869ee52 update the wiki for dvr 2015-09-15 17:58:35 +08:00
winlin
2a1b2b69a0 for #459, dvr support apply filter for ng-control dvr module. 2015-09-15 15:58:57 +08:00
winlin
8f9cfcdcf4 fix #319, http raw api support update global and vhost. 3.0.4 2015-09-15 13:03:18 +08:00
winlin
e8a00de4a3 for #319, support enable or disable vhost. 2015-09-15 12:51:14 +08:00
winlin
631e76cd32 for #319, support update and delete the disabled vhost 2015-09-15 12:15:18 +08:00
winlin
a7c4b786cf merge from 2.0 2015-09-14 18:42:31 +08:00
winlin
511627abab fix #474, config to donot parse width/height from sps. 2.0.189 2015-09-14 18:36:44 +08:00
winlin
eb578b4a39 refine the thread, set to disposed when terminate normally 2015-09-14 17:17:38 +08:00
winlin
83a9ff9f5d for #474, refine the hls publish, donot fetch from source when publish 2015-09-14 15:49:25 +08:00
winlin
44bcb4045f for #474, decode the sequence header before hls. 2015-09-14 15:32:09 +08:00
winlin
07ef8160a3 clear the queue when edge republish. 2015-09-14 15:25:01 +08:00
winlin
704624c9ec clear the queue when edge republish. 2015-09-14 15:19:49 +08:00
winlin
8be3c875af donot release stream when busy 2015-09-14 15:17:59 +08:00
winlin
3da25f3aee when thread terminated normally, set the tid to NULL. 2015-09-14 15:11:49 +08:00
winlin
a994191ddc for #474, always release publish for source. 2015-09-14 15:10:34 +08:00
winlin
eb9aa47ab1 merge from 2.0 2015-09-14 13:48:27 +08:00
winlin
0d57ef9373 fix #458, http hooks use source thread cid. 2.0.188 2015-09-14 13:47:25 +08:00
winlin
3b483094bd merge from 2.0 2015-09-14 12:24:57 +08:00
winlin
6d50aa1aa2 #475, fix http hooks crash for st context switch. 2.0.187 2015-09-14 12:22:19 +08:00
winlin
adb74dc74e Merge branch '2.0release' into develop 2015-09-14 11:17:19 +08:00
winlin
f0fc093b19 fix the http zero content length bug. 2015-09-14 11:17:04 +08:00
winlin
01308ecc98 for #319, support initialize the parser to whether use jsonp 2015-09-12 22:22:33 +08:00
winlin
491ec11833 for #319, raw api support add new vhost 2015-09-12 21:55:53 +08:00