Commit Graph

378 Commits (c4a510b83488d456abdd9edcf000697382d98bec)

Author SHA1 Message Date
winlin ba6c3132e3 refine code, use decoder to parse flv stream 10 years ago
winlin b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 10 years ago
winlin 115daa3cc1 migarate from winlinvip to srs org 10 years ago
winlin d19dfa528e abs overflow also plus the deviation, for pure audio hls. 10 years ago
winlin a28eec89b0 support ingest hls with m3u8 in m3u8. 10 years ago
winlin ba6736839b support hls ingest, fix the bugs. 10 years ago
winlin 1f93fb3399 refine hls notify, support timeout. 10 years ago
winlin d8988da0ea refine the hls_on_notify, calc the spent time in ms. 10 years ago
winlin 23b310971e guess again when annexb change to ibmf. 10 years ago
winlin 546be09219 fix #375, fix hls bug, keep cc continous between ts files. 2.0.159. 10 years ago
winlin 6e2d756e1b fix the bug of h.264 bit stream demux. 10 years ago
winlin 61d5b78ae5 refine the h264 parser, one ts message should parsed to one rtmp/flv message. 10 years ago
winlin 77c29da26b for #304, rewrite annexb mux for ts, refer to apple sample. 2.0.157. 10 years ago
winlin 70c59da1bf enhanced avc decode, parse the sps get width+height. 2.0.156. 10 years ago
winlin e458305f81 add utc time format. 10 years ago
winlin cd682ae4be update donations. fix hls path bug. 10 years ago
winlin 01ee456649 fix the ts parse bug, should never complete message when PES packet length is 0. 10 years ago
winlin 896983c1dc refine the aac codec enum name 10 years ago
winlin 1401f2e0ab ignore when sps/pps consumed all frame. 10 years ago
winlin e818f36316 fix #360, fix build bug for centos7. 10 years ago
winlin f69fa7273b fix #302, remove the thread unsafe code, no static. 10 years ago
winlin bbac2348db for #354, remove the double underscore functions and variables. 10 years ago
winlin c6817cc422 for #354, remove the double underscore of macro. 10 years ago
wenjie.zhao e57bda8908 Merge code.
Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp
10 years ago
wenjie.zhao d4198ee8ba add hds supported. 10 years ago
winlin f9767c91b5 fix configure bug, refine code for stream caster. 10 years ago
winlin 6c11207e28 fix http ts bug, the adts use id=1 which indicates the aac encoding. 10 years ago
winlin 5c3c38684b fix the bug of flv stream, metadata type should be 18 10 years ago
winlin db7ddfd510 fix #155, #135, support osx(darwin) for mac pro. 2.0.137. 10 years ago
winlin 5143e3a58d fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136 10 years ago
winlin 2e9f2753c9 for #316, add stream codec info. 2.0.135 10 years ago
winlin 885b9af122 for #310, refine code to support he/hev2, use aac object. 10 years ago
winlin 8dbabe3708 fix #310, refine aac LC, support aac HE/HEv2. 2.0.134. 10 years ago
winlin d3e2838fc6 for #310, refine the aac profile for adts and aac object for RTMP sequence header. 10 years ago
winlin 04f3f2a8f8 for #316, add codec info to stream. 10 years ago
winlin 3982ec1d87 refine http request parse. 2.0.132. 10 years ago
winlin e7fd733dc5 fix the long long warning. 10 years ago
winlin b903a7b436 for #179, dvr suport vhost/app/stream level control. 2.0.125. 10 years ago
winlin 1cb8e44b1b fix #304, fix hls bug, write pts/dts error. 2.0.124. 10 years ago
winlin 849e59b05d for #179, support http api to start dvr. 10 years ago
winlin c67a4fdf97 for #179, enable http api crossdomain for dvr api. 10 years ago
winlin 1445086451 for #179, update the metadata of flv dvr file. 10 years ago
winlin a984eeecab refine dvr, append file when dvr file exists. 2.0.122. 10 years ago
winlin 1102c7a58f refine pithy print to more easyer to use 2.0.121. 10 years ago
winlin 9d233db27e fix #133, support push rtsp to srs. 2.0.120. 10 years ago
winlin a954040d29 for #133, rtsp parse aac from rtp packet. 10 years ago
winlin 0cc693a3b8 for #133, decode the h264 NALU from rtp. 10 years ago
winlin 4807f7850d for #133, rtsp parse the announce packet, parse the sps/pps and audio sequence header by base64. 10 years ago
winlin 604f4cc57b for #133, support the rtsp options request and response. 10 years ago
winlin 78f34ad46f for #304, support config default acodec/vcodec. 2.0.118. 10 years ago
winlin 922150b2cf for #304, rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117. 10 years ago
winlin 3c813847bd rewrite the ts remux of hls. 2.0.117 10 years ago
winlin 1ed3e283ab implements the pat/pmt write ts header. 10 years ago
winlin e19ee0cb99 for #311, set pcr_base to dts. 2.0.114. 10 years ago
winlin 87519aaae8 fix the avc codec bug, the ibmf format may like the annexb, we must guess only one time. 2.0.114 10 years ago
winlin 66931a8890 try to fix hls problem, print the video packets. 10 years ago
winlin 5a3cd235fd refine hls, try to fix the hls ts corrupt problem. 10 years ago
winlin 4820d455d5 for #310, workaround to force to LC/MAIN, donot support SSR above. 2.0.113 10 years ago
winlin 693c7a5349 refine hls m3u8, use LR(0x0a, \n) as new line char 10 years ago
winlin 4246be92c9 for #250, merge avc to codec. use queue to dequeue. 10 years ago
winlin 70c8fe13c4 for #250, support h264 video for push mpegts over udp. 2.0.110 10 years ago
winlin 66fccdbbd1 for #250, demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109. 10 years ago
winlin bce78fdab6 for #250, add comments for elemetary stream specifed by stream_id. 10 years ago
winlin b38bae2a89 for #250, refine parse pes packet, remove the clear method. 10 years ago
winlin 1685cdd48e for #250, parse pes packet ok, ts message ok. 10 years ago
winlin 486277089d for #250, parse the PES ts packet payload. 10 years ago
winlin 755e61e011 update the qt project. 10 years ago
winlin cc87992fe0 for #250, decode the PMT and PAT 10 years ago
winlin 7692e50fc2 for #250, calc and verify the crc32 of PAT. 10 years ago
winlin 52b62918d9 for #250, decode the PAT of PSI ts packet. 10 years ago
winlin 51aecb8fde for #250, decode the ts packet header and adaptation field. 10 years ago
winlin bd395904df for #250, the ts packet and adaptation field. 10 years ago
winlin aff7a1cb4d add ts packet definition for #250. 10 years ago
winlin 919a85b103 for #301, hls support h.264+mp3, ok for vlc. 2.0.107 10 years ago
winlin 2c42350489 for #301, http ts stream support h.264+mp3. 2.0.106 10 years ago
winlin aaade0f04f for #268, refine the pcr start at 0, dts/pts plus delay. 2.0.105 10 years ago
winlin c9d270fbe0 refine code for #250, ts remux 10 years ago
winlin ea85ad2e20 for #293, #250, move the ts codec to kernel ts. 10 years ago
winlin 52891b491a listen and serve stream caster mpegts over udp. 10 years ago
winlin 2a05783d5c for #293, support http ts stream. 2.0.101 10 years ago
winlin dfe385d0c9 for #293, move the simple buffer to kernel. 10 years ago
winlin 77d78eac5c for #293, add http ts stream framework. 10 years ago
winlin 913f98b902 for bug #293, http ts stream, move the avc codec from app to kernel. 10 years ago
winlin 25807298ad alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux 10 years ago
winlin e6549b261c for #293, support http mp3 streaming 10 years ago
winlin 99bf397487 for bug #293, add mp3 id3 spec 10 years ago
winlin 15d87537a1 for bug #293, support aac stream. 10 years ago
winlin 3244c083c7 for bug #293, support http aac stream 10 years ago
winlin 7674524c31 for #239, empty the aac encoder 10 years ago
winlin c0233542bf for #293, add aac encoder for http aac stream. 10 years ago
winlin 9bbbaad288 for bug #277, refine http api refer to go http-framework. 2.0.97 10 years ago
winlin a1f887f46f refine code, move onMetaData to consts. 10 years ago
winlin 5661fc2676 refine dvr and rtmp dump, write the original data. 10 years ago
winlin f881bc43b5 fix #179: dvr support custom filepath by variables. 2.0.87 10 years ago
winlin 75f2607685 fix #211, support security allow/deny publish/play all/ip. 2.0.86 10 years ago
winlin 9d34820c80 fix #158: http-callback check http status code ok(200). 2.0.84 10 years ago
winlin 518a5a72ab fix #263, srs-librtmp flv read tag should init size. 2.0.82 10 years ago
winlin 569596c10d update copyright, from 2013 to 2015 10 years ago
winlin 10297fab51 fix #257, support 0.1s+ latency. 2.0.70 10 years ago
winlin bba6063492 for bug #251, the shared ptr message share the header. 2.0.64 10 years ago
winlin 330819fb74 for bug #251, refine the mic algorithm. 2.0.63 10 years ago
winlin d53fd7f570 for bug #251, support mic(message iovs cache). 2.0.61 10 years ago
winlin fad6074a25 set send socket buf. mw/mr sleep default to 350. 10 years ago
winlin 4c6cf959c1 refine fast buffer, check available bytes to read. 10 years ago
winlin b1d7fbe668 fix #241, add mw(merged-write) config. 2.0.53 10 years ago
winlin 5589b13d2e for bug #241, support mr(merged-read) config and reload. 2.0.52. 10 years ago
winlin 29324fab46 fix #248, improve about 15% performance for fast buffer. 2.0.49 10 years ago
winlin ea0e837cd6 move the srs_kernel_buffer to srs_protocol_buffer. 10 years ago
winlin 2fdf994350 for bug #241, use heap to alloc the socket buffer. 10 years ago
winlin 565f29ed6c Revert "for bug #241, merge big chunks for publish, no use."
This reverts commit 6b57597718.
10 years ago
winlin 6b57597718 for bug #241, merge big chunks for publish, no use. 10 years ago
winlin 18c308248e refine code by winlin, for merged from allspace. 10 years ago
winlin 1855c9429c merge from allspace, to srs-librtmp, for vs2010 10 years ago
winlin e492fa5353 fix #212, support publish aac adts raw stream. 2.0.31. 10 years ago
winlin d6072b16c0 support compile srs-librtmp on windows. 2.0.26 10 years ago
winlin 2c601a0069 fix #204, srs-librtmp drop dupliated sps/pps(sequence header). 2.0.22. 10 years ago
winlin 278ff845d3 fix #203, srs-librtmp drop any video before sps/pps(sequence header). 2.0.21. 10 years ago
winlin 7ebca6cb5b refine the type of RTMP from int to char. add srs_parse_timestamp(), 2.0.19 10 years ago
winlin 4af2e78c59 refine code for bug #194, add comments to macros. 10 years ago
winlin cc6aca9ad5 fix #194, writev multiple msgs, support 6k+ 250kbps clients. 2.0.15. 10 years ago
winlin 8acd143a7a fix #194: refine the timeout recv, pulse to 500ms. 2.0.14. 10 years ago
winlin a6f3478a74 for bug #194, remove the poll, it's no-use 10 years ago
winlin 164f632b62 for bug #194, add fds poll, just sleep to send without recv. 10 years ago
winlin e87eacd499 Revert "add srs pipe for bug #194"
This reverts commit f9756ea14c.
10 years ago
winlin f9756ea14c add srs pipe for bug #194 10 years ago
winlin 3358570be6 refine for bug#66, implements the usage. 10 years ago
winlin 57e8356221 fix #184, support AnnexB in RTMP body for HLS. 2.0.2 11 years ago
winlin bc6616bd1f refine code according to inspect of clion. 0.9.219 11 years ago
winlin 002facb85b refine code, fix bug of hls, following jetbrains clion code-inspector. 0.9.215 11 years ago
winlin d0c585af86 max connections is 32756, for st use mmap default. 0.9.209 11 years ago
winlin d4c2aa1e8e add __openssl_compute_key to calc the shared key 11 years ago
winlin 12ad95a5b8 refine HMAC sha256 digest algorithm. 0.9.193 11 years ago
winlin 67403bdbf1 fix #79, fix the reload remove edge assert bug. 0.9.189. 11 years ago
winlin 7b24788445 for bug #143, build on centos5. 11 years ago
winlin 7241fa8744 fix #126, srs_publiser add warnings. refine config utest. 11 years ago
winlin 7865b0e935 refine config, check chunk size. 11 years ago
winlin f562a98602 add configure options --log-verbose/info/trace to compile log macros. 0.9.169 11 years ago
winlin fd8c4989f5 add todo fixme for log verbose and info 11 years ago
winlin 91d2296836 fix #121, srs_info detail log compile failed. 0.9.168. 11 years ago
winlin 6e8c4df4b1 refine error codes. 11 years ago
winlin 1afa6ed607 refine consts. 11 years ago
winlin 2667815123 refine consts, move http consts to kernel consts 11 years ago
winlin 573952e2fc refine macros of HTTP 11 years ago
winlin 198a7f1e9d refine the rtmp consts name 11 years ago
winlin a9f7f1ecfe refine the consts to kernel consts 11 years ago
winlin 736ec48c71 move some consts to kernel consts 11 years ago
winlin 073d900674 add consts to kernel 11 years ago
winlin 9135aa117c use librtmp to implemnts the bandwidth linux tool. 0.9.158 11 years ago
winlin 9556790a5e finish utest of protocol stack. 0.9.156 11 years ago
winlin aefff75d08 fix #103, support all aac sample rate, add detail codec logs. 11 years ago
winlin 63214d0f2b fix #81: support all aac sample rate, for instance, 48000. to 0.9.150 11 years ago
winlin 5a41b1b538 finish kernel utest. to 0.9.149 11 years ago
winlin 1e395e7c10 add assert to flv. 11 years ago
winlin d219a7b67e complete the normal kernel flv utest. 0.9.147 11 years ago
winlin 8271bd657b refine flv codec, rename fast encoder to flv vod stream decoder 11 years ago
winlin 032118581a refine http/dvr/hls to use file reader/writer. 0.9.146 11 years ago
winlin a888e52df1 donot mix the read and write for librtmp 11 years ago
winlin 1a7735182f refine the file stream, to file reader and writer. 0.9.142 11 years ago
winlin f5f54e6008 add utest for kernel codec 11 years ago
winlin b357504b1d fix #109: fix the system jump time, adjust system startup time. 0.9.135 11 years ago
winlin 3f9c23d834 fix #101: for ubuntu14 build error. 11 years ago
winlin a639eb0596 fix bug of buffer assert, erase can accept any value 11 years ago
winlin d48d739fa7 fix bug of detect rtmp, add error code 11 years ago
winlin 0327c85f85 refine kernel codec, remove unused stream 11 years ago
winlin 6286759eaa refine codec, extract avc aac codec to app. 11 years ago
winlin 31b568b013 refine core, move specified functions to kernel utility. 11 years ago
winlin 94cf0c1069 refine kernel buffer. complete the utest for buffer. 11 years ago
winlin 8992e217a9 refine srs buffer, min interfaces 11 years ago
winlin 7ec202ee41 support flv inject and flv http streaming with start=bytes. 0.9.122 11 years ago
winlin 22968c85df supprt inject flv 11 years ago
winlin 4970664e37 move codec to kernel. 11 years ago
winlin 608083d42f add flv injecter, add flv codec to librtmp. 11 years ago
winlin 7920348e5f extract get_local_ip and get_peer_ip to app utility 11 years ago
winlin b13bd70c86 http streaming support flv start index. 11 years ago
winlin 3064e5ec61 fix bug of nx_json parse, to 0.9.104 11 years ago
winlin 2f89c8b2e8 move some utilities from kernel to app. 0.9.99 11 years ago
winlin a1fed15789 add uptime, startup time, load to api 11 years ago
winlin 8388da6325 add miss files. fix bug #60: support aggregate message 11 years ago
winlin f6dd1371bf fix bug #36: never directly use *(int32_t*) to convert, for arm may not support 11 years ago
winlin 94076b3246 fix bug #50, ubuntu14 build error 11 years ago
winlin a4410a4fa9 update pithy-print to 10s. refine log 11 years ago
winlin d0dff2d332 fix bug #34: convert signal to io. 0.9.85 11 years ago
winlin fd0efecbc8 refine ingester pithy print 11 years ago
winlin 23b04e2a57 completed the edge reload, to 0.9.79 11 years ago
winlin c681098949 fix bug of edge, one fd for one thread 11 years ago
winlin 16319d73fd implements basic edge(play and publish), with bug 11 years ago
winlin ec96072472 add publish edge framework 11 years ago
winlin acba4cfdc6 add edge framework 11 years ago
winlin 435e02db5d dvr use .tmp and rename to .flv when finished. 11 years ago
winlin a5f4f6bd14 add meminfo 11 years ago
winlin 15aea4d9b3 add cpuinfo 11 years ago
winlin 951a93ab86 get self proc and system proc stat 11 years ago
winlin 117fd67950 add cpu stat 11 years ago
winlin 2d1c28cff9 update dvr, support segment plan 11 years ago
winlin 73459547e1 support dvr. change to 0.9.69 11 years ago
winlin 9a036958d7 fix bug #45, support duration for live. change to 0.9.62 11 years ago
winlin eda1ddc03d support reload log level/logfile/tank 11 years ago
winlin b38df9cd1a refine main object(server, config, log, context), handler reload in intialize(), change to 0.9.59 11 years ago
winlin f2f30dcc52 add utility, change log to trace 11 years ago
winlin 6c5d8b4851 refine reload config 11 years ago