@pixwel/pixwel-sdk 2.1.19 → 2.1.21

package/coverage/lcov-report/fileType.js.html

@@ -87,9 +87,9 @@
 <a name='L39'></a><a href='#L39'>39</a>
 <a name='L40'></a><a href='#L40'>40</a>
 <a name='L41'></a><a href='#L41'>41</a>
-<a name='L42'></a><a href='#L42'>42</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
+<a name='L42'></a><a href='#L42'>42</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -123,7 +123,7 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -175,7 +175,7 @@ module.exports = {
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Sep 07 2019 17:17:44 GMT-0500 (Central Daylight Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Sep 07 2019 18:03:07 GMT-0500 (Central Daylight Time)
 </div>
 </div>
 <script src="prettify.js"></script>

package/coverage/lcov-report/index.html

@@ -20,31 +20,31 @@
     </h1>
     <div class='clearfix'>
       <div class='fl pad1y space-right2'>
-        <span class="strong">45% </span>
+        <span class="strong">53.79% </span>
         <span class="quiet">Statements</span>
-        <span class='fraction'>261/580</span>
+        <span class='fraction'>312/580</span>
       </div>
       <div class='fl pad1y space-right2'>
-        <span class="strong">51.01% </span>
+        <span class="strong">55.28% </span>
         <span class="quiet">Branches</span>
-        <span class='fraction'>203/398</span>
+        <span class='fraction'>220/398</span>
       </div>
       <div class='fl pad1y space-right2'>
-        <span class="strong">32.22% </span>
+        <span class="strong">50% </span>
         <span class="quiet">Functions</span>
-        <span class='fraction'>29/90</span>
+        <span class='fraction'>45/90</span>
       </div>
       <div class='fl pad1y space-right2'>
-        <span class="strong">45.14% </span>
+        <span class="strong">53.65% </span>
         <span class="quiet">Lines</span>
-        <span class='fraction'>260/576</span>
+        <span class='fraction'>309/576</span>
       </div>
     </div>
     <p class="quiet">
       Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
     </p>
   </div>
-  <div class='status-line low'></div>
+  <div class='status-line medium'></div>
 <div class="pad1">
 <table class="coverage-summary">
 <thead>
@@ -166,16 +166,16 @@
 	</tr>
 
 <tr>
-	<td class="file low" data-value="Model.js"><a href="Model.js.html">Model.js</a></td>
-	<td data-value="20.78" class="pic low"><div class="chart"><div class="cover-fill" style="width: 20%;"></div><div class="cover-empty" style="width:80%;"></div></div></td>
-	<td data-value="20.78" class="pct low">20.78%</td>
-	<td data-value="77" class="abs low">16/77</td>
-	<td data-value="0" class="pct low">0%</td>
-	<td data-value="32" class="abs low">0/32</td>
-	<td data-value="24" class="pct low">24%</td>
-	<td data-value="25" class="abs low">6/25</td>
-	<td data-value="21.33" class="pct low">21.33%</td>
-	<td data-value="75" class="abs low">16/75</td>
+	<td class="file high" data-value="Model.js"><a href="Model.js.html">Model.js</a></td>
+	<td data-value="87.01" class="pic high"><div class="chart"><div class="cover-fill" style="width: 87%;"></div><div class="cover-empty" style="width:13%;"></div></div></td>
+	<td data-value="87.01" class="pct high">87.01%</td>
+	<td data-value="77" class="abs high">67/77</td>
+	<td data-value="53.13" class="pct medium">53.13%</td>
+	<td data-value="32" class="abs medium">17/32</td>
+	<td data-value="88" class="pct high">88%</td>
+	<td data-value="25" class="abs high">22/25</td>
+	<td data-value="86.67" class="pct high">86.67%</td>
+	<td data-value="75" class="abs high">65/75</td>
 	</tr>
 
 <tr>
@@ -262,7 +262,7 @@
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Sep 07 2019 17:17:44 GMT-0500 (Central Daylight Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Sep 07 2019 18:03:07 GMT-0500 (Central Daylight Time)
 </div>
 </div>
 <script src="prettify.js"></script>

package/coverage/lcov.info

@@ -864,143 +864,143 @@ FN:236,(anonymous_22)
 FN:244,(anonymous_23)
 FN:250,(anonymous_24)
 FNF:25
-FNH:6
-FNDA:54,connection
-FNDA:54,(anonymous_1)
+FNH:22
+FNDA:78,connection
+FNDA:72,(anonymous_1)
 FNDA:0,(anonymous_2)
-FNDA:0,(anonymous_3)
-FNDA:0,(anonymous_4)
-FNDA:0,(anonymous_5)
-FNDA:114,(anonymous_6)
-FNDA:1005,(anonymous_7)
-FNDA:430,(anonymous_8)
-FNDA:0,(anonymous_9)
-FNDA:0,(anonymous_10)
-FNDA:0,(anonymous_11)
-FNDA:1,(anonymous_12)
-FNDA:0,(anonymous_13)
-FNDA:0,(anonymous_14)
-FNDA:0,(anonymous_15)
-FNDA:0,(anonymous_16)
-FNDA:0,(anonymous_17)
+FNDA:4,(anonymous_3)
+FNDA:2,(anonymous_4)
+FNDA:1,(anonymous_5)
+FNDA:126,(anonymous_6)
+FNDA:1083,(anonymous_7)
+FNDA:454,(anonymous_8)
+FNDA:2,(anonymous_9)
+FNDA:6,(anonymous_10)
+FNDA:5,(anonymous_11)
+FNDA:3,(anonymous_12)
+FNDA:1,(anonymous_13)
+FNDA:1,(anonymous_14)
+FNDA:6,(anonymous_15)
+FNDA:6,(anonymous_16)
+FNDA:5,(anonymous_17)
 FNDA:0,(anonymous_18)
-FNDA:0,(anonymous_19)
+FNDA:3,(anonymous_19)
 FNDA:0,(anonymous_20)
-FNDA:0,(anonymous_21)
-FNDA:0,(anonymous_22)
-FNDA:0,(anonymous_23)
-FNDA:0,(anonymous_24)
-DA:20,1
-DA:31,54
-DA:44,54
-DA:45,54
-DA:46,54
-DA:47,54
-DA:48,54
-DA:49,54
+FNDA:1,(anonymous_21)
+FNDA:1,(anonymous_22)
+FNDA:1,(anonymous_23)
+FNDA:1,(anonymous_24)
+DA:20,2
+DA:31,78
+DA:44,72
+DA:45,72
+DA:46,72
+DA:47,72
+DA:48,72
+DA:49,72
 DA:58,0
-DA:64,0
-DA:65,0
-DA:66,0
-DA:68,0
-DA:70,0
-DA:73,0
-DA:81,0
-DA:87,114
-DA:89,1005
-DA:92,114
-DA:93,114
-DA:94,114
-DA:95,430
-DA:97,114
-DA:106,0
-DA:115,0
-DA:117,0
-DA:118,0
-DA:119,0
-DA:121,0
-DA:125,0
-DA:126,0
-DA:129,0
-DA:137,1
-DA:143,0
-DA:151,0
-DA:159,0
-DA:161,0
-DA:162,0
-DA:163,0
-DA:164,0
-DA:166,0
-DA:169,0
-DA:170,0
+DA:64,4
+DA:65,4
+DA:66,2
+DA:68,2
+DA:70,4
+DA:73,2
+DA:81,1
+DA:87,126
+DA:89,1083
+DA:92,126
+DA:93,126
+DA:94,126
+DA:95,454
+DA:97,126
+DA:106,2
+DA:115,6
+DA:117,6
+DA:118,2
+DA:119,2
+DA:121,4
+DA:125,6
+DA:126,5
+DA:129,6
+DA:137,3
+DA:143,1
+DA:151,1
+DA:159,6
+DA:161,6
+DA:162,1
+DA:163,1
+DA:164,1
+DA:166,5
+DA:169,6
+DA:170,6
 DA:172,0
-DA:176,0
-DA:177,0
-DA:180,0
-DA:189,0
-DA:190,0
+DA:176,6
+DA:177,6
+DA:180,6
+DA:189,5
+DA:190,5
 DA:191,0
-DA:193,0
+DA:193,5
 DA:195,0
-DA:197,0
-DA:198,0
-DA:207,0
-DA:208,0
+DA:197,5
+DA:198,5
+DA:207,3
+DA:208,3
 DA:209,0
-DA:211,0
-DA:212,0
+DA:211,3
+DA:212,3
 DA:213,0
-DA:215,0
+DA:215,3
 DA:217,0
 DA:219,0
-DA:221,0
-DA:222,0
-DA:231,0
-DA:232,0
+DA:221,3
+DA:222,3
+DA:231,1
+DA:232,1
 DA:233,0
-DA:235,0
-DA:236,0
-DA:245,0
-DA:246,0
+DA:235,1
+DA:236,1
+DA:245,1
+DA:246,1
 DA:247,0
-DA:249,0
-DA:250,0
+DA:249,1
+DA:250,1
 LF:75
-LH:16
-BRDA:65,0,0,0
-BRDA:65,0,1,0
-BRDA:70,1,0,0
-BRDA:70,1,1,0
-BRDA:114,2,0,0
+LH:65
+BRDA:65,0,0,2
+BRDA:65,0,1,2
+BRDA:70,1,0,2
+BRDA:70,1,1,2
+BRDA:114,2,0,6
 BRDA:115,3,0,0
-BRDA:115,3,1,0
-BRDA:117,4,0,0
-BRDA:117,4,1,0
+BRDA:115,3,1,6
+BRDA:117,4,0,2
+BRDA:117,4,1,4
 BRDA:150,5,0,0
-BRDA:158,6,0,0
-BRDA:161,7,0,0
-BRDA:161,7,1,0
+BRDA:158,6,0,3
+BRDA:161,7,0,1
+BRDA:161,7,1,5
 BRDA:193,8,0,0
 BRDA:206,9,0,0
-BRDA:207,10,0,0
+BRDA:207,10,0,3
 BRDA:207,10,1,0
 BRDA:208,11,0,0
-BRDA:208,11,1,0
+BRDA:208,11,1,3
 BRDA:215,12,0,0
 BRDA:215,12,1,0
 BRDA:230,13,0,0
 BRDA:230,14,0,0
-BRDA:231,15,0,0
+BRDA:231,15,0,1
 BRDA:231,15,1,0
 BRDA:232,16,0,0
-BRDA:232,16,1,0
+BRDA:232,16,1,1
 BRDA:244,17,0,0
-BRDA:245,18,0,0
+BRDA:245,18,0,1
 BRDA:245,18,1,0
 BRDA:246,19,0,0
-BRDA:246,19,1,0
+BRDA:246,19,1,1
 BRF:32
-BRH:0
+BRH:17
 end_of_record
 TN:
 SF:/Users/jeff/www/pixwel/platform/pixwel-sdk/src/Order.js
@@ -1267,8 +1267,8 @@ FNH:0
 FNDA:0,extensionType
 FNDA:0,extension
 FNDA:0,mediaType
-DA:1,1
-DA:3,1
+DA:1,2
+DA:3,2
 DA:16,0
 DA:17,0
 DA:18,0
@@ -1277,7 +1277,7 @@ DA:28,0
 DA:30,0
 DA:31,0
 DA:34,0
-DA:37,1
+DA:37,2
 LF:11
 LH:3
 BRDA:17,0,0,0

package/dist/src/Ingest.js

@@ -256,12 +256,6 @@ var Ingest = function (_Model) {
 				return part.toUpperCase();
 			});
 
-			// if Aspect and Standard are available, then set the encodeName accoring to naming standard
-			if (mediaType == 'video' && tags.Aspect && tags.Standard) {
-				var encodeName = tags.Standard.toUpperCase() + "-" + tags.Aspect.replace(':', 'X');
-				parts = parts.push("" + encodeName);
-			}
-
 			var matchedSet = matchSet(allTags, options.tags);
 			var requiredInfo = tags.Resolution && tags["Frame Mode"] && tags.Framerate;
 
@@ -339,7 +333,7 @@ var Ingest = function (_Model) {
 			if (!Array.isArray(info["media"]["track"])) {
 				general = info["media"]["track"];
 			} else {
-				general = _lodash2.default.find(info["media"]["track"], { _type: "General" });
+				general = _lodash2.default.find(info["media"]["track"], { '@type': "General" });
 			}
 
 			switch (mediaType) {
@@ -367,7 +361,7 @@ var Ingest = function (_Model) {
 			};
 
 			var media = _lodash2.default.find(info["media"]["track"], {
-				_type: mediaType
+				'@type': mediaType
 			});
 			media = _lodash2.default.merge({}, mediainfoDefaults, media);
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@pixwel/pixwel-sdk",
 	"description": "",
-	"version": "2.1.19",
+	"version": "2.1.21",
 	"author": "Pixwel",
 	"license": "UNLICENSED",
 	"main": "./dist/index.js",

package/src/Ingest.js

@@ -227,12 +227,6 @@ export default class Ingest extends Model {
 			.filter()
 			.map(part => part.toUpperCase());
 
-		// if Aspect and Standard are available, then set the encodeName accoring to naming standard
-		if (mediaType == 'video' && tags.Aspect && tags.Standard) {
-			let encodeName = `${tags.Standard.toUpperCase()}-${tags.Aspect.replace(':', 'X')}`;
-			parts = parts.push(`${encodeName}`);
-		}
-
 		let matchedSet = matchSet(allTags, options.tags);
 		let requiredInfo = tags.Resolution && tags["Frame Mode"] && tags.Framerate;
 
@@ -314,7 +308,7 @@ export default class Ingest extends Model {
 		if (!Array.isArray(info["media"]["track"])) {
 			general = info["media"]["track"];
 		} else {
-			general = _.find(info["media"]["track"], { _type: "General" });
+			general = _.find(info["media"]["track"], { '@type': "General" });
 		}
 
 		switch (mediaType) {
@@ -342,7 +336,7 @@ export default class Ingest extends Model {
 		};
 
 		let media = _.find(info["media"]["track"], {
-			_type: mediaType
+			'@type': mediaType
 		});
 		media = _.merge({}, mediainfoDefaults, media);
 

package/test/mocks/mediainfo-4x3.mock.js

@@ -16,7 +16,7 @@ module.exports = {
 				Tagged_date: "UTC 2019-09-06 18:01:18",
 				FileExtension_Invalid:
 					"mov mp4 m4v m4a m4b m4p 3gpp 3gp 3gpp2 3g2 k3g jpm jpx mqv ismv isma ismt f4v",
-				_type: "General"
+				'@type': "General"
 			},
 			{
 				ID: "1",
@@ -49,7 +49,7 @@ module.exports = {
 				Transfer_characteristics: "BT.709",
 				Matrix_coefficients: "BT.709",
 				matrix_coefficients_Original: "BT.601",
-				_type: "Video"
+				'@type': "Video"
 			},
 			{
 				ID: "2",
@@ -68,7 +68,7 @@ module.exports = {
 				Language: "English",
 				Encoded_date: "UTC 2019-09-06 18:01:18",
 				Tagged_date: "UTC 2019-09-06 18:01:18",
-				_type: "Audio"
+				'@type': "Audio"
 			}
 		]
 	},

package/test/mocks/mediainfo.mock.js

@@ -19,7 +19,7 @@ module.exports = {
 				FooterSize: "8875",
 				IsStreamable: "No",
 				Encoded_Application: "Lavf57.83.100",
-				_type: "General"
+				'@type': "General"
 			},
 			{
 				StreamOrder: "0",
@@ -55,7 +55,7 @@ module.exports = {
 				Encoded_Library_Settings:
 					"cabac=1 / ref=3 / deblock=1:0:0 / analyse=0x3:0x113 / me=hex / subme=7 / psy=1 / psy_rd=1.00:0.00 / mixed_ref=1 / me_range=16 / chroma_me=1 / trellis=1 / 8x8dct=1 / cqm=0 / deadzone=21,11 / fast_pskip=1 / chroma_qp_offset=-2 / threads=6 / lookahead_threads=1 / sliced_threads=0 / nr=0 / decimate=1 / interlaced=0 / bluray_compat=0 / constrained_intra=0 / bframes=3 / b_pyramid=2 / b_adapt=1 / b_bias=0 / direct=1 / weightb=1 / open_gop=0 / weightp=2 / keyint=250 / keyint_min=23 / scenecut=40 / intra_refresh=0 / rc_lookahead=40 / rc=crf / mbtree=1 / crf=23.0 / qcomp=0.60 / qpmin=0 / qpmax=69 / qpstep=4 / ip_ratio=1.40 / aq=1:1.00",
 				Language: "en",
-				_type: "Video"
+				'@type': "Video"
 			},
 			{
 				StreamOrder: "1",
@@ -81,7 +81,7 @@ module.exports = {
 				Language: "en",
 				Default: "Yes",
 				AlternateGroup: "1",
-				_type: "Audio"
+				'@type': "Audio"
 			}
 		],
 		_ref:

package/test/mocks/mediainfo.mxf.mock.js

@@ -15,7 +15,7 @@ module.exports = {
 				Encoded_date: "2018-07-03 01:23:26.180",
 				Writing_application: "OpenCube MXFTk Advanced 2.6.4.0.1",
 				Writing_library: "Darwin 15.6.0 x86_64 2.6.4.0.1",
-				_type: "General"
+				'@type': "General"
 			},
 			{
 				ID: "2",
@@ -51,7 +51,7 @@ module.exports = {
 				Color_primaries: "BT.709",
 				Transfer_characteristics: "BT.709",
 				Matrix_coefficients: "BT.709",
-				_type: "Video"
+				'@type': "Video"
 			},
 			{
 				ID: "3",
@@ -68,7 +68,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Stream_size: "1.37 MiB (2%)",
 				Title: "Sound",
-				_type: "Audio",
+				'@type': "Audio",
 				_typeorder: "1"
 			},
 			{
@@ -86,7 +86,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Stream_size: "1.37 MiB (2%)",
 				Title: "Sound",
-				_type: "Audio",
+				'@type': "Audio",
 				_typeorder: "2"
 			},
 			{
@@ -104,7 +104,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Stream_size: "1.37 MiB (2%)",
 				Title: "Sound",
-				_type: "Audio",
+				'@type': "Audio",
 				_typeorder: "3"
 			},
 			{
@@ -122,7 +122,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Stream_size: "1.37 MiB (2%)",
 				Title: "Sound",
-				_type: "Audio",
+				'@type': "Audio",
 				_typeorder: "4"
 			},
 			{
@@ -140,7 +140,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Stream_size: "1.37 MiB (2%)",
 				Title: "Sound",
-				_type: "Audio",
+				'@type': "Audio",
 				_typeorder: "5"
 			},
 			{
@@ -158,7 +158,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Stream_size: "1.37 MiB (2%)",
 				Title: "Sound",
-				_type: "Audio",
+				'@type': "Audio",
 				_typeorder: "6"
 			},
 			{
@@ -176,7 +176,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Stream_size: "1.37 MiB (2%)",
 				Title: "Sound",
-				_type: "Audio",
+				'@type': "Audio",
 				_typeorder: "7"
 			},
 			{
@@ -194,7 +194,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Stream_size: "1.37 MiB (2%)",
 				Title: "Sound",
-				_type: "Audio",
+				'@type': "Audio",
 				_typeorder: "8"
 			},
 			{
@@ -204,7 +204,7 @@ module.exports = {
 				Time_code_of_first_frame: "00:00:00:00",
 				Time_code_settings: "Material Package",
 				Time_code__striped: "Yes",
-				_type: "Other",
+				'@type': "Other",
 				_typeorder: "1"
 			},
 			{
@@ -214,7 +214,7 @@ module.exports = {
 				Time_code_of_first_frame: "00:00:00:00",
 				Time_code_settings: "Source Package",
 				Time_code__striped: "Yes",
-				_type: "Other",
+				'@type': "Other",
 				_typeorder: "2"
 			},
 			{
@@ -222,7 +222,7 @@ module.exports = {
 				Format: "SMPTE TC",
 				Muxing_mode: "SDTI",
 				Time_code_of_first_frame: "00:00:00:00",
-				_type: "Other",
+				'@type': "Other",
 				_typeorder: "3"
 			}
 		]

package/test/mocks/mediainfo.png.mock.js

@@ -5,7 +5,7 @@ module.exports = {
 				Format: "PNG",
 				Format_Info: "Portable Network Graphic",
 				File_size: "518 KiB",
-				_type: "General"
+				'@type': "General"
 			},
 			{
 				Format: "PNG",
@@ -15,7 +15,7 @@ module.exports = {
 				Bit_depth: "24 bits",
 				Compression_mode: "Lossless",
 				Stream_size: "518 KiB (100%)",
-				_type: "Image"
+				'@type': "Image"
 			}
 		]
 	}

package/test/mocks/prores.mock.js

@@ -2,7 +2,7 @@ module.exports = {
 	media: {
 		track: [
 			{
-				_type: "General",
+				'@type': "General",
 				VideoCount: "1",
 				AudioCount: "1",
 				OtherCount: "1",
@@ -34,7 +34,7 @@ module.exports = {
 				}
 			},
 			{
-				_type: "Video",
+				'@type': "Video",
 				StreamOrder: "0",
 				ID: "1",
 				Format: "ProRes",
@@ -72,7 +72,7 @@ module.exports = {
 				}
 			},
 			{
-				_type: "Audio",
+				'@type': "Audio",
 				StreamOrder: "1",
 				ID: "2",
 				Format: "PCM",
@@ -101,7 +101,7 @@ module.exports = {
 				}
 			},
 			{
-				_type: "Other",
+				'@type': "Other",
 				StreamOrder: "2",
 				ID: "3",
 				Type: "Time code",