external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 19:31:53 +00:00
Code Issues Releases Wiki Activity
5173 commits 13 branches 107 tags 375 MiB
Commit graph

3983 commits

Author SHA1 Message Date
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
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
8ee307b0b4 update configure, try to detect the tools 2013-10-30 12:01:35 +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
winlin
f0f4837a97 define the structs for c0c1 complex handshake 2013-10-25 07:42:18 +08:00
winlin
e6ca039dd6 add rtmp complex handshake classes 2013-10-25 07:15:33 +08:00
winlin
598aaa5c98 detect the video/audio codec, only cache the h264/aac sequence header 2013-10-24 22:29:12 +08:00
winlin
2987a24877 add TODO for complex handshake 2013-10-23 22:25:35 +08:00
winlin
2ee913bd70 update comment TODO for sequence header and fast-startup caching last gop 2013-10-23 22:20:08 +08:00
winlin
9da31de1c1 support decode user control message. response ping automatically 2013-10-23 22:17:57 +08:00
winlin
0a92faf2e3 update timestamp comments 2013-10-23 21:44:24 +08:00
winlin
b40d0467a8 time jitter detect and correct, very simple algorithm 2013-10-23 21:37:22 +08:00
winlin
e31e3d601d time jitter detect and correct, very simple algorithm 2013-10-23 21:31:22 +08:00
winlin
2a346c2398 support send acknowledgement when recv message. 2013-10-23 20:59:08 +08:00
winlin
5d1d0ff8bb update help 2013-10-23 12:20:03 +08:00
winlin
a0a0da5f23 release v0.1, support FMLE/FFMPEG publish, vp6 codec live streaming 2013-10-23 11:57:47 +08:00
winlin
54b9c5d389 support FMLE/FFMPEG publish vp6 codec, h264/aac not support yet 2013-10-23 00:17:44 +08:00
winlin
444a45facd fix bug to accept FFMPEG streaming 2013-10-23 00:01:59 +08:00
winlin
150489af51 support ffmpeg publish 2013-10-22 23:37:44 +08:00
winlin
584a427c2e dispatch video/audio/data to consumers 2013-10-22 20:08:55 +08:00
winlin
0a0d33335a rename base message to ISrsMessage 2013-10-22 19:51:46 +08:00
winlin
52a454c41b rename base message to ISrsMessage 2013-10-22 19:48:50 +08:00
winlin
d8a99dde52 rename SrsSharedMessage to SrsSharedPtrMessage 2013-10-22 19:45:02 +08:00
winlin
cdd843a641 rename SrsMessage to SrsCommonMessage 2013-10-22 19:44:12 +08:00
winlin
c64ed83378 add shared ptr to video/audio/data 2013-10-22 19:38:14 +08:00
winlin
5af377e41d add shared ptr message 2013-10-22 18:30:36 +08:00
winlin
940d2f02eb basic media cache framework 2013-10-22 18:20:54 +08:00
winlin
a24d0ecf0c support decode onMetaData. 2013-10-22 17:26:05 +08:00
winlin
ed371d6e7e support FMLE publish streaming 2013-10-22 16:44:10 +08:00
winlin
33c586181d support fmle publish. fix bug of rtmp chunk stream. 2013-10-22 15:48:33 +08:00
winlin
e598616e14 fix objectEncoding bug, default to AMF0, change to AMF3 if required. 2013-10-22 12:27:22 +08:00
winlin
99aa8bc087 support FMLE releaseStream, FCPublish 2013-10-22 12:12:10 +08:00
winlin
58a54176f7 support onStatus, RtmpSampleAccess, DataStart 2013-10-22 11:31:52 +08:00
winlin
adc382ad48 support set chunk size, PCUC 4bytes packets 2013-10-22 08:00:13 +08:00
winlin
af5961432d support createStream and play, identity the play client 2013-10-21 22:42:36 +08:00
winlin
5475d0e435 support ack size. 2013-10-20 22:22:55 +08:00
winlin
2e590e18f4 fix bug of send rtmp message 2013-10-20 21:58:03 +08:00
winlin
1beee1e970 support ecma array. connect app response. 2013-10-20 17:55:44 +08:00
winlin
8283ed465a support encode amf0 packet, connect app response packet 2013-10-20 17:13:01 +08:00
winlin
57dd58d557 send set peer bandwidth packet. 2013-10-20 15:59:26 +08:00
winlin
2abfcee10f support set ack window size. 2013-10-20 15:28:55 +08:00
winlin
1047e06bf3 encode packet and send out 2013-10-20 14:28:37 +08:00
winlin
a2d2fa1a25 log the req. 2013-10-20 08:55:42 +08:00
winlin
bd64ae8257 refine the protocol and amf0, extract the template method as global static method 2013-10-20 08:45:29 +08:00
winlin
2c53134bbb connect vhost/app packet decoded. 2013-10-19 21:39:19 +08:00
winlin
df400ef1c5 connect vhost/app packet decoded. 2013-10-19 21:32:41 +08:00
winlin
2886672347 amf0 object decode framework 2013-10-19 20:06:07 +08:00
winlin
810bb6ba38 decode amf0 string 2013-10-19 18:46:12 +08:00
winlin
a638ebd1c6 decode the amf0 command message: connect. 2013-10-19 18:27:52 +08:00
winlin
63bf9e112d decode the amf0 command message: connect. 2013-10-19 18:20:39 +08:00
winlin
25468e4ff8 refine buffer read socket logic. 2013-10-19 16:52:22 +08:00
winlin
496c5ecfde add amf0 decode framework. 2013-10-19 16:47:40 +08:00
winlin
f5672998fd expect rtmp packet which decoded from message payload 2013-10-19 16:16:06 +08:00
winlin
bf5378434f decode chunk stream to RTMP message 2013-10-19 13:52:07 +08:00
winlin
2625ecc151 decode message header 2013-10-19 12:12:52 +08:00
winlin
f730ccbf9f decode basic header 2013-10-19 11:18:15 +08:00
winlin
393e32ee0f add rtmp specification 2013-10-19 09:17:56 +08:00
winlin
bd66702299 add rtmp specification 2013-10-19 09:16:25 +08:00
winlin
9541ac1e35 add log macro use __PRETTY_FUNCTION__ for c++ 2013-10-19 09:10:17 +08:00
winlin
49a7cb9afb refine comments. 2013-10-19 09:01:56 +08:00
winlin
56e78bdf6f add comments. refine naming 2013-10-19 09:00:17 +08:00
winlin
a323483bea add protocol stack 2013-10-19 08:42:21 +08:00
winlin
fbe6e061c0 simple handshake(specified by rtmp protocol v1.0) success 2013-10-18 22:04:39 +08:00
winlin
3976a17841 add auto free. recv c0c1 2013-10-18 21:57:52 +08:00
winlin
0609eeb7c8 add socket rtmp and buffer. rename logs 2013-10-18 21:41:05 +08:00
winlin
d4b6178f0f get peer ip and add rtmp class 2013-10-18 20:15:05 +08:00
winlin
96e1de255c close fd when delete connection object 2013-10-18 17:10:24 +08:00
winlin
973bea1e14 extract the rtmp connection 2013-10-18 16:57:21 +08:00
winlin
d8a64603c0 support listen and accept framework 2013-10-18 16:23:06 +08:00
winlin
5b02f9c78b init st, add error code 2013-10-18 10:39:37 +08:00
winlin
eb3b824e6c rename upp project 2013-10-18 09:19:19 +08:00
winlin
a4c5f94b15 add copyright info 2013-10-17 22:27:47 +08:00
winlin
78c69016ba add srs_core.cpp 2013-10-17 22:14:11 +08:00
winlin
67d96fcab4 add log 2013-10-17 22:09:10 +08:00
winlin
7268dd15a1 add build framework 2013-10-17 20:58:04 +08:00