external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity
4883 commits 13 branches 107 tags 375 MiB
Commit graph

234 commits

Author SHA1 Message Date
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
e88c1e32ee always increasing target duration, for #304 2015-02-14 16:30:04 +08:00
winlin
25af6c6847 for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116. 2015-02-12 13:34:59 +08:00
winlin
66931a8890 try to fix hls problem, print the video packets. 2015-02-10 19:58:24 +08:00
winlin
b8d4f68a69 try to refine hls, always flush video when reap segment. 2015-02-10 19:32:42 +08:00
winlin
5a3cd235fd refine hls, try to fix the hls ts corrupt problem. 2015-02-10 19:09:31 +08:00
winlin
4820d455d5 for #310, workaround to force to LC/MAIN, donot support SSR above. 2.0.113 2015-02-10 16:58:13 +08:00
winlin
f8bdd28de6 add comments for hls m3u8, target duration may should not changed. 2015-02-10 15:18:20 +08:00
winlin
693c7a5349 refine hls m3u8, use LR(0x0a, \n) as new line char 2015-02-10 11:38:14 +08:00
winlin
81ea6d34ce add pdf of hls rfc, corrent the content type. 2015-02-10 10:58:27 +08:00
winlin
a23191497f fix #136, support hls without io(in ram). 2.0.112 2015-02-03 16:01:07 +08:00
winlin
4246be92c9 for #250, merge avc to codec. use queue to dequeue. 2015-01-31 21:16:42 +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
winlin
2c42350489 for #301, http ts stream support h.264+mp3. 2.0.106 2015-01-25 16:42:22 +08:00
winlin
ea85ad2e20 for #293, #250, move the ts codec to kernel ts. 2015-01-25 10:54:25 +08:00
winlin
8ace73f30d for #151, use absolutely overflow to make jwplayer happy. 2.0.103 2015-01-23 15:29:14 +08:00
winlin
a4ba40952a for #250, rename rtmp to protocol dir. 2015-01-23 10:07:20 +08:00
winlin
2a05783d5c for #293, support http ts stream. 2.0.101 2015-01-22 18:32:10 +08:00
winlin
dfe385d0c9 for #293, move the simple buffer to kernel. 2015-01-22 18:13:33 +08:00
winlin
0f59073400 refine code, rename the pts to dts although both ok for audio. 2015-01-22 17:35:07 +08:00
winlin
913f98b902 for bug #293, http ts stream, move the avc codec from app to kernel. 2015-01-22 17:08:38 +08:00
winlin
63309a0538 refine for bug #288, drop info frame without error. 2015-01-14 11:55:15 +08:00
winlin
b705ed0b90 for bug #288, refine the codec decode info frame failed. 1.0.21 2015-01-14 11:32:19 +08:00
winlin
b466756931 merge from feilong for bug #281. 2015-01-08 17:44:08 +08:00
winlin
27e0521ace fix #281, fix hls bug ignore type-9 send aud. 1.0.20 2015-01-08 17:37:28 +08:00
winlin
f881bc43b5 fix #179: dvr support custom filepath by variables. 2.0.87 2015-01-03 12:54:54 +08:00
winlin
569596c10d update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
winlin
e27c95b0e8 merge from 1.0release for #268, the hls pcr is negative when startup. 2.0.78 2014-12-29 08:45:19 +08:00
winlin
513c1ec6d5 fix #268, the hls pcr is negative when startup. 1.0.14 2014-12-29 08:38:29 +08:00
winlin
eef8034632 merge from 1.0release for bug #264. 2.0.74 2014-12-20 11:58:39 +08:00
winlin
7737042795 fix #264, remove the test code. 1.0.11 2014-12-20 11:56:16 +08:00
winlin
1dfac0bf1d fix #264, support disconnect publish connect when hls error. 1.0.11 2014-12-20 11:45:59 +08:00
winlin
bba6063492 for bug #251, the shared ptr message share the header. 2.0.64 2014-12-07 11:25:05 +08:00
winlin
de993b6465 for bug #251, refine the directly access ptrs for hls,dvr,forwarder,consumer. 2014-12-05 23:49:53 +08:00
winlin
0ea8cd9e84 for bug #248, use simple buffer for http. 2014-12-04 11:29:47 +08:00
winlin
2cb8b7dd52 for bug #248, use simple buffer for hls. 2014-12-04 11:27:07 +08:00
winlin
ea0e837cd6 move the srs_kernel_buffer to srs_protocol_buffer. 2014-12-03 18:56:09 +08:00
winlin
9789335d0b fix #151, always reap ts whatever audio or video packet. 0.9.223. 2014-10-08 15:15:57 +08:00
winlin
bc6616bd1f refine code according to inspect of clion. 0.9.219 2014-09-28 11:08:30 +08:00
winlin
7b24788445 for bug #143, build on centos5. 2014-08-02 22:18:39 +08:00
winlin
8497b22d4a complete the consts refine 2014-07-20 13:45:54 +08:00
winlin
573952e2fc refine macros of HTTP 2014-07-20 13:33:21 +08:00
winlin
a9f7f1ecfe refine the consts to kernel consts 2014-07-20 13:23:45 +08:00
winlin
465ff88b1f refine hls avc/aac codec, move metadata to it. 2014-07-16 09:37:27 +08:00
winlin
a4d3283cdd refine hls codec sample info. 0.9.161 2014-07-15 10:44:06 +08:00
winlin
ccd99381e6 fix bug, when disable all, some code of HLS must be exported. 2014-07-13 13:42:08 +08:00
winlin
88c94193a3 rename rtmp_stack to stack. remove the global templte function to member function. 2014-07-12 08:47:47 +08:00
winlin
96e0273e99 refine hls, extract the flv/aac sample rates 2014-07-06 17:32:48 +08:00
winlin
dc7b952043 change HLS audio delay to 100ms. 0.9.153 2014-07-06 14:28:05 +08:00
winlin
f895523ac6 fix hls media codec info bug, ignore nal_unit_type 7/8/9. 0.9.152 2014-07-06 13:53:30 +08:00
winlin
21a75924ad fix hls media codec info bug, ignore nal_unit_type 7/8/9. 0.9.152 2014-07-06 13:48:03 +08:00
winlin
aefff75d08 fix #103, support all aac sample rate, add detail codec logs. 2014-07-06 09:59:41 +08:00
winlin
b2303c5704 refine code, use macro for hls resample audio 2014-07-05 23:45:43 +08:00
winlin
921b7d239f refine code, use macro for hls resample audio 2014-07-05 23:43:28 +08:00
winlin
63214d0f2b fix #81: support all aac sample rate, for instance, 48000. to 0.9.150 2014-07-05 23:29:45 +08:00
winlin
010eb09a30 Merge branch 'master' of github.com:winlinvip/simple-rtmp-server 2014-07-05 09:32:13 +08:00
winlin
032118581a refine http/dvr/hls to use file reader/writer. 0.9.146 2014-07-05 07:33:18 +08:00
wenjiegit
d7454134c9 Update srs_app_hls.cpp 
for hls, srs should not allow player to cache m3u8 list.

add #EXT-X-ALLOW-CACHE:NO to m3u8 file.
 2014-07-04 09:53:50 +08:00
winlin
1970e18ed6 fix #108: disable the time jitter for encoder non-monotonical stream. 0.9.133 2014-06-25 17:14:11 +08:00
winlin
6286759eaa refine codec, extract avc aac codec to app. 2014-06-08 22:36:17 +08:00
winlin
31b568b013 refine core, move specified functions to kernel utility. 2014-06-08 13:03:03 +08:00
winlin
4970664e37 move codec to kernel. 2014-05-28 17:37:15 +08:00
winlin
dc66c525fd refine autofree, only free object, never free arrays 2014-05-14 09:41:41 +08:00
winlin
a4410a4fa9 update pithy-print to 10s. refine log 2014-05-04 10:45:13 +08:00
winlin
80ddddf823 refine RTMP protocol completed, to 0.9.81 2014-04-29 14:44:07 +08:00
winlin
ebf6203c3b refine rtmp protocol stack, refer to go.rtmp 2014-04-29 13:39:16 +08:00
winlin
2bcaeccc51 edge support play and ingest origin stream. change to 0.9.77 2014-04-26 21:41:18 +08:00
winlin
ab9a2ddd6c dvr support segment plan 2014-04-17 18:13:59 +08:00
winlin
996d042a33 add comments for file stream 2014-04-17 12:59:35 +08:00
winlin
005502a07e update comments for HLS on_hls_start 2014-04-16 11:11:53 +08:00
winlin
23a1b29935 add dvr option. refine macros of auto headers 2014-04-15 14:01:57 +08:00
winlin
3f13726544 add log level in conf. change to 0.9.45 2014-04-03 18:32:51 +08:00
winlin
4c8d6d2eb1 fix bug of hls and rename demo player stream to live/demo. change to 0.9.36 2014-03-26 18:13:33 +08:00
winlin
4f284b20f0 drop ts segment when duration is too small 2014-03-21 17:35:27 +08:00
winlin
5758551508 support hls republish 2014-03-21 17:10:24 +08:00
winlin
2cebaff9d8 refine hls, ts temp file use ext .tmp 2014-03-21 13:10:47 +08:00
winlin
e0fb1029c9 support pure audio hls. change to 0.9.24 2014-03-20 18:55:45 +08:00
winlin
b708f588fc refine the hls module, clear logic dead code, rename TSCache to HlsCache, M3u8Muxer to HlsMuxer. that is, make it to more readable. 2014-03-20 18:19:08 +08:00
winlin
c85dde7f3f substitute all TAB with 4spaces. 2014-03-18 11:32:58 +08:00
winlin
9fd48d84c1 refine amf0 object size to total_size, elem count to count 2014-03-08 22:59:30 +08:00
winlin
bfe771bbba amf0 utest: null,undefined,object-eof to any 2014-03-08 14:38:19 +08:00
winlin
880f4f5dc2 final the modularity, rename the app module. 2014-03-02 21:49:09 +08:00
Renamed from trunk/src/app/srs_core_hls.cpp (Browse further)