Commit Graph

79 Commits (1ed5118246fd9160dc3bb29d290513725c695e4d)

Author SHA1 Message Date
winlin 7ac932cfa0 update to 2013-2017 8 years ago
winlin eac5440559 merge from srs2 #558 #559 9 years ago
flowerwrong d42a58faf4 Keep blank of line 9 years ago
flowerwrong 9ddd0054a1 Add tcUrl to on_publish http hook for issue #548 9 years ago
winlin f516636448 refine code for hooks and http core. 9 years ago
winlin d0c74fa7cd update 2015 to 2016 9 years ago
winlin ffef3905af merge from srs2. 9 years ago
winlin 2830ee12c1 fix the on_hls.ts_url bug. 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 f57e537686 for #515, merge from srs2, use SrsAutoFreeA. 9 years ago
winlin f4f76cd196 for #515, use SrsAutoFreeA to free the array. 9 years ago
winlin 9eebb89432 Merge branch '2.0release' into develop 10 years ago
winlin 91e9fc7e5b fix typo of INVLIAD to INVALID 10 years ago
winlin ed80d9d281 merge from srs2 10 years ago
winlin 0c8209cccd fix #448, fix the bug of response of http hooks. 2.0.195 10 years ago
winlin 168625dce2 rename rtmp amf0 to protocol amf0. 10 years ago
winlin b471c6e61c refine code, use json integter rather than number. 10 years ago
winlin 3042115385 refine json to_str to dumps. 10 years ago
winlin 3f7e69b617 json objects support dumps to string. 10 years ago
winlin 1fd83d9314 refine the order. 10 years ago
winlin 256459e1ec fix the utest bug 10 years ago
winlin eb9aa47ab1 merge from 2.0 10 years ago
winlin 0d57ef9373 fix #458, http hooks use source thread cid. 2.0.188 10 years ago
winlin 04bea781ca use amf0 encode for json encode. 10 years ago
winlin 66a26bdce8 move json from app to protocol 10 years ago
winlin 31d2de3f23 fix #435, add pageUrl for HTTP callback on_play. 10 years ago
winlin baa892a762 merge srs_app_st_socket to srs_app_st. 10 years ago
winlin d103557a8b merge the rtmp sdk to stack. 10 years ago
winlin 19e1f610a3 merge from bravo, parse the http reponse in json of bravo system. 10 years ago
winlin 6bfb743aa0 remove the unused app http file 10 years ago
winlin f0ae66a081 merge the app http to conn. 10 years ago
winlin ce1bb6c605 refine code, extrat the ISrsHttpMessage. 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 0acb942c3a update on_hls, add ts_url, m3u8 and m3u8_url. 10 years ago
winlin 542aab4557 fix the hls notify bug, pass the query to get path. 10 years ago
winlin e5b8e0da01 fix async call and hls_nb_notify bug. 10 years ago
winlin 5d37e47783 support config the hls_nb_notify. 10 years ago
winlin 5c00ce8a96 refine hls on_hls_notify, read a little of ts. 10 years ago
winlin 1f93fb3399 refine hls notify, support timeout. 10 years ago
winlin 310157ab77 refine the hls_on_notify, calc the spent time in ms. 10 years ago
winlin e6d6bdfe57 refine the hls_on_notify, only read a chunk. 10 years ago
winlin e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts. 10 years ago
winlin 64b065e450 for hls callback, add duration of ts. 10 years ago
winlin 3b4bd194b6 refine http hooks, donot pass the known variable. 10 years ago
winlin c49bc0628e support on_hls for http hooks. 2.0.152. 10 years ago
winlin c6817cc422 for #354, remove the double underscore of macro. 10 years ago
Nimrod A. Abing (on kohima) a95bd7d30e Modified on_close webhook.
Pass the send_bytes and recv_bytes count to the web hook.
10 years ago
winlin 1277968d4a refine http client, use initialize to set host and port. 10 years ago