1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Commit graph

220 commits

Author SHA1 Message Date
winlin
f85b70966c rename global username and email 2013-11-30 23:26:40 +08:00
winlin
951cd08f1f refine the params 2013-11-30 23:21:14 +08:00
winlin
407801b8a6 add ffempty 2013-11-30 23:20:46 +08:00
winlin
b88596b6dc update readme 2013-11-30 23:15:25 +08:00
winlin
601a69aa70 update readme 2013-11-30 23:15:13 +08:00
winlin
525af4599f support live stream transcoding by ffmpeg. 2013-11-30 23:04:47 +08:00
winlin
06278176dd add research empty ffmpeg 2013-11-30 21:53:28 +08:00
winlin
80a81b1661 parse ffmpeg params 2013-11-30 21:02:21 +08:00
winlin
ce15f4bce3 update encoder framework 2013-11-30 19:14:19 +08:00
winlin
8d91561ca0 add ffmpeg transcoding framework 2013-11-30 18:31:07 +08:00
winlin
a086e2bbfa add transcoding params to config 2013-11-30 16:23:01 +08:00
winlin
57064237d0 rename author to contributor 2013-11-30 14:35:59 +08:00
winlin
790294f437 add authors 2013-11-29 23:08:50 +08:00
winlin
28572b009a remove the clock msg from log 2013-11-29 22:39:50 +08:00
winlin
5d69236bff convert to unix format 2013-11-29 22:21:31 +08:00
winlin
db405b7e0e support forward stream to origin/edge 2013-11-29 22:20:51 +08:00
winlin
f656087d74 add forward framework 2013-11-29 16:52:24 +08:00
winlin
2fa7610f9c add rtmp client 2013-11-29 15:07:05 +08:00
winlin
844718c99b refine the forwarder 2013-11-28 23:43:52 +08:00
winlin
1f8bb0e935 add forward st thread 2013-11-28 23:18:05 +08:00
winlin
f09d457644 add forward framework 2013-11-28 22:59:00 +08:00
winlin
3515af9dff add tools 2013-11-28 22:32:50 +08:00
winlin
de95bf74b1 refine source, extract gop cache, add srs forwarder. 2013-11-28 22:28:34 +08:00
winlin
ecebedfed2 refine code 2013-11-28 15:12:08 +08:00
winlin
af5e7f002f fix the memory leak error 2013-11-28 14:53:46 +08:00
winlin
005f821441 fix bug of hls conf detect 2013-11-28 09:14:56 +08:00
winlin
3877ab0ff2 fix bug of hls conf detect 2013-11-28 09:14:31 +08:00
winlin
1653e444dd add comments for auto ptr message 2013-11-27 23:02:37 +08:00
winlin
90af450d63 add todo for response client detail error 2013-11-27 22:54:43 +08:00
winlin
62a2384a35 check publish streaming available 2013-11-27 22:53:08 +08:00
winlin
ec5cb39b96 add options --with/without -hls/ssl 2013-11-27 22:41:58 +08:00
winlin
f8855cfcbb fix the aac jump bug on iphone, correct the audio pts, use audio buffer and flush audio 2013-11-27 17:30:16 +08:00
winlin
c78baedf4e fix bug of 0.5 release. 2013-11-26 18:20:04 +08:00
winlin
94623c0cee fix bug of shared ptr, must copy the payload for it free it. 2013-11-26 18:11:45 +08:00
winlin
758dff0e97 fix bug of hls, close the muxer when segment finished 2013-11-26 17:56:55 +08:00
winlin
00ec634d56 support hls_fragment and hls_window 2013-11-26 17:48:35 +08:00
winlin
04cfe20279 support HLS, refine the dir use app 2013-11-26 17:21:49 +08:00
winlin
57ea56970d add nginx and used as http server 2013-11-26 16:45:50 +08:00
winlin
0c72c56f74 support HLS(m3u8) 2013-11-26 16:06:58 +08:00
winlin
749b7bdb2a refine hls, support time jitter detect and correct 2013-11-26 11:48:18 +08:00
winlin
326713fbed refine code, extract the rtmp jitter for hls 2013-11-26 11:15:44 +08:00
winlin
501b182dc9 refine code, write audio immediatly 2013-11-26 10:56:29 +08:00
winlin
dbdfb29de1 refine code, remove the base dts, donot drop start BP frames 2013-11-26 10:48:37 +08:00
winlin
b4235582dc refine code, remove the base dts, donot drop start BP frames 2013-11-26 10:47:05 +08:00
winlin
9e5b3afcbe update readme 2013-11-26 00:03:07 +08:00
winlin
7ed20cc670 support write ts file 2013-11-25 23:54:01 +08:00
winlin
164392f6aa fix bug of ts_info 2013-11-25 10:59:21 +08:00
winlin
d5b84b5e20 refine ts code 2013-11-25 00:46:08 +08:00
winlin
38e66be490 fix ts audio bug, aac adts header and PES_packet_length fixed 2013-11-25 00:02:01 +08:00
winlin
4fca914694 support write ts file 2013-11-24 23:13:14 +08:00
winlin
ca6720aab2 add time to write ts file 2013-11-24 18:55:39 +08:00
winlin
385394315d add ts mux framework 2013-11-24 17:53:36 +08:00
winlin
4af3982721 add ts muxer to write hls/ts file 2013-11-24 17:15:37 +08:00
winlin
ce021b25c7 update the config file format 2013-11-24 16:49:00 +08:00
winlin
19f16ba7a8 remove the analysis doc for ts 2013-11-24 16:00:45 +08:00
winlin
ecc8688455 ensure sequence header is ok when parse avc/aac data 2013-11-24 15:11:18 +08:00
winlin
c243ad3282 avc/aac demux the flv samples 2013-11-24 15:08:43 +08:00
winlin
fcfd51ee20 decoded audio and video. add avc file format doc 2013-11-24 14:28:58 +08:00
winlin
ba234e8741 add avc format doc. decode the flv codec info 2013-11-24 12:39:47 +08:00
winlin
b87318dec0 extract method to process publish message 2013-11-23 20:33:10 +08:00
winlin
195a857f22 nginx never keep the metadata. 2013-11-23 20:23:00 +08:00
winlin
4f3cdd51c1 change metadata. add hls class. 2013-11-23 20:16:47 +08:00
winlin
200a6a6975 add hls config 2013-11-23 19:15:11 +08:00
winlin
e3e0db9bb1 fix the format to unix without x 2013-11-23 18:20:02 +08:00
winlin
2c4c91d821 convert format to unix 2013-11-23 11:36:07 +08:00
winlin
974af0605b fix protocol decode PCUC packet bug, requires 4bytes 2013-11-20 20:41:46 +08:00
winlin
bc8828a7de update the random generater 2013-11-20 14:52:47 +08:00
winlin
4bba9ddcbb add ts_info doc 2013-11-20 11:51:07 +08:00
winlin
d1e20dc866 fix the global static instance error, use function to get server 2013-11-20 10:08:52 +08:00
winlin
ff565c4d9b fix bug of amf0 decode 2013-11-16 12:54:48 +08:00
winlin
bf1113dad7 add log for update video/audio sequence header 2013-11-14 17:13:20 +08:00
winlin
687d190da1 reset the audio sample size and video frame size when unpublish 2013-11-13 13:29:03 +08:00
winlin
0645f5e927 calc the delta for time jitter for video 2013-11-12 18:41:22 +08:00
winlin
8f528ae5b2 v0.4 released. 12500 lines. 2013-11-10 12:05:13 +08:00
winlin
b855caa045 refine handshake, pithy print clock 2013-11-10 12:00:01 +08:00
winlin
3669419e4c support config and reload the pithy print. 2013-11-10 11:52:19 +08:00
winlin
6c3b5943e9 add reload config comments for config. 2013-11-09 22:53:59 +08:00
winlin
68ccd7eb64 support reload config(listen and chunk_size) by SIGHUP(1). 2013-11-09 22:41:44 +08:00
winlin
ed3525056c support config the chunk_size. 2013-11-09 20:56:35 +08:00
winlin
c78af697a1 support pause for live stream. 2013-11-09 11:49:38 +08:00
winlin
c77695ce55 add comments for extended-timestamp, always send the extended-timestamp even chunk type=0x03 2013-11-08 15:35:24 +08:00
winlin
883b054f9d update readme. 2013-11-04 23:08:34 +08:00
winlin
6e62efb9e6 update readme. 2013-11-04 23:08:07 +08:00
winlin
751323fac8 release v0.3, 11773 lines 2013-11-04 22:55:19 +08:00
winlin
58d9677ddd support vhosts specified config. 2013-11-04 22:42:03 +08:00
winlin
9f94f891ad delete the cache when unpublish, when publish the encoder will update it 2013-11-03 19:57:54 +08:00
winlin
a5339c2a27 refine socket buffer, append bytes to vector directly 2013-11-02 19:52:33 +08:00
winlin
c0b6982e0d support listen multiple ports. 2013-11-02 19:32:52 +08:00
winlin
2aa15a1134 support nginx-style config file 2013-11-02 17:55:59 +08:00
winlin
a1a3a2eef9 add macro to disable the srs_trace 2013-10-30 11:37:11 +08:00
winlin
b4427877f7 support pithy print log message specified by stage. 2013-10-29 22:16:18 +08:00
winlin
293399dcf5 fix bug of time jitter correcter 2013-10-29 18:46:46 +08:00
winlin
3aa6be8645 fix the timestamp bug. correct the audio diff by audiosamplerate 2013-10-29 10:17:33 +08:00
winlin
3accc969ab update the signature of server 2013-10-29 07:46:55 +08:00
winlin
3c8e1f8ff7 fix bug of extended-timestamp, support librtmp/ffmpeg publish 2013-10-28 22:09:11 +08:00
winlin
0ed8807727 support cache last gop for video 2013-10-27 11:25:42 +08:00
winlin
359c7da19b support flash publish 2013-10-25 18:44:56 +08:00
winlin
6d385f15a7 refine code, add todo command 2013-10-25 17:35:37 +08:00
winlin
24a54a40e8 refine code, add prefix srs 2013-10-25 17:22:52 +08:00
winlin
53a668e34d support h264/avc codec by rtmp complex handshake(SrsComplexHandshake) 2013-10-25 17:16:23 +08:00