Sergey Dryabzhinsky
|
ac4197b871
|
Use client connection socket port for info
|
2015-07-04 23:04:18 +03:00 |
|
Sergey Dryabzhinsky
|
b49c7fb6ea
|
Fix version number
|
2015-07-04 09:04:14 +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
|
1e5b135b2b
|
Merge pull request #15 from itpp16/patch-2
Update ngx_rtmp_handler.c
|
2015-07-03 02:45:50 +03:00 |
|
Sergey
|
889e6afccb
|
Merge pull request #19 from sergey-dryabzhinsky/fmle-onfi-command
Add onFi data command for live stream.
|
2015-07-03 02:15:55 +03:00 |
|
Sergey Dryabzhinsky
|
99cf8a1a10
|
Add onFi data command for live stream. It is sended by FMLE with timestamps.
|
2015-07-03 02:15:04 +03:00 |
|
Sergey
|
1055727de8
|
Merge pull request #18 from dailymotion/DEVSYS-260
Display socket port number for each rtmp connection
|
2015-07-03 02:06:21 +03:00 |
|
Sergey
|
de8faa55a7
|
Merge pull request #17 from Eugaulerss/patch-1
Update ngx_rtmp_handler.c
|
2015-07-03 02:05:13 +03:00 |
|
Sergey
|
c9e70d5994
|
Merge pull request #16 from itpp16/patch-4
Update ngx_rtmp_play_module.c
|
2015-07-03 02:04:36 +03:00 |
|
Sergey
|
593368e9e6
|
Merge pull request #14 from LanetNetwork/master
Added Directive "record_interval_size"
|
2015-07-03 02:02:42 +03:00 |
|
Sergey
|
a05b3babfe
|
Merge pull request #13 from hannseman/master
Remove unneeded space in EXT-X-PLAYLIST-TYPE tag
|
2015-07-03 02:00:08 +03:00 |
|
Sergey
|
961fde23f7
|
Merge pull request #12 from sqbing/patch-1
Update ngx_rtmp_codec_module.c
|
2015-07-03 01:55:52 +03:00 |
|
Sergey
|
75fe5406b4
|
Merge pull request #11 from Florob/ipv6-worker
Fix access to config field of ngx_rtmp_in{,6}_addr_t. Closes #290
|
2015-07-03 01:51:39 +03:00 |
|
Sergey
|
1616a378ef
|
Merge pull request #10 from cine-io/data-channel-live-record
Data channel live record
|
2015-07-03 01:49:46 +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 |
|
Sergey Dryabzhinsky
|
038c3bbc67
|
Merge branch 'cine-io-dont-overwrite-with-invalid-metadata'
|
2015-07-03 01:36:40 +03:00 |
|
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 |
|
Sellier Alexis
|
098ded3e87
|
App name was not copied when creating relay
|
2015-06-03 16:29:34 +02:00 |
|
Sellier Alexis
|
70c90bbac5
|
Display socket port number for each rtmp connection
|
2015-06-02 18:01:10 +02:00 |
|
Eugaulerss
|
a4907e80ce
|
Update ngx_rtmp_handler.c
fixbug lost data when chunk_size changing, the frontier of stream data should by pointed by the pos and last of ngx_buf_t
|
2015-05-28 16:47:23 +08:00 |
|
itpp16
|
48983747d3
|
Update ngx_rtmp_play_module.c
|
2015-04-09 12:58:46 +02:00 |
|
itpp16
|
6ce821727d
|
Update ngx_rtmp_play_module.c
fixed compilation with nginx 1.7.12
|
2015-04-09 12:57:07 +02:00 |
|
itpp16
|
809f094124
|
Update ngx_rtmp_handler.c
fixed compilation with nginx 1.7.12
|
2015-04-09 12:47:32 +02:00 |
|
Anton Baranov
|
2c2e90b706
|
add Directive record_interval_size
|
2015-04-08 11:08:17 +03:00 |
|
Anton Baranov
|
b053eca1f9
|
add Directive record_interval_size
|
2015-04-08 11:06:54 +03:00 |
|
Anton Baranov
|
b92a262f4c
|
add Directive record_interval_size
|
2015-04-08 11:00:03 +03:00 |
|
Hannes Ljungberg
|
955c7e6b64
|
Remove unneeded space in EXT-X-PLAYLIST-TYPE tag
|
2015-03-27 13:31:40 +01:00 |
|
Roman Arutyunyan
|
f62a083806
|
fixed compilation with nginx 1.7.11
|
2015-03-23 22:30:37 +03:00 |
|
BeenWoo
|
cb36f9c23c
|
Update ngx_rtmp_codec_module.c
Some encoders send "setDataFrame" instead of "@setDataFrame", which makes rtmp module can't show correct video frame rate in stat page.
|
2015-02-03 15:37:46 +08:00 |
|
Florian Zeitz
|
1d1d4fcac6
|
Fix access to config field of ngx_rtmp_in{,6}_addr_t. Closes #290
|
2014-11-28 19:19:52 +01: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
|
17159755e5
|
Support for the data channel for the record module.
|
2014-10-30 18:20:54 -07:00 |
|
Jeffrey Wescott
|
de42f3801d
|
Support for onTextData and onCuePoint in the data channel for the live module.
|
2014-10-30 18:18:53 -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 |
|
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 |
|