external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-24 23:14:19 +00:00
Code Issues Releases Wiki Activity
4358 commits 14 branches 107 tags 377 MiB
Commit graph

146 commits

Author SHA1 Message Date
winlin
1b1a2a1e63 fix #471, api response the width and height. 3.0.2 2015-08-28 18:00:24 +08:00
winlin
d921d59e57 for #319, support HTTP RAW API reload. 2015-08-27 18:11:50 +08:00
winlin
1e0481a2d0 for #319, support signal to persistence config 2015-08-26 21:49:05 +08:00
winlin
94641c812b fix #442, support kickoff client. 2015-08-22 13:36:15 +08:00
lovacat
e8c0ca7af0 fix #442: HTTP API kickoff client. 2015-08-11 15:23:46 +08:00
winlin
19e1f610a3 merge from bravo, parse the http reponse in json of bravo system. 2015-06-08 17:28:39 +08:00
winlin
db57a519a9 for #374, use SIGINT then SIGKILL to try to kill FFMPEG gracefullly. 2015-05-30 09:32:03 +08:00
winlin
5caafadd45 fix #409: support pure video hls. 2.0.172. 2015-05-29 21:43:17 +08:00
winlin
5d7b0edccc merge from bravo code, fix some warnings. 2015-05-22 11:20:25 +08:00
winlin
ba6c3132e3 refine code, use decoder to parse flv stream 2015-05-04 18:28:41 +08:00
winlin
b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 2015-04-29 17:38:23 +08:00
winlin
115daa3cc1 migarate from winlinvip to srs org 2015-04-29 17:06:32 +08:00
winlin
a28eec89b0 support ingest hls with m3u8 in m3u8. 2015-04-21 12:53:45 +08:00
winlin
70c59da1bf enhanced avc decode, parse the sps get width+height. 2.0.156. 2015-04-03 23:17:50 +08:00
wenjie.zhao
e57bda8908 Merge code. 
Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp
 2015-03-11 14:18:09 +08:00
wenjie.zhao
d4198ee8ba add hds supported. 2015-03-11 13:34:58 +08:00
winlin
f9767c91b5 fix configure bug, refine code for stream caster. 2015-03-10 18:07:43 +08:00
winlin
d3e2838fc6 for #310, refine the aac profile for adts and aac object for RTMP sequence header. 2015-03-08 17:33:52 +08:00
winlin
3982ec1d87 refine http request parse. 2.0.132. 2015-03-06 11:36:26 +08:00
winlin
b903a7b436 for #179, dvr suport vhost/app/stream level control. 2.0.125. 2015-02-25 09:20:11 +08:00
winlin
849e59b05d for #179, support http api to start dvr. 2015-02-21 23:09:21 +08:00
winlin
c67a4fdf97 for #179, enable http api crossdomain for dvr api. 2015-02-21 21:17:59 +08:00
winlin
9d233db27e fix #133, support push rtsp to srs. 2.0.120. 2015-02-18 22:28:39 +08:00
winlin
a954040d29 for #133, rtsp parse aac from rtp packet. 2015-02-18 13:37:08 +08:00
winlin
0cc693a3b8 for #133, decode the h264 NALU from rtp. 2015-02-18 11:49:42 +08:00
winlin
604f4cc57b for #133, support the rtsp options request and response. 2015-02-16 22:15:59 +08:00
winlin
70c8fe13c4 for #250, support h264 video for push mpegts over udp. 2.0.110 2015-01-31 19:46:55 +08:00
winlin
66fccdbbd1 for #250, demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109. 2015-01-31 12:21:04 +08:00
winlin
1685cdd48e for #250, parse pes packet ok, ts message ok. 2015-01-29 22:58:02 +08:00
winlin
cc87992fe0 for #250, decode the PMT and PAT 2015-01-27 18:35:43 +08:00
winlin
7692e50fc2 for #250, calc and verify the crc32 of PAT. 2015-01-27 17:04:30 +08:00
winlin
51aecb8fde for #250, decode the ts packet header and adaptation field. 2015-01-27 14:28:59 +08:00
winlin
2c42350489 for #301, http ts stream support h.264+mp3. 2.0.106 2015-01-25 16:42:22 +08:00
winlin
52891b491a listen and serve stream caster mpegts over udp. 2015-01-24 14:52:52 +08:00
winlin
25807298ad alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux 2015-01-22 09:34:33 +08:00
winlin
99bf397487 for bug #293, add mp3 id3 spec 2015-01-19 09:25:07 +08:00
winlin
3244c083c7 for bug #293, support http aac stream 2015-01-19 00:05:12 +08:00
winlin
7674524c31 for #239, empty the aac encoder 2015-01-18 22:56:01 +08:00
winlin
c0233542bf for #293, add aac encoder for http aac stream. 2015-01-18 22:51:07 +08:00
winlin
9bbbaad288 for bug #277, refine http api refer to go http-framework. 2.0.97 2015-01-17 21:58:23 +08:00
winlin
f881bc43b5 fix #179: dvr support custom filepath by variables. 2.0.87 2015-01-03 12:54:54 +08:00
winlin
75f2607685 fix #211, support security allow/deny publish/play all/ip. 2.0.86 2015-01-02 16:02:13 +08:00
winlin
9d34820c80 fix #158: http-callback check http status code ok(200). 2.0.84 2015-01-02 10:21:04 +08:00
winlin
569596c10d update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
winlin
330819fb74 for bug #251, refine the mic algorithm. 2.0.63 2014-12-06 22:50:51 +08:00
winlin
d53fd7f570 for bug #251, support mic(message iovs cache). 2.0.61 2014-12-06 20:10:05 +08:00
winlin
4c6cf959c1 refine fast buffer, check available bytes to read. 2014-12-04 22:10:05 +08:00
winlin
29324fab46 fix #248, improve about 15% performance for fast buffer. 2.0.49 2014-12-04 13:05:13 +08:00
winlin
18c308248e refine code by winlin, for merged from allspace. 2014-11-27 15:22:39 +08:00
winlin
1855c9429c merge from allspace, to srs-librtmp, for vs2010 2014-11-27 14:46:05 +08:00
winlin
e492fa5353 fix #212, support publish aac adts raw stream. 2.0.31. 2014-11-24 16:28:52 +08:00
winlin
2c601a0069 fix #204, srs-librtmp drop dupliated sps/pps(sequence header). 2.0.22. 2014-11-15 16:53:24 +08:00
winlin
278ff845d3 fix #203, srs-librtmp drop any video before sps/pps(sequence header). 2.0.21. 2014-11-15 16:30:37 +08:00
winlin
7ebca6cb5b refine the type of RTMP from int to char. add srs_parse_timestamp(), 2.0.19 2014-11-15 13:20:58 +08:00
winlin
a6f3478a74 for bug #194, remove the poll, it's no-use 2014-11-12 10:26:48 +08:00
winlin
164f632b62 for bug #194, add fds poll, just sleep to send without recv. 2014-11-11 18:35:46 +08:00
winlin
e87eacd499 Revert "add srs pipe for bug #194" 
This reverts commit f9756ea14c.
 2014-11-11 17:05:25 +08:00
winlin
f9756ea14c add srs pipe for bug #194 2014-11-11 16:09:44 +08:00
winlin
3358570be6 refine for bug#66, implements the usage. 2014-11-08 10:44:00 +08:00
winlin
57e8356221 fix #184, support AnnexB in RTMP body for HLS. 2.0.2 2014-10-19 19:42:27 +08:00
winlin
d0c585af86 max connections is 32756, for st use mmap default. 0.9.209 2014-08-27 13:31:39 +08:00
winlin
d4c2aa1e8e add __openssl_compute_key to calc the shared key 2014-08-08 11:34:17 +08:00
winlin
12ad95a5b8 refine HMAC sha256 digest algorithm. 0.9.193 2014-08-08 09:54:33 +08:00
winlin
67403bdbf1 fix #79, fix the reload remove edge assert bug. 0.9.189. 2014-08-03 21:50:48 +08:00
winlin
7b24788445 for bug #143, build on centos5. 2014-08-02 22:18:39 +08:00
winlin
6e8c4df4b1 refine error codes. 2014-07-20 17:32:34 +08:00
winlin
9135aa117c use librtmp to implemnts the bandwidth linux tool. 0.9.158 2014-07-13 19:16:18 +08:00
winlin
5a41b1b538 finish kernel utest. to 0.9.149 2014-07-05 21:22:20 +08:00
winlin
d219a7b67e complete the normal kernel flv utest. 0.9.147 2014-07-05 11:10:42 +08:00
winlin
032118581a refine http/dvr/hls to use file reader/writer. 0.9.146 2014-07-05 07:33:18 +08:00
winlin
a888e52df1 donot mix the read and write for librtmp 2014-06-29 17:17:50 +08:00
winlin
d48d739fa7 fix bug of detect rtmp, add error code 2014-06-10 11:57:46 +08:00
winlin
608083d42f add flv injecter, add flv codec to librtmp. 2014-05-28 15:37:06 +08:00
winlin
7920348e5f extract get_local_ip and get_peer_ip to app utility 2014-05-27 16:45:02 +08:00
winlin
b13bd70c86 http streaming support flv start index. 2014-05-26 13:57:08 +08:00
winlin
3064e5ec61 fix bug of nx_json parse, to 0.9.104 2014-05-18 16:48:24 +08:00
winlin
8388da6325 add miss files. fix bug #60: support aggregate message 2014-05-08 14:33:25 +08:00
winlin
d0dff2d332 fix bug #34: convert signal to io. 0.9.85 2014-04-30 11:26:32 +08:00
winlin
23b04e2a57 completed the edge reload, to 0.9.79 2014-04-28 17:57:59 +08:00
winlin
16319d73fd implements basic edge(play and publish), with bug 2014-04-27 12:28:45 +08:00
winlin
ec96072472 add publish edge framework 2014-04-27 09:29:37 +08:00
winlin
acba4cfdc6 add edge framework 2014-04-26 18:08:21 +08:00
winlin
435e02db5d dvr use .tmp and rename to .flv when finished. 2014-04-22 17:50:22 +08:00
winlin
73459547e1 support dvr. change to 0.9.69 2014-04-17 16:06:49 +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
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
00eda0d7b2 implements the http stream module. 2014-04-04 23:04:38 +08:00
winlin
818c1f1520 support http error code, check url 2014-04-03 15:17:02 +08:00
winlin
341b5151d9 create http handler framework 2014-04-02 18:07:34 +08:00
winlin
f25c6558a5 write pid to ./objs/srs.pid. 2014-03-21 15:45:34 +08:00
winlin
c85dde7f3f substitute all TAB with 4spaces. 2014-03-18 11:32:58 +08:00
winlin
e5770b10b1 refine the colorful log for srs. remove the log when client close. 2014-03-18 11:28:22 +08:00
winlin
a488ef8317 fix bug#25: fmle republish bug, srs return special error code and wait for client to republish. 2014-03-05 10:21:31 +08:00
winlin
f24f27deb9 srs-librtmp: add make ssl/nossl support for sample 2014-03-02 11:31:31 +08:00
winlin
dea66a322d extract kernel module, depends on core and provides kernel service(no stream) 2014-03-01 10:30:16 +08:00
Renamed from trunk/src/app/srs_core_error.hpp (Browse further)