Commit graph

622 commits

Author SHA1 Message Date
Roman Arutyunyan c65e51d61b fixed rtmp constants 2012-10-24 14:26:53 +04:00
Roman Arutyunyan 101b43a478 merged sync branch 2012-10-24 14:21:13 +04:00
Roman Arutyunyan 4adc5f7487 fixed uri in vod-http 2012-10-23 22:07:54 +04:00
Roman Arutyunyan b8424c9b63 vod-http is now working 2012-10-23 21:59:31 +04:00
Roman Arutyunyan eacfd8fac4 this version compiles ok 2012-10-23 20:21:24 +04:00
Roman Arutyunyan f65f07deb3 implemented connection dropped in control module 2012-10-23 10:46:44 +04:00
Roman Arutyunyan c86e30fd27 added deps to config 2012-10-21 05:56:58 +04:00
Roman Arutyunyan cb4623aa4f removed legacy constants 2012-10-20 17:40:21 +04:00
Roman Arutyunyan a3fde6ea53 added closing descriptors in enotify module 2012-10-18 23:37:44 +04:00
Roman Arutyunyan ff1c7ecec5 explicitly close file descriptors in child to escape epoll signaling wrong events 2012-10-18 22:15:27 +04:00
Roman Arutyunyan 795c1538a3 added option for choosing exec kill signal 2012-10-18 11:08:30 +04:00
Roman Arutyunyan 21174b2ee7 fixed pts assignment while synchronizing hls 2012-10-16 14:09:52 +04:00
Roman Arutyunyan a4c790e0ee fixed compilation 2012-10-15 09:43:22 +04:00
Roman Arutyunyan 5aac8b5cb3 fixed AAC header parser 2012-10-13 09:28:35 +04:00
Roman Arutyunyan 5cd5f83d8d fixed AAC real sample rate parsing 2012-10-12 21:10:39 +04:00
Roman Arutyunyan 67e7f4818f fixed logging 2012-10-12 21:08:12 +04:00
Roman Arutyunyan ebb20b848e implemented MPEG-TS sample re-arranging in HLS stream to fix crackles because of low-resolution timestamp in RTMP vs MPEG-TS 2012-10-12 20:45:47 +04:00
Roman Arutyunyan f7e7ea0fc1 fixed frame interleaving 2012-10-10 23:46:16 +04:00
Roman Arutyunyan f23075c78d added interleave directive 2012-10-10 00:27:44 +04:00
Roman Arutyunyan e5d61f2c62 added 'busy' directive 2012-10-09 18:22:14 +04:00
Roman Arutyunyan 72d175ed7f Merge branch 'control' 2012-10-09 09:05:50 +04:00
Roman Arutyunyan bff1c355ec added record_notify feature 2012-10-05 15:46:57 +04:00
Roman Arutyunyan 2ef9075f2b refactored seek & pause in vod 2012-10-05 15:36:05 +04:00
Roman Arutyunyan fb824371e7 fixed vod stopping: added NetStream.Play.Complete meta message 2012-10-05 10:11:30 +04:00
Roman Arutyunyan 0740b046d6 recorder now stops at closeStream instead of deleteStream 2012-10-04 22:18:51 +04:00
Roman Arutyunyan 6e55e3a77f fixed compilation 2012-10-04 14:00:18 +04:00
Roman Arutyunyan cc632eb6b6 refactored & restyled access module; implemented access inheritance from higher config levels 2012-10-04 11:25:51 +04:00
Roman Arutyunyan 83aa7b9e89 fixed mp4 b-frame delay 2012-10-04 09:26:00 +04:00
Roman Arutyunyan ce7ae837b3 fixed compilation (dup result) 2012-10-03 09:33:43 +04:00
Roman Arutyunyan 01d3b8857c changed capture codecs to h264/speex 2012-10-01 14:37:30 +04:00
Roman Arutyunyan 9b4725a01a fixed live timestamps in non-atc mode 2012-09-30 18:17:30 +04:00
Roman Arutyunyan b4ca0bede8 implemented absolute timestamp feature (atc on) 2012-09-30 16:12:46 +04:00
Roman Arutyunyan 87686029aa fixed exec terminate crash; added closing io descriptors in child prior to exec 2012-09-30 01:42:02 +04:00
Roman Arutyunyan ac13bbf1af merged master into sync
o sync

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2012-09-29 00:07:46 +04:00
Roman Arutyunyan 0b757e8a49 fixed http output 2012-09-27 21:25:35 +04:00
Roman Arutyunyan e630c91391 fixed formatting 2012-09-27 21:18:49 +04:00
Roman Arutyunyan 0cd7883a43 implemented control section/method parsers; added returning file path 2012-09-27 21:06:46 +04:00
Roman Arutyunyan b70d37edb1 improved manual recorder: keyframes, repeated open/close 2012-09-27 21:05:52 +04:00
Roman Arutyunyan 3d6d65f7c7 minor fixes in control module 2012-09-27 14:39:46 +04:00
Roman Arutyunyan 840b62bf71 initial implementation of control http module 2012-09-27 14:24:51 +04:00
Roman Arutyunyan 17886deadd updated README 2012-09-25 09:05:06 +04:00
Roman Arutyunyan 6485716fb4 fixed push & pull in auto-push mode 2012-09-22 16:42:43 +04:00
Roman Arutyunyan cdb084e375 fixed on_record_done; fixed notification inheritance; fixed logging 2012-09-22 14:46:03 +04:00
Roman Arutyunyan 9aff59fc43 fixed recording audio splitted into fragments 2012-09-22 13:35:03 +04:00
Roman Arutyunyan 76211a4bd2 moved some logging from debug to info 2012-09-17 11:46:16 +04:00
Roman Arutyunyan 129a161fb8 Merge branch 'master' of github.com:arut/nginx-rtmp-module 2012-09-14 16:51:17 +04:00
Roman Arutyunyan abc2704db1 added merging up activity flag i nnotifiers 2012-09-13 21:47:57 +04:00
Roman Arutyunyan 11cc6e6019 implemented sub-applications; recorders are now merged as sub-applications 2012-09-13 21:47:22 +04:00
Roman Arutyunyan d8fbe51e3f changed malloc to nginx alloc 2012-09-13 16:19:16 +04:00
Roman Arutyunyan 8494e179d1 fixed evaluation variable at the end of string 2012-09-13 15:20:14 +04:00