Roman Arutyunyan
|
ba87ca48c5
|
Merge branch 'close-stream'
|
2012-07-03 14:59:08 +04:00 |
|
Roman Arutyunyan
|
51647d03b3
|
added arguments to on_record_done
|
2012-06-29 16:00:00 +04:00 |
|
Roman Arutyunyan
|
d912561f65
|
Merge branch 'master' of https://github.com/arut/nginx-rtmp-module
|
2012-06-29 15:29:36 +04:00 |
|
Roman Arutyunyan
|
223b2713af
|
added SwfUrl to statistics
|
2012-06-29 15:29:18 +04:00 |
|
Roman Arutyunyan
|
d9579d627d
|
implemented returning OK from close stream handler sending stream EOF. Any other value can break destruction chain which leads to undestructed data
|
2012-06-28 22:57:15 +04:00 |
|
Roman Arutyunyan
|
68515773e5
|
fixed time representation in stat.xsl
|
2012-06-27 15:44:45 +04:00 |
|
Roman Arutyunyan
|
1719ef4433
|
Merge branch 'out-queue-settings'
|
2012-06-27 12:25:53 +04:00 |
|
Roman Arutyunyan
|
62c750ab8b
|
added resetting msg mask in close_stream
|
2012-06-25 21:46:57 +04:00 |
|
Roman Arutyunyan
|
32ab32f168
|
added stream begin/eof to play/closeStream
|
2012-06-25 21:40:23 +04:00 |
|
Roman Arutyunyan
|
53fd032ae1
|
close_stream implementation
|
2012-06-25 16:22:42 +04:00 |
|
Roman Arutyunyan
|
ae71903de4
|
added uptime to statisctics
|
2012-06-22 14:07:03 +04:00 |
|
Roman Arutyunyan
|
f48bcc5235
|
added AAC support to HLS
|
2012-06-22 12:26:56 +04:00 |
|
Roman Arutyunyan
|
78f6ccd604
|
record_interval now restarts recording even if it has been active
|
2012-06-21 12:36:05 +04:00 |
|
Roman Arutyunyan
|
63c4269a91
|
added external get-style arguments to notifiers; implemented on_done notification
|
2012-06-20 21:11:03 +04:00 |
|
Roman Arutyunyan
|
d21a240b12
|
added record_unique note to README
|
2012-06-20 18:38:50 +04:00 |
|
Roman Arutyunyan
|
5493fad47d
|
added record_unique feature
|
2012-06-20 18:37:52 +04:00 |
|
Roman Arutyunyan
|
45cd9825a2
|
updated README
|
2012-06-19 23:07:03 +04:00 |
|
Roman Arutyunyan
|
5dd0120cc8
|
updated README with HLS notes
|
2012-06-19 23:05:00 +04:00 |
|
Roman Arutyunyan
|
5153992d5d
|
minor fixes in hls
|
2012-06-19 22:55:13 +04:00 |
|
Roman Arutyunyan
|
1d44a18ad2
|
Merge branch 'master' into hlslight
|
2012-06-19 17:22:04 +04:00 |
|
Roman Arutyunyan
|
633abd83a1
|
hls code improvement
|
2012-06-19 17:06:34 +04:00 |
|
Roman Arutyunyan
|
1e0e98a439
|
added more audio codec params to codec module
|
2012-06-19 17:05:05 +04:00 |
|
Roman Arutyunyan
|
dc698edf24
|
added audio support to HLS; it's still choppy
|
2012-06-18 22:29:50 +04:00 |
|
Roman Arutyunyan
|
43ceafc186
|
fixed crash in delete_stream
|
2012-06-18 18:07:51 +04:00 |
|
Roman Arutyunyan
|
cba4ecc560
|
the virst version which successfully broadscasts video to iPhone
|
2012-06-18 17:57:07 +04:00 |
|
Roman Arutyunyan
|
54d536bdeb
|
this version gets validated without a single error/warning
|
2012-06-17 17:20:20 +04:00 |
|
Roman Arutyunyan
|
7707515810
|
the first version which passes validator without an error (but still with warnings)
|
2012-06-17 16:47:32 +04:00 |
|
Roman Arutyunyan
|
8855a1e1be
|
this version works with ffplay but is not validated by Apple tool
|
2012-06-17 15:43:41 +04:00 |
|
Roman Arutyunyan
|
2c1fbcfb8f
|
fixed compilation error
|
2012-06-15 13:53:29 +04:00 |
|
Roman Arutyunyan
|
f679b888c8
|
Merge branch 'master' into hlslight
|
2012-06-14 20:49:08 +04:00 |
|
Roman Arutyunyan
|
b188f679b9
|
an attempt to implement hls
|
2012-06-14 20:48:27 +04:00 |
|
Roman Arutyunyan
|
2fdec45460
|
fixed out queue allocation & made out_cork default value dependant on out_queue
|
2012-06-14 20:08:57 +04:00 |
|
Roman Arutyunyan
|
7c99cfba0a
|
moved out queue params to config
|
2012-06-14 19:53:21 +04:00 |
|
Roman Arutyunyan
|
358f7680e2
|
improved h264 profile/level look
|
2012-06-14 17:53:05 +04:00 |
|
Roman Arutyunyan
|
1da4bb923e
|
added H264 profile & level parsers
|
2012-06-14 17:44:30 +04:00 |
|
Roman Arutyunyan
|
bf04e66862
|
added fps - alias for framerate
|
2012-06-14 17:23:48 +04:00 |
|
Roman Arutyunyan
|
95e2c4172a
|
moved metadata handlers from live to codec module & fixed setDataFrame handler to handle ffmpeg packets
|
2012-06-14 17:07:31 +04:00 |
|
Roman Arutyunyan
|
fca76ef349
|
codec header is now sent as first (abs) frame for late clients; this fixes fplaying with ffplay
|
2012-06-14 14:56:48 +04:00 |
|
Roman Arutyunyan
|
5539cb7935
|
removed useless code
|
2012-06-13 23:49:23 +04:00 |
|
Roman Arutyunyan
|
356b824af3
|
removed useless header initializers
|
2012-06-13 23:48:49 +04:00 |
|
Roman Arutyunyan
|
696cfda126
|
fixed srv pool log
|
2012-06-13 23:48:23 +04:00 |
|
Roman Arutyunyan
|
266e206afc
|
added support for multiple aac/avc codecs per stream
|
2012-06-13 17:35:48 +04:00 |
|
Roman Arutyunyan
|
c377e3b5c6
|
deleted useless file
|
2012-06-13 16:02:33 +04:00 |
|
Roman Arutyunyan
|
88346934e5
|
Merge branch 'reentrant-relay'
|
2012-06-13 13:58:16 +04:00 |
|
Roman Arutyunyan
|
edd957f5cd
|
added setting codec from rtmp audio/video frame header
|
2012-06-13 13:57:48 +04:00 |
|
Roman Arutyunyan
|
077a2a7c67
|
Merge branch 'codec'
|
2012-06-13 13:48:09 +04:00 |
|
Roman Arutyunyan
|
218e312a1f
|
added memory info to stat xml
|
2012-06-13 13:47:43 +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
|
4eda3e8392
|
added AV-sync stat field
|
2012-06-11 23:38:14 +04:00 |
|
Roman Arutyunyan
|
6143abc418
|
added amf3_* handlers; this adds compatibility with amf3 players (srobe etc)
|
2012-06-11 01:02:53 +04:00 |
|