atem-state - npm Package Compare versions

Comparing version 0.1.0 to 0.1.1

CHANGELOG.md

@@ -5,2 +5,13 @@ # Change Log
 
+<a name="0.1.1"></a>
+## [0.1.1](https://github.com/nrk/tv-automation-atem-state/compare/0.1.0...0.1.1) (2018-06-14)
+
+
+### Bug Fixes
+
+* **upstream-key:** defaults for upstream key. guard against bits of upstream-key being undefined ([c932d9d](https://github.com/nrk/tv-automation-atem-state/commit/c932d9d))
+* enforce setting certain properties after pattern change ([605758d](https://github.com/nrk/tv-automation-atem-state/commit/605758d))
+
+
+
 <a name="0.1.0"></a>
@@ -7,0 +18,0 @@ # 0.1.0 (2018-06-10)

dist/defaults.d.ts

 import { VideoState } from 'atem-connection';
+import * as USK from 'atem-connection/dist/state/video/upstreamKeyers';
 import * as DSK from 'atem-connection/dist/state/video/downstreamKeyers';
@@ -16,4 +17,5 @@ export declare namespace Defaults {
         const MixEffect: Partial<VideoState.MixEffect>;
+        function UpstreamKeyer(id: number): USK.UpstreamKeyer;
         const SuperSourceBox: VideoState.SuperSourceBox;
     }
 }

dist/defaults.js

@@ -98,4 +98,130 @@ "use strict";
             transitionProperties: Video.TransitionProperties,
-            transitionSettings: Video.TransitionSettings
+            transitionSettings: Video.TransitionSettings,
+            upstreamKeyers: []
         };
+        function UpstreamKeyer(id) {
+            return {
+                upstreamKeyerId: id,
+                mixEffectKeyType: atem_connection_1.Enums.MixEffectKeyType.Luma,
+                flyEnabled: false,
+                fillSource: 0,
+                cutSource: 0,
+                maskEnabled: false,
+                maskTop: 0,
+                maskBottom: 0,
+                maskLeft: 0,
+                maskRight: 0,
+                onAir: false,
+                dveSettings: {
+                    borderEnabled: false,
+                    shadowEnabled: false,
+                    borderBevel: atem_connection_1.Enums.BorderBevel.None,
+                    rate: 1,
+                    sizeX: 0,
+                    sizeY: 0,
+                    positionX: 0,
+                    positionY: 0,
+                    rotation: 0,
+                    borderOuterWidth: 0,
+                    borderInnerWidth: 0,
+                    borderOuterSoftness: 0,
+                    borderInnerSoftness: 0,
+                    borderBevelSoftness: 0,
+                    borderBevelPosition: 0,
+                    borderOpacity: 0,
+                    borderHue: 0,
+                    borderSaturation: 0,
+                    borderLuma: 0,
+                    lightSourceDirection: 0,
+                    lightSourceAltitude: 0,
+                    maskEnabled: false,
+                    maskTop: 0,
+                    maskBottom: 0,
+                    maskLeft: 0,
+                    maskRight: 0
+                },
+                chromaSettings: {
+                    hue: 0,
+                    gain: 0,
+                    ySuppress: 0,
+                    lift: 0,
+                    narrow: false
+                },
+                lumaSettings: {
+                    preMultiplied: false,
+                    clip: 0,
+                    gain: 0,
+                    invert: false
+                },
+                patternSettings: {
+                    style: atem_connection_1.Enums.Pattern.LeftToRightBar,
+                    size: 0,
+                    symmetry: 0,
+                    softness: 0,
+                    positionX: 0,
+                    positionY: 0,
+                    invert: false
+                },
+                // @todo should these be defined if the atem doesnt support it?
+                flyKeyframes: [
+                    {
+                        keyFrameId: 0,
+                        sizeX: 0,
+                        sizeY: 0,
+                        positionX: 0,
+                        positionY: 0,
+                        rotation: 0,
+                        borderOuterWidth: 0,
+                        borderInnerWidth: 0,
+                        borderOuterSoftness: 0,
+                        borderInnerSoftness: 0,
+                        borderBevelSoftness: 0,
+                        borderBevelPosition: 0,
+                        borderOpacity: 0,
+                        borderHue: 0,
+                        borderSaturation: 0,
+                        borderLuma: 0,
+                        lightSourceDirection: 0,
+                        lightSourceAltitude: 0,
+                        maskEnabled: false,
+                        maskTop: 0,
+                        maskBottom: 0,
+                        maskLeft: 0,
+                        maskRight: 0
+                    },
+                    {
+                        keyFrameId: 1,
+                        sizeX: 0,
+                        sizeY: 0,
+                        positionX: 0,
+                        positionY: 0,
+                        rotation: 0,
+                        borderOuterWidth: 0,
+                        borderInnerWidth: 0,
+                        borderOuterSoftness: 0,
+                        borderInnerSoftness: 0,
+                        borderBevelSoftness: 0,
+                        borderBevelPosition: 0,
+                        borderOpacity: 0,
+                        borderHue: 0,
+                        borderSaturation: 0,
+                        borderLuma: 0,
+                        lightSourceDirection: 0,
+                        lightSourceAltitude: 0,
+                        maskEnabled: false,
+                        maskTop: 0,
+                        maskBottom: 0,
+                        maskLeft: 0,
+                        maskRight: 0
+                    }
+                ],
+                flyProperties: {
+                    isASet: false,
+                    isBSet: false,
+                    isAtKeyFrame: atem_connection_1.Enums.IsAtKeyFrame.None,
+                    runToInfiniteIndex: 0
+                }
+            };
+        }
+        Video.UpstreamKeyer = UpstreamKeyer;
         Video.SuperSourceBox = {
@@ -102,0 +228,0 @@ enabled: false,

dist/resolvers/upstreamKeyers/chromaKeyer.js

@@ -8,4 +8,12 @@ "use strict";
         for (const upstreamKeyerId in oldState.video.ME[mixEffectId].upstreamKeyers) {
-            const oldChromaKeyer = oldState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId].chromaSettings;
-            const newChromaKeyer = newState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId].chromaSettings;
+            const oldKeyer = oldState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId];
+            const newKeyer = newState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId];
+            if (!oldKeyer || !newKeyer) {
+                continue;
+            }
+            const oldChromaKeyer = oldKeyer.chromaSettings;
+            const newChromaKeyer = newKeyer.chromaSettings;
+            if (!oldChromaKeyer || !newChromaKeyer) {
+                continue;
+            }
             const props = {};
@@ -12,0 +20,0 @@ for (const key in atem_connection_1.Commands.MixEffectKeyChromaCommand.MaskFlags) {

dist/resolvers/upstreamKeyers/dveKeyer.js

@@ -8,4 +8,12 @@ "use strict";
         for (const upstreamKeyerId in oldState.video.ME[mixEffectId].upstreamKeyers) {
-            const oldDVEKeyer = oldState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId].dveSettings;
-            const newDVEKeyer = newState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId].dveSettings;
+            const oldKeyer = oldState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId];
+            const newKeyer = newState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId];
+            if (!oldKeyer || !newKeyer) {
+                continue;
+            }
+            const oldDVEKeyer = oldKeyer.dveSettings;
+            const newDVEKeyer = newKeyer.dveSettings;
+            if (!oldDVEKeyer || !newDVEKeyer) {
+                continue;
+            }
             const props = {};
@@ -12,0 +20,0 @@ for (const key in atem_connection_1.Commands.MixEffectKeyDVECommand.MaskFlags) {

dist/resolvers/upstreamKeyers/index.js

@@ -19,2 +19,5 @@ "use strict";
             const newKeyer = newState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId];
+            if (!oldKeyer || !newKeyer) {
+                continue;
+            }
             if (oldKeyer.fillSource !== newKeyer.fillSource) {
@@ -68,2 +71,5 @@ const command = new atem_connection_1.Commands.MixEffectKeyFillSourceSetCommand();
             const newKeyer = newState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId];
+            if (!oldKeyer || !newKeyer) {
+                continue;
+            }
             const props = {};
@@ -70,0 +76,0 @@ if (oldKeyer.maskEnabled !== newKeyer.maskEnabled)

dist/resolvers/upstreamKeyers/lumaKeyer.js

@@ -8,4 +8,12 @@ "use strict";
         for (const upstreamKeyerId in oldState.video.ME[mixEffectId].upstreamKeyers) {
-            const oldLumaKeyer = oldState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId].lumaSettings;
-            const newLumaKeyer = newState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId].lumaSettings;
+            const oldKeyer = oldState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId];
+            const newKeyer = newState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId];
+            if (!oldKeyer || !newKeyer) {
+                continue;
+            }
+            const oldLumaKeyer = oldKeyer.lumaSettings;
+            const newLumaKeyer = newKeyer.lumaSettings;
+            if (!oldLumaKeyer || !newLumaKeyer) {
+                continue;
+            }
             const props = {};
@@ -12,0 +20,0 @@ for (const key in atem_connection_1.Commands.MixEffectKeyLumaCommand.MaskFlags) {

dist/resolvers/upstreamKeyers/patternKeyer.js

@@ -8,6 +8,14 @@ "use strict";
         for (const upstreamKeyerId in oldState.video.ME[mixEffectId].upstreamKeyers) {
-            const oldPatternKeyer = oldState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId].patternSettings;
-            const newPatternKeyer = newState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId].patternSettings;
+            const oldKeyer = oldState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId];
+            const newKeyer = newState.video.ME[mixEffectId].upstreamKeyers[upstreamKeyerId];
+            if (!oldKeyer || !newKeyer) {
+                continue;
+            }
+            const oldPatternKeyer = oldKeyer.patternSettings;
+            const newPatternKeyer = newKeyer.patternSettings;
+            if (!oldPatternKeyer || !newPatternKeyer) {
+                continue;
+            }
             const props = {};
-            for (const key in atem_connection_1.Commands.MixEffectKeyLumaCommand.MaskFlags) {
+            for (const key in atem_connection_1.Commands.MixEffectKeyPatternCommand.MaskFlags) {
                 if (oldPatternKeyer[key] !== newPatternKeyer[key]) {
@@ -17,2 +25,7 @@ props[key] = newPatternKeyer[key];
             }
+            if (oldPatternKeyer.style !== newPatternKeyer.style) {
+                props.positionX = newPatternKeyer.positionX;
+                props.positionY = newPatternKeyer.positionY;
+                props.symmetry = newPatternKeyer.symmetry;
+            }
             if (Object.keys(props).length > 0) {
@@ -19,0 +32,0 @@ const command = new atem_connection_1.Commands.MixEffectKeyPatternCommand();

package.json

 {
   "name": "atem-state",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Typescript Node.js library for comparing ATEM states",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

86170

increased by14.17%

Lines of code

986

increased by20.98%

No dependency changes