From b4e244008fa1b717484fd88ade51f23af57cc957 Mon Sep 17 00:00:00 2001 From: redpanther Date: Wed, 9 Mar 2016 07:27:06 +0100 Subject: [PATCH] merge upstream changes Former-commit-id: 60c92921da4582ba65022c3fea84c3b24055b0f2 --- config/hyperion.config.json | 111 +++--------------------------------- 1 file changed, 8 insertions(+), 103 deletions(-) diff --git a/config/hyperion.config.json b/config/hyperion.config.json index 21f5725a..8c9d1ecc 100644 --- a/config/hyperion.config.json +++ b/config/hyperion.config.json @@ -134,18 +134,20 @@ // "forwarder" : // { // "proto" : ["127.0.0.1:19447"], -// "json" : ["127.0.0.1:19446"] +// "json" : ["127.0.0.1:19446"] // }, /// The configuration for the frame-grabber, contains the following items: /// * width : The width of the grabbed frames [pixels] /// * height : The height of the grabbed frames [pixels] /// * frequency_Hz : The frequency of the frame grab [Hz] + /// * priority : The priority "framegrabber" : { - "width" : 80, - "height" : 45, - "frequency_Hz" : 10.0 + "width" : 80, + "height" : 45, + "frequency_Hz" : 10.0, + "priority" : 900 }, /// The configuration of the Kodi connection used to enable and disable the frame-grabber. Contains the following fields: @@ -187,7 +189,8 @@ /// * port : Port at which the boblight server is started // "boblightServer" : // { -// "port" : 19333 +// "port" : 19333, +// "priority" : 900 // }, /// Configuration for the embedded V4L2 grabber @@ -470,103 +473,5 @@ } ], - /// The black border configuration, contains the following items: - /// * enable : true if the detector should be activated - /// * threshold : Value below which a pixel is regarded as black (value between 0.0 and 1.0) - /// * unknownFrameCnt : Number of frames without any detection before the border is set to 0 (default 600) - optional - /// * borderFrameCnt : Number of frames before a consistent detected border gets set (default 50) - optional - /// * maxInconsistentCnt : Number of inconsistent frames that are ignored before a new border gets a chance to proof consistency - optional - /// * blurRemoveCnt : Number of pixels that get removed from the detected border to cut away blur (default 1) - optional - /// * mode : Border detection mode (values "default","classic","osd") - optional - - "blackborderdetector" : - { - "enable" : true, - "threshold" : 0.01, - "unknownFrameCnt": 600, - "borderFrameCnt" : 50, - "maxInconsistentCnt" : 10, - "blurRemoveCnt": 1, - "mode" : "default" - }, - - /// The configuration of the effect engine, contains the following items: - /// * paths : An array with absolute location(s) of directories with effects - /// * bootsequence : The effect selected as 'boot sequence' - /// * effect : name of the effect you want to start. Set to empty if no effect wanted - /// * color : switch to static color after effect is done - /// * duration_ms : duration of boot effect in ms. 0 means effect stays forever - /// * priority : priority of boot effect and static color - "effects" : - { - "paths" : - [ - "/opt/hyperion/effects" - ] - }, - - "bootsequence" : - { - "color" : [0,0,0], - "effect" : "Rainbow swirl fast", - "duration_ms" : 3000, - "priority" : 990 - }, - - /// The configuration for the frame-grabber, contains the following items: - /// * width : The width of the grabbed frames [pixels] - /// * height : The height of the grabbed frames [pixels] - /// * frequency_Hz : The frequency of the frame grab [Hz] - "framegrabber" : - { - "width" : 64, - "height" : 64, - "frequency_Hz" : 10.0, - "priority" : 900 - }, - - /// The configuration of the XBMC connection used to enable and disable the frame-grabber. Contains the following fields: - /// * xbmcAddress : The IP address of the XBMC-host - /// * xbmcTcpPort : The TCP-port of the XBMC-server - /// * grabVideo : Flag indicating that the frame-grabber is on(true) during video playback - /// * grabPictures : Flag indicating that the frame-grabber is on(true) during picture show - /// * grabAudio : Flag indicating that the frame-grabber is on(true) during audio playback - /// * grabMenu : Flag indicating that the frame-grabber is on(true) in the XBMC menu - /// * grabScreensaver : Flag indicating that the frame-grabber is on(true) when XBMC is on screensaver - /// * enable3DDetection : Flag indicating that the frame-grabber should switch to a 3D compatible modus if a 3D video is playing - "xbmcVideoChecker" : - { - "xbmcAddress" : "127.0.0.1", - "xbmcTcpPort" : 9090, - "grabVideo" : true, - "grabPictures" : true, - "grabAudio" : true, - "grabMenu" : false, - "grabScreensaver" : true, - "enable3DDetection" : true - }, - - /// The configuration of the Json server which enables the json remote interface - /// * port : Port at which the json server is started - "jsonServer" : - { - "port" : 19444 - }, - - /// The configuration of the Proto server which enables the protobuffer remote interface - /// * port : Port at which the protobuffer server is started - "protoServer" : - { - "port" : 19445 - }, - - /// The configuration of the boblight server which enables the boblight remote interface - /// * port : Port at which the boblight server is started -// "boblightServer" : -// { -// "port" : 19333, -// "priority" : 900 -// }, - "endOfJson" : "endOfJson" }