winlin
|
f69fa7273b
|
fix #302, remove the thread unsafe code, no static.
|
2015-03-23 21:19:04 +08:00 |
|
winlin
|
bbac2348db
|
for #354, remove the double underscore functions and variables.
|
2015-03-21 11:55:28 +08:00 |
|
winlin
|
c6817cc422
|
for #354, remove the double underscore of macro.
|
2015-03-21 10:25:03 +08:00 |
|
wenjie.zhao
|
e57bda8908
|
Merge code.
Conflicts:
trunk/configure
trunk/src/app/srs_app_source.cpp
trunk/src/kernel/srs_kernel_error.hpp
|
2015-03-11 14:18:09 +08:00 |
|
wenjie.zhao
|
d4198ee8ba
|
add hds supported.
|
2015-03-11 13:34:58 +08:00 |
|
winlin
|
f9767c91b5
|
fix configure bug, refine code for stream caster.
|
2015-03-10 18:07:43 +08:00 |
|
winlin
|
6c11207e28
|
fix http ts bug, the adts use id=1 which indicates the aac encoding.
|
2015-03-10 17:58:29 +08:00 |
|
winlin
|
5c3c38684b
|
fix the bug of flv stream, metadata type should be 18
|
2015-03-10 17:04:02 +08:00 |
|
winlin
|
db7ddfd510
|
fix #155, #135, support osx(darwin) for mac pro. 2.0.137.
|
2015-03-10 12:50:27 +08:00 |
|
winlin
|
5143e3a58d
|
fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136
|
2015-03-08 19:59:10 +08:00 |
|
winlin
|
2e9f2753c9
|
for #316, add stream codec info. 2.0.135
|
2015-03-08 18:33:35 +08:00 |
|
winlin
|
885b9af122
|
for #310, refine code to support he/hev2, use aac object.
|
2015-03-08 17:56:49 +08:00 |
|
winlin
|
8dbabe3708
|
fix #310, refine aac LC, support aac HE/HEv2. 2.0.134.
|
2015-03-08 17:36:43 +08:00 |
|
winlin
|
d3e2838fc6
|
for #310, refine the aac profile for adts and aac object for RTMP sequence header.
|
2015-03-08 17:33:52 +08:00 |
|
winlin
|
04f3f2a8f8
|
for #316, add codec info to stream.
|
2015-03-08 15:33:08 +08:00 |
|
winlin
|
3982ec1d87
|
refine http request parse. 2.0.132.
|
2015-03-06 11:36:26 +08:00 |
|
winlin
|
e7fd733dc5
|
fix the long long warning.
|
2015-03-04 09:59:40 +08:00 |
|
winlin
|
b903a7b436
|
for #179, dvr suport vhost/app/stream level control. 2.0.125.
|
2015-02-25 09:20:11 +08:00 |
|
winlin
|
1cb8e44b1b
|
fix #304, fix hls bug, write pts/dts error. 2.0.124.
|
2015-02-24 18:39:31 +08:00 |
|
winlin
|
849e59b05d
|
for #179, support http api to start dvr.
|
2015-02-21 23:09:21 +08:00 |
|
winlin
|
c67a4fdf97
|
for #179, enable http api crossdomain for dvr api.
|
2015-02-21 21:17:59 +08:00 |
|
winlin
|
1445086451
|
for #179, update the metadata of flv dvr file.
|
2015-02-21 19:14:05 +08:00 |
|
winlin
|
a984eeecab
|
refine dvr, append file when dvr file exists. 2.0.122.
|
2015-02-19 19:50:10 +08:00 |
|
winlin
|
1102c7a58f
|
refine pithy print to more easyer to use 2.0.121.
|
2015-02-19 18:56:21 +08:00 |
|
winlin
|
9d233db27e
|
fix #133, support push rtsp to srs. 2.0.120.
|
2015-02-18 22:28:39 +08:00 |
|
winlin
|
a954040d29
|
for #133, rtsp parse aac from rtp packet.
|
2015-02-18 13:37:08 +08:00 |
|
winlin
|
0cc693a3b8
|
for #133, decode the h264 NALU from rtp.
|
2015-02-18 11:49:42 +08:00 |
|
winlin
|
4807f7850d
|
for #133, rtsp parse the announce packet, parse the sps/pps and audio sequence header by base64.
|
2015-02-17 14:16:02 +08:00 |
|
winlin
|
604f4cc57b
|
for #133, support the rtsp options request and response.
|
2015-02-16 22:15:59 +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
|
e19ee0cb99
|
for #311, set pcr_base to dts. 2.0.114.
|
2015-02-10 23:15:43 +08:00 |
|
winlin
|
87519aaae8
|
fix the avc codec bug, the ibmf format may like the annexb, we must guess only one time. 2.0.114
|
2015-02-10 22:37:29 +08:00 |
|
winlin
|
66931a8890
|
try to fix hls problem, print the video packets.
|
2015-02-10 19:58:24 +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
|
693c7a5349
|
refine hls m3u8, use LR(0x0a, \n) as new line char
|
2015-02-10 11:38:14 +08:00 |
|
winlin
|
4246be92c9
|
for #250, merge avc to codec. use queue to dequeue.
|
2015-01-31 21:16:42 +08:00 |
|
winlin
|
70c8fe13c4
|
for #250, support h264 video for push mpegts over udp. 2.0.110
|
2015-01-31 19:46:55 +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
|
755e61e011
|
update the qt project.
|
2015-01-29 11:27:56 +08:00 |
|
winlin
|
cc87992fe0
|
for #250, decode the PMT and PAT
|
2015-01-27 18:35:43 +08:00 |
|
winlin
|
7692e50fc2
|
for #250, calc and verify the crc32 of PAT.
|
2015-01-27 17:04:30 +08:00 |
|
winlin
|
52b62918d9
|
for #250, decode the PAT of PSI ts packet.
|
2015-01-27 16:25:46 +08:00 |
|