From c54b2dee19caa1e1e418c5571a421d3901cb69cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Velad=20Galv=C3=A1n?= Date: Fri, 24 Jan 2025 08:29:51 +0100 Subject: [PATCH] chore: Stop using "Object" in plugins annotations (#7933) Related to https://github.com/shaka-project/shaka-player/issues/1672 --- lib/media/closed_caption_parser.js | 10 +++++----- lib/media/manifest_parser.js | 20 ++++++++------------ lib/net/networking_engine.js | 14 +++++++------- lib/text/text_engine.js | 14 +++++++------- lib/transmuxer/transmuxer_engine.js | 12 ++++++------ 5 files changed, 33 insertions(+), 37 deletions(-) diff --git a/lib/media/closed_caption_parser.js b/lib/media/closed_caption_parser.js index b3f7b980d..35346c48b 100644 --- a/lib/media/closed_caption_parser.js +++ b/lib/media/closed_caption_parser.js @@ -143,7 +143,7 @@ shaka.media.ClosedCaptionParser = class { * @export */ static registerParser(mimeType, plugin) { - shaka.media.ClosedCaptionParser.parserMap_[mimeType] = plugin; + shaka.media.ClosedCaptionParser.parserMap_.set(mimeType, plugin); } /** @@ -151,7 +151,7 @@ shaka.media.ClosedCaptionParser = class { * @export */ static unregisterParser(mimeType) { - delete shaka.media.ClosedCaptionParser.parserMap_[mimeType]; + shaka.media.ClosedCaptionParser.parserMap_.delete(mimeType); } /** @@ -160,7 +160,7 @@ shaka.media.ClosedCaptionParser = class { * @export */ static findParser(mimeType) { - return shaka.media.ClosedCaptionParser.parserMap_[mimeType]; + return shaka.media.ClosedCaptionParser.parserMap_.get(mimeType); } /** @@ -187,8 +187,8 @@ shaka.media.ClosedCaptionParser = class { } }; -/** @private {!Object} */ -shaka.media.ClosedCaptionParser.parserMap_ = {}; +/** @private {!Map} */ +shaka.media.ClosedCaptionParser.parserMap_ = new Map(); /** @private {?shaka.extern.CaptionDecoderPlugin} */ shaka.media.ClosedCaptionParser.decoderFactory_ = null; diff --git a/lib/media/manifest_parser.js b/lib/media/manifest_parser.js index 2480cdcc2..d3f6e6ea2 100644 --- a/lib/media/manifest_parser.js +++ b/lib/media/manifest_parser.js @@ -42,7 +42,7 @@ shaka.media.ManifestParser = class { * @export */ static registerParserByMime(mimeType, parserFactory) { - shaka.media.ManifestParser.parsersByMime[mimeType] = parserFactory; + shaka.media.ManifestParser.parsersByMime.set(mimeType, parserFactory); } /** @@ -52,7 +52,7 @@ shaka.media.ManifestParser = class { * @export */ static unregisterParserByMime(mimeType) { - delete shaka.media.ManifestParser.parsersByMime[mimeType]; + shaka.media.ManifestParser.parsersByMime.delete(mimeType); } @@ -68,7 +68,7 @@ shaka.media.ManifestParser = class { // Make sure all registered parsers are shown, but only for MSE-enabled // platforms where our parsers matter. if (shaka.util.Platform.supportsMediaSource()) { - for (const type in ManifestParser.parsersByMime) { + for (const type of ManifestParser.parsersByMime.keys()) { support[type] = true; } } @@ -89,7 +89,7 @@ shaka.media.ManifestParser = class { // Only query our parsers for MSE-enabled platforms. Otherwise, query a // temporary media element for native support for these types. if (shaka.util.Platform.supportsMediaSource()) { - support[type] = !!ManifestParser.parsersByMime[type]; + support[type] = ManifestParser.parsersByMime.has(type); } else { support[type] = shaka.util.Platform.supportsMediaType(type); } @@ -112,7 +112,7 @@ shaka.media.ManifestParser = class { // Try using the MIME type we were given. if (mimeType) { - const factory = ManifestParser.parsersByMime[mimeType.toLowerCase()]; + const factory = ManifestParser.parsersByMime.get(mimeType.toLowerCase()); if (factory) { return factory; } @@ -145,11 +145,7 @@ shaka.media.ManifestParser = class { return false; } - if (mimeType in shaka.media.ManifestParser.parsersByMime) { - return true; - } - - return false; + return shaka.media.ManifestParser.parsersByMime.has(mimeType); } }; @@ -191,8 +187,8 @@ shaka.media.ManifestParser.AccessibilityPurpose = { /** * Contains the parser factory functions indexed by MIME type. * - * @type {!Object} + * @type {!Map} */ -shaka.media.ManifestParser.parsersByMime = {}; +shaka.media.ManifestParser.parsersByMime = new Map(); diff --git a/lib/net/networking_engine.js b/lib/net/networking_engine.js index 8e13aeb64..cf03b08fc 100644 --- a/lib/net/networking_engine.js +++ b/lib/net/networking_engine.js @@ -156,13 +156,13 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget { priority == undefined || priority > 0, 'explicit priority must be > 0'); priority = priority || shaka.net.NetworkingEngine.PluginPriority.APPLICATION; - const existing = shaka.net.NetworkingEngine.schemes_[scheme]; + const existing = shaka.net.NetworkingEngine.schemes_.get(scheme); if (!existing || priority >= existing.priority) { - shaka.net.NetworkingEngine.schemes_[scheme] = { + shaka.net.NetworkingEngine.schemes_.set(scheme, { priority: priority, plugin: plugin, progressSupport: progressSupport, - }; + }); } } @@ -173,7 +173,7 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget { * @export */ static unregisterScheme(scheme) { - delete shaka.net.NetworkingEngine.schemes_[scheme]; + shaka.net.NetworkingEngine.schemes_.delete(scheme); } /** @@ -539,7 +539,7 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget { // and https://tools.ietf.org/html/rfc3986#section-3.1 scheme = scheme.toLowerCase(); - const object = shaka.net.NetworkingEngine.schemes_[scheme]; + const object = shaka.net.NetworkingEngine.schemes_.get(scheme); const plugin = object ? object.plugin : null; if (!plugin) { return shaka.util.AbortableOperation.failed( @@ -972,9 +972,9 @@ shaka.net.NetworkingEngine.SchemeObject; /** * Contains the scheme plugins. * - * @private {!Object} + * @private {!Map} */ -shaka.net.NetworkingEngine.schemes_ = {}; +shaka.net.NetworkingEngine.schemes_ = new Map(); /** * @typedef {{ diff --git a/lib/text/text_engine.js b/lib/text/text_engine.js index 2de0d7768..1c19bfbff 100644 --- a/lib/text/text_engine.js +++ b/lib/text/text_engine.js @@ -74,7 +74,7 @@ shaka.text.TextEngine = class { * @export */ static registerParser(mimeType, plugin) { - shaka.text.TextEngine.parserMap_[mimeType] = plugin; + shaka.text.TextEngine.parserMap_.set(mimeType, plugin); } /** @@ -82,7 +82,7 @@ shaka.text.TextEngine = class { * @export */ static unregisterParser(mimeType) { - delete shaka.text.TextEngine.parserMap_[mimeType]; + shaka.text.TextEngine.parserMap_.delete(mimeType); } /** @@ -90,7 +90,7 @@ shaka.text.TextEngine = class { * @export */ static findParser(mimeType) { - return shaka.text.TextEngine.parserMap_[mimeType]; + return shaka.text.TextEngine.parserMap_.get(mimeType); } /** @@ -98,7 +98,7 @@ shaka.text.TextEngine = class { * @return {boolean} */ static isTypeSupported(mimeType) { - if (shaka.text.TextEngine.parserMap_[mimeType]) { + if (shaka.text.TextEngine.parserMap_.has(mimeType)) { // An actual parser is available. return true; } @@ -147,7 +147,7 @@ shaka.text.TextEngine = class { return; } - const factory = shaka.text.TextEngine.parserMap_[mimeType]; + const factory = shaka.text.TextEngine.parserMap_.get(mimeType); goog.asserts.assert( factory, 'Text type negotiation should have happened already'); this.parser_ = factory(); @@ -469,5 +469,5 @@ shaka.text.TextEngine = class { } }; -/** @private {!Object} */ -shaka.text.TextEngine.parserMap_ = {}; +/** @private {!Map} */ +shaka.text.TextEngine.parserMap_ = new Map(); diff --git a/lib/transmuxer/transmuxer_engine.js b/lib/transmuxer/transmuxer_engine.js index 29edbfabf..79530ee96 100644 --- a/lib/transmuxer/transmuxer_engine.js +++ b/lib/transmuxer/transmuxer_engine.js @@ -33,10 +33,10 @@ shaka.transmuxer.TransmuxerEngine = class { const TransmuxerEngine = shaka.transmuxer.TransmuxerEngine; const normalizedMimetype = TransmuxerEngine.normalizeMimeType_(mimeType); const key = normalizedMimetype + '-' + priority; - TransmuxerEngine.transmuxerMap_[key] = { + TransmuxerEngine.transmuxerMap_.set(key, { priority: priority, plugin: plugin, - }; + }); } /** @@ -48,7 +48,7 @@ shaka.transmuxer.TransmuxerEngine = class { const TransmuxerEngine = shaka.transmuxer.TransmuxerEngine; const normalizedMimetype = TransmuxerEngine.normalizeMimeType_(mimeType); const key = normalizedMimetype + '-' + priority; - delete TransmuxerEngine.transmuxerMap_[key]; + TransmuxerEngine.transmuxerMap_.delete(key); } /** @@ -68,7 +68,7 @@ shaka.transmuxer.TransmuxerEngine = class { ]; for (const priority of priorities) { const key = normalizedMimetype + '-' + priority; - const object = TransmuxerEngine.transmuxerMap_[key]; + const object = TransmuxerEngine.transmuxerMap_.get(key); if (object) { const transmuxer = object.plugin(); const isSupported = transmuxer.isSupported(mimeType, contentType); @@ -139,9 +139,9 @@ shaka.transmuxer.TransmuxerEngine.PluginObject; /** - * @private {!Object} + * @private {!Map} */ -shaka.transmuxer.TransmuxerEngine.transmuxerMap_ = {}; +shaka.transmuxer.TransmuxerEngine.transmuxerMap_ = new Map(); /**