Commit Graph

66 Commits (3ffb0980f54a0f2bb9016add741f62733a947f3d)

Author SHA1 Message Date
HungMingWu 815d50f00a Remove warning: C++11 requires a space between string literal and macro (#874)
On Ubuntu 17.04, the default gcc compiler version is 6.3.0.
It switch standard from c++98 to c++11.
So it would generate verbose warnings.
8 years ago
winlin f97260be1d Merge SRS2 8 years ago
winlin ae5450181c Fix #636, FD leak for requesting empty HTTP stream. 2.0.241 8 years ago
winlin c97f2233a2 Merge SRS2 for #851 8 years ago
winlin ff87318b95 Fix #851, HTTP API support number of video frames for FPS. 2.0.240 8 years ago
winlin 0a57a46016 Refine LICENSE 8 years ago
winlin f32aab3d92 For #299, refine code. 8 years ago
winlin 733ba73d54 for #738, write mp4 samples. 8 years ago
winlin 79def81792 for #742, refine the rtmp conn, use info as data cluster. 8 years ago
winlin 4583a63789 for #742, refine code for recv thread. 8 years ago
winlin 3fe338d1c5 for #742, use ms for application clock tbn. 8 years ago
winlin 7ac932cfa0 update to 2013-2017 8 years ago
winlin d0c74fa7cd update 2015 to 2016 9 years ago
winlin 01c46bdbfd rename org simle-rtmp-server to ossrs 9 years ago
winlin 1ffd5fd455 rename org simple-rtmp-server to ossrs 9 years ago
winlin d32632ee8a rename SrsFastBuffer to SrsFastStream 10 years ago
winlin 738642073e for #319, refine config, collect the mr and publish timeout 10 years ago
winlin c75f05c88b fix the log cid display error, merge the publish recv thread log to publish connection. 10 years ago
winlin 2cf526ffc7 close #454, support obs restart publish. 2.0.184 10 years ago
winlin d103557a8b merge the rtmp sdk to stack. 10 years ago
winlin 5908096fc3 refine the thread, protocol, kbps code. 2.0.166 10 years ago
winlin cfc0877ec9 refine the thread, add all callback. 10 years ago
winlin e5f449ce36 refine the thread to three category. 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 a4ba40952a for #250, rename rtmp to protocol dir. 10 years ago
winlin 5f194bc87c merge from feilong, the crash for cosumer wait. 10 years ago
winlin a402ca7120 refine code, the consumer always alive longer than queue recv thread. 10 years ago
winlin 569596c10d update copyright, from 2013 to 2015 10 years ago
winlin db13c725a6 refine #259, rename the on_dispose to wakeup. 2.0.73 10 years ago
winlin 61a648f1d2 refine for #259, chmod -x files. 10 years ago
zhengfl 2317f0e767 refine 11 years ago
zhengfl bafdd83122 last 11 years ago
zhengfl 1e34d2a5cd client connection no disconnect 11 years ago
winlin 10297fab51 fix #257, support 0.1s+ latency. 2.0.70 10 years ago
winlin f9b9a60de7 for bug #251, remove the SrsMessage, use SrsCommonMessage or SrsSharedPtrMessage. 2.0.60 10 years ago
winlin 4c1d5c0d1e refine the log for mw and mr. 2.0.55 10 years ago
winlin fad6074a25 set send socket buf. mw/mr sleep default to 350. 10 years ago
winlin 98647d6e67 limit the user-space buffer size to 128KB, 128MB for 1k publishers. 10 years ago
winlin 76af04c55d refine the recv buffer for mr. 10 years ago
winlin f1192a8302 fix bug for bug #241, default to 32k for socket buffer. 10 years ago
winlin 5589b13d2e for bug #241, support mr(merged-read) config and reload. 2.0.52. 10 years ago
winlin a23b5b9a4b for bug#241, simplify the buffer, donot change its size. 10 years ago
winlin 4b09531e2f for bug #241, simplify the merged read config macros. 10 years ago
winlin 60bc9c2aa0 add performance header to control options for performance. 2.0.50 10 years ago
winlin 315f981821 refine for bug #241, increase the small bytes for merged read. 10 years ago
winlin 5791ed59fd for bug #241, refine the socket max buffer. 10 years ago
winlin 4785f882d4 for bug #241, refine the max buffer and kbps. 10 years ago
winlin 850946bb13 for bug #241, calc the small and sleep for merged read. 10 years ago
winlin aee00877df for bug #241, change buffer size when chunk size changed. 10 years ago