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
962 commits 18 branches 115 tags 3.7 MiB
Commit graph

962 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey Dryabzhinsky 0d77210815 Merge branch 'dont-overwrite-with-invalid-metadata' of https://github.com/cine-io/nginx-rtmp-module into cine-io-dont-overwrite-with-invalid-metadata 2015-07-03 01:35:53 +03:00
Sergey c4ee944870 Merge pull request #7 from steelywing/master 
fix 'volatile' qualifiers error
 2015-07-03 01:25:24 +03:00
Sergey 69d79ccda6 Merge pull request #6 from odiszapc/master 
Add in/out traffice per client
 2015-07-03 01:24:04 +03:00
Sergey 859540db60 Merge pull request #5 from berg/parse-scaling-list 
Parse scaling list from SPS
 2015-07-03 01:22:50 +03:00
Sergey 087e5358e2 Merge pull request #4 from berg/dash-frame-rate 
Don't truncate framerate for MPEG-DASH
 2015-07-03 01:21:26 +03:00
Sergey d797d269a4 Merge pull request #3 from petergeneric/master 
Allow the filename on disk to use no suffix
 2015-07-03 01:19:57 +03:00
Sergey 95471ae880 Merge pull request #2 from jbochi/program-date-time 
Program date time
 2015-07-03 01:13:46 +03:00
Sergey a079875fd7 Merge pull request #1 from sergey-dryabzhinsky/hls-mp3-support-backport 
Backport support MP3 for HLS from abandoned pull request
 2015-07-03 01:05:51 +03:00
Sergey Dryabzhinsky 8341644121 Backport support MP3 for HLS from abandoned pull request 2015-07-03 01:03:39 +03:00
Roman Arutyunyan f62a083806 fixed compilation with nginx 1.7.11 2015-03-23 22:30:37 +03:00
Jeffrey Wescott d069f36f86 to avoid writing invalid metadata, don't overwrite metadata from previous @setDataFrame / onMetaData invocations unless the metadata has actually changed 2014-10-27 18:46:55 -07:00
Wing 99433754df fix 'volatile' qualifiers error 2014-10-24 01:35:36 +08:00
Wing 2362acf45c fix 'volatile' qualifiers error 2014-10-24 01:34:12 +08:00
Juarez Bochi ad6c63c149 Fix the way date time is written to fd 2014-10-10 13:33:32 -03:00
Juarez Bochi c54b413b43 Add program datetime from system or stream timestamp 2014-10-10 13:33:32 -03:00
Roman Arutyunyan 7a35372e30 enabled static relay cleanup to fix static_relay+auto_push combination 2014-09-23 23:39:09 +04:00
Alexey Plotnik d99c069e8e Add in/out traffice per client (because <play> has no information about traffic itself) 2014-09-22 00:51:09 +11: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
Bryan Berg 2262649c1f Don't truncate framerate for MPEG-DASH 
When pushing 29.97fps RTMP streams, the manifest shows an
incorrect frame rate of "29", not "30000/1001" as it should be.
 2014-09-07 13:03:58 -07:00
Bryan Berg 9ebfcc1978 Parse scaling list from SPS 
This is required for the dimensions to be calcuated properly when
streaming using the high profile (at least for the encoder I'm
using). Without this, the scaling list isn't skipped over and
the parsed dimensions are incorrect.

When the dimensions are incorrect, the MPEG-DASH manifest is
generated incorrectly.
 2014-09-07 12:48:56 -07: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
Peter Wright 80d7b1c905 Allow the filename on disk to use no suffix (or a different suffix from the format), as long as the format prefix is used (e.g. "mp4:test.mov") 2014-07-17 13:07:49 +00: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