@mediakind/mkplayer 1.0.22 → 1.0.23

package/doc/classes/mkplayer.html

@@ -191,7 +191,7 @@
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in MKPlayer.ts:238</li>
+									<li>Defined in MKPlayer.ts:250</li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -213,7 +213,7 @@
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in MKPlayer.ts:229</li>
+									<li>Defined in MKPlayer.ts:241</li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -235,7 +235,7 @@
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in MKPlayer.ts:257</li>
+									<li>Defined in MKPlayer.ts:269</li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -288,7 +288,7 @@
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in MKPlayer.ts:264</li>
+									<li>Defined in MKPlayer.ts:276</li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -310,7 +310,7 @@
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in MKPlayer.ts:203</li>
+									<li>Defined in MKPlayer.ts:215</li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -343,7 +343,7 @@
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in MKPlayer.ts:214</li>
+									<li>Defined in MKPlayer.ts:226</li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -420,7 +420,7 @@
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in MKPlayer.ts:271</li>
+									<li>Defined in MKPlayer.ts:283</li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -442,7 +442,7 @@
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in MKPlayer.ts:249</li>
+									<li>Defined in MKPlayer.ts:261</li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -472,7 +472,7 @@
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in MKPlayer.ts:287</li>
+									<li>Defined in MKPlayer.ts:299</li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -503,7 +503,7 @@
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in MKPlayer.ts:222</li>
+									<li>Defined in MKPlayer.ts:234</li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -525,7 +525,7 @@
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in MKPlayer.ts:278</li>
+									<li>Defined in MKPlayer.ts:290</li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">
@@ -547,7 +547,7 @@
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in MKPlayer.ts:294</li>
+									<li>Defined in MKPlayer.ts:306</li>
 								</ul>
 							</aside>
 							<div class="tsd-comment tsd-typography">

package/doc/interfaces/labelconfig.html

@@ -113,7 +113,7 @@
 				<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-interface">
 					<a name="captions" class="tsd-anchor"></a>
 					<h3><span class="tsd-flag ts-flagOptional">Optional</span> captions</h3>
-					<div class="tsd-signature tsd-kind-icon">captions<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">Record</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">, </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">&gt;</span></div>
+					<div class="tsd-signature tsd-kind-icon">captions<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">LabelConfigMap</span><span class="tsd-signature-symbol">[]</span></div>
 					<aside class="tsd-sources">
 						<ul>
 							<li>Defined in LabelConfig.ts:13</li>

package/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang='en'>
 <head>
-    <title>MKPlayer 1.0.22</title>
+    <title>MKPlayer 1.0.23</title>
     <meta charset='UTF-8'/>
     <meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
     <meta name='viewport' content='width=device-width, initial-scale=1.0'>
@@ -320,19 +320,39 @@
   let liveSource = {
     // primaryUrl: "https://ceslive-mediakind.akamaized.net/cmaftkn/CES-Hero/index.m3u8",
     // secondaryUrl:"https://ceslive-mediakind.akamaized.net/cmaftkn/CES-Hero/index.m3u8",
-    primaryUrl: 'https://live-mkmsctacdn.azureedge.net/cmaftkn/CES-Hero-asl/index.m3u8',
-    secondaryUrl: 'https://live-mkmsctacdn.azureedge.net/cmaftkn/CES-Hero-asl/index.m3u8',
-    cdnFailoverPercent: 10,
+    primaryUrl: 'https://dtcvod.mediakindengage.com/ctatkn/hls/CES_MEDIA17/index.m3u8',
+    secondaryUrl: 'https://dtcvod.mediakindengage.com/ctatkn/hls/CES_MEDIA17/index.m3u8',
+    cdnFailoverPercent: 1,
     subtitleTracks: [],
     assetIdentifier: 'HLS Live',
     labelConfig: {
-      audio: {'en': 'English', 'mis': 'Audio Descriptions'},
-      captions: {'ENG': 'English', 'GER': 'German'},
+      audio: [
+        {'en': 'English', 'mis': 'Audio Descriptions'}
+      ],
+      captions: [
+        {id: 'application/mp4-2', language: 'en', name: 'English'},
+        {id: 'application/mp4-3', language: 'zh', name: 'Chinese Simplified'},
+        {id: 'application/mp4-4', language: 'cs', name: 'CS'},
+        {id: 'application/mp4-5', language: 'ar', name: 'AR'},
+        {id: 'application/mp4-6', language: 'ko', name: 'Korean'},
+        {id: 'application/mp4-7', language: 'sv', name: 'SV'},
+        {id: 'application/mp4-8', language: 'ja', name: 'Japanese'},
+        {id: 'application/mp4-9', language: 'tr', name: 'Turkish'},
+        {id: 'application/mp4-10', language: 'de', name: 'German'},
+        {id: 'application/mp4-11', language: 'ru', name: 'Russian'},
+        {id: 'application/mp4-12', language: 'zh', name: 'Chinese Traditional'},
+        {id: 'application/mp4-13', language: 'es', name: 'Spanish'},
+        {id: 'application/mp4-14', language: 'pt', name: 'Portugese'},
+        {id: 'application/mp4-15', language: 'fr', name: 'French'},
+        {id: 'application/mp4-16', language: 'it', name: 'Italian'},
+        {id: 'application/mp4-17', language: 'pl', name: 'PL'},
+        {id: 'application/mp4-18', language: 'nl', name: 'Dutch'},
+      ]
     }
   };
 
   let liveSubtitle = {
-    primaryUrl: "https://cesstatic.blob.core.windows.net/hls/Test1/master.m3u8?abc=123",
+    primaryUrl: "https://cdn-0573.aas.mediakind.com/cmaftkn/CES-Hero/index.m3u8",
     cdnFailoverPercent: 10,
     assetIdentifier: 'DASH Live',
     subtitleTracks: [
@@ -349,6 +369,22 @@
         language: 'TA',
       },
     ],
+    labelConfig: {
+      audio: {'en': 'English', 'mis': 'Audio Descriptions'},
+      captions: [
+        {id: 'application/mp4-2', language: 'ENG', name: 'English'},
+        {id: 'application/mp4-3', language: 'zh', name: 'Chinese Simplified'},
+        {id: 'application/mp4-4', language: 'cs', name: 'CS'},
+        {id: 'application/mp4-5', language: 'ar', name: 'AR'},
+        {id: 'application/mp4-6', language: 'ko', name: 'Korean'},
+        {id: 'application/mp4-7', language: 'sv', name: 'SV'},
+        {id: 'application/mp4-8', language: 'ja', name: 'Japanese'},
+        {id: 'application/mp4-9', language: 'TA', name: 'Turkish'},
+        {id: 'application/mp4-10', language: 'GER', name: 'German'},
+        {id: 'application/mp4-11', language: 'ru', name: 'Russian'},
+        {id: 'application/mp4-12', language: 'zh', name: 'Chinese Traditional'},
+      ]
+    }
   };
 
   let liveId3Source = {
@@ -445,15 +481,15 @@
     smallScreen: false,
     key: '84dc4716-55f9-43fa-ae8e-6fa334c5189b',
 
-    refreshToken: (type) => {
-      // if (type === 'primary') {
-      //   return {name: 'hdnts', value: 'exp=1610140360~acl=*~hmac=3662c21bdc6cfa7f2d0a0462c23a71982bfa0c176c7e164b0630195ee4003104'}
-      // }else if (type === 'secondary') {
-      //   return {name: 'hdnts', value: 'exp=1610140360~acl=*~hmac=3662c21bdc6cfa7f2d0a0462c23a71982bfa0c176c7e164b0630195ee4003104'}
-      // }
-
-      return {name: 'hdnts', value: '5pIs6i6k5KbY0n5ezMaN-GGDUvq4zYUXMFUJzlHs-j_BuZKkd5zzbFCfudf52qL2'}
-    },
+    // refreshToken: (type) => {
+    //   // if (type === 'primary') {
+    //   //   return {name: 'hdnts', value: 'exp=1610140360~acl=*~hmac=3662c21bdc6cfa7f2d0a0462c23a71982bfa0c176c7e164b0630195ee4003104'}
+    //   // }else if (type === 'secondary') {
+    //   //   return {name: 'hdnts', value: 'exp=1610140360~acl=*~hmac=3662c21bdc6cfa7f2d0a0462c23a71982bfa0c176c7e164b0630195ee4003104'}
+    //   // }
+    //
+    //   return {name: 'hdnts', value: '5pIs6i6k5KbY0n5ezMaN-GGDUvq4zYUXMFUJzlHs-j_BuZKkd5zzbFCfudf52qL2'}
+    // },
   };
 
   let playerContainer = document.getElementById('testPlayer');

package/multi-camera.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang='en'>
 <head>
-    <title>MKPlayer 1.0.22</title>
+    <title>MKPlayer 1.0.23</title>
     <meta charset='UTF-8'/>
     <meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
     <meta name='viewport' content='width=device-width, initial-scale=1.0'>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mediakind/mkplayer",
-  "version": "1.0.22",
+  "version": "1.0.23",
   "description": "MediaKind Web Player",
   "repository": {
     "type": "git",

package/src/LabelConfig.ts

@@ -10,5 +10,11 @@ export interface LabelConfig {
   /**
    * list of labels to use in the captions dropdown
    */
-  captions?: Record<string, string>;
+  captions?: LabelConfigMap[];
+}
+
+export interface LabelConfigMap {
+  id?: string;
+  language: string;
+  name: string;
 }

package/src/MKPlayer.ts

@@ -159,13 +159,25 @@ export class MKPlayer {
           },
           subtitles: (track) => {
             console.log(track);
-            if (this.stream.labelConfig && this.stream.labelConfig.captions && this.stream.labelConfig.captions[track.lang]) {
-              return this.stream.labelConfig.captions[track.lang];
-            } else {
+            try {
+              if (this.stream.labelConfig && this.stream.labelConfig.captions) {
+                let filtered = this.stream.labelConfig.captions.filter((value) => value.language === track.lang);
+                if (filtered && filtered.length === 1) {
+                  return filtered[0].name;
+                } else if (filtered && filtered.length > 1) {
+                  filtered = filtered.filter((value) => value.id === track.id);
+                  if (filtered && filtered[0]) {
+                    return filtered[0].name;
+                  }
+                }
+              }
+              } catch (e) {
               return track.lang;
+
             }
+            return track.lang;
+            },
           },
-        },
       };
 
     if (stream.assetIdentifier) {
@@ -292,7 +304,7 @@ export class MKPlayer {
    * returns the current player version
    */
   version(): string {
-    return '1.0.21';
+    return '1.0.23';
   }
 
   private selectUrl(): string {