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

2555 commits

Author SHA1 Message Date
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
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
d8a64aaab5 fix #484, hotfix the openssl build script 2.0.190 2015-09-21 12:01:48 +08:00
没——问题
e8680527c3 allow domain * 
在使用时，srs_player可能和所在页面部署在不同的域名下。

所以在此处添加跨域许可。
 2015-09-17 12:09:29 +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
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
0d57ef9373 fix #458, http hooks use source thread cid. 2.0.188 2015-09-14 13:47:25 +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
f0fc093b19 fix the http zero content length bug. 2015-09-14 11:17:04 +08:00
winlin
abd7ee227c support reload utc_time. 2.0.186 2015-09-09 23:37:07 +08:00
synote
9b01aad220 fix bug for build failure when configure with --log-info 
wrong use of size in SrsStream::initialize of  srs_kernel_stream.cpp
 2015-08-28 11:43:55 +08:00
winlin
fe4cdceb15 always wait for process to terminated when SIGKILL. 2015-08-26 23:02:54 +08:00
lovecat
9c2beffe8f statistic connection bytes before remove client. 2015-08-25 11:46:12 +08:00
winlin
15102a7345 refine commit script 2015-08-24 11:16:39 +08:00
winlin
a7f4104d45 fix bug of commit script 2015-08-24 11:04:39 +08:00
winlin
064031cac1 refine commit script 2015-08-24 10:59:32 +08:00
winlin
8e259eb0c2 refine the commit script 2015-08-24 10:57:12 +08:00
winlin
4118138cf0 update commit script 2015-08-24 10:54:31 +08:00
winlin
28791fd14a release 2.0alpha0, the 2.0a0, 2.0.185 2015-08-23 09:00:21 +08:00
winlin
e43d4e46b4 support JSONP DELTE/POST/PUT 2015-08-23 00:01:03 +08:00
winlin
baa70d4ddd add nb_streams for vhost 2015-08-22 22:51:59 +08:00
winlin
6e5143449e HTTP API support JSONP by specifies the query string callback=xxx. 2015-08-22 18:18:18 +08:00
winlin
aeebddb269 for #442, add more information for client for api. 2015-08-22 13:57:34 +08:00
winlin
94641c812b fix #442, support kickoff client. 2015-08-22 13:36:15 +08:00
winlin
b37797b13a for #442, add publish connection in stream.publish api 2015-08-22 13:03:10 +08:00
winlin
529803ed04 refine code for api. 2015-08-22 12:38:14 +08:00
winlin
6b6d951298 add api /api/v1/features 2015-08-22 11:08:56 +08:00
winlin
4763f205a2 add kbps for vhost and stream 2015-08-22 09:49:38 +08:00
winlin
20a8818a8e refine the error response. 2015-08-21 17:15:32 +08:00
winlin
2edcf1d4ff support query specified vhost 2015-08-21 17:00:52 +08:00
winlin
66a26bdce8 move json from app to protocol 2015-08-21 16:20:19 +08:00
winlin
a7589b9ad3 refine code for api, add clients and parse_rest_id 2015-08-21 16:12:48 +08:00
winlin
ab4620870d refine the stat api, support query specified stream. 2015-08-21 15:51:20 +08:00
winlin
c75f05c88b fix the log cid display error, merge the publish recv thread log to publish connection. 2015-08-21 15:22:40 +08:00
winlin
3c402cb908 refine the tcp nodelay, effect connected connections. 2015-08-21 13:43:33 +08:00
winlin
c31a546eec support vhost for http flv. 2015-08-21 12:08:25 +08:00
winlin
dd21eee7f0 srs player show current time and url 2015-08-20 18:33:33 +08:00
winlin
dfecfb65b1 support fluency and stream empty count 2015-08-20 18:13:07 +08:00
winlin
fcd2d3d445 refine code for link generation from rtmp url. 2015-08-20 16:18:32 +08:00
winlin
fe87bf1b61 support generate link page for rtmp url 2015-08-20 16:11:17 +08:00
winlin
018af55d65 refine the demo pages, move scripts after body. 2015-08-20 15:19:43 +08:00
winlin
575a698820 fix #380, srs-librtmp send sequence header when sps or pps changed. 2015-08-20 14:20:49 +08:00
winlin
ec87dd9cd6 refine code for srs rtmp dump 2015-08-19 19:02:33 +08:00
winlin
785a5907a8 set the default get_publish_normal_timeout to 5s 2015-08-19 16:27:22 +08:00
winlin
0bbfc5526a set the default get_publish_normal_timeout to 5s 2015-08-19 16:22:52 +08:00
winlin
7273c33c35 support publish_1stpkt_timeout and publish_normal_timeout 2015-08-19 16:16:05 +08:00
winlin
170ad05148 add gfps and nb_packets 2015-08-19 15:31:19 +08:00
winlin
e7714cd445 add packets interval in ms to set the right send_min_interval 2015-08-19 15:14:26 +08:00
winlin
de48b477ae drop the metadata when drop sequence header 2015-08-19 14:23:12 +08:00
winlin
f691dddc1a drop metadata when drop sequence header. support PCUC 0x1a 2015-08-19 14:20:31 +08:00
winlin
2cf526ffc7 close #454, support obs restart publish. 2.0.184 2015-08-18 17:43:01 +08:00
winlin
ccc4c05da9 fix #229, support vs2010 for srslibrtmp. 2015-08-18 14:08:54 +08:00
winlin
01be68fe58 refine code, donot remove the detail when hls disabled. 2015-08-17 16:34:11 +08:00
winlin
afd05f71c3 refine code, use size cache for performance issue. 2015-08-14 15:51:02 +08:00
winlin
3b0b2e0b85 fix the bug to support dump packets with count. 2015-08-14 15:47:29 +08:00
winlin
a0a89a8ca6 use reduce_sequence_header for stream control. 2015-08-14 14:35:41 +08:00
winlin
b79d830e2c refine the default smi 2015-08-14 11:15:23 +08:00
winlin
ae37fa8f3e use send_min_interval for stream control. 2.0.183 2015-08-14 11:13:40 +08:00
winlin
7dcba040eb refine config. 2015-08-12 18:02:31 +08:00
winlin
9fb4640a8f enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182 2015-08-12 13:22:09 +08:00
winlin
1261916eab refine the mount and dir to /console 2015-08-12 12:49:22 +08:00
winlin
eab538d2e4 fix the version of srs2 2015-08-11 18:37:50 +08:00
winlin
f28c9b7eb5 merge from 2.0release 2015-08-11 15:49:48 +08:00
winlin
3a6854fc2e refine code. 2015-08-11 15:36:14 +08:00
lovacat
e8c0ca7af0 fix #442: HTTP API kickoff client. 2015-08-11 15:23:46 +08:00
winlin
d761ebfa55 refine the api, move the requests and errors to rest. 2015-08-11 13:09:21 +08:00
winlin
c5bf397295 fix the http error header. 2015-08-10 16:41:25 +08:00
winlin
fbcc07d85a fix the typo of AUTIO. 2015-08-05 22:54:29 +08:00
winlin
0e3128d3e3 Merge branch '2.0release' into develop 2015-08-03 15:23:07 +08:00
winlin
65b2ed7ac5 refine code, move the order of functions. 2015-08-03 14:11:21 +08:00
winlin
71f2726b31 fix bug of merge code for reload http_remux for vhost 2015-08-03 13:44:24 +08:00
winlin
ccf6a4de1e remove the on_reload_vhost_http_remux_updated for vhost added. 2015-08-03 13:35:25 +08:00
winlin
bfe0f97edd refine params nameing and SrsStream. 2015-07-28 18:08:11 +08:00
winlin
8d86eb6516 refine code naming or comments. 2015-07-28 17:56:50 +08:00
winlin
c2d9c98678 Merge branch '2.0release' into develop 2015-07-23 14:20:57 +08:00
winlin
bc033d5de3 refine code, move default to config function. 2015-07-23 14:20:46 +08:00
zhengfl
39a2d51c66 fix #445, 修正由skip(-4)引起的assert错误 2015-07-22 12:10:19 +08:00
winlin
94569b181f merge from 2.0 2015-07-21 12:08:05 +08:00
winlin
c85f92c229 fix #169, support default values for transcode. 2.0.180 2015-07-21 12:07:26 +08:00
winlin
48c040c92b Merge branch '2.0release' into develop 2015-07-21 11:41:13 +08:00
winlin
31d2de3f23 fix #435, add pageUrl for HTTP callback on_play. 2015-07-21 10:50:57 +08:00
winlin
146a44a2ce merge from 2.0 2015-07-20 09:32:46 +08:00
winlin
b54f9b0f94 refine the hls, ignore packet when no sequence header. 2.0.179 2015-07-20 09:31:46 +08:00
winlin
fdb17a1864 merge from 2.0 2015-07-17 14:06:15 +08:00
winlin
3b65af9bd2 fix the hstrs bug on edge. 2015-07-17 14:05:34 +08:00
winlin
99db2888e7 refine code for hstrs. 2015-07-16 18:42:27 +08:00
winlin
c2ef779523 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 2015-07-16 17:31:31 +08:00
winlin
366d3a3f56 for #441, use 30s timeout for first msg. 2.0.178 2015-07-16 17:30:27 +08:00
zhengfl
a5a9f7c8c5 refine code:优化edge模式回源播放线程启动流程 2015-07-16 11:36:14 +08:00
winlin
5f77724021 refine hls disable the time jitter, support not mix monotonically increase. 2.0.177 2015-07-14 11:46:23 +08:00