Commit graph

  • a05b3babfe Merge pull request #13 from hannseman/master Sergey 2015-07-03 02:00:08 +0300
  • 961fde23f7 Merge pull request #12 from sqbing/patch-1 Sergey 2015-07-03 01:55:52 +0300
  • 75fe5406b4 Merge pull request #11 from Florob/ipv6-worker Sergey 2015-07-03 01:51:39 +0300
  • 1616a378ef Merge pull request #10 from cine-io/data-channel-live-record Sergey 2015-07-03 01:49:46 +0300
  • 4c1b69b5bb Merge pull request #9 from cine-io/relay-push-set-data-frame Sergey 2015-07-03 01:48:30 +0300
  • 038c3bbc67 Merge branch 'cine-io-dont-overwrite-with-invalid-metadata' Sergey Dryabzhinsky 2015-07-03 01:36:40 +0300
  • 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 cine-io-dont-overwrite-with-invalid-metadata Sergey Dryabzhinsky 2015-07-03 01:35:53 +0300
  • c4ee944870 Merge pull request #7 from steelywing/master Sergey 2015-07-03 01:25:24 +0300
  • 69d79ccda6 Merge pull request #6 from odiszapc/master Sergey 2015-07-03 01:24:04 +0300
  • 859540db60 Merge pull request #5 from berg/parse-scaling-list Sergey 2015-07-03 01:22:50 +0300
  • 087e5358e2 Merge pull request #4 from berg/dash-frame-rate Sergey 2015-07-03 01:21:26 +0300
  • d797d269a4 Merge pull request #3 from petergeneric/master Sergey 2015-07-03 01:19:57 +0300
  • 95471ae880 Merge pull request #2 from jbochi/program-date-time Sergey 2015-07-03 01:13:46 +0300
  • a079875fd7 Merge pull request #1 from sergey-dryabzhinsky/hls-mp3-support-backport Sergey 2015-07-03 01:05:51 +0300
  • 8341644121 Backport support MP3 for HLS from abandoned pull request Sergey Dryabzhinsky 2015-07-03 01:03:39 +0300
  • 098ded3e87 App name was not copied when creating relay Sellier Alexis 2015-06-03 16:29:34 +0200
  • 70c90bbac5 Display socket port number for each rtmp connection Sellier Alexis 2015-06-02 18:01:10 +0200
  • a4907e80ce Update ngx_rtmp_handler.c Eugaulerss 2015-05-28 16:47:23 +0800
  • 48983747d3 Update ngx_rtmp_play_module.c itpp16 2015-04-09 12:58:46 +0200
  • 6ce821727d Update ngx_rtmp_play_module.c itpp16 2015-04-09 12:57:07 +0200
  • 809f094124 Update ngx_rtmp_handler.c itpp16 2015-04-09 12:47:32 +0200
  • 2c2e90b706 add Directive record_interval_size Anton Baranov 2015-04-08 11:08:17 +0300
  • b053eca1f9 add Directive record_interval_size Anton Baranov 2015-04-08 11:06:54 +0300
  • b92a262f4c add Directive record_interval_size Anton Baranov 2015-04-08 11:00:03 +0300
  • 955c7e6b64 Remove unneeded space in EXT-X-PLAYLIST-TYPE tag Hannes Ljungberg 2015-03-27 13:31:40 +0100
  • f62a083806 fixed compilation with nginx 1.7.11 v1.1.7 arut-master Roman Arutyunyan 2015-03-23 22:30:37 +0300
  • cb36f9c23c Update ngx_rtmp_codec_module.c BeenWoo 2015-02-03 15:37:46 +0800
  • 1d1d4fcac6 Fix access to config field of ngx_rtmp_in{,6}_addr_t. Closes #290 Florian Zeitz 2014-11-28 19:15:54 +0100
  • 459e730d34 don't send @setDataFrame unless we've already received NetStream.Publish.Start Jeffrey Wescott 2014-11-05 10:15:44 -0800
  • 8f0f2e75c9 We need to loop through _all_ of the ctx->play sessions when sending @setDataFrame Jeffrey Wescott 2014-10-30 21:44:26 -0700
  • 17159755e5 Support for the data channel for the record module. Jeffrey Wescott 2014-10-30 18:13:45 -0700
  • de42f3801d Support for onTextData and onCuePoint in the data channel for the live module. Jeffrey Wescott 2014-10-30 15:17:51 -0700
  • 1d21d68c3c It's possible that we'll receive NetStream.Publish.Start _before_ the codec module has parsed the meta data. To handle that case, we'll also try to call @setDataFrame when we receive the @setDataFrame from the publisher. Jeffrey Wescott 2014-10-30 10:18:37 -0700
  • 2a54c8e089 Adobe Media Server and the like require that metadata is sent using @setDataFrame. As such, in the relay module, when propagating metadata to another server, we will use the @setDataFrame command. Jeffrey Wescott 2014-10-28 19:28:35 -0700
  • d069f36f86 to avoid writing invalid metadata, don't overwrite metadata from previous @setDataFrame / onMetaData invocations unless the metadata has actually changed Jeffrey Wescott 2014-10-27 18:46:55 -0700
  • 99433754df fix 'volatile' qualifiers error Wing 2014-10-24 01:35:36 +0800
  • 2362acf45c fix 'volatile' qualifiers error Wing 2014-10-24 01:34:12 +0800
  • ad6c63c149 Fix the way date time is written to fd Juarez Bochi 2014-04-09 11:59:20 -0300
  • c54b413b43 Add program datetime from system or stream timestamp Juarez Bochi 2014-04-08 18:38:57 -0300
  • 7a35372e30 enabled static relay cleanup to fix static_relay+auto_push combination v1.1.6 Roman Arutyunyan 2014-09-23 23:39:09 +0400
  • d99c069e8e Add in/out traffice per client (because <play> has no information about traffic itself) Alexey Plotnik 2014-09-22 00:51:09 +1100
  • 5fb4c99ca9 added queue init Roman Arutyunyan 2014-09-21 10:17:58 +0400
  • e1f92b1409 Merge pull request #469 from itpp16/patch-1 Roman Arutyunyan 2014-09-17 09:42:25 +0400
  • dd5f2aa117 fixed compilation Roman Arutyunyan 2014-09-17 07:10:38 +0400
  • d574043a96 Update ngx_rtmp_mpegts.c itpp16 2014-09-13 22:48:03 +0200
  • c390521963 Merge branch 'master' of github.com:arut/nginx-rtmp-module Roman Arutyunyan 2014-09-09 20:45:57 +0400
  • 83dc27d30a fixed issue with multiple access_logs Roman Arutyunyan 2014-09-09 20:45:06 +0400
  • 2262649c1f Don't truncate framerate for MPEG-DASH Bryan Berg 2014-09-07 12:35:10 -0700
  • 9ebfcc1978 Parse scaling list from SPS Bryan Berg 2014-09-06 18:15:48 -0700
  • 0bb2323990 Merge pull request #458 from saintdev/for-upstream Roman Arutyunyan 2014-09-01 22:44:12 +0400
  • 7500b4bd90 fixed path allocation v1.1.5 Roman Arutyunyan 2014-09-01 18:30:41 +0400
  • eb1cfef69e zero fragments_per_key now means one key per stream Roman Arutyunyan 2014-09-01 18:01:28 +0400
  • 0b3d545ff6 fixed return code Roman Arutyunyan 2014-09-01 17:21:13 +0400
  • 5e1d735992 fixed encryption Roman Arutyunyan 2014-09-01 17:10:03 +0400
  • 997f24c5c6 implemented key id recovery from iv Roman Arutyunyan 2014-09-01 16:39:10 +0400
  • 8099f44828 optimized aes128 encryption in mpegts writer Roman Arutyunyan 2014-09-01 13:25:48 +0400
  • 51ab327abf fixed style Roman Arutyunyan 2014-08-31 18:58:43 +0400
  • 69c090d85f renamed directives Roman Arutyunyan 2014-08-31 18:50:04 +0400
  • 2f82fa2e8e fixed hls key path Roman Arutyunyan 2014-08-31 14:48:48 +0400
  • 773336e497 make aes iv big-endian Roman Arutyunyan 2014-08-31 13:53:46 +0400
  • 359d76b555 Explicitly signal HE-AAC in DASH manifest Nathan Caldwell 2014-08-27 19:48:39 -0600
  • 4bed919cbe read hls key from old playlist Roman Arutyunyan 2014-08-05 16:00:50 +0400
  • 416931d631 added keys directory handling Roman Arutyunyan 2014-08-05 14:28:04 +0400
  • eff973ce01 fixes in hls encryption Roman Arutyunyan 2014-08-05 11:26:19 +0400
  • 53064a48f1 implemented hls key auto-generation Roman Arutyunyan 2014-08-05 00:35:27 +0400
  • 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") Peter Wright 2014-07-17 13:07:49 +0000
  • 8acacd0d79 fixed skipping first key frame in mp4 streamer Roman Arutyunyan 2014-04-24 07:06:11 +0400
  • 607a53842a fixed debug logging Roman Arutyunyan 2014-04-08 04:53:11 +0400
  • 812e2fd7b1 fixed compilation with old nginx Roman Arutyunyan 2014-04-03 19:13:26 +0400
  • 8c2229cce5 version bump v1.1.4 Roman Arutyunyan 2014-04-03 07:13:12 +0400
  • a72e33ea41 fixed proxy protocol event error Roman Arutyunyan 2014-03-31 11:03:30 +0400
  • 4e780909b9 added proxy protocol support Roman Arutyunyan 2014-03-31 08:52:20 +0400
  • 876de488b8 added epoch argument to on_connect Roman Arutyunyan 2014-03-05 11:34:33 +0400
  • abb017225b fixed errors in control output; now returning http 206 instead of empty recorded file path Roman Arutyunyan 2014-03-04 16:02:09 +0400
  • 96855b1413 moved vod sample access to fix flash security error Roman Arutyunyan 2014-03-03 15:47:03 +0400
  • 6f768dc4eb version up v1.1.3 Roman Arutyunyan 2014-02-28 17:11:25 +0400
  • 668125888b Merge branch 'vod-sample-access' Roman Arutyunyan 2014-02-28 17:09:32 +0400
  • b31539ce95 reset byte counter at 0xf0000000 to fix publishing from fmle Roman Arutyunyan 2014-02-25 14:59:26 +0400
  • 0f337fe9a4 added rtmp sample access for vod Roman Arutyunyan 2014-02-21 23:15:41 +0400
  • a43bafe3de added hls dicontinuity tag when forcing fragment split Roman Arutyunyan 2014-02-21 09:17:39 +0400
  • dcf37b2c39 fixed forcing HLS fragment split Roman Arutyunyan 2014-02-20 22:57:22 +0400
  • 87bc473cde Merge branch 'flv-append-fix' Roman Arutyunyan 2014-02-04 19:55:04 +0400
  • c76d0fad44 Merge branch 'master' of github.com:arut/nginx-rtmp-module Roman Arutyunyan 2014-02-04 17:16:54 +0400
  • 0210f7ca83 added timestamp cut in recorder to prevent negative (big unsigned) timestamps Roman Arutyunyan 2014-02-04 14:32:32 +0400
  • 521f8998b0 implemented play2 time continuation Roman Arutyunyan 2014-02-03 11:16:01 +0400
  • 434e6cfc06 Merge pull request #334 from hlamer/patch-1 Roman Arutyunyan 2014-01-31 08:52:00 -0800
  • 04cbad5fda Use same path in the comments and in the code Andrei Kopats 2014-01-31 16:52:19 +0200
  • 8d1b1c1243 fix flv append time shift Roman Arutyunyan 2014-01-31 10:39:08 +0400
  • 1474aec731 Merge branch 'flv-header-mask' Roman Arutyunyan 2014-01-27 17:46:39 +0400
  • 78dcfbcc35 ensure hls directory every time before opening fragment Roman Arutyunyan 2014-01-26 00:55:49 +0400
  • 546c42efeb added hls_fragment_naming_granularity Roman Arutyunyan 2014-01-24 01:41:54 +0400
  • 2eb36e3d7d fixed hls crash in stream eof Roman Arutyunyan 2014-01-23 07:47:58 +0400
  • acc1aa789f fixed crash in hls module Roman Arutyunyan 2014-01-22 17:45:50 +0400
  • fac68de376 recorder now writes correct flv track mask Roman Arutyunyan 2014-01-20 19:13:18 +0400
  • 51c1459e04 Merge branch 'envivo-fix' Roman Arutyunyan 2014-01-20 09:05:17 +0400
  • 39717828d6 implemented default buflen setting Roman Arutyunyan 2014-01-16 22:56:08 +0400
  • a8094dfef1 added clientid to notifications & control Roman Arutyunyan 2014-01-16 20:51:33 +0400
  • 8d9f99b540 fixed crash in control drop Roman Arutyunyan 2014-01-16 20:35:20 +0400
  • 036a7fd1d5 version up to 1.1.2 Roman Arutyunyan 2014-01-15 21:06:01 +0400
  • c392252301 updated year Roman Arutyunyan 2014-01-15 21:03:53 +0400