winlin
|
23b310971e
|
guess again when annexb change to ibmf.
|
2015-04-09 18:03:45 +08:00 |
|
winlin
|
71e1602458
|
merge from 2.0.159
|
2015-04-09 12:35:53 +08:00 |
|
winlin
|
bd77f995bf
|
ignore the unknown flv tag.
|
2015-04-09 12:35:17 +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
|
29ac4c724b
|
change default log tank to file.
|
2015-04-07 17:55:45 +08:00 |
|
winlin
|
cfed8e81c5
|
merge from 2.0.158
|
2015-04-07 17:44:09 +08:00 |
|
winlin
|
e56d7add44
|
fix bug of config to parse the default value. 2.0.158
|
2015-04-07 17:42:41 +08:00 |
|
winlin
|
aef97db77a
|
refine the config code.
|
2015-04-07 17:04:04 +08:00 |
|
winlin
|
931370e9f6
|
Merge branch '2.0release' into develop
|
2015-04-07 10:30:53 +08:00 |
|
winlin
|
e7fd309cb0
|
refine hls info, show the deviation in seconds and pieces.
|
2015-04-07 10:30:45 +08:00 |
|
winlin
|
e958305d09
|
Merge branch '2.0release' into develop
|
2015-04-04 18:24:13 +08:00 |
|
winlin
|
6e2d756e1b
|
fix the bug of h.264 bit stream demux.
|
2015-04-04 18:24:07 +08:00 |
|
winlin
|
bd7db5aed6
|
only ignore the aud message.
|
2015-04-04 16:05:11 +08:00 |
|
winlin
|
61d5b78ae5
|
refine the h264 parser, one ts message should parsed to one rtmp/flv message.
|
2015-04-04 15:53:36 +08:00 |
|
winlin
|
4329366c08
|
for #304, do not add deviation for absolute overflow.
|
2015-04-04 15:00:24 +08:00 |
|
winlin
|
4f9df4f1a0
|
merge from 2.0.157, reap ts on the IDR.
|
2015-04-04 13:31:02 +08:00 |
|
winlin
|
77c29da26b
|
for #304, rewrite annexb mux for ts, refer to apple sample. 2.0.157.
|
2015-04-04 13:30:13 +08:00 |
|
winlin
|
70c59da1bf
|
enhanced avc decode, parse the sps get width+height. 2.0.156.
|
2015-04-03 23:17:50 +08:00 |
|
winlin
|
7e1749e029
|
refine the comments.
|
2015-04-03 17:20:41 +08:00 |
|
winlin
|
e458305f81
|
add utc time format.
|
2015-04-03 16:42:32 +08:00 |
|
winlin
|
90cd16aae4
|
Merge branch '2.0release' into develop
|
2015-04-03 14:36:09 +08:00 |
|
winlin
|
56cd373015
|
support hls callback with duration.
|
2015-04-03 14:24:47 +08:00 |
|
winlin
|
64b065e450
|
for hls callback, add duration of ts.
|
2015-04-03 13:46:44 +08:00 |
|
winlin
|
c4466a8c0c
|
fix crash bug for hls cleanup.
|
2015-04-03 12:43:40 +08:00 |
|
winlin
|
eb54ec25c9
|
fix compile errors.
|
2015-04-03 11:30:59 +08:00 |
|
winlin
|
cb148e43ee
|
merge from 2.0.155
|
2015-04-03 10:57:34 +08:00 |
|
winlin
|
17c0a5c470
|
fix #372, support transform vhost of edge 2.0.155.
|
2015-04-03 10:56:56 +08:00 |
|
winlin
|
d95e5a3f47
|
Merge branch '2.0release' into develop
|
2015-04-02 15:07:29 +08:00 |
|
winlin
|
4d98cbb965
|
add hls config in api.
|
2015-04-02 15:05:09 +08:00 |
|
winlin
|
fe5783e7a4
|
merge 2.0.154
|
2015-04-02 11:52:49 +08:00 |
|
winlin
|
8401d9ac06
|
fix #366, config hls to disable cleanup of ts. 2.0.154.
|
2015-04-02 11:52:03 +08:00 |
|
winlin
|
2d3d628865
|
merge from 2.0.153
|
2015-03-31 18:09:13 +08:00 |
|
winlin
|
717d088376
|
support server cycle handler. 2.0.153.
|
2015-03-31 18:06:55 +08:00 |
|
winlin
|
e75b7e89d6
|
merge from 2.0.152
|
2015-03-31 17:53:32 +08:00 |
|
winlin
|
3b4bd194b6
|
refine http hooks, donot pass the known variable.
|
2015-03-31 17:52:49 +08:00 |
|
winlin
|
c49bc0628e
|
support on_hls for http hooks. 2.0.152.
|
2015-03-31 17:42:12 +08:00 |
|
winlin
|
97442c56b6
|
enhance hls in floor mode.
|
2015-03-31 17:03:14 +08:00 |
|
winlin
|
76c1957260
|
enhance hls, increase piece one by one.
|
2015-03-31 16:58:20 +08:00 |
|
winlin
|
ef28865991
|
merge from 2.0.151
|
2015-03-31 15:54:37 +08:00 |
|
winlin
|
b9c21b1e8f
|
enhanced hls, warning when ts dup or jmp.
|
2015-03-31 15:54:05 +08:00 |
|
winlin
|
9be7fbba7d
|
user smaller deviation to avoid dup ts.
|
2015-03-31 15:42:21 +08:00 |
|
winlin
|
f6e135943f
|
enhanced hls, support deviation for duration. 2.0.151.
|
2015-03-31 15:39:47 +08:00 |
|
winlin
|
40f186ba82
|
Merge branch '2.0release' into develop
|
2015-03-30 14:08:26 +08:00 |
|
winlin
|
cd682ae4be
|
update donations. fix hls path bug.
|
2015-03-30 14:08:17 +08:00 |
|
winlin
|
abbed8f66c
|
merge from 2.0release
|
2015-03-30 12:56:52 +08:00 |
|
winlin
|
692b751da8
|
for #351, support config the m3u8/ts path for hls. 2.0.149.
|
2015-03-30 12:44:04 +08:00 |
|
winlin
|
922adaf59f
|
Merge branch '2.0release' into develop
|
2015-03-29 22:35:10 +08:00 |
|
winlin
|
85afb6ea6f
|
add donation. fix bug of adts.
|
2015-03-29 22:34:53 +08:00 |
|
winlin
|
01ee456649
|
fix the ts parse bug, should never complete message when PES packet length is 0.
|
2015-03-27 15:27:10 +08:00 |
|
winlin
|
75ca70c619
|
Merge branch '2.0release' into develop
|
2015-03-26 19:58:27 +08:00 |
|
tufang14
|
0faaa61be7
|
seg fault
seg fault
|
2015-03-26 19:57:51 +08:00 |
|
winlin
|
a5c5befad1
|
for parse video ts.
|
2015-03-26 19:52:21 +08:00 |
|
winlin
|
896983c1dc
|
refine the aac codec enum name
|
2015-03-26 11:31:40 +08:00 |
|
winlin
|
1401f2e0ab
|
ignore when sps/pps consumed all frame.
|
2015-03-26 11:07:45 +08:00 |
|
winlin
|
12d5431f3b
|
Merge branch '2.0release' into develop
|
2015-03-26 10:31:19 +08:00 |
|
winlin
|
b319e9ff9c
|
ignore when sps/pps consumed all frame.
|
2015-03-26 10:31:13 +08:00 |
|
winlin
|
c250e3e651
|
Merg branch '2.0release' into develop
|
2015-03-25 20:39:01 +08:00 |
|
winlin
|
e818f36316
|
fix #360, fix build bug for centos7.
|
2015-03-25 20:38:51 +08:00 |
|
winlin
|
713cedfbb4
|
fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148
|
2015-03-23 23:14:29 +08:00 |
|
winlin
|
b6feb0742f
|
fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148
|
2015-03-23 23:13:57 +08:00 |
|
winlin
|
d16ae193f6
|
Merge branch '2.0release' into develop
|
2015-03-23 22:06:25 +08:00 |
|
winlin
|
fcab17741c
|
fix #222, the dvr path rule changed.
|
2015-03-23 22:06:18 +08:00 |
|
winlin
|
df3f24403e
|
Merge branch '2.0release' into develop
|
2015-03-23 21:21:42 +08:00 |
|
winlin
|
02addf61f7
|
fix #302, remove the thread unsafe code, no static.
|
2015-03-23 21:21:36 +08:00 |
|
winlin
|
bfa46e7a98
|
fix #302, remove the thread unsafe code, no static.
|
2015-03-23 21:19:35 +08:00 |
|
winlin
|
f69fa7273b
|
fix #302, remove the thread unsafe code, no static.
|
2015-03-23 21:19:04 +08:00 |
|
winlin
|
0a7b179e14
|
Merge branch '2.0release' into develop
|
2015-03-21 15:38:29 +08:00 |
|
winlin
|
2f2aaf5ee4
|
for #155, refine code, donot check network devices for osx.
|
2015-03-21 15:38:22 +08:00 |
|
winlin
|
e7e17cf15d
|
fix osx bug.
|
2015-03-21 15:24:26 +08:00 |
|
winlin
|
33cca3e027
|
for #155, add todo for osx. 2.0.146
|
2015-03-21 15:22:45 +08:00 |
|
winlin
|
e45c62003a
|
Merge branch '2.0release' into develop
|
2015-03-21 11:55:35 +08:00 |
|
winlin
|
bbac2348db
|
for #354, remove the double underscore functions and variables.
|
2015-03-21 11:55:28 +08:00 |
|
winlin
|
7065db192c
|
for #354, remove the double underscore of macro.
|
2015-03-21 10:42:55 +08:00 |
|
winlin
|
45d9018051
|
Merge branch '2.0release' into develop
|
2015-03-21 10:25:09 +08:00 |
|
winlin
|
c6817cc422
|
for #354, remove the double underscore of macro.
|
2015-03-21 10:25:03 +08:00 |
|
winlin
|
3ca906d560
|
Merge branch '2.0release' into develop
|
2015-03-20 15:10:34 +08:00 |
|
winlin
|
a4709a6439
|
for #151, add comments for the audio overflow ratio.
|
2015-03-19 21:08:42 +08:00 |
|
winlin
|
b1142d83fc
|
Merge branch '2.0release' into develop
|
2015-03-19 17:24:37 +08:00 |
|
winlin
|
0319e85f99
|
support config the audio overflow ratio.
|
2015-03-19 17:24:27 +08:00 |
|
winlin
|
b7138ba9c5
|
merge from 2.0
|
2015-03-19 10:17:51 +08:00 |
|
tufang14
|
e319da3329
|
小瑕疵
小瑕疵
|
2015-03-19 10:16:58 +08:00 |
|
winlin
|
f564c903ac
|
support got uptime and loadavg for osx. 2.0.145
|
2015-03-18 22:30:17 +08:00 |
|
winlin
|
4a50bf1894
|
Merge branch '2.0release' into develop
|
2015-03-18 16:50:54 +08:00 |
|
winlin
|
fbd722bf76
|
refine the fast buffer to more readable.
|
2015-03-18 16:50:47 +08:00 |
|
winlin
|
d25eb0aaa2
|
merge from 2.0
|
2015-03-18 16:35:24 +08:00 |
|
winlin
|
f36e4a443d
|
refine the fast buffer. 2.0.144
|
2015-03-18 16:34:27 +08:00 |
|
winlin
|
6a98758435
|
revert the changes for SRS2.
|
2015-03-17 23:51:10 +08:00 |
|
winlin
|
df2644c850
|
merge from 2.0release
|
2015-03-17 23:48:50 +08:00 |
|
winlin
|
6855ab4c52
|
Merge branch 'develop' of https://github.com/tufang14/simple-rtmp-server into tufang14-develop
|
2015-03-17 23:46:09 +08:00 |
|
winlin
|
9bf6c9e9c6
|
Merge branch '2.0release' into develop
|
2015-03-17 22:36:04 +08:00 |
|
winlin
|
cf3becbc17
|
for #155, osx(darwin) enable http api and stat, rusage is ok.
|
2015-03-17 22:35:47 +08:00 |
|
winlin
|
9f81a8b73e
|
for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.
|
2015-03-17 22:07:38 +08:00 |
|
winlin
|
ab673e1300
|
for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.
|
2015-03-17 22:06:59 +08:00 |
|
tufang14
|
1cc3384a19
|
seg fault
seg fault
|
2015-03-17 17:45:20 +08:00 |
|
winlin
|
79fbeeb8c6
|
Merge branch '2.0release' into develop
|
2015-03-17 15:37:03 +08:00 |
|
winlin
|
8a4312f4ec
|
fix bug, use size_t for string::npos
|
2015-03-17 15:36:12 +08:00 |
|
winlin
|
9e407d32fe
|
change verstion to 3.0.0
|
2015-03-17 07:58:38 +08:00 |
|
winlin
|
2241ba0e34
|
for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142
|
2015-03-17 07:57:58 +08:00 |
|
wenjie.zhao
|
65f404fb42
|
for #340, refine ts prefix code.
|
2015-03-13 02:01:24 +08:00 |
|
wenjie.zhao
|
5969f72354
|
for #340, refine ts prefix code.
|
2015-03-13 01:32:51 +08:00 |
|