zotan/nginx-mod-rtmp
1
1
Fork 0
mirror of https://github.com/zotanmew/nginx-rtmp-module.git synced 2024-05-10 14:31:07 +02:00
Code Issues Projects Releases Wiki Activity
944 commits 18 branches 115 tags 3.7 MiB
Commit graph

944 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Arutyunyan f62a083806 fixed compilation with nginx 1.7.11 2015-03-23 22:30:37 +03:00
Roman Arutyunyan 7a35372e30 enabled static relay cleanup to fix static_relay+auto_push combination 2014-09-23 23:39:09 +04:00
Roman Arutyunyan 5fb4c99ca9 added queue init 2014-09-21 10:17:58 +04:00
Roman Arutyunyan e1f92b1409 Merge pull request #469 from itpp16/patch-1 
Update ngx_rtmp_mpegts.c
 2014-09-17 09:42:25 +04:00
Roman Arutyunyan dd5f2aa117 fixed compilation 2014-09-17 07:10:38 +04:00
itpp16 d574043a96 Update ngx_rtmp_mpegts.c 
Fixes for "warning C4244: '=' : conversion from 'uint64_t' to 'u_char', possible loss of data"
 2014-09-13 22:48:03 +02:00
Roman Arutyunyan c390521963 Merge branch 'master' of github.com:arut/nginx-rtmp-module 2014-09-09 20:45:57 +04:00
Roman Arutyunyan 83dc27d30a fixed issue with multiple access_logs 2014-09-09 20:45:06 +04:00
Roman Arutyunyan 0bb2323990 Merge pull request #458 from saintdev/for-upstream 
Explicitly signal HE-AAC in DASH manifest
 2014-09-01 22:44:12 +04:00
Roman Arutyunyan 7500b4bd90 fixed path allocation 2014-09-01 18:30:41 +04:00
Roman Arutyunyan eb1cfef69e zero fragments_per_key now means one key per stream 2014-09-01 18:01:28 +04:00
Roman Arutyunyan 0b3d545ff6 fixed return code 2014-09-01 17:21:13 +04:00
Roman Arutyunyan 5e1d735992 fixed encryption 2014-09-01 17:10:03 +04:00
Roman Arutyunyan 997f24c5c6 implemented key id recovery from iv 2014-09-01 16:39:10 +04:00
Roman Arutyunyan 8099f44828 optimized aes128 encryption in mpegts writer 2014-09-01 13:25:48 +04:00
Roman Arutyunyan 51ab327abf fixed style 2014-08-31 18:58:43 +04:00
Roman Arutyunyan 69c090d85f renamed directives 2014-08-31 18:50:04 +04:00
Roman Arutyunyan 2f82fa2e8e fixed hls key path 2014-08-31 14:48:48 +04:00
Roman Arutyunyan 773336e497 make aes iv big-endian 2014-08-31 13:53:46 +04:00
Nathan Caldwell 359d76b555 Explicitly signal HE-AAC in DASH manifest 
This works around an issue in the Chromium MediaSource implementation[1].
Chromium will not play a video when the audio track uses HE-AAC, unless it is
explicitly signaled in the manifest.

[1]: https://code.google.com/p/chromium/issues/detail?id=370927#c3
 2014-08-27 20:21:46 -06:00
Roman Arutyunyan 4bed919cbe read hls key from old playlist 2014-08-05 16:00:50 +04:00
Roman Arutyunyan 416931d631 added keys directory handling 2014-08-05 14:28:04 +04:00
Roman Arutyunyan eff973ce01 fixes in hls encryption 2014-08-05 11:26:19 +04:00
Roman Arutyunyan 53064a48f1 implemented hls key auto-generation 2014-08-05 00:35:27 +04:00
Roman Arutyunyan 8acacd0d79 fixed skipping first key frame in mp4 streamer 2014-04-24 07:06:11 +04:00
Roman Arutyunyan 607a53842a fixed debug logging 2014-04-08 04:53:11 +04:00
Roman Arutyunyan 812e2fd7b1 fixed compilation with old nginx 2014-04-03 19:13:26 +04:00
Roman Arutyunyan 8c2229cce5 version bump 2014-04-03 07:13:12 +04:00
Roman Arutyunyan a72e33ea41 fixed proxy protocol event error 2014-03-31 11:03:30 +04:00
Roman Arutyunyan 4e780909b9 added proxy protocol support 2014-03-31 08:52:20 +04:00
Roman Arutyunyan 876de488b8 added epoch argument to on_connect 2014-03-05 11:34:33 +04:00
Roman Arutyunyan abb017225b fixed errors in control output; now returning http 206 instead of empty recorded file path 2014-03-04 16:02:09 +04:00
Roman Arutyunyan 96855b1413 moved vod sample access to fix flash security error 2014-03-03 15:47:03 +04:00
Roman Arutyunyan 6f768dc4eb version up 2014-02-28 17:11:25 +04:00
Roman Arutyunyan 668125888b Merge branch 'vod-sample-access' 2014-02-28 17:09:32 +04:00
Roman Arutyunyan b31539ce95 reset byte counter at 0xf0000000 to fix publishing from fmle 2014-02-25 14:59:26 +04:00
Roman Arutyunyan 0f337fe9a4 added rtmp sample access for vod 2014-02-21 23:15:41 +04:00
Roman Arutyunyan a43bafe3de added hls dicontinuity tag when forcing fragment split 2014-02-21 09:17:39 +04:00
Roman Arutyunyan dcf37b2c39 fixed forcing HLS fragment split 2014-02-20 22:57:22 +04:00
Roman Arutyunyan 87bc473cde Merge branch 'flv-append-fix' 2014-02-04 19:55:04 +04:00
Roman Arutyunyan c76d0fad44 Merge branch 'master' of github.com:arut/nginx-rtmp-module 2014-02-04 17:16:54 +04:00
Roman Arutyunyan 0210f7ca83 added timestamp cut in recorder to prevent negative (big unsigned) timestamps 2014-02-04 14:32:32 +04:00
Roman Arutyunyan 521f8998b0 implemented play2 time continuation 2014-02-03 11:16:01 +04:00
Roman Arutyunyan 434e6cfc06 Merge pull request #334 from hlamer/patch-1 
Use same path in the comments and in the code
 2014-01-31 08:52:00 -08:00
Andrei Kopats 04cbad5fda Use same path in the comments and in the code 2014-01-31 16:52:19 +02:00
Roman Arutyunyan 8d1b1c1243 fix flv append time shift 2014-01-31 10:39:08 +04:00
Roman Arutyunyan 1474aec731 Merge branch 'flv-header-mask' 2014-01-27 17:46:39 +04:00
Roman Arutyunyan 78dcfbcc35 ensure hls directory every time before opening fragment 2014-01-26 00:55:49 +04:00
Roman Arutyunyan 546c42efeb added hls_fragment_naming_granularity 2014-01-24 01:41:54 +04:00
Roman Arutyunyan 2eb36e3d7d fixed hls crash in stream eof 2014-01-23 07:47:58 +04:00