From e471c193e20f04ebc0ac9650b91ed56b7f200ad6 Mon Sep 17 00:00:00 2001 From: RZCH-DX Date: Sun, 23 Feb 2025 21:57:55 +0100 Subject: [PATCH 1/2] fix match typo for Mac OS X --- web/js/3las/util/3las.helpers.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/js/3las/util/3las.helpers.js b/web/js/3las/util/3las.helpers.js index f1a5631..548d3d3 100644 --- a/web/js/3las/util/3las.helpers.js +++ b/web/js/3las/util/3las.helpers.js @@ -33,7 +33,7 @@ var OSName; isWindows = (ua.match('windows') ? true : false); isLinux = (ua.match('android') ? false : (ua.match('linux') ? true : false)); isBSD = (ua.match('bsd') ? true : false); - isMacOSX = !isIOS && !isIPadOS && (ua.match('mac osx') ? true : false); + isMacOSX = !isIOS && !isIPadOS && (ua.match('mac os x') ? true : false); isInternetExplorer = (ua.match('msie') ? true : false); isEdge = (ua.match('edg') ? true : false); isSafari = (ua.match(/(chromium|chrome|crios)/g) ? false : (ua.match('safari') ? true : false)); @@ -126,4 +126,4 @@ var WakeLock = /** @class */ (function () { WakeLock.VideoWebm = 'GkXfo0AgQoaBAUL3gQFC8oEEQvOBCEKCQAR3ZWJtQoeBAkKFgQIYU4BnQI0VSalmQCgq17FAAw9CQE2AQAZ3aGFtbXlXQUAGd2hhbW15RIlACECPQAAAAAAAFlSua0AxrkAu14EBY8WBAZyBACK1nEADdW5khkAFVl9WUDglhohAA1ZQOIOBAeBABrCBCLqBCB9DtnVAIueBAKNAHIEAAIAwAQCdASoIAAgAAUAmJaQAA3AA/vz0AAA='; WakeLock.VideoMp4 = 'AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAAG21kYXQAAAGzABAHAAABthADAowdbb9/AAAC6W1vb3YAAABsbXZoZAAAAAB8JbCAfCWwgAAAA+gAAAAAAAEAAAEAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIVdHJhawAAAFx0a2hkAAAAD3wlsIB8JbCAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQAAAAAAIAAAACAAAAAABsW1kaWEAAAAgbWRoZAAAAAB8JbCAfCWwgAAAA+gAAAAAVcQAAAAAAC1oZGxyAAAAAAAAAAB2aWRlAAAAAAAAAAAAAAAAVmlkZW9IYW5kbGVyAAAAAVxtaW5mAAAAFHZtaGQAAAABAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAAEcc3RibAAAALhzdHNkAAAAAAAAAAEAAACobXA0dgAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAIAAgASAAAAEgAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABj//wAAAFJlc2RzAAAAAANEAAEABDwgEQAAAAADDUAAAAAABS0AAAGwAQAAAbWJEwAAAQAAAAEgAMSNiB9FAEQBFGMAAAGyTGF2YzUyLjg3LjQGAQIAAAAYc3R0cwAAAAAAAAABAAAAAQAAAAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAEAAAABAAAAFHN0c3oAAAAAAAAAEwAAAAEAAAAUc3RjbwAAAAAAAAABAAAALAAAAGB1ZHRhAAAAWG1ldGEAAAAAAAAAIWhkbHIAAAAAAAAAAG1kaXJhcHBsAAAAAAAAAAAAAAAAK2lsc3QAAAAjqXRvbwAAABtkYXRhAAAAAQAAAABMYXZmNTIuNzguMw=='; return WakeLock; -}()); \ No newline at end of file +}()); From ad4705f70ba4963f02e42da172bc1f3d22e4068b Mon Sep 17 00:00:00 2001 From: RZCH-DX Date: Sun, 23 Feb 2025 22:00:21 +0100 Subject: [PATCH 2/2] Add Mac OS X to extractSampleOffset exception --- web/js/3las/fallback/formats/3las.formatreader.mpeg.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/js/3las/fallback/formats/3las.formatreader.mpeg.js b/web/js/3las/fallback/formats/3las.formatreader.mpeg.js index 2774f37..a8b0c79 100644 --- a/web/js/3las/fallback/formats/3las.formatreader.mpeg.js +++ b/web/js/3las/fallback/formats/3las.formatreader.mpeg.js @@ -226,7 +226,7 @@ var AudioFormatReader_MPEG = /** @class */ (function (_super) { } if (Math.abs(firstGranulePlayTime - lastGranulePlayTime) <= delta) { // First and last granule are equal. We need to make an educated guess which one is present. - if (isIOS || isIPadOS) { + if (isIOS || isIPadOS || isMacOSX) { // I don't know why, but Apple does things differently. extractSampleOffset = Math.floor((decodedData.length - extractSampleCount) / 2); } @@ -316,4 +316,4 @@ var AudioFormatReader_MPEG = /** @class */ (function (_super) { // Slot size (MPEG unit of measurement) - use [layer] AudioFormatReader_MPEG.MPEG_slot_size = new Array(0, 1, 1, 4); // Rsvd, 3, 2, 1 return AudioFormatReader_MPEG; -}(AudioFormatReader)); \ No newline at end of file +}(AudioFormatReader));