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

53 commits

Author SHA1 Message Date
Sergey Dryabzhinsky 4c7dd6ed00 Update: 
- add more debug output for 'play' handler to view all chained calls
- fix gcc compilation fail or live module with ```-Werror``` option
  - wrap var definition with debug enabled check
 2015-11-30 13:02:57 +03:00
Sergey Dryabzhinsky 24be2c72cd Fix gcc pedantic build warnings/errors 
- use ngx_memcpy if return value not needed
- remove some unused vars
- add new function definitions for send submodule
 2015-08-08 00:57:13 +03:00
Sergey 5d4dfaee43 Merge pull request #20 from dailymotion/DEVSYS-261 
App name was not copied when creating relay
 2015-07-03 02:49:38 +03:00
Sergey 4c1b69b5bb Merge pull request #9 from cine-io/relay-push-set-data-frame 
Relay push set data frame
 2015-07-03 01:48:30 +03:00
Sellier Alexis 098ded3e87 App name was not copied when creating relay 2015-06-03 16:29:34 +02:00
Jeffrey Wescott 459e730d34 don't send @setDataFrame unless we've already received NetStream.Publish.Start 2014-11-05 17:16:21 -08:00
Jeffrey Wescott 8f0f2e75c9 We need to loop through _all_ of the ctx->play sessions when sending @setDataFrame 2014-10-30 21:44:26 -07:00
Jeffrey Wescott 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.
 2014-10-30 13:17:17 -07:00
Jeffrey Wescott 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.
 2014-10-29 17:22:22 -07: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 b9fcf7d880 removed trailing spaces 2013-11-30 11:21:53 +04:00
Roman Arutyunyan f599c70568 updated copyright line 2013-11-03 23:11:37 +04:00
Roman Arutyunyan 1bd6aed4c8 added ifdefs to fix msvc compilation 2013-06-12 20:47:25 +04:00
Roman Arutyunyan e4070fb777 fixed default values of conf params 2013-06-12 20:47:23 +04:00
Roman Arutyunyan f94fcee9fb included ngx_config.h & ngx_core.h to every file 2013-06-12 20:47:23 +04:00
Roman Arutyunyan aeb20d0a24 minor logger fixes & more debug logging 2013-05-13 13:35:56 +04:00
Roman Arutyunyan 244961076f added round-robin relay url balancing 2013-05-13 12:13:11 +04:00
Roman Arutyunyan db5d361743 fixed remote connect in relay module to use the right address 2013-05-13 09:59:34 +04:00
Roman Arutyunyan 3fc1598db9 implemented proper initializers for exec_static and pull static 2013-04-19 01:10:29 +04:00
Roman Arutyunyan 57dd1406bd reverted the meaning of session_relay 2013-03-03 18:42:57 +04:00
Roman Arutyunyan 43539b7234 implemented session relay 2013-02-26 20:43:49 +04:00
Roman Arutyunyan 5715784e7c fixed pulling from red5: 'live' play mode 2013-02-08 19:12:44 +04:00
Roman Arutyunyan 8104bff06f fixed crash if missing rtmp{} block in config; thanks to @Freexer 2013-02-05 19:42:18 +04:00
Roman Arutyunyan 6d5986aa59 removed rtmp init event queue 2013-02-05 17:52:06 +04:00
Roman Arutyunyan 8c39b37131 post static pull initialization to rtmp init queue 2013-02-01 17:25:44 +04:00
Roman Arutyunyan f358a2e8f9 Merge branch 'static-relay' 2013-02-01 17:20:27 +04:00
Roman Arutyunyan 0153d0865b fixed nginx_stat for rtmp relays 2013-01-28 16:42:48 +04:00
Roman Arutyunyan 3bd60857bd implemented static pulls 2013-01-14 22:58:10 +04:00
Roman Arutyunyan 96b0fddbb1 fixed creating relay tcUrl 2012-12-17 21:38:13 +04:00
Roman Arutyunyan 5999daebc2 fixed string allocation in relay module 2012-11-13 21:28:09 +04:00
Roman Arutyunyan fd99086834 implemented segmented live streaming; moved specific code from cmd module to live/play modules 2012-11-13 00:22:57 +04:00
Roman Arutyunyan 6485716fb4 fixed push & pull in auto-push mode 2012-09-22 16:42:43 +04:00
Roman Arutyunyan 76211a4bd2 moved some logging from debug to info 2012-09-17 11:46:16 +04:00
Roman Arutyunyan b960e68a0b fully tunable auto-push feature 2012-07-19 12:10:59 +04:00
Roman Arutyunyan dbc3ac2438 fixed compilation 2012-07-18 13:36:17 +04:00
Roman Arutyunyan e21ba2dc2c reimplemented push reconnect using target tags 2012-07-13 20:08:28 +04:00
Roman Arutyunyan bfb7df5f6a implemented stock push reconnect 2012-07-11 12:58:07 +04:00
Roman Arutyunyan eb4e9e8d90 fixed compilation 2012-07-06 16:05:41 +04:00
Roman Arutyunyan c9973fc68a added per-relay parameters; app, pageUrl, swfUrl etc 2012-06-27 21:20:41 +04:00
Roman Arutyunyan b69efd3e94 changed relay disconnect handler to deleteStream handler & added check for repeated stream play 2012-06-12 02:00:52 +04:00
Roman Arutyunyan 5ced4aea88 added relay remote address string to connection 2012-06-01 15:13:15 +04:00
Roman Arutyunyan 3027868a50 fixed crash because of shared log handler changed by relay 2012-06-01 15:07:37 +04:00
Roman Arutyunyan 52f8295d5c improved sesion epoch storage; added live stream time field & added time field to statistics 2012-05-25 16:34:42 +04:00
Roman Arutyunyan 3fb41195a5 added publish/play silent mode to escape sending unrelated replies to when using relays 2012-05-22 22:53:35 +04:00
Roman Arutyunyan cfab13d47d added sending chunk size before relay connects 2012-05-22 17:14:57 +04:00
Roman Arutyunyan a6a430ec2a fixed peer address allocation when creating relay 2012-05-22 15:54:25 +04:00
Roman Arutyunyan 63713c650d added features to fix pulling from FMS 2012-05-21 20:37:20 +04:00
Roman Arutyunyan eae15c6013 added more AMF handlers to relay for logging 2012-05-21 10:45:14 +04:00
Roman Arutyunyan 107ea3699e improved relay implementation 2012-05-18 14:25:30 +04:00
Roman Arutyunyan 1f9072bbe6 implemented full relay support & updated README 2012-05-16 22:29:00 +04:00