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

56 commits

Author SHA1 Message Date
winlin
abcaba33ee For #913: TS/HLS/MPEGTS support complex error 2017-09-22 21:50:54 +08:00
HungMingWu
234904c206 Refine Refine Refine kernel/ts code (#891) 2017-05-21 09:09:58 +08:00
HungMingWu
e8ea27088a Refine Refine kernel/ts code (#881) 2017-05-13 09:19:19 +08:00
winlin
33375db401 Merge from SRS2, for #834 2017-04-09 18:52:21 +08:00
winlin
b11ddc7f41 Fix #834, crash for TS context corrupt. 2.0.235 2017-04-09 18:45:42 +08:00
winlin
0a57a46016 Refine LICENSE 2017-03-25 21:29:29 +08:00
winlin
f32aab3d92 For #299, refine code. 2017-03-25 17:21:39 +08:00
winlin
ede1c34a25 for #299, refine the signature of api for hls/dash 2017-02-19 21:48:32 +08:00
winlin
2fcd3972c1 for #299, refine the encoder object name 2017-02-12 21:50:02 +08:00
winlin
2a4f57a587 Fix #301, User must config the codec in right way for HLS. 3.0.18 2017-02-12 20:55:35 +08:00
winlin
caf69f193d for #299, refine the codec object name 2017-02-12 20:38:39 +08:00
winlin
d7458c4e72 For #299, refine the codec to format-frame-sample chain. 2017-02-12 18:18:18 +08:00
winlin
b16ab038ce for #742, refine the u_intxx_t to uintxx_t 2017-01-30 17:32:18 +08:00
winlin
1ed5118246 refine the spaces, no TABS 2017-01-16 15:47:26 +08:00
winlin
7ac932cfa0 update to 2013-2017 2016-12-16 11:57:25 +08:00
winlin
d0c74fa7cd update 2015 to 2016 2015-12-23 11:35:40 +08:00
winlin
01c46bdbfd rename org simle-rtmp-server to ossrs 2015-11-11 10:45:45 +08:00
winlin
1ffd5fd455 rename org simple-rtmp-server to ossrs 2015-11-11 10:37:50 +08:00
winlin
1d57e53910 merge from 2.0release 2015-10-27 17:45:14 +08:00
winlin
d1979c760f for #512, partical hotfix the hls pure audio. 2.0.196 2015-10-27 17:44:10 +08:00
winlin
3683f06e4d for #512, write audio frame by frame for video+audio hls. 2015-10-27 16:20:02 +08:00
winlin
8862ec1988 merge from srs2 2015-10-01 13:05:25 +08:00
winlin
a3c229472e fix #495, decrease the srs-librtmp size. 2.0.193 2015-10-01 13:04:28 +08:00
winlin
4f3d2c8607 rename SrsSimpleBuffer to SrsSimpleStream 2015-09-22 08:59:52 +08:00
winlin
0e52fc6d5b rename SrsStream to SrsBuffer 2015-09-22 08:57:31 +08:00
winlin
1fd83d9314 refine the order. 2015-09-17 13:36:02 +08:00
winlin
bfe0f97edd refine params nameing and SrsStream. 2015-07-28 18:08:11 +08:00
winlin
77ee2400df fix the unicode to ascii 2015-05-09 23:12:12 +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
d19dfa528e abs overflow also plus the deviation, for pure audio hls. 2015-04-21 14:35:28 +08:00
winlin
ba6736839b support hls ingest, fix the bugs. 2015-04-20 18:31:45 +08:00
winlin
546be09219 fix #375, fix hls bug, keep cc continous between ts files. 2.0.159. 2015-04-08 16:52:43 +08:00
winlin
e818f36316 fix #360, fix build bug for centos7. 2015-03-25 20:38:51 +08:00
winlin
78f34ad46f for #304, support config default acodec/vcodec. 2.0.118. 2015-02-15 18:11:24 +08:00
winlin
922150b2cf for #304, rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117. 2015-02-15 17:43:35 +08:00
winlin
3c813847bd rewrite the ts remux of hls. 2.0.117 2015-02-15 16:37:28 +08:00
winlin
1ed3e283ab implements the pat/pmt write ts header. 2015-02-14 23:06:01 +08:00
winlin
5a3cd235fd refine hls, try to fix the hls ts corrupt problem. 2015-02-10 19:09:31 +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
bce78fdab6 for #250, add comments for elemetary stream specifed by stream_id. 2015-01-31 11:46:51 +08:00
winlin
b38bae2a89 for #250, refine parse pes packet, remove the clear method. 2015-01-29 23:08:26 +08:00
winlin
1685cdd48e for #250, parse pes packet ok, ts message ok. 2015-01-29 22:58:02 +08:00
winlin
486277089d for #250, parse the PES ts packet payload. 2015-01-29 13:54:07 +08:00
winlin
cc87992fe0 for #250, decode the PMT and PAT 2015-01-27 18:35:43 +08:00
winlin
52b62918d9 for #250, decode the PAT of PSI ts packet. 2015-01-27 16:25:46 +08:00
winlin
51aecb8fde for #250, decode the ts packet header and adaptation field. 2015-01-27 14:28:59 +08:00
winlin
bd395904df for #250, the ts packet and adaptation field. 2015-01-27 11:13:03 +08:00
winlin
aff7a1cb4d add ts packet definition for #250. 2015-01-26 17:06:06 +08:00
winlin
919a85b103 for #301, hls support h.264+mp3, ok for vlc. 2.0.107 2015-01-25 17:06:49 +08:00