diff --git a/files/en-us/_redirects.txt b/files/en-us/_redirects.txt index eb651e75ee93e01..92f672f3c90ee73 100644 --- a/files/en-us/_redirects.txt +++ b/files/en-us/_redirects.txt @@ -7911,6 +7911,12 @@ /en-US/docs/Web/API/MediaCapabilities/MediaCapabilitiesInfo /en-US/docs/Web/API/MediaCapabilities /en-US/docs/Web/API/MediaCapabilities_API /en-US/docs/Web/API/Media_Capabilities_API/Using_the_Media_Capabilities_API /en-US/docs/Web/API/MediaDevices/mediaDevices.getUserMedia /en-US/docs/Web/API/MediaDevices/getUserMedia +/en-US/docs/Web/API/MediaKeySystemConfiguration /en-US/docs/Web/API/MediaKeySystemAccess/getConfiguration +/en-US/docs/Web/API/MediaKeySystemConfiguration/audioCapabilities /en-US/docs/Web/API/MediaKeySystemAccess/getConfiguration +/en-US/docs/Web/API/MediaKeySystemConfiguration/distinctiveIdentifier /en-US/docs/Web/API/MediaKeySystemAccess/getConfiguration +/en-US/docs/Web/API/MediaKeySystemConfiguration/initDataTypes /en-US/docs/Web/API/MediaKeySystemAccess/getConfiguration +/en-US/docs/Web/API/MediaKeySystemConfiguration/persistentState /en-US/docs/Web/API/MediaKeySystemAccess/getConfiguration +/en-US/docs/Web/API/MediaKeySystemConfiguration/videoCapabilities /en-US/docs/Web/API/MediaKeySystemAccess/getConfiguration /en-US/docs/Web/API/MediaMetadata/MediaMetadata.title /en-US/docs/Web/API/MediaMetadata/title /en-US/docs/Web/API/MediaPositionState /en-US/docs/Web/API/MediaSession/setPositionState /en-US/docs/Web/API/MediaPositionState/duration /en-US/docs/Web/API/MediaSession/setPositionState diff --git a/files/en-us/_wikihistory.json b/files/en-us/_wikihistory.json index 2e76d357ff558cd..299034b5d060cae 100644 --- a/files/en-us/_wikihistory.json +++ b/files/en-us/_wikihistory.json @@ -59202,67 +59202,6 @@ "jpmedley" ] }, - "Web/API/MediaKeySystemConfiguration": { - "modified": "2020-10-15T21:33:47.354Z", - "contributors": [ - "sideshowbarker", - "fscholz", - "Sheppy", - "Sebastianz", - "jpmedley", - "kscarfone" - ] - }, - "Web/API/MediaKeySystemConfiguration/audioCapabilities": { - "modified": "2020-10-15T21:37:20.135Z", - "contributors": [ - "sideshowbarker", - "fscholz", - "rolfedh", - "Sebastianz", - "jpmedley" - ] - }, - "Web/API/MediaKeySystemConfiguration/distinctiveIdentifier": { - "modified": "2020-10-15T21:37:20.112Z", - "contributors": [ - "sideshowbarker", - "fscholz", - "rolfedh", - "Sebastianz", - "jpmedley" - ] - }, - "Web/API/MediaKeySystemConfiguration/initDataTypes": { - "modified": "2020-10-15T21:37:20.109Z", - "contributors": [ - "sideshowbarker", - "fscholz", - "rolfedh", - "Sebastianz", - "jpmedley" - ] - }, - "Web/API/MediaKeySystemConfiguration/persistentState": { - "modified": "2020-10-15T21:37:20.133Z", - "contributors": [ - "sideshowbarker", - "fscholz", - "rolfedh", - "Sebastianz", - "jpmedley" - ] - }, - "Web/API/MediaKeySystemConfiguration/videoCapabilities": { - "modified": "2020-10-15T21:37:20.137Z", - "contributors": [ - "sideshowbarker", - "fscholz", - "rolfedh", - "Sebastianz", - "jpmedley" - ] - }, "Web/API/MediaKeys": { "modified": "2020-10-15T21:33:46.038Z", "contributors": [ diff --git a/files/en-us/web/api/encrypted_media_extensions_api/index.md b/files/en-us/web/api/encrypted_media_extensions_api/index.md index 7c7620412cfe2f0..35aea327f134282 100644 --- a/files/en-us/web/api/encrypted_media_extensions_api/index.md +++ b/files/en-us/web/api/encrypted_media_extensions_api/index.md @@ -27,8 +27,6 @@ The Encrypted Media Extensions API provides interfaces for controlling the playb - : Is a read-only map of media key statuses by key IDs. - {{domxref('MediaKeySystemAccess')}} - : Provides access to a Key System for decryption and/or a content protection provider. -- {{domxref('MediaKeySystemConfiguration')}} - - : Provides configuration information about the media key system. ## Specifications diff --git a/files/en-us/web/api/mediakeysystemaccess/getconfiguration/index.md b/files/en-us/web/api/mediakeysystemaccess/getconfiguration/index.md index 1cca42e17635245..765bd27b9739b06 100644 --- a/files/en-us/web/api/mediakeysystemaccess/getconfiguration/index.md +++ b/files/en-us/web/api/mediakeysystemaccess/getconfiguration/index.md @@ -16,9 +16,19 @@ browser-compat: api.MediaKeySystemAccess.getConfiguration --- {{APIRef("EncryptedMediaExtensions")}}{{SeeCompatTable}} -The `MediaKeySystemAccess.getConfiguration()` method returns a -{{domxref('MediaKeySystemConfiguration')}} object with the supported combination of -configuration options. +The `MediaKeySystemAccess.getConfiguration()` method returns an object with the supported combination of +the following configuration options: + +- `initDataTypes` {{readonlyinline}} + - : Returns a list of supported initialization data type names. An initialization data type is a string indicating the format of the initialization data. +- `audioCapabilities` {{readonlyinline}} + - : Returns a list of supported audio type and capability pairs. +- `videoCapabilities` {{readonlyinline}} + - : Returns a list of supported video type and capability pairs. +- `distinctiveIdentifier` {{readonlyinline}} + - : Indicates whether a persistent distinctive identifier is required. +- `persistentState` {{readonlyinline}} + - : Indicates whether the ability to persist state is required. ## Syntax diff --git a/files/en-us/web/api/mediakeysystemaccess/index.md b/files/en-us/web/api/mediakeysystemaccess/index.md index 3b449b457919812..3ff15ec50ec211c 100644 --- a/files/en-us/web/api/mediakeysystemaccess/index.md +++ b/files/en-us/web/api/mediakeysystemaccess/index.md @@ -27,7 +27,7 @@ The **`MediaKeySystemAccess`** interface of the [EncryptedMediaExtensions API](/ - {{domxref("MediaKeySystemAccess.createMediaKeys()")}} - : Returns a {{jsxref('Promise')}} that resolves to a new {{domxref("MediaKeys")}} object. - {{domxref("MediaKeySystemAccess.getConfiguration()")}} - - : Returns a {{domxref("MediaKeySystemConfiguration")}} object with the supported combination of configuration options. + - : Returns an object with the supported combination of configuration options. ## Specifications diff --git a/files/en-us/web/api/mediakeysystemconfiguration/audiocapabilities/index.md b/files/en-us/web/api/mediakeysystemconfiguration/audiocapabilities/index.md deleted file mode 100644 index 384f6c5ab05ccf1..000000000000000 --- a/files/en-us/web/api/mediakeysystemconfiguration/audiocapabilities/index.md +++ /dev/null @@ -1,33 +0,0 @@ ---- -title: MediaKeySystemConfiguration.audioCapabilities -slug: Web/API/MediaKeySystemConfiguration/audioCapabilities -tags: - - API - - Audio - - EncryptedMediaExtensions - - Media - - MediaKeySystemConfiguration - - NeedsExample - - Property - - Reference - - initDataTypes -browser-compat: api.MediaKeySystemConfiguration.audioCapabilities ---- -{{APIRef("EncryptedMediaExtensions")}}{{SeeCompatTable}} - -The `MediaKeySystemConfiguration.audioCapabilities` read-only property -returns an array of supported audio type and capability pairs. - -## Syntax - -```js -var audioCapabilities[ {contentType: 'contentType', robustness:'robustness'}] = mediaSystemConfiguration.audioCapabilities; -``` - -## Specifications - -{{Specifications}} - -## Browser compatibility - -{{Compat}} diff --git a/files/en-us/web/api/mediakeysystemconfiguration/distinctiveidentifier/index.md b/files/en-us/web/api/mediakeysystemconfiguration/distinctiveidentifier/index.md deleted file mode 100644 index ae542d588475ae2..000000000000000 --- a/files/en-us/web/api/mediakeysystemconfiguration/distinctiveidentifier/index.md +++ /dev/null @@ -1,33 +0,0 @@ ---- -title: MediaKeySystemConfiguration.distinctiveIdentifier -slug: Web/API/MediaKeySystemConfiguration/distinctiveIdentifier -tags: - - API - - EncryptedMediaExtensions - - Media - - MediaKeySystemConfiguration - - NeedsExample - - Property - - Reference - - Video - - distinctiveIdentifier -browser-compat: api.MediaKeySystemConfiguration.distinctiveIdentifier ---- -{{APIRef("EncryptedMediaExtensions")}}{{SeeCompatTable}} - -The `MediaKeySystemConfiguration.distinctiveIdentifier` read-only property -indicates whether a persistent distinctive identifier is required. - -## Syntax - -```js -var distinctiveIdentifier = mediaSystemConfiguration.distinctiveIdentifier; -``` - -## Specifications - -{{Specifications}} - -## Browser compatibility - -{{Compat}} diff --git a/files/en-us/web/api/mediakeysystemconfiguration/index.md b/files/en-us/web/api/mediakeysystemconfiguration/index.md deleted file mode 100644 index 1e81b4833773536..000000000000000 --- a/files/en-us/web/api/mediakeysystemconfiguration/index.md +++ /dev/null @@ -1,40 +0,0 @@ ---- -title: MediaKeySystemConfiguration -slug: Web/API/MediaKeySystemConfiguration -tags: - - API - - EME - - Encrypted Media Extensions - - Encrypted Media Extensions API - - EncryptedMediaExtensions - - Interface - - MediaKeySystemConfiguration - - NeedsContent - - NeedsExample - - Reference -browser-compat: api.MediaKeySystemConfiguration ---- -{{APIRef("Encrypted Media Extensions")}}{{SeeCompatTable}} - -The **`MediaKeySystemConfiguration`** dictionary holds configuration information about the media key system in use. - -## Properties - -- {{domxref("MediaKeySystemConfiguration.initDataTypes")}} {{readonlyinline}} - - : Returns a list of supported initialization data type names. An initialization data type is a string indicating the format of the initialization data. -- {{domxref("MediaKeySystemConfiguration.audioCapabilities")}} {{readonlyinline}} - - : Returns a list of supported audio type and capability pairs. -- {{domxref("MediaKeySystemConfiguration.videoCapabilities")}} {{readonlyinline}} - - : Returns a list of supported video type and capability pairs. -- {{domxref("MediaKeySystemConfiguration.distinctiveIdentifier")}} {{readonlyinline}} - - : Indicates whether a persistent distinctive identifier is required. -- {{domxref("MediaKeySystemConfiguration.persistentState")}} {{readonlyinline}} - - : Indicates whether the ability to persist state is required. - -## Specifications - -{{Specifications}} - -## Browser compatibility - -{{Compat}} diff --git a/files/en-us/web/api/mediakeysystemconfiguration/initdatatypes/index.md b/files/en-us/web/api/mediakeysystemconfiguration/initdatatypes/index.md deleted file mode 100644 index 35d56819b7c467a..000000000000000 --- a/files/en-us/web/api/mediakeysystemconfiguration/initdatatypes/index.md +++ /dev/null @@ -1,35 +0,0 @@ ---- -title: MediaKeySystemConfiguration.initDataTypes -slug: Web/API/MediaKeySystemConfiguration/initDataTypes -tags: - - API - - Audio - - EncryptedMediaExtensions - - Media - - MediaKeySystemConfiguration - - NeedsExample - - Property - - Reference - - Video - - initDataTypes -browser-compat: api.MediaKeySystemConfiguration.initDataTypes ---- -{{APIRef("EncryptedMediaExtensions")}}{{SeeCompatTable}} - -The `MediaKeySystemConfiguration.initDataTypes` read-only property returns a -list of supported initialization data type names. An initialization data type is a -string indicating the format of the initialization data. - -## Syntax - -```js -var dataTypes[] = mediaSystemConfiguration.initDataTypes; -``` - -## Specifications - -{{Specifications}} - -## Browser compatibility - -{{Compat}} diff --git a/files/en-us/web/api/mediakeysystemconfiguration/persistentstate/index.md b/files/en-us/web/api/mediakeysystemconfiguration/persistentstate/index.md deleted file mode 100644 index bbe98930cd26af3..000000000000000 --- a/files/en-us/web/api/mediakeysystemconfiguration/persistentstate/index.md +++ /dev/null @@ -1,33 +0,0 @@ ---- -title: MediaKeySystemConfiguration.persistentState -slug: Web/API/MediaKeySystemConfiguration/persistentState -tags: - - API - - EncryptedMediaExtensions - - Media - - MediaKeySystemConfiguration - - NeedsExample - - Property - - Reference - - Video - - persistentState -browser-compat: api.MediaKeySystemConfiguration.persistentState ---- -{{APIRef("EncryptedMediaExtensions")}}{{SeeCompatTable}} - -The `MediaKeySystemConfiguration.persistentState` read-only property -indicates whether the ability to persist state is required. - -## Syntax - -```js -var persistentState = mediaSystemConfiguration.persistentSTate; -``` - -## Specifications - -{{Specifications}} - -## Browser compatibility - -{{Compat}} diff --git a/files/en-us/web/api/mediakeysystemconfiguration/videocapabilities/index.md b/files/en-us/web/api/mediakeysystemconfiguration/videocapabilities/index.md deleted file mode 100644 index 96fe10c0e04849d..000000000000000 --- a/files/en-us/web/api/mediakeysystemconfiguration/videocapabilities/index.md +++ /dev/null @@ -1,33 +0,0 @@ ---- -title: MediaKeySystemConfiguration.videoCapabilities -slug: Web/API/MediaKeySystemConfiguration/videoCapabilities -tags: - - API - - EncryptedMediaExtensions - - Media - - MediaKeySystemConfiguration - - NeedsExample - - Property - - Reference - - Video - - initDataTypes -browser-compat: api.MediaKeySystemConfiguration.videoCapabilities ---- -{{APIRef("EncryptedMediaExtensions")}}{{SeeCompatTable}} - -The `MediaKeySystemConfiguration.videoCapabilities` read-only property -returns an array of supported video type and capability pairs. - -## Syntax - -```js -var videoCapabilities[{contentType: 'contentType', robustness:'robustness'}] = mediaSystemConfiguration.videoCapabilities; -``` - -## Specifications - -{{Specifications}} - -## Browser compatibility - -{{Compat}} diff --git a/files/en-us/web/api/navigator/requestmediakeysystemaccess/index.md b/files/en-us/web/api/navigator/requestmediakeysystemaccess/index.md index 8e133952f922525..ba39d37fdcaafc8 100644 --- a/files/en-us/web/api/navigator/requestmediakeysystemaccess/index.md +++ b/files/en-us/web/api/navigator/requestmediakeysystemaccess/index.md @@ -44,8 +44,7 @@ promise = navigator.requestMediaKeySystemAccess(keySystem, supportedConfiguratio - : A {{domxref('DOMString')}} identifying the key system. For example `com.example.somesystem` or `org.w3.clearkey`. - `supportedConfigurations` - - : A non-empty {{jsxref('Array')}} of {{domxref('MediaKeySystemConfiguration')}} - objects. The first element with a satisfiable configuration will be used. + - : A non-empty {{jsxref('Array')}} of objects conforming to the object returned by {{domxref("MediaKeySystemAccess.getConfiguration")}}. The first element with a satisfiable configuration will be used. ### Return value diff --git a/files/jsondata/GroupData.json b/files/jsondata/GroupData.json index b254c47a4906385..4a1b9e109b8e16a 100644 --- a/files/jsondata/GroupData.json +++ b/files/jsondata/GroupData.json @@ -406,8 +406,7 @@ "MediaKeys", "MediaKeySession", "MediaKeyStatusMap", - "MediaKeySystemAccess", - "MediaKeySystemConfiguration" + "MediaKeySystemAccess" ], "methods": [ "Navigator.requestMediaKeySystemAccess()",