1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Commit graph

2951 commits

Author SHA1 Message Date
J
56f75cbbe9 fix #384 2015-04-17 10:12:52 +08:00
winlin
6726a88f47 merge from 2.0release 2015-04-15 17:12:57 +08:00
winlin
22ca46350b fix #383, support mix_correct algorithm. 2.0.161. 2015-04-15 17:12:22 +08:00
winlin
8fbc6526bb for #383, refine code to support mix correct algorithm. 2015-04-15 16:17:52 +08:00
winlin
542aab4557 fix the hls notify bug, pass the query to get path. 2015-04-14 17:53:53 +08:00
winlin
70c1d3cc7e Merge branch '2.0release' into develop 2015-04-14 11:37:06 +08:00
winlin
02a2cb7e1a for #381, refine the hls notify, report one by one. 2015-04-14 11:36:58 +08:00
winlin
a4216cc582 add todo for ts parse. 2015-04-13 16:40:31 +08:00
winlin
40eab7fc88 for #381, refine the deviation for hls. 2015-04-13 11:45:08 +08:00
winlin
0c939e7114 merge from 2.0.160: 2015-04-13 10:33:08 +08:00
winlin
dcac9c69d5 fix #381, support reap hls/ts by gop or not. 2.0.160. 2015-04-13 10:32:32 +08:00
winlin
52a8c90b99 Merge branch '2.0release' into develop 2015-04-11 12:49:20 +08:00
winlin
d2c63d818b update donation. 2015-04-11 12:49:14 +08:00
winlin
9759b78da8 Merge branch '2.0release' into develop 2015-04-10 21:06:16 +08:00
winlin
bedc4f006c update donation. 2015-04-10 21:06:09 +08:00
winlin
0000c945ea refine the proxy api server. 2015-04-10 16:07:45 +08:00
winlin
fe1886aa08 add proxy for hls 2015-04-10 15:50:12 +08:00
winlin
e5b8e0da01 fix async call and hls_nb_notify bug. 2015-04-10 15:00:07 +08:00
winlin
5d37e47783 support config the hls_nb_notify. 2015-04-10 14:44:18 +08:00
winlin
0a7cea063c refine http read, support c style api 2015-04-10 14:25:14 +08:00
winlin
5c00ce8a96 refine hls on_hls_notify, read a little of ts. 2015-04-10 14:17:49 +08:00
winlin
1f93fb3399 refine hls notify, support timeout. 2015-04-10 13:45:21 +08:00
winlin
d8988da0ea refine the hls_on_notify, calc the spent time in ms. 2015-04-10 12:32:34 +08:00
winlin
310157ab77 refine the hls_on_notify, calc the spent time in ms. 2015-04-10 12:30:22 +08:00
winlin
e6d6bdfe57 refine the hls_on_notify, only read a chunk. 2015-04-10 12:27:30 +08:00
winlin
17c1423f4a Merge branch '2.0release' into develop 2015-04-10 12:01:52 +08:00
winlin
e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts. 2015-04-10 12:01:45 +08:00
winlin
7dbc95e085 refine the hls deviation for floor algorithm. 2015-04-10 10:21:30 +08:00
winlin
425e69e0cd Merge branch '2.0release' into develop 2015-04-09 18:03:55 +08:00
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
3fcc26a499 update donation. 2015-04-04 16:24:33 +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