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
443 commits 13 branches 107 tags 375 MiB
Commit graph

343 commits

Author SHA1 Message Date
winlin
d6897205c7 add todo for protocol 2013-12-02 12:56:52 +08:00
winlin
a2e6e6718e fix the m3u8 crash bug, simplify it 2013-12-02 11:46:39 +08:00
winlin
2b0bef18ed add todo for forward 2013-12-01 20:03:07 +08:00
winlin
09f9811a97 fix the hls crash bug 2013-12-01 19:54:52 +08:00
winlin
6f0bba9856 add todo: cycle all process, reap the exited 2013-12-01 18:53:24 +08:00
winlin
2695e4d0c6 fix bug of core 2013-12-01 17:42:09 +08:00
winlin
6af0794bab support dead-loop detect for forwarder and transcoder. 2013-12-01 17:32:06 +08:00
winlin
e4ea965a3a update conf 2013-12-01 14:28:07 +08:00
winlin
9d65cd1c9f change server name to demo, dev used for development vhost 2013-12-01 14:08:28 +08:00
winlin
35676920be convert to unix format 2013-12-01 13:05:43 +08:00
winlin
18028ad4cb update readme 2013-12-01 13:04:09 +08:00
winlin
bf18a3ac96 change demo video to 200kbps 2013-12-01 12:41:52 +08:00
winlin
bbf7b9bb01 disable the forward for bug. update the steps 2013-12-01 12:31:23 +08:00
winlin
41fcda1d86 use hosts to play stream 2013-12-01 12:25:04 +08:00
winlin
5502344e85 add forward sample 2013-12-01 12:16:57 +08:00
winlin
5cc1ad6da8 add drawtext filter sample 2013-12-01 12:04:00 +08:00
winlin
1da09e5ffb add sample video 2013-12-01 11:24:26 +08:00
winlin
a7c83b1aee support ffmpeg filter 2013-12-01 10:55:06 +08:00
winlin
9a0d8855d8 support ffmpeg filter 2013-12-01 10:54:41 +08:00
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
52e6115f9a update readme 2013-11-30 23:12:47 +08:00
winlin
525af4599f support live stream transcoding by ffmpeg. 2013-11-30 23:04:47 +08:00
winlin
ee18b9f537 add ffempty 2013-11-30 21:56:50 +08:00
winlin
2be9ef2a8b add research empty ffmpeg 2013-11-30 21:53:42 +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
b1466c8883 fix build ffmpeg bug, add -ldl compile option 2013-11-30 16:45:47 +08:00
winlin
129244aafa change x264 from 10bit to 8bit 2013-11-30 16:37:33 +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
9a582b0e4a refine the configure 2013-11-30 14:12:19 +08:00
winlin
ad618702aa add ffmpeg build script 2013-11-30 13:55:14 +08:00
winlin
041ce8f18f add ffmpeg build script 2013-11-30 12:52:15 +08:00
winlin
e4840d4480 add ffmpeg build script 2013-11-30 12:43:55 +08:00
winlin
14c2585cc3 add build ffmpeg script 2013-11-30 11:59:21 +08:00
winlin
df53681a07 add ffmpeg-2.1, x264-core138, lame-3.99.5, libaacplus-2.0.2. 2013-11-30 11:50:00 +08:00
winlin
93fec0997f add ffmpeg2.1 2013-11-30 11:48:00 +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
c76043f95b add ccache zip 2013-11-28 22:34:15 +08:00
winlin
eddef96479 add +x for build ccache script 2013-11-28 22:33:14 +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
023e23bc82 add performance test 2013-11-28 19:25:56 +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
a26c28334e update readme 2013-11-27 23:27:55 +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
d631882d34 use nginx-1.5.7 for security hole fixed 2013-11-27 11:54:24 +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
bb775ef7bd update the ts_info 2013-11-24 16:47:21 +08:00
winlin
adb7572c8c print the nalu of avc 2013-11-24 16:29:39 +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
235e3cc120 add comments for PES packet length is 0 2013-11-23 17:47:01 +08:00
winlin
2c4c91d821 convert format to unix 2013-11-23 11:36:07 +08:00
winlin
145eb7bf29 convert ts_info to unix format 2013-11-23 11:33:57 +08:00
winlin
14211d884a add comments for ts_info 2013-11-23 11:30:00 +08:00
winlin
cdd548004c rename ts_info.cpp to ts_info.cc 2013-11-23 11:29:30 +08:00
winlin
37e53f3735 add ts PCR analysis, the tool MPEG-2-ts-packet-analysis.2.4.5.0 decode PCR wrong 2013-11-23 11:25:58 +08:00
winlin
71015dc4a1 fix bug of aac demux, make same to ffmpeg, demux success 2013-11-22 22:25:12 +08:00
winlin
c7e5bc0264 add ffmpeg demuxed dts/pts doc 2013-11-22 21:40:26 +08:00
winlin
26c24b7bdc add ts dts/pts analysis 2013-11-22 21:27:46 +08:00
winlin
08d745f1cf remove the flv muxer 2013-11-22 21:20:24 +08:00
winlin
21b962e9ff rename ts to mpegts, for github parse the *.ts as typedscript 2013-11-22 00:06:40 +08:00
winlin
f70894d2c3 demux aac from ts and write to file.aac 2013-11-22 00:04:37 +08:00
winlin
a0ecc5a305 finger out the PES_packet_length is 0 2013-11-21 22:33:32 +08:00
winlin
dc7f2cff86 remove the unused h264 enums 2013-11-21 20:34:59 +08:00
winlin
3913e46ba5 fix bug of ts_info 2013-11-20 23:48:21 +08:00
winlin
af5ce26746 finger out the ts audio/video package for AACADTS and H264NAL 2013-11-20 23:07:59 +08:00
winlin
54a1116f7a add ts analysis file 2013-11-20 20:50:31 +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
c350a182b7 link the -lcrypto 2013-11-20 10:13:38 +08:00
winlin
d1e20dc866 fix the global static instance error, use function to get server 2013-11-20 10:08:52 +08:00
winlin
c79372417d parse the aac ADTS packets, add h264 doc 2013-11-20 00:25:53 +08:00
winlin
f667351095 add aac specification, iso-13818-7 2013-11-19 23:03:05 +08:00
winlin
1ae03a2ba0 parse video/audio message 2013-11-19 18:38:33 +08:00
winlin
6b75390476 add Makefile for ts_info 2013-11-19 16:02:13 +08:00
winlin
6d4e4d3da2 update the ts_info, parse the PES packet 2013-11-19 14:06:28 +08:00
winlin
b2fe7fb8a1 update ts_info, parse the PES packet dts/pts. 2013-11-19 11:06:28 +08:00
winlin
a47a53f271 update the ts_info parse the PMT and PES header 2013-11-18 23:49:18 +08:00
winlin
89332789d1 update ts_info, parse header, adaption field and PAT 2013-11-17 23:34:36 +08:00
winlin
611d2a7e46 update ts_info, parse header, adaption field and PAT 2013-11-17 23:25:39 +08:00
winlin
741564b809 add reference doc from vb 2013-11-17 11:27:06 +08:00
winlin
c621be2247 add ts_info.cpp for HLS research 2013-11-16 23:11:16 +08:00
winlin
732b2bbc6e add hls specification 2013-11-16 16:55:24 +08:00
winlin
d06d83fb96 add rtmp players 2013-11-16 13:36:00 +08:00
winlin
8745ab542b add rtmp players 2013-11-16 13:30:12 +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
0813104c6e support reload config(vhost and its detail). 2013-11-09 22:47:27 +08:00
winlin
aef2fe9db5 support reload config(vhost and its detail). 2013-11-09 22:46:50 +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