viaprog/shaka-player
1
0
Fork 0
mirror of https://github.com/shaka-project/shaka-player.git synced 2026-06-16 16:16:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore: Stop using "Object" in Demo annotations (#7932)

Browse Source 
Related to https://github.com/shaka-project/shaka-player/issues/1672
This commit is contained in:
Álvaro Velad Galván
2025-01-24 08:29:38 +01:00
committed by GitHub
parent b72255fba9
commit 8276b59cd9
4 changed files with 108 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
demo/config.js
+53 -54
View File
@@ -123,14 +123,13 @@ shakaDemo.Config = class {
/** @private */
addDrmSection_() {
const widevineRobustnessLevels = {
'': '',
'SW_SECURE_CRYPTO': 'SW_SECURE_CRYPTO',
'SW_SECURE_DECODE': 'SW_SECURE_DECODE',
'HW_SECURE_CRYPTO': 'HW_SECURE_CRYPTO',
'HW_SECURE_DECODE': 'HW_SECURE_DECODE',
'HW_SECURE_ALL': 'HW_SECURE_ALL',
};
const widevineRobustnessLevels = new Map()
.set('', '')
.set('SW_SECURE_CRYPTO', 'SW_SECURE_CRYPTO')
.set('SW_SECURE_DECODE', 'SW_SECURE_DECODE')
.set('HW_SECURE_CRYPTO', 'HW_SECURE_CRYPTO')
.set('HW_SECURE_DECODE', 'HW_SECURE_DECODE')
.set('HW_SECURE_ALL', 'HW_SECURE_ALL');
const docLink = this.resolveExternLink_('.DrmConfiguration');
this.addSection_('DRM', docLink)
.addBoolInput_('Delay License Request Until Played',
@@ -561,33 +560,29 @@ shakaDemo.Config = class {
this.latestInput_.input().checked = true;
}
const hdrLevels = {
'': '',
'AUTO': 'AUTO',
'SDR': 'SDR',
'PQ': 'PQ',
'HLG': 'HLG',
};
const hdrLevelNames = {
'AUTO': 'Auto Detect',
'SDR': 'SDR',
'PQ': 'PQ',
'HLG': 'HLG',
'': 'No Preference',
};
const hdrLevels = new Map()
.set('', '')
.set('AUTO', 'AUTO')
.set('SDR', 'SDR')
.set('PQ', 'PQ')
.set('HLG', 'HLG');
const hdrLevelNames = new Map()
.set('AUTO', 'Auto Detect')
.set('SDR', 'SDR')
.set('PQ', 'PQ')
.set('HLG', 'HLG')
.set('', 'No Preference');
this.addSelectInput_('Preferred HDR Level', 'preferredVideoHdrLevel',
hdrLevels, hdrLevelNames);
const videoLayouts = {
'': '',
'CH-STEREO': 'CH-STEREO',
'CH-MONO': 'CH-MONO',
};
const videoLayoutsNames = {
'CH-STEREO': 'Stereoscopic',
'CH-MONO': 'Monoscopic',
'': 'No Preference',
};
const videoLayouts = new Map()
.set('', '')
.set('CH-STEREO', 'CH-STEREO')
.set('CH-MONO', 'CH-MONO');
const videoLayoutsNames = new Map()
.set('CH-STEREO', 'Stereoscopic')
.set('CH-MONO', 'Monoscopic')
.set('', 'No Preference');
this.addSelectInput_('Preferred video layout', 'preferredVideoLayout',
videoLayouts, videoLayoutsNames);
@@ -654,13 +649,16 @@ shakaDemo.Config = class {
/** @private */
addMediaSourceSection_() {
const strategyOptions = shaka.config.CodecSwitchingStrategy;
const strategyOptionsNames = {
'RELOAD': 'reload',
'SMOOTH': 'smooth',
};
const docLink = this.resolveExternLink_('.MediaSourceConfiguration');
const strategyOptions = new Map();
for (const key of Object.keys(shaka.config.CodecSwitchingStrategy)) {
strategyOptions.set(key, shaka.config.CodecSwitchingStrategy[key]);
}
const strategyOptionsNames = new Map()
.set('RELOAD', 'reload')
.set('SMOOTH', 'smooth');
this.addSection_('Media source', docLink)
.addBoolInput_('Force Transmux', 'mediaSource.forceTransmux')
.addBoolInput_('Insert fake encryption in init segments when needed ' +
@@ -678,13 +676,15 @@ shakaDemo.Config = class {
addLanguageSection_() {
const docLink = this.resolveExternLink_('.PlayerConfiguration');
const autoShowTextOptions = shaka.config.AutoShowText;
const autoShowTextOptionNames = {
'NEVER': 'Never',
'ALWAYS': 'Always',
'IF_PREFERRED_TEXT_LANGUAGE': 'If preferred text language',
'IF_SUBTITLES_MAY_BE_NEEDED': 'If subtitles may be needed',
};
const autoShowTextOptions = new Map();
for (const key of Object.keys(shaka.config.AutoShowText)) {
autoShowTextOptions.set(key, shaka.config.AutoShowText[key]);
}
const autoShowTextOptionNames = new Map()
.set('NEVER', 'Never')
.set('ALWAYS', 'Always')
.set('IF_PREFERRED_TEXT_LANGUAGE', 'If preferred text language')
.set('IF_SUBTITLES_MAY_BE_NEEDED', 'If subtitles may be needed');
this.addSection_('Language', docLink)
.addTextInput_('Preferred Audio Language', 'preferredAudioLanguage')
@@ -785,12 +785,11 @@ shakaDemo.Config = class {
const Level = shaka['log']['Level'];
const setLevel = shaka['log']['setLevel'];
const logLevels = {
'info': 'Info',
'debug': 'Debug',
'v': 'Verbose',
'vv': 'Very Verbose',
};
const logLevels = new Map()
.set('info', 'Info')
.set('debug', 'Debug')
.set('v', 'Verbose')
.set('vv', 'Very Verbose');
const onChange = (input) => {
switch (input.value) {
case 'info':
@@ -998,7 +997,7 @@ shakaDemo.Config = class {
/**
* @param {string} name
* @param {!Object<string, string>} values
* @param {!Map<string, string>} values
* @param {function(!HTMLInputElement)} onChange
* @param {string=} tooltipMessage
* @return {!shakaDemo.Config}
@@ -1016,8 +1015,8 @@ shakaDemo.Config = class {
/**
* @param {string} name
* @param {string} valueName
* @param {!Object<string, ?>} options
* @param {!Object<string, string>} optionNames
* @param {!Map<string, ?>} options
* @param {!Map<string, string>} optionNames
* @param {string=} tooltipMessage
* @return {!shakaDemo.Config}
* @private
demo/input.js
+5 -5
View File
@@ -122,7 +122,7 @@ shakaDemo.SelectInput = class extends shakaDemo.Input {
* @param {!shakaDemo.InputContainer} parentContainer
* @param {?string} name
* @param {function(!HTMLInputElement, !shakaDemo.Input)} onChange
* @param {!Object<string, string>} values
* @param {!Map<string, string>} values
*/
constructor(parentContainer, name, onChange, values) {
super(parentContainer, 'select', 'div', 'label', onChange);
@@ -135,13 +135,13 @@ shakaDemo.SelectInput = class extends shakaDemo.Input {
if (name) {
this.extra_.textContent = name;
}
for (const value of Object.keys(values)) {
values.forEach((value, key) => {
const option =
/** @type {!HTMLOptionElement} */(document.createElement('option'));
option.textContent = values[value];
option.value = value;
option.textContent = value;
option.value = key;
this.input_.appendChild(option);
}
});
}
};
demo/main.js
+47 -47
View File
@@ -212,7 +212,7 @@ shakaDemo.Main = class {
// Optionally enter noinput mode. This has to happen before setting up the
// player.
this.noInput_ = 'noinput' in this.getParams_();
this.noInput_ = this.getParams_().has('noinput');
this.setupPlayer_();
window.addEventListener('hashchange', () => this.hashChanged_());
@@ -900,10 +900,10 @@ shakaDemo.Main = class {
getLastAssetFromHash_() {
const params = this.getParams_();
const manifest = params['asset'];
const assetBase64 = params['assetBase64'];
const manifest = params.get('asset');
const assetBase64 = params.get('assetBase64');
if (manifest) {
const adTagUri = params['adTagUri'];
const adTagUri = params.get('adTagUri');
// See if it's a default asset.
for (const asset of shakaAssets.testAssets) {
if (asset.manifestUri == manifest && asset.adTagUri == adTagUri) {
@@ -924,17 +924,17 @@ shakaDemo.Main = class {
/* iconUri= */ '',
/* manifestUri= */ manifest,
/* source= */ shakaAssets.Source.CUSTOM);
if ('license' in params) {
if (params.has('license')) {
let drmSystems = shakaDemo.Main.commonDrmSystems;
if ('drmSystem' in params) {
drmSystems = [params['drmSystem']];
if (params.has('drmSystem')) {
drmSystems = [params.get('drmSystem')];
}
for (const drmSystem of drmSystems) {
asset.addLicenseServer(drmSystem, params['license']);
asset.addLicenseServer(drmSystem, params.get('license'));
}
}
if ('certificate' in params) {
asset.addCertificateUri(params['certificate']);
if (params.has('certificate')) {
asset.addCertificateUri(params.get('certificate'));
}
return asset;
} else if (assetBase64) {
@@ -963,13 +963,13 @@ shakaDemo.Main = class {
if (this.player_) {
const readParam = (hashName, configName) => {
if (hashName in params) {
if (params.has(hashName)) {
const existing = this.getCurrentConfigValue(configName);
// Translate the param string into a non-string value if appropriate.
// Determine what type the parsed value should be based on the current
// value.
let value = params[hashName];
let value = params.get(hashName);
if (typeof existing == 'boolean') {
value = value == 'true';
} else if (typeof existing == 'number') {
@@ -987,73 +987,73 @@ shakaDemo.Main = class {
if (!advanced[drmSystem]) {
advanced[drmSystem] = shakaDemo.Main.defaultAdvancedDrmConfig();
}
if ('videoRobustness' in params) {
if (params.has('videoRobustness')) {
advanced[drmSystem].videoRobustness =
params['videoRobustness'].split(',');
params.get('videoRobustness').split(',');
}
if ('audioRobustness' in params) {
if (params.has('audioRobustness')) {
advanced[drmSystem].audioRobustness =
params['audioRobustness'].split(',');
params.get('audioRobustness').split(',');
}
}
if ('audioRobustness' in params || 'videoRobustness' in params) {
if (params.has('audioRobustness') || params.has('videoRobustness')) {
this.configure('drm.advanced', advanced);
}
}
}
if ('lang' in params) {
if (params.has('lang')) {
// Load the legacy 'lang' hash value.
const lang = params['lang'];
const lang = params.get('lang');
this.configure('preferredAudioLanguage', lang);
this.configure('preferredTextLanguage', lang);
this.setUILocale(lang);
}
if ('uilang' in params) {
this.setUILocale(params['uilang']);
if (params.has('uilang')) {
this.setUILocale(params.get('uilang'));
// TODO(#1591): Support multiple language preferences
}
if ('noadaptation' in params) {
if (params.has('noadaptation')) {
this.configure('abr.enabled', false);
}
if ('preferredVideoCodecs' in params) {
if (params.has('preferredVideoCodecs')) {
this.configure('preferredVideoCodecs',
params['preferredVideoCodecs'].split(','));
params.get('preferredVideoCodecs').split(','));
}
if ('preferredAudioCodecs' in params) {
if (params.has('preferredAudioCodecs')) {
this.configure('preferredAudioCodecs',
params['preferredAudioCodecs'].split(','));
params.get('preferredAudioCodecs').split(','));
}
if ('preferredTextFormats' in params) {
if (params.has('preferredTextFormats')) {
this.configure('preferredTextFormats',
params['preferredTextFormats'].split(','));
params.get('preferredTextFormats').split(','));
}
// Add compiled/uncompiled links.
this.makeVersionLinks_();
// Disable custom controls.
this.nativeControlsEnabled_ = 'nativecontrols' in params;
this.nativeControlsEnabled_ = params.has('nativecontrols');
// Enable trick play.
if ('trickplay' in params) {
if (params.has('trickplay')) {
this.trickPlayControlsEnabled_ = true;
this.configureUI_();
}
if ('customContextMenu' in params) {
if (params.has('customContextMenu')) {
this.customContextMenu_ = true;
this.configureUI_();
}
if ('watermarkText' in params) {
this.watermarkText_ = params['watermarkText'];
if (params.has('watermarkText')) {
this.watermarkText_ = params.get('watermarkText');
}
if ('visualizer' in params) {
if (params.has('visualizer')) {
this.setIsVisualizerActive(true);
} else {
this.setIsVisualizerActive(false);
@@ -1070,13 +1070,13 @@ shakaDemo.Main = class {
}
if (shaka.log) {
if ('vv' in params) {
if (params.has('vv')) {
shaka.log.setLevel(shaka.log.Level.V2);
} else if ('v' in params) {
} else if (params.has('v')) {
shaka.log.setLevel(shaka.log.Level.V1);
} else if ('debug' in params) {
} else if (params.has('debug')) {
shaka.log.setLevel(shaka.log.Level.DEBUG);
} else if ('info' in params) {
} else if (params.has('info')) {
shaka.log.setLevel(shaka.log.Level.INFO);
}
}
@@ -1086,9 +1086,9 @@ shakaDemo.Main = class {
makeVersionLinks_() {
const params = this.getParams_();
let buildType = 'uncompiled';
if ('build' in params) {
buildType = params['build'];
} else if ('compiled' in params) {
if (params.has('build')) {
buildType = params.get('build');
} else if (params.has('compiled')) {
buildType = 'compiled';
}
for (const type of ['compiled', 'debug_compiled', 'uncompiled']) {
@@ -1117,7 +1117,7 @@ shakaDemo.Main = class {
}
/**
* @return {!Object<string, string>} params
* @return {!Map<string, string>} params
* @private
*/
getParams_() {
@@ -1132,10 +1132,10 @@ shakaDemo.Main = class {
// the URL fragment takes precedence.
/** @type {!Array<string>} */
const combined = fields.concat(fragments);
const params = {};
const params = new Map();
for (const line of combined) {
const kv = line.split('=');
params[kv[0]] = kv.slice(1).join('=');
params.set([kv[0]], kv.slice(1).join('='));
}
return params;
}
@@ -1809,14 +1809,14 @@ shakaDemo.Main = class {
// Determine if the element is selected.
const params = this.getParams_();
let selected =
params['panel'] == encodeURI(button.getAttribute('tab-identifier'));
params.get('panel') == encodeURI(button.getAttribute('tab-identifier'));
if (selected) {
// Re-apply any saved data from hash.
const hashValues = params['panelData'];
const hashValues = params.get('panelData');
if (hashValues) {
button.setAttribute('tab-hash', hashValues);
}
} else if (!params['panel']) {
} else if (!params.has('panel')) {
// Check if it's selected by default.
selected = button.getAttribute('defaultselected') != null;
}
demo/search.js
+3 -3
View File
@@ -299,11 +299,11 @@ shakaDemo.Search = class {
makeSelectInput_(searchContainer, name, choices, type) {
searchContainer.addRow(null, null);
const nullOption = '---';
const valuesObject = {};
const valuesObject = new Map();
for (const term of choices) {
valuesObject[term] = term;
valuesObject.set(term, term);
}
valuesObject[nullOption] = nullOption;
valuesObject.set(nullOption, nullOption);
let lastValue = nullOption;
const onChange = (input) => {
if (input.value != nullOption) {