diff --git a/lib/services/mediaServicesManagement/README.md b/lib/services/mediaServicesManagement/README.md index d7ee91337e..7f4bd1ed4a 100644 --- a/lib/services/mediaServicesManagement/README.md +++ b/lib/services/mediaServicesManagement/README.md @@ -1,3 +1,8 @@ +--- +uid: azure-arm-mediaservices +summary: *content + +--- # Microsoft Azure SDK for Node.js - AzureMediaServices This project provides a Node.js package for accessing Azure. Right now it supports: - **Node.js version 6.x.x or higher** diff --git a/lib/services/mediaServicesManagement/lib/azureMediaServices.js b/lib/services/mediaServicesManagement/lib/azureMediaServices.js index b05e2a3d11..d00dd12ed6 100644 --- a/lib/services/mediaServicesManagement/lib/azureMediaServices.js +++ b/lib/services/mediaServicesManagement/lib/azureMediaServices.js @@ -50,7 +50,7 @@ class AzureMediaServices extends ServiceClient { super(credentials, options); - this.apiVersion = '2018-03-30-preview'; + this.apiVersion = '2018-06-01-preview'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.generateClientRequestId = true; diff --git a/lib/services/mediaServicesManagement/lib/models/aacAudio.js b/lib/services/mediaServicesManagement/lib/models/aacAudio.js index e57aa9748d..8e15d7dbe1 100644 --- a/lib/services/mediaServicesManagement/lib/models/aacAudio.js +++ b/lib/services/mediaServicesManagement/lib/models/aacAudio.js @@ -86,8 +86,7 @@ class AacAudio extends models['Audio'] { required: false, serializedName: 'profile', type: { - name: 'Enum', - allowedValues: [ 'AacLc', 'HeAacV1', 'HeAacV2' ] + name: 'String' } } } diff --git a/lib/services/mediaServicesManagement/lib/models/apiError.js b/lib/services/mediaServicesManagement/lib/models/apiError.js index ff855dbca3..20ddeb52a1 100644 --- a/lib/services/mediaServicesManagement/lib/models/apiError.js +++ b/lib/services/mediaServicesManagement/lib/models/apiError.js @@ -19,7 +19,7 @@ const models = require('./index'); class ApiError { /** * Create a ApiError. - * @member {object} [error] ApiError. The error properties. + * @member {object} [error] The error properties. * @member {string} [error.code] A language-independent error name. * @member {string} [error.message] The error message. * @member {string} [error.target] The target of the error (for example, the diff --git a/lib/services/mediaServicesManagement/lib/models/asset.js b/lib/services/mediaServicesManagement/lib/models/asset.js index 9f65fcaf1e..a6c0dc5072 100644 --- a/lib/services/mediaServicesManagement/lib/models/asset.js +++ b/lib/services/mediaServicesManagement/lib/models/asset.js @@ -130,8 +130,7 @@ class Asset extends models['ProxyResource'] { readOnly: true, serializedName: 'properties.storageEncryptionFormat', type: { - name: 'Enum', - allowedValues: [ 'None', 'MediaStorageClientEncryption' ] + name: 'String' } } } diff --git a/lib/services/mediaServicesManagement/lib/models/builtInStandardEncoderPreset.js b/lib/services/mediaServicesManagement/lib/models/builtInStandardEncoderPreset.js index 4dc1a622eb..7264b66e35 100644 --- a/lib/services/mediaServicesManagement/lib/models/builtInStandardEncoderPreset.js +++ b/lib/services/mediaServicesManagement/lib/models/builtInStandardEncoderPreset.js @@ -61,8 +61,7 @@ class BuiltInStandardEncoderPreset extends models['Preset'] { required: true, serializedName: 'presetName', type: { - name: 'Enum', - allowedValues: [ 'AdaptiveStreaming', 'AACGoodQualityAudio', 'H264MultipleBitrate1080p', 'H264MultipleBitrate720p', 'H264MultipleBitrateSD' ] + name: 'String' } } } diff --git a/lib/services/mediaServicesManagement/lib/models/cbcsDrmConfiguration.js b/lib/services/mediaServicesManagement/lib/models/cbcsDrmConfiguration.js index 61bcef3cd4..746146424d 100644 --- a/lib/services/mediaServicesManagement/lib/models/cbcsDrmConfiguration.js +++ b/lib/services/mediaServicesManagement/lib/models/cbcsDrmConfiguration.js @@ -13,14 +13,14 @@ const models = require('./index'); /** - * Class to specify drm configurations of CommonEncryptionCbcs scheme in + * Class to specify DRM configurations of CommonEncryptionCbcs scheme in * Streaming Policy * */ class CbcsDrmConfiguration { /** * Create a CbcsDrmConfiguration. - * @member {object} [fairPlay] Fairplay configurations + * @member {object} [fairPlay] FairPlay configurations * @member {string} [fairPlay.customLicenseAcquisitionUrlTemplate] The * template for a customer service to deliver keys to end users. Not needed * when using Azure Media Services for issuing keys. diff --git a/lib/services/mediaServicesManagement/lib/models/cencDrmConfiguration.js b/lib/services/mediaServicesManagement/lib/models/cencDrmConfiguration.js index 3f77955777..9423f287aa 100644 --- a/lib/services/mediaServicesManagement/lib/models/cencDrmConfiguration.js +++ b/lib/services/mediaServicesManagement/lib/models/cencDrmConfiguration.js @@ -13,7 +13,7 @@ const models = require('./index'); /** - * Class to specify drm configurations of CommonEncryptionCenc scheme in + * Class to specify DRM configurations of CommonEncryptionCenc scheme in * Streaming Policy * */ diff --git a/lib/services/mediaServicesManagement/lib/models/commonEncryptionCbcs.js b/lib/services/mediaServicesManagement/lib/models/commonEncryptionCbcs.js index 86bc0ce348..8a3e1ee426 100644 --- a/lib/services/mediaServicesManagement/lib/models/commonEncryptionCbcs.js +++ b/lib/services/mediaServicesManagement/lib/models/commonEncryptionCbcs.js @@ -22,8 +22,8 @@ class CommonEncryptionCbcs { * @member {object} [enabledProtocols] Representing supported protocols * @member {boolean} [enabledProtocols.download] Enable Download protocol or * not - * @member {boolean} [enabledProtocols.dash] Enable Dash protocol or not - * @member {boolean} [enabledProtocols.hls] Enable Hls protocol or not + * @member {boolean} [enabledProtocols.dash] Enable DASH protocol or not + * @member {boolean} [enabledProtocols.hls] Enable HLS protocol or not * @member {boolean} [enabledProtocols.smoothStreaming] Enable * SmoothStreaming protocol or not * @member {array} [clearTracks] Representing which tracks should not be @@ -33,13 +33,13 @@ class CommonEncryptionCbcs { * @member {object} [contentKeys.defaultKey] Default content key for an * encryption scheme * @member {string} [contentKeys.defaultKey.label] Label can be used to - * specify Content Key when creating Stremaing Locator + * specify Content Key when creating a Streaming Locator * @member {string} [contentKeys.defaultKey.policyName] Policy used by * Default Key * @member {array} [contentKeys.keyToTrackMappings] Representing tracks needs - * sepearete content key + * separate content key * @member {object} [drm] Configuration of DRMs for current encryption scheme - * @member {object} [drm.fairPlay] Fairplay configurations + * @member {object} [drm.fairPlay] FairPlay configurations * @member {string} [drm.fairPlay.customLicenseAcquisitionUrlTemplate] The * template for a customer service to deliver keys to end users. Not needed * when using Azure Media Services for issuing keys. diff --git a/lib/services/mediaServicesManagement/lib/models/commonEncryptionCenc.js b/lib/services/mediaServicesManagement/lib/models/commonEncryptionCenc.js index 7808b8d8fd..3b409e61df 100644 --- a/lib/services/mediaServicesManagement/lib/models/commonEncryptionCenc.js +++ b/lib/services/mediaServicesManagement/lib/models/commonEncryptionCenc.js @@ -22,8 +22,8 @@ class CommonEncryptionCenc { * @member {object} [enabledProtocols] Representing supported protocols * @member {boolean} [enabledProtocols.download] Enable Download protocol or * not - * @member {boolean} [enabledProtocols.dash] Enable Dash protocol or not - * @member {boolean} [enabledProtocols.hls] Enable Hls protocol or not + * @member {boolean} [enabledProtocols.dash] Enable DASH protocol or not + * @member {boolean} [enabledProtocols.hls] Enable HLS protocol or not * @member {boolean} [enabledProtocols.smoothStreaming] Enable * SmoothStreaming protocol or not * @member {array} [clearTracks] Representing which tracks should not be @@ -33,11 +33,11 @@ class CommonEncryptionCenc { * @member {object} [contentKeys.defaultKey] Default content key for an * encryption scheme * @member {string} [contentKeys.defaultKey.label] Label can be used to - * specify Content Key when creating Stremaing Locator + * specify Content Key when creating a Streaming Locator * @member {string} [contentKeys.defaultKey.policyName] Policy used by * Default Key * @member {array} [contentKeys.keyToTrackMappings] Representing tracks needs - * sepearete content key + * separate content key * @member {object} [drm] Configuration of DRMs for CommonEncryptionCenc * encryption scheme * @member {object} [drm.playReady] PlayReady configurations diff --git a/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyFairPlayConfiguration.js b/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyFairPlayConfiguration.js index 1849186b05..529a5c623a 100644 --- a/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyFairPlayConfiguration.js +++ b/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyFairPlayConfiguration.js @@ -87,8 +87,7 @@ class ContentKeyPolicyFairPlayConfiguration extends models['ContentKeyPolicyConf required: true, serializedName: 'rentalAndLeaseKeyType', type: { - name: 'Enum', - allowedValues: [ 'Unknown', 'Undefined', 'PersistentUnlimited', 'PersistentLimited' ] + name: 'String' } }, rentalDuration: { diff --git a/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyPlayReadyLicense.js b/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyPlayReadyLicense.js index 5571cce6e5..5952bc3f84 100644 --- a/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyPlayReadyLicense.js +++ b/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyPlayReadyLicense.js @@ -150,8 +150,7 @@ class ContentKeyPolicyPlayReadyLicense { required: true, serializedName: 'licenseType', type: { - name: 'Enum', - allowedValues: [ 'Unknown', 'NonPersistent', 'Persistent' ] + name: 'String' } }, contentKeyLocation: { @@ -171,8 +170,7 @@ class ContentKeyPolicyPlayReadyLicense { required: true, serializedName: 'contentType', type: { - name: 'Enum', - allowedValues: [ 'Unknown', 'Unspecified', 'UltraVioletDownload', 'UltraVioletStreaming' ] + name: 'String' } } } diff --git a/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyPlayReadyPlayRight.js b/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyPlayReadyPlayRight.js index 6acd466d78..3ab1696059 100644 --- a/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyPlayReadyPlayRight.js +++ b/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyPlayReadyPlayRight.js @@ -127,8 +127,7 @@ class ContentKeyPolicyPlayReadyPlayRight { required: true, serializedName: 'allowPassingVideoContentToUnknownOutput', type: { - name: 'Enum', - allowedValues: [ 'Unknown', 'NotAllowed', 'Allowed', 'AllowedWithVideoConstriction' ] + name: 'String' } }, uncompressedDigitalVideoOpl: { diff --git a/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyTokenRestriction.js b/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyTokenRestriction.js index df42bbf034..ffad0b9c72 100644 --- a/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyTokenRestriction.js +++ b/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyTokenRestriction.js @@ -131,8 +131,7 @@ class ContentKeyPolicyTokenRestriction extends models['ContentKeyPolicyRestricti required: true, serializedName: 'restrictionTokenType', type: { - name: 'Enum', - allowedValues: [ 'Unknown', 'Swt', 'Jwt' ] + name: 'String' } }, openIdConnectDiscoveryDocument: { diff --git a/lib/services/mediaServicesManagement/lib/models/defaultKey.js b/lib/services/mediaServicesManagement/lib/models/defaultKey.js index 4031d90b4e..49d0e8072f 100644 --- a/lib/services/mediaServicesManagement/lib/models/defaultKey.js +++ b/lib/services/mediaServicesManagement/lib/models/defaultKey.js @@ -19,7 +19,7 @@ class DefaultKey { /** * Create a DefaultKey. * @member {string} [label] Label can be used to specify Content Key when - * creating Stremaing Locator + * creating a Streaming Locator * @member {string} [policyName] Policy used by Default Key */ constructor() { diff --git a/lib/services/mediaServicesManagement/lib/models/deinterlace.js b/lib/services/mediaServicesManagement/lib/models/deinterlace.js index 2aaf2112e3..f7528e2d63 100644 --- a/lib/services/mediaServicesManagement/lib/models/deinterlace.js +++ b/lib/services/mediaServicesManagement/lib/models/deinterlace.js @@ -43,16 +43,14 @@ class Deinterlace { required: false, serializedName: 'parity', type: { - name: 'Enum', - allowedValues: [ 'Auto', 'TopFieldFirst', 'BottomFieldFirst' ] + name: 'String' } }, mode: { required: false, serializedName: 'mode', type: { - name: 'Enum', - allowedValues: [ 'Off', 'AutoPixelAdaptive' ] + name: 'String' } } } diff --git a/lib/services/mediaServicesManagement/lib/models/enabledProtocols.js b/lib/services/mediaServicesManagement/lib/models/enabledProtocols.js index a2a86cd2ff..0b90fdd76d 100644 --- a/lib/services/mediaServicesManagement/lib/models/enabledProtocols.js +++ b/lib/services/mediaServicesManagement/lib/models/enabledProtocols.js @@ -18,8 +18,8 @@ class EnabledProtocols { /** * Create a EnabledProtocols. * @member {boolean} download Enable Download protocol or not - * @member {boolean} dash Enable Dash protocol or not - * @member {boolean} hls Enable Hls protocol or not + * @member {boolean} dash Enable DASH protocol or not + * @member {boolean} hls Enable HLS protocol or not * @member {boolean} smoothStreaming Enable SmoothStreaming protocol or not */ constructor() { diff --git a/lib/services/mediaServicesManagement/lib/models/envelopeEncryption.js b/lib/services/mediaServicesManagement/lib/models/envelopeEncryption.js index 22740e4449..2cc9ff86d0 100644 --- a/lib/services/mediaServicesManagement/lib/models/envelopeEncryption.js +++ b/lib/services/mediaServicesManagement/lib/models/envelopeEncryption.js @@ -22,8 +22,8 @@ class EnvelopeEncryption { * @member {object} [enabledProtocols] Representing supported protocols * @member {boolean} [enabledProtocols.download] Enable Download protocol or * not - * @member {boolean} [enabledProtocols.dash] Enable Dash protocol or not - * @member {boolean} [enabledProtocols.hls] Enable Hls protocol or not + * @member {boolean} [enabledProtocols.dash] Enable DASH protocol or not + * @member {boolean} [enabledProtocols.hls] Enable HLS protocol or not * @member {boolean} [enabledProtocols.smoothStreaming] Enable * SmoothStreaming protocol or not * @member {array} [clearTracks] Representing which tracks should not be @@ -33,14 +33,14 @@ class EnvelopeEncryption { * @member {object} [contentKeys.defaultKey] Default content key for an * encryption scheme * @member {string} [contentKeys.defaultKey.label] Label can be used to - * specify Content Key when creating Stremaing Locator + * specify Content Key when creating a Streaming Locator * @member {string} [contentKeys.defaultKey.policyName] Policy used by * Default Key * @member {array} [contentKeys.keyToTrackMappings] Representing tracks needs - * sepearete content key - * @member {string} [customLicenseAcquisitionUrlTemplate] - * LicenseAcquistionUrlTemplate is used to point to user speicified service - * to delivery content keys + * separate content key + * @member {string} [customKeyAcquisitionUrlTemplate] + * KeyAcquistionUrlTemplate is used to point to user specified service to + * delivery content keys */ constructor() { } @@ -90,9 +90,9 @@ class EnvelopeEncryption { className: 'StreamingPolicyContentKeys' } }, - customLicenseAcquisitionUrlTemplate: { + customKeyAcquisitionUrlTemplate: { required: false, - serializedName: 'customLicenseAcquisitionUrlTemplate', + serializedName: 'customKeyAcquisitionUrlTemplate', type: { name: 'String' } diff --git a/lib/services/mediaServicesManagement/lib/models/filters.js b/lib/services/mediaServicesManagement/lib/models/filters.js index c2b26955aa..63481afe04 100644 --- a/lib/services/mediaServicesManagement/lib/models/filters.js +++ b/lib/services/mediaServicesManagement/lib/models/filters.js @@ -75,8 +75,7 @@ class Filters { required: false, serializedName: 'rotation', type: { - name: 'Enum', - allowedValues: [ 'Auto', 'None', 'Rotate0', 'Rotate90', 'Rotate180', 'Rotate270' ] + name: 'String' } }, crop: { diff --git a/lib/services/mediaServicesManagement/lib/models/h264Layer.js b/lib/services/mediaServicesManagement/lib/models/h264Layer.js index 55e52f30b2..9f771f4ef5 100644 --- a/lib/services/mediaServicesManagement/lib/models/h264Layer.js +++ b/lib/services/mediaServicesManagement/lib/models/h264Layer.js @@ -136,8 +136,7 @@ class H264Layer extends models['VideoLayer'] { required: false, serializedName: 'profile', type: { - name: 'Enum', - allowedValues: [ 'Auto', 'Baseline', 'Main', 'High', 'High422', 'High444' ] + name: 'String' } }, level: { @@ -165,8 +164,7 @@ class H264Layer extends models['VideoLayer'] { required: false, serializedName: 'entropyMode', type: { - name: 'Enum', - allowedValues: [ 'Cabac', 'Cavlc' ] + name: 'String' } } } diff --git a/lib/services/mediaServicesManagement/lib/models/h264Video.js b/lib/services/mediaServicesManagement/lib/models/h264Video.js index 0dd96c8e97..99148fe3b7 100644 --- a/lib/services/mediaServicesManagement/lib/models/h264Video.js +++ b/lib/services/mediaServicesManagement/lib/models/h264Video.js @@ -79,8 +79,7 @@ class H264Video extends models['Video'] { required: false, serializedName: 'stretchMode', type: { - name: 'Enum', - allowedValues: [ 'None', 'AutoSize', 'AutoFit' ] + name: 'String' } }, sceneChangeDetection: { @@ -94,8 +93,7 @@ class H264Video extends models['Video'] { required: false, serializedName: 'complexity', type: { - name: 'Enum', - allowedValues: [ 'Speed', 'Balanced', 'Quality' ] + name: 'String' } }, layers: { diff --git a/lib/services/mediaServicesManagement/lib/models/image.js b/lib/services/mediaServicesManagement/lib/models/image.js index c1bd9dbbb1..847d9c1a8f 100644 --- a/lib/services/mediaServicesManagement/lib/models/image.js +++ b/lib/services/mediaServicesManagement/lib/models/image.js @@ -86,8 +86,7 @@ class Image extends models['Video'] { required: false, serializedName: 'stretchMode', type: { - name: 'Enum', - allowedValues: [ 'None', 'AutoSize', 'AutoFit' ] + name: 'String' } }, start: { diff --git a/lib/services/mediaServicesManagement/lib/models/index.d.ts b/lib/services/mediaServicesManagement/lib/models/index.d.ts index 413a615128..39cccc113f 100644 --- a/lib/services/mediaServicesManagement/lib/models/index.d.ts +++ b/lib/services/mediaServicesManagement/lib/models/index.d.ts @@ -206,7 +206,7 @@ export interface ODataError { * @constructor * The API error. * - * @member {object} [error] ApiError. The error properties. + * @member {object} [error] The error properties. * @member {string} [error.code] A language-independent error name. * @member {string} [error.message] The error message. * @member {string} [error.target] The target of the error (for example, the @@ -1688,6 +1688,8 @@ export interface JobOutputAsset extends JobOutput { * @member {string} [priority] Priority with which the job should be processed. * Higher priority jobs are processed before lower priority jobs. If not set, * the default is normal. Possible values include: 'Low', 'Normal', 'High' + * @member {object} [correlationData] Customer provided correlation data that + * will be returned in Job completed events. */ export interface Job extends ProxyResource { readonly created?: Date; @@ -1697,6 +1699,7 @@ export interface Job extends ProxyResource { readonly lastModified?: Date; outputs: JobOutput[]; priority?: string; + correlationData?: { [propertyName: string]: string }; } /** @@ -1709,7 +1712,7 @@ export interface Job extends ProxyResource { * 'Unknown', 'FourCC' * @member {string} operation Track property condition operation. Possible * values include: 'Unknown', 'Equal' - * @member {string} [value] Track proprty value + * @member {string} [value] Track property value */ export interface TrackPropertyCondition { property: string; @@ -1738,7 +1741,7 @@ export interface TrackSelection { * scheme * * @member {string} [label] Label can be used to specify Content Key when - * creating Stremaing Locator + * creating a Streaming Locator * @member {string} [policyName] Policy used by Default Key */ export interface DefaultKey { @@ -1753,7 +1756,7 @@ export interface DefaultKey { * Class to specify properties of content key * * @member {string} [label] Label can be used to specify Content Key when - * creating Stremaing Locator + * creating a Streaming Locator * @member {string} [policyName] Policy used by Content Key * @member {array} [tracks] Tracks which use this content key */ @@ -1771,9 +1774,9 @@ export interface StreamingPolicyContentKey { * * @member {object} [defaultKey] Default content key for an encryption scheme * @member {string} [defaultKey.label] Label can be used to specify Content Key - * when creating Stremaing Locator + * when creating a Streaming Locator * @member {string} [defaultKey.policyName] Policy used by Default Key - * @member {array} [keyToTrackMappings] Representing tracks needs sepearete + * @member {array} [keyToTrackMappings] Representing tracks needs separate * content key */ export interface StreamingPolicyContentKeys { @@ -1831,10 +1834,10 @@ export interface StreamingPolicyFairPlayConfiguration { * @class * Initializes a new instance of the CbcsDrmConfiguration class. * @constructor - * Class to specify drm configurations of CommonEncryptionCbcs scheme in + * Class to specify DRM configurations of CommonEncryptionCbcs scheme in * Streaming Policy * - * @member {object} [fairPlay] Fairplay configurations + * @member {object} [fairPlay] FairPlay configurations * @member {string} [fairPlay.customLicenseAcquisitionUrlTemplate] The template * for a customer service to deliver keys to end users. Not needed when using * Azure Media Services for issuing keys. @@ -1861,7 +1864,7 @@ export interface CbcsDrmConfiguration { * @class * Initializes a new instance of the CencDrmConfiguration class. * @constructor - * Class to specify drm configurations of CommonEncryptionCenc scheme in + * Class to specify DRM configurations of CommonEncryptionCenc scheme in * Streaming Policy * * @member {object} [playReady] PlayReady configurations @@ -1887,8 +1890,8 @@ export interface CencDrmConfiguration { * Class to specify which protocols are enabled * * @member {boolean} download Enable Download protocol or not - * @member {boolean} dash Enable Dash protocol or not - * @member {boolean} hls Enable Hls protocol or not + * @member {boolean} dash Enable DASH protocol or not + * @member {boolean} hls Enable HLS protocol or not * @member {boolean} smoothStreaming Enable SmoothStreaming protocol or not */ export interface EnabledProtocols { @@ -1907,8 +1910,8 @@ export interface EnabledProtocols { * @member {object} [enabledProtocols] Representing supported protocols * @member {boolean} [enabledProtocols.download] Enable Download protocol or * not - * @member {boolean} [enabledProtocols.dash] Enable Dash protocol or not - * @member {boolean} [enabledProtocols.hls] Enable Hls protocol or not + * @member {boolean} [enabledProtocols.dash] Enable DASH protocol or not + * @member {boolean} [enabledProtocols.hls] Enable HLS protocol or not * @member {boolean} [enabledProtocols.smoothStreaming] Enable SmoothStreaming * protocol or not */ @@ -1925,8 +1928,8 @@ export interface NoEncryption { * @member {object} [enabledProtocols] Representing supported protocols * @member {boolean} [enabledProtocols.download] Enable Download protocol or * not - * @member {boolean} [enabledProtocols.dash] Enable Dash protocol or not - * @member {boolean} [enabledProtocols.hls] Enable Hls protocol or not + * @member {boolean} [enabledProtocols.dash] Enable DASH protocol or not + * @member {boolean} [enabledProtocols.hls] Enable HLS protocol or not * @member {boolean} [enabledProtocols.smoothStreaming] Enable SmoothStreaming * protocol or not * @member {array} [clearTracks] Representing which tracks should not be @@ -1936,20 +1939,19 @@ export interface NoEncryption { * @member {object} [contentKeys.defaultKey] Default content key for an * encryption scheme * @member {string} [contentKeys.defaultKey.label] Label can be used to specify - * Content Key when creating Stremaing Locator + * Content Key when creating a Streaming Locator * @member {string} [contentKeys.defaultKey.policyName] Policy used by Default * Key * @member {array} [contentKeys.keyToTrackMappings] Representing tracks needs - * sepearete content key - * @member {string} [customLicenseAcquisitionUrlTemplate] - * LicenseAcquistionUrlTemplate is used to point to user speicified service to - * delivery content keys + * separate content key + * @member {string} [customKeyAcquisitionUrlTemplate] KeyAcquistionUrlTemplate + * is used to point to user specified service to delivery content keys */ export interface EnvelopeEncryption { enabledProtocols?: EnabledProtocols; clearTracks?: TrackSelection[]; contentKeys?: StreamingPolicyContentKeys; - customLicenseAcquisitionUrlTemplate?: string; + customKeyAcquisitionUrlTemplate?: string; } /** @@ -1961,8 +1963,8 @@ export interface EnvelopeEncryption { * @member {object} [enabledProtocols] Representing supported protocols * @member {boolean} [enabledProtocols.download] Enable Download protocol or * not - * @member {boolean} [enabledProtocols.dash] Enable Dash protocol or not - * @member {boolean} [enabledProtocols.hls] Enable Hls protocol or not + * @member {boolean} [enabledProtocols.dash] Enable DASH protocol or not + * @member {boolean} [enabledProtocols.hls] Enable HLS protocol or not * @member {boolean} [enabledProtocols.smoothStreaming] Enable SmoothStreaming * protocol or not * @member {array} [clearTracks] Representing which tracks should not be @@ -1972,11 +1974,11 @@ export interface EnvelopeEncryption { * @member {object} [contentKeys.defaultKey] Default content key for an * encryption scheme * @member {string} [contentKeys.defaultKey.label] Label can be used to specify - * Content Key when creating Stremaing Locator + * Content Key when creating a Streaming Locator * @member {string} [contentKeys.defaultKey.policyName] Policy used by Default * Key * @member {array} [contentKeys.keyToTrackMappings] Representing tracks needs - * sepearete content key + * separate content key * @member {object} [drm] Configuration of DRMs for CommonEncryptionCenc * encryption scheme * @member {object} [drm.playReady] PlayReady configurations @@ -2006,8 +2008,8 @@ export interface CommonEncryptionCenc { * @member {object} [enabledProtocols] Representing supported protocols * @member {boolean} [enabledProtocols.download] Enable Download protocol or * not - * @member {boolean} [enabledProtocols.dash] Enable Dash protocol or not - * @member {boolean} [enabledProtocols.hls] Enable Hls protocol or not + * @member {boolean} [enabledProtocols.dash] Enable DASH protocol or not + * @member {boolean} [enabledProtocols.hls] Enable HLS protocol or not * @member {boolean} [enabledProtocols.smoothStreaming] Enable SmoothStreaming * protocol or not * @member {array} [clearTracks] Representing which tracks should not be @@ -2017,13 +2019,13 @@ export interface CommonEncryptionCenc { * @member {object} [contentKeys.defaultKey] Default content key for an * encryption scheme * @member {string} [contentKeys.defaultKey.label] Label can be used to specify - * Content Key when creating Stremaing Locator + * Content Key when creating a Streaming Locator * @member {string} [contentKeys.defaultKey.policyName] Policy used by Default * Key * @member {array} [contentKeys.keyToTrackMappings] Representing tracks needs - * sepearete content key + * separate content key * @member {object} [drm] Configuration of DRMs for current encryption scheme - * @member {object} [drm.fairPlay] Fairplay configurations + * @member {object} [drm.fairPlay] FairPlay configurations * @member {string} [drm.fairPlay.customLicenseAcquisitionUrlTemplate] The * template for a customer service to deliver keys to end users. Not needed * when using Azure Media Services for issuing keys. @@ -2061,9 +2063,9 @@ export interface CommonEncryptionCbcs { * supported protocols * @member {boolean} [envelopeEncryption.enabledProtocols.download] Enable * Download protocol or not - * @member {boolean} [envelopeEncryption.enabledProtocols.dash] Enable Dash + * @member {boolean} [envelopeEncryption.enabledProtocols.dash] Enable DASH * protocol or not - * @member {boolean} [envelopeEncryption.enabledProtocols.hls] Enable Hls + * @member {boolean} [envelopeEncryption.enabledProtocols.hls] Enable HLS * protocol or not * @member {boolean} [envelopeEncryption.enabledProtocols.smoothStreaming] * Enable SmoothStreaming protocol or not @@ -2075,13 +2077,13 @@ export interface CommonEncryptionCbcs { * @member {object} [envelopeEncryption.contentKeys.defaultKey] Default content * key for an encryption scheme * @member {string} [envelopeEncryption.contentKeys.defaultKey.label] Label can - * be used to specify Content Key when creating Stremaing Locator + * be used to specify Content Key when creating a Streaming Locator * @member {string} [envelopeEncryption.contentKeys.defaultKey.policyName] * Policy used by Default Key * @member {array} [envelopeEncryption.contentKeys.keyToTrackMappings] - * Representing tracks needs sepearete content key - * @member {string} [envelopeEncryption.customLicenseAcquisitionUrlTemplate] - * LicenseAcquistionUrlTemplate is used to point to user speicified service to + * Representing tracks needs separate content key + * @member {string} [envelopeEncryption.customKeyAcquisitionUrlTemplate] + * KeyAcquistionUrlTemplate is used to point to user specified service to * delivery content keys * @member {object} [commonEncryptionCenc] Configuration of * CommonEncryptionCenc @@ -2089,9 +2091,9 @@ export interface CommonEncryptionCbcs { * supported protocols * @member {boolean} [commonEncryptionCenc.enabledProtocols.download] Enable * Download protocol or not - * @member {boolean} [commonEncryptionCenc.enabledProtocols.dash] Enable Dash + * @member {boolean} [commonEncryptionCenc.enabledProtocols.dash] Enable DASH * protocol or not - * @member {boolean} [commonEncryptionCenc.enabledProtocols.hls] Enable Hls + * @member {boolean} [commonEncryptionCenc.enabledProtocols.hls] Enable HLS * protocol or not * @member {boolean} [commonEncryptionCenc.enabledProtocols.smoothStreaming] * Enable SmoothStreaming protocol or not @@ -2103,11 +2105,11 @@ export interface CommonEncryptionCbcs { * @member {object} [commonEncryptionCenc.contentKeys.defaultKey] Default * content key for an encryption scheme * @member {string} [commonEncryptionCenc.contentKeys.defaultKey.label] Label - * can be used to specify Content Key when creating Stremaing Locator + * can be used to specify Content Key when creating a Streaming Locator * @member {string} [commonEncryptionCenc.contentKeys.defaultKey.policyName] * Policy used by Default Key * @member {array} [commonEncryptionCenc.contentKeys.keyToTrackMappings] - * Representing tracks needs sepearete content key + * Representing tracks needs separate content key * @member {object} [commonEncryptionCenc.drm] Configuration of DRMs for * CommonEncryptionCenc encryption scheme * @member {object} [commonEncryptionCenc.drm.playReady] PlayReady @@ -2130,9 +2132,9 @@ export interface CommonEncryptionCbcs { * supported protocols * @member {boolean} [commonEncryptionCbcs.enabledProtocols.download] Enable * Download protocol or not - * @member {boolean} [commonEncryptionCbcs.enabledProtocols.dash] Enable Dash + * @member {boolean} [commonEncryptionCbcs.enabledProtocols.dash] Enable DASH * protocol or not - * @member {boolean} [commonEncryptionCbcs.enabledProtocols.hls] Enable Hls + * @member {boolean} [commonEncryptionCbcs.enabledProtocols.hls] Enable HLS * protocol or not * @member {boolean} [commonEncryptionCbcs.enabledProtocols.smoothStreaming] * Enable SmoothStreaming protocol or not @@ -2144,14 +2146,14 @@ export interface CommonEncryptionCbcs { * @member {object} [commonEncryptionCbcs.contentKeys.defaultKey] Default * content key for an encryption scheme * @member {string} [commonEncryptionCbcs.contentKeys.defaultKey.label] Label - * can be used to specify Content Key when creating Stremaing Locator + * can be used to specify Content Key when creating a Streaming Locator * @member {string} [commonEncryptionCbcs.contentKeys.defaultKey.policyName] * Policy used by Default Key * @member {array} [commonEncryptionCbcs.contentKeys.keyToTrackMappings] - * Representing tracks needs sepearete content key + * Representing tracks needs separate content key * @member {object} [commonEncryptionCbcs.drm] Configuration of DRMs for * current encryption scheme - * @member {object} [commonEncryptionCbcs.drm.fairPlay] Fairplay configurations + * @member {object} [commonEncryptionCbcs.drm.fairPlay] FairPlay configurations * @member {string} * [commonEncryptionCbcs.drm.fairPlay.customLicenseAcquisitionUrlTemplate] The * template for a customer service to deliver keys to end users. Not needed @@ -2172,14 +2174,14 @@ export interface CommonEncryptionCbcs { * [commonEncryptionCbcs.drm.widevine.customLicenseAcquisitionUrlTemplate] The * template for a customer service to deliver keys to end users. Not needed * when using Azure Media Services for issuing keys. - * @member {object} [noEncryption] Configuations of NoEncryption + * @member {object} [noEncryption] Configurations of NoEncryption * @member {object} [noEncryption.enabledProtocols] Representing supported * protocols * @member {boolean} [noEncryption.enabledProtocols.download] Enable Download * protocol or not - * @member {boolean} [noEncryption.enabledProtocols.dash] Enable Dash protocol + * @member {boolean} [noEncryption.enabledProtocols.dash] Enable DASH protocol * or not - * @member {boolean} [noEncryption.enabledProtocols.hls] Enable Hls protocol or + * @member {boolean} [noEncryption.enabledProtocols.hls] Enable HLS protocol or * not * @member {boolean} [noEncryption.enabledProtocols.smoothStreaming] Enable * SmoothStreaming protocol or not @@ -2193,44 +2195,27 @@ export interface StreamingPolicy extends ProxyResource { noEncryption?: NoEncryption; } -/** - * @class - * Initializes a new instance of the StreamingLocatorUserDefinedContentKey class. - * @constructor - * Describes the properties of a user-defined content key in the Streaming - * Locator - * - * @member {uuid} id ID of Content Key - * @member {string} [label] The Content Key description - * @member {string} [value] The Content Key secret - */ -export interface StreamingLocatorUserDefinedContentKey { - id: string; - label?: string; - value?: string; -} - /** * @class * Initializes a new instance of the StreamingLocatorContentKey class. * @constructor * Class for content key in Streaming Locator * - * @member {string} [label] Label of Content Key - * @member {string} type Encryption type of Content Key. Possible values + * @member {uuid} id ID of Content Key + * @member {string} [type] Encryption type of Content Key. Possible values * include: 'CommonEncryptionCenc', 'CommonEncryptionCbcs', * 'EnvelopeEncryption' - * @member {uuid} id ID of Content Key + * @member {string} [label] Label of Content Key * @member {string} [value] Value of of Content Key * @member {string} [policyName] ContentKeyPolicy used by Content Key * @member {array} [tracks] Tracks which use this Content Key */ export interface StreamingLocatorContentKey { - label?: string; - type: string; id: string; + readonly type?: string; + label?: string; value?: string; - policyName?: string; + readonly policyName?: string; tracks?: TrackSelection[]; } @@ -2303,6 +2288,12 @@ export interface ListPathsResponse { * @member {string} [defaultContentKeyPolicyName] Default ContentKeyPolicy used * by this Streaming Locator * @member {array} [contentKeys] ContentKeys used by this Streaming Locator + * @member {string} [alternativeMediaId] An Alternative Media Identifier + * associated with the StreamingLocator. This identifier can be used to + * distinguish different StreamingLocators for the same Asset for authorization + * purposes in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. */ export interface StreamingLocator extends ProxyResource { assetName: string; @@ -2312,7 +2303,8 @@ export interface StreamingLocator extends ProxyResource { streamingLocatorId?: string; streamingPolicyName: string; defaultContentKeyPolicyName?: string; - contentKeys?: StreamingLocatorUserDefinedContentKey[]; + contentKeys?: StreamingLocatorContentKey[]; + alternativeMediaId?: string; } /** @@ -2454,12 +2446,18 @@ export interface LiveEventPreviewAccessControl { * @member {string} [previewLocator] The preview locator Guid. * @member {string} [streamingPolicyName] The name of streaming policy used for * LiveEvent preview + * @member {string} [alternativeMediaId] An Alternative Media Identifier + * associated with the preview url. This identifier can be used to distinguish + * the preview of different live events for authorization purposes in the + * CustomLicenseAcquisitionUrlTemplate or the CustomKeyAcquisitionUrlTemplate + * of the StreamingPolicy specified in the StreamingPolicyName field. */ export interface LiveEventPreview { endpoints?: LiveEventEndpoint[]; accessControl?: LiveEventPreviewAccessControl; previewLocator?: string; streamingPolicyName?: string; + alternativeMediaId?: string; } /** @@ -2530,6 +2528,12 @@ export interface LiveEventActionInput { * @member {string} [preview.previewLocator] The preview locator Guid. * @member {string} [preview.streamingPolicyName] The name of streaming policy * used for LiveEvent preview + * @member {string} [preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. * @member {object} [encoding] The Live Event encoding. * @member {string} [encoding.encodingType] The encoding type for Live Event. * Possible values include: 'None', 'Basic' diff --git a/lib/services/mediaServicesManagement/lib/models/index.js b/lib/services/mediaServicesManagement/lib/models/index.js index 01e5e9f81a..e0cc9a7288 100644 --- a/lib/services/mediaServicesManagement/lib/models/index.js +++ b/lib/services/mediaServicesManagement/lib/models/index.js @@ -123,7 +123,6 @@ exports.EnvelopeEncryption = require('./envelopeEncryption'); exports.CommonEncryptionCenc = require('./commonEncryptionCenc'); exports.CommonEncryptionCbcs = require('./commonEncryptionCbcs'); exports.StreamingPolicy = require('./streamingPolicy'); -exports.StreamingLocatorUserDefinedContentKey = require('./streamingLocatorUserDefinedContentKey'); exports.StreamingLocatorContentKey = require('./streamingLocatorContentKey'); exports.StreamingPath = require('./streamingPath'); exports.ListContentKeysResponse = require('./listContentKeysResponse'); diff --git a/lib/services/mediaServicesManagement/lib/models/job.js b/lib/services/mediaServicesManagement/lib/models/job.js index 9d4922037b..9532a5d757 100644 --- a/lib/services/mediaServicesManagement/lib/models/job.js +++ b/lib/services/mediaServicesManagement/lib/models/job.js @@ -43,6 +43,8 @@ class Job extends models['ProxyResource'] { * processed. Higher priority jobs are processed before lower priority jobs. * If not set, the default is normal. Possible values include: 'Low', * 'Normal', 'High' + * @member {object} [correlationData] Customer provided correlation data that + * will be returned in Job completed events. */ constructor() { super(); @@ -99,8 +101,7 @@ class Job extends models['ProxyResource'] { readOnly: true, serializedName: 'properties.state', type: { - name: 'Enum', - allowedValues: [ 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing', 'Queued', 'Scheduled' ] + name: 'String' } }, description: { @@ -155,8 +156,21 @@ class Job extends models['ProxyResource'] { required: false, serializedName: 'properties.priority', type: { - name: 'Enum', - allowedValues: [ 'Low', 'Normal', 'High' ] + name: 'String' + } + }, + correlationData: { + required: false, + serializedName: 'properties.correlationData', + type: { + name: 'Dictionary', + value: { + required: false, + serializedName: 'StringElementType', + type: { + name: 'String' + } + } } } } diff --git a/lib/services/mediaServicesManagement/lib/models/jobError.js b/lib/services/mediaServicesManagement/lib/models/jobError.js index 4b681fe48b..a0f434dc43 100644 --- a/lib/services/mediaServicesManagement/lib/models/jobError.js +++ b/lib/services/mediaServicesManagement/lib/models/jobError.js @@ -56,8 +56,7 @@ class JobError { readOnly: true, serializedName: 'code', type: { - name: 'Enum', - allowedValues: [ 'ServiceError', 'ServiceTransientError', 'DownloadNotAccessible', 'DownloadTransientError', 'UploadNotAccessible', 'UploadTransientError', 'ConfigurationUnsupported', 'ContentMalformed', 'ContentUnsupported' ] + name: 'String' } }, message: { @@ -73,8 +72,7 @@ class JobError { readOnly: true, serializedName: 'category', type: { - name: 'Enum', - allowedValues: [ 'Service', 'Download', 'Upload', 'Configuration', 'Content' ] + name: 'String' } }, retry: { @@ -82,8 +80,7 @@ class JobError { readOnly: true, serializedName: 'retry', type: { - name: 'Enum', - allowedValues: [ 'DoNotRetry', 'MayRetry' ] + name: 'String' } }, details: { diff --git a/lib/services/mediaServicesManagement/lib/models/jobOutput.js b/lib/services/mediaServicesManagement/lib/models/jobOutput.js index fa8f6ea839..5fc69cb1e5 100644 --- a/lib/services/mediaServicesManagement/lib/models/jobOutput.js +++ b/lib/services/mediaServicesManagement/lib/models/jobOutput.js @@ -81,8 +81,7 @@ class JobOutput { readOnly: true, serializedName: 'state', type: { - name: 'Enum', - allowedValues: [ 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing', 'Queued', 'Scheduled' ] + name: 'String' } }, progress: { diff --git a/lib/services/mediaServicesManagement/lib/models/jobOutputAsset.js b/lib/services/mediaServicesManagement/lib/models/jobOutputAsset.js index 15747d6bb4..1bc5d1ab1d 100644 --- a/lib/services/mediaServicesManagement/lib/models/jobOutputAsset.js +++ b/lib/services/mediaServicesManagement/lib/models/jobOutputAsset.js @@ -59,8 +59,7 @@ class JobOutputAsset extends models['JobOutput'] { readOnly: true, serializedName: 'state', type: { - name: 'Enum', - allowedValues: [ 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing', 'Queued', 'Scheduled' ] + name: 'String' } }, progress: { diff --git a/lib/services/mediaServicesManagement/lib/models/jpgImage.js b/lib/services/mediaServicesManagement/lib/models/jpgImage.js index d10e8ff30e..8492223111 100644 --- a/lib/services/mediaServicesManagement/lib/models/jpgImage.js +++ b/lib/services/mediaServicesManagement/lib/models/jpgImage.js @@ -73,8 +73,7 @@ class JpgImage extends models['Image'] { required: false, serializedName: 'stretchMode', type: { - name: 'Enum', - allowedValues: [ 'None', 'AutoSize', 'AutoFit' ] + name: 'String' } }, start: { diff --git a/lib/services/mediaServicesManagement/lib/models/listContainerSasInput.js b/lib/services/mediaServicesManagement/lib/models/listContainerSasInput.js index 856a7ed981..0340bd286b 100644 --- a/lib/services/mediaServicesManagement/lib/models/listContainerSasInput.js +++ b/lib/services/mediaServicesManagement/lib/models/listContainerSasInput.js @@ -43,8 +43,7 @@ class ListContainerSasInput { required: false, serializedName: 'permissions', type: { - name: 'Enum', - allowedValues: [ 'Read', 'ReadWrite', 'ReadWriteDelete' ] + name: 'String' } }, expiryTime: { diff --git a/lib/services/mediaServicesManagement/lib/models/liveEvent.js b/lib/services/mediaServicesManagement/lib/models/liveEvent.js index 3d2d944988..c32101e92d 100644 --- a/lib/services/mediaServicesManagement/lib/models/liveEvent.js +++ b/lib/services/mediaServicesManagement/lib/models/liveEvent.js @@ -38,6 +38,12 @@ class LiveEvent extends models['TrackedResource'] { * @member {string} [preview.previewLocator] The preview locator Guid. * @member {string} [preview.streamingPolicyName] The name of streaming * policy used for LiveEvent preview + * @member {string} [preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used + * to distinguish the preview of different live events for authorization + * purposes in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. * @member {object} [encoding] The Live Event encoding. * @member {string} [encoding.encodingType] The encoding type for Live Event. * Possible values include: 'None', 'Basic' diff --git a/lib/services/mediaServicesManagement/lib/models/liveEventPreview.js b/lib/services/mediaServicesManagement/lib/models/liveEventPreview.js index 58383b1428..c1fb7acf45 100644 --- a/lib/services/mediaServicesManagement/lib/models/liveEventPreview.js +++ b/lib/services/mediaServicesManagement/lib/models/liveEventPreview.js @@ -26,6 +26,12 @@ class LiveEventPreview { * @member {string} [previewLocator] The preview locator Guid. * @member {string} [streamingPolicyName] The name of streaming policy used * for LiveEvent preview + * @member {string} [alternativeMediaId] An Alternative Media Identifier + * associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization + * purposes in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. */ constructor() { } @@ -80,6 +86,13 @@ class LiveEventPreview { type: { name: 'String' } + }, + alternativeMediaId: { + required: false, + serializedName: 'alternativeMediaId', + type: { + name: 'String' + } } } } diff --git a/lib/services/mediaServicesManagement/lib/models/noEncryption.js b/lib/services/mediaServicesManagement/lib/models/noEncryption.js index a35649f64f..4869916258 100644 --- a/lib/services/mediaServicesManagement/lib/models/noEncryption.js +++ b/lib/services/mediaServicesManagement/lib/models/noEncryption.js @@ -22,8 +22,8 @@ class NoEncryption { * @member {object} [enabledProtocols] Representing supported protocols * @member {boolean} [enabledProtocols.download] Enable Download protocol or * not - * @member {boolean} [enabledProtocols.dash] Enable Dash protocol or not - * @member {boolean} [enabledProtocols.hls] Enable Hls protocol or not + * @member {boolean} [enabledProtocols.dash] Enable DASH protocol or not + * @member {boolean} [enabledProtocols.hls] Enable HLS protocol or not * @member {boolean} [enabledProtocols.smoothStreaming] Enable * SmoothStreaming protocol or not */ diff --git a/lib/services/mediaServicesManagement/lib/models/pngImage.js b/lib/services/mediaServicesManagement/lib/models/pngImage.js index 77dea14f6d..d644d5ea1d 100644 --- a/lib/services/mediaServicesManagement/lib/models/pngImage.js +++ b/lib/services/mediaServicesManagement/lib/models/pngImage.js @@ -73,8 +73,7 @@ class PngImage extends models['Image'] { required: false, serializedName: 'stretchMode', type: { - name: 'Enum', - allowedValues: [ 'None', 'AutoSize', 'AutoFit' ] + name: 'String' } }, start: { diff --git a/lib/services/mediaServicesManagement/lib/models/storageAccount.js b/lib/services/mediaServicesManagement/lib/models/storageAccount.js index 3e97d302ea..19a27b777b 100644 --- a/lib/services/mediaServicesManagement/lib/models/storageAccount.js +++ b/lib/services/mediaServicesManagement/lib/models/storageAccount.js @@ -53,8 +53,7 @@ class StorageAccount { required: true, serializedName: 'type', type: { - name: 'Enum', - allowedValues: [ 'Primary', 'Secondary' ] + name: 'String' } } } diff --git a/lib/services/mediaServicesManagement/lib/models/streamingLocator.js b/lib/services/mediaServicesManagement/lib/models/streamingLocator.js index 318c14bb9d..fb991b15b8 100644 --- a/lib/services/mediaServicesManagement/lib/models/streamingLocator.js +++ b/lib/services/mediaServicesManagement/lib/models/streamingLocator.js @@ -36,6 +36,12 @@ class StreamingLocator extends models['ProxyResource'] { * @member {string} [defaultContentKeyPolicyName] Default ContentKeyPolicy * used by this Streaming Locator * @member {array} [contentKeys] ContentKeys used by this Streaming Locator + * @member {string} [alternativeMediaId] An Alternative Media Identifier + * associated with the StreamingLocator. This identifier can be used to + * distinguish different StreamingLocators for the same Asset for + * authorization purposes in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. */ constructor() { super(); @@ -136,13 +142,20 @@ class StreamingLocator extends models['ProxyResource'] { name: 'Sequence', element: { required: false, - serializedName: 'StreamingLocatorUserDefinedContentKeyElementType', + serializedName: 'StreamingLocatorContentKeyElementType', type: { name: 'Composite', - className: 'StreamingLocatorUserDefinedContentKey' + className: 'StreamingLocatorContentKey' } } } + }, + alternativeMediaId: { + required: false, + serializedName: 'properties.alternativeMediaId', + type: { + name: 'String' + } } } } diff --git a/lib/services/mediaServicesManagement/lib/models/streamingLocatorContentKey.js b/lib/services/mediaServicesManagement/lib/models/streamingLocatorContentKey.js index 45e391fa83..4df3869752 100644 --- a/lib/services/mediaServicesManagement/lib/models/streamingLocatorContentKey.js +++ b/lib/services/mediaServicesManagement/lib/models/streamingLocatorContentKey.js @@ -19,11 +19,11 @@ const models = require('./index'); class StreamingLocatorContentKey { /** * Create a StreamingLocatorContentKey. - * @member {string} [label] Label of Content Key - * @member {string} type Encryption type of Content Key. Possible values + * @member {uuid} id ID of Content Key + * @member {string} [type] Encryption type of Content Key. Possible values * include: 'CommonEncryptionCenc', 'CommonEncryptionCbcs', * 'EnvelopeEncryption' - * @member {uuid} id ID of Content Key + * @member {string} [label] Label of Content Key * @member {string} [value] Value of of Content Key * @member {string} [policyName] ContentKeyPolicy used by Content Key * @member {array} [tracks] Tracks which use this Content Key @@ -45,24 +45,24 @@ class StreamingLocatorContentKey { name: 'Composite', className: 'StreamingLocatorContentKey', modelProperties: { - label: { - required: false, - serializedName: 'label', + id: { + required: true, + serializedName: 'id', type: { name: 'String' } }, type: { - required: true, + required: false, + readOnly: true, serializedName: 'type', type: { - name: 'Enum', - allowedValues: [ 'CommonEncryptionCenc', 'CommonEncryptionCbcs', 'EnvelopeEncryption' ] + name: 'String' } }, - id: { - required: true, - serializedName: 'id', + label: { + required: false, + serializedName: 'label', type: { name: 'String' } @@ -76,6 +76,7 @@ class StreamingLocatorContentKey { }, policyName: { required: false, + readOnly: true, serializedName: 'policyName', type: { name: 'String' diff --git a/lib/services/mediaServicesManagement/lib/models/streamingPath.js b/lib/services/mediaServicesManagement/lib/models/streamingPath.js index 2736addbe7..5f4978a55f 100644 --- a/lib/services/mediaServicesManagement/lib/models/streamingPath.js +++ b/lib/services/mediaServicesManagement/lib/models/streamingPath.js @@ -46,16 +46,14 @@ class StreamingPath { required: true, serializedName: 'streamingProtocol', type: { - name: 'Enum', - allowedValues: [ 'Hls', 'Dash', 'SmoothStreaming', 'Download' ] + name: 'String' } }, encryptionScheme: { required: true, serializedName: 'encryptionScheme', type: { - name: 'Enum', - allowedValues: [ 'NoEncryption', 'EnvelopeEncryption', 'CommonEncryptionCenc', 'CommonEncryptionCbcs' ] + name: 'String' } }, paths: { diff --git a/lib/services/mediaServicesManagement/lib/models/streamingPolicy.js b/lib/services/mediaServicesManagement/lib/models/streamingPolicy.js index 65318e7726..a5b7e832fe 100644 --- a/lib/services/mediaServicesManagement/lib/models/streamingPolicy.js +++ b/lib/services/mediaServicesManagement/lib/models/streamingPolicy.js @@ -28,9 +28,9 @@ class StreamingPolicy extends models['ProxyResource'] { * supported protocols * @member {boolean} [envelopeEncryption.enabledProtocols.download] Enable * Download protocol or not - * @member {boolean} [envelopeEncryption.enabledProtocols.dash] Enable Dash + * @member {boolean} [envelopeEncryption.enabledProtocols.dash] Enable DASH * protocol or not - * @member {boolean} [envelopeEncryption.enabledProtocols.hls] Enable Hls + * @member {boolean} [envelopeEncryption.enabledProtocols.hls] Enable HLS * protocol or not * @member {boolean} [envelopeEncryption.enabledProtocols.smoothStreaming] * Enable SmoothStreaming protocol or not @@ -42,23 +42,23 @@ class StreamingPolicy extends models['ProxyResource'] { * @member {object} [envelopeEncryption.contentKeys.defaultKey] Default * content key for an encryption scheme * @member {string} [envelopeEncryption.contentKeys.defaultKey.label] Label - * can be used to specify Content Key when creating Stremaing Locator + * can be used to specify Content Key when creating a Streaming Locator * @member {string} [envelopeEncryption.contentKeys.defaultKey.policyName] * Policy used by Default Key * @member {array} [envelopeEncryption.contentKeys.keyToTrackMappings] - * Representing tracks needs sepearete content key - * @member {string} [envelopeEncryption.customLicenseAcquisitionUrlTemplate] - * LicenseAcquistionUrlTemplate is used to point to user speicified service - * to delivery content keys + * Representing tracks needs separate content key + * @member {string} [envelopeEncryption.customKeyAcquisitionUrlTemplate] + * KeyAcquistionUrlTemplate is used to point to user specified service to + * delivery content keys * @member {object} [commonEncryptionCenc] Configuration of * CommonEncryptionCenc * @member {object} [commonEncryptionCenc.enabledProtocols] Representing * supported protocols * @member {boolean} [commonEncryptionCenc.enabledProtocols.download] Enable * Download protocol or not - * @member {boolean} [commonEncryptionCenc.enabledProtocols.dash] Enable Dash + * @member {boolean} [commonEncryptionCenc.enabledProtocols.dash] Enable DASH * protocol or not - * @member {boolean} [commonEncryptionCenc.enabledProtocols.hls] Enable Hls + * @member {boolean} [commonEncryptionCenc.enabledProtocols.hls] Enable HLS * protocol or not * @member {boolean} [commonEncryptionCenc.enabledProtocols.smoothStreaming] * Enable SmoothStreaming protocol or not @@ -70,11 +70,11 @@ class StreamingPolicy extends models['ProxyResource'] { * @member {object} [commonEncryptionCenc.contentKeys.defaultKey] Default * content key for an encryption scheme * @member {string} [commonEncryptionCenc.contentKeys.defaultKey.label] Label - * can be used to specify Content Key when creating Stremaing Locator + * can be used to specify Content Key when creating a Streaming Locator * @member {string} [commonEncryptionCenc.contentKeys.defaultKey.policyName] * Policy used by Default Key * @member {array} [commonEncryptionCenc.contentKeys.keyToTrackMappings] - * Representing tracks needs sepearete content key + * Representing tracks needs separate content key * @member {object} [commonEncryptionCenc.drm] Configuration of DRMs for * CommonEncryptionCenc encryption scheme * @member {object} [commonEncryptionCenc.drm.playReady] PlayReady @@ -98,9 +98,9 @@ class StreamingPolicy extends models['ProxyResource'] { * supported protocols * @member {boolean} [commonEncryptionCbcs.enabledProtocols.download] Enable * Download protocol or not - * @member {boolean} [commonEncryptionCbcs.enabledProtocols.dash] Enable Dash + * @member {boolean} [commonEncryptionCbcs.enabledProtocols.dash] Enable DASH * protocol or not - * @member {boolean} [commonEncryptionCbcs.enabledProtocols.hls] Enable Hls + * @member {boolean} [commonEncryptionCbcs.enabledProtocols.hls] Enable HLS * protocol or not * @member {boolean} [commonEncryptionCbcs.enabledProtocols.smoothStreaming] * Enable SmoothStreaming protocol or not @@ -112,14 +112,14 @@ class StreamingPolicy extends models['ProxyResource'] { * @member {object} [commonEncryptionCbcs.contentKeys.defaultKey] Default * content key for an encryption scheme * @member {string} [commonEncryptionCbcs.contentKeys.defaultKey.label] Label - * can be used to specify Content Key when creating Stremaing Locator + * can be used to specify Content Key when creating a Streaming Locator * @member {string} [commonEncryptionCbcs.contentKeys.defaultKey.policyName] * Policy used by Default Key * @member {array} [commonEncryptionCbcs.contentKeys.keyToTrackMappings] - * Representing tracks needs sepearete content key + * Representing tracks needs separate content key * @member {object} [commonEncryptionCbcs.drm] Configuration of DRMs for * current encryption scheme - * @member {object} [commonEncryptionCbcs.drm.fairPlay] Fairplay + * @member {object} [commonEncryptionCbcs.drm.fairPlay] FairPlay * configurations * @member {string} * [commonEncryptionCbcs.drm.fairPlay.customLicenseAcquisitionUrlTemplate] @@ -143,14 +143,14 @@ class StreamingPolicy extends models['ProxyResource'] { * [commonEncryptionCbcs.drm.widevine.customLicenseAcquisitionUrlTemplate] * The template for a customer service to deliver keys to end users. Not * needed when using Azure Media Services for issuing keys. - * @member {object} [noEncryption] Configuations of NoEncryption + * @member {object} [noEncryption] Configurations of NoEncryption * @member {object} [noEncryption.enabledProtocols] Representing supported * protocols * @member {boolean} [noEncryption.enabledProtocols.download] Enable Download * protocol or not - * @member {boolean} [noEncryption.enabledProtocols.dash] Enable Dash + * @member {boolean} [noEncryption.enabledProtocols.dash] Enable DASH * protocol or not - * @member {boolean} [noEncryption.enabledProtocols.hls] Enable Hls protocol + * @member {boolean} [noEncryption.enabledProtocols.hls] Enable HLS protocol * or not * @member {boolean} [noEncryption.enabledProtocols.smoothStreaming] Enable * SmoothStreaming protocol or not diff --git a/lib/services/mediaServicesManagement/lib/models/streamingPolicyContentKey.js b/lib/services/mediaServicesManagement/lib/models/streamingPolicyContentKey.js index 52aca53d46..79c327be8e 100644 --- a/lib/services/mediaServicesManagement/lib/models/streamingPolicyContentKey.js +++ b/lib/services/mediaServicesManagement/lib/models/streamingPolicyContentKey.js @@ -20,7 +20,7 @@ class StreamingPolicyContentKey { /** * Create a StreamingPolicyContentKey. * @member {string} [label] Label can be used to specify Content Key when - * creating Stremaing Locator + * creating a Streaming Locator * @member {string} [policyName] Policy used by Content Key * @member {array} [tracks] Tracks which use this content key */ diff --git a/lib/services/mediaServicesManagement/lib/models/streamingPolicyContentKeys.js b/lib/services/mediaServicesManagement/lib/models/streamingPolicyContentKeys.js index e1a3acadbb..707c0305e3 100644 --- a/lib/services/mediaServicesManagement/lib/models/streamingPolicyContentKeys.js +++ b/lib/services/mediaServicesManagement/lib/models/streamingPolicyContentKeys.js @@ -21,9 +21,9 @@ class StreamingPolicyContentKeys { * Create a StreamingPolicyContentKeys. * @member {object} [defaultKey] Default content key for an encryption scheme * @member {string} [defaultKey.label] Label can be used to specify Content - * Key when creating Stremaing Locator + * Key when creating a Streaming Locator * @member {string} [defaultKey.policyName] Policy used by Default Key - * @member {array} [keyToTrackMappings] Representing tracks needs sepearete + * @member {array} [keyToTrackMappings] Representing tracks needs separate * content key */ constructor() { diff --git a/lib/services/mediaServicesManagement/lib/models/trackPropertyCondition.js b/lib/services/mediaServicesManagement/lib/models/trackPropertyCondition.js index fc9fb28fa8..0de9c72e81 100644 --- a/lib/services/mediaServicesManagement/lib/models/trackPropertyCondition.js +++ b/lib/services/mediaServicesManagement/lib/models/trackPropertyCondition.js @@ -21,7 +21,7 @@ class TrackPropertyCondition { * 'Unknown', 'FourCC' * @member {string} operation Track property condition operation. Possible * values include: 'Unknown', 'Equal' - * @member {string} [value] Track proprty value + * @member {string} [value] Track property value */ constructor() { } @@ -44,16 +44,14 @@ class TrackPropertyCondition { required: true, serializedName: 'property', type: { - name: 'Enum', - allowedValues: [ 'Unknown', 'FourCC' ] + name: 'String' } }, operation: { required: true, serializedName: 'operation', type: { - name: 'Enum', - allowedValues: [ 'Unknown', 'Equal' ] + name: 'String' } }, value: { diff --git a/lib/services/mediaServicesManagement/lib/models/transformOutput.js b/lib/services/mediaServicesManagement/lib/models/transformOutput.js index 418beb1f12..32b2be7a34 100644 --- a/lib/services/mediaServicesManagement/lib/models/transformOutput.js +++ b/lib/services/mediaServicesManagement/lib/models/transformOutput.js @@ -55,16 +55,14 @@ class TransformOutput { required: false, serializedName: 'onError', type: { - name: 'Enum', - allowedValues: [ 'StopProcessingJob', 'ContinueJob' ] + name: 'String' } }, relativePriority: { required: false, serializedName: 'relativePriority', type: { - name: 'Enum', - allowedValues: [ 'Low', 'Normal', 'High' ] + name: 'String' } }, preset: { diff --git a/lib/services/mediaServicesManagement/lib/models/video.js b/lib/services/mediaServicesManagement/lib/models/video.js index 27a5dc04e3..ddff3c0951 100644 --- a/lib/services/mediaServicesManagement/lib/models/video.js +++ b/lib/services/mediaServicesManagement/lib/models/video.js @@ -77,8 +77,7 @@ class Video extends models['Codec'] { required: false, serializedName: 'stretchMode', type: { - name: 'Enum', - allowedValues: [ 'None', 'AutoSize', 'AutoFit' ] + name: 'String' } } } diff --git a/lib/services/mediaServicesManagement/lib/operations/index.d.ts b/lib/services/mediaServicesManagement/lib/operations/index.d.ts index bf8ef9ca58..7f7ad07fa6 100644 --- a/lib/services/mediaServicesManagement/lib/operations/index.d.ts +++ b/lib/services/mediaServicesManagement/lib/operations/index.d.ts @@ -2732,6 +2732,9 @@ export interface Jobs { * not set, the default is normal. Possible values include: 'Low', 'Normal', * 'High' * + * @param {object} [parameters.correlationData] Customer provided correlation + * data that will be returned in Job completed events. + * * @param {object} [options] Optional Parameters. * * @param {object} [options.customHeaders] Headers that will be added to the @@ -2782,6 +2785,9 @@ export interface Jobs { * not set, the default is normal. Possible values include: 'Low', 'Normal', * 'High' * + * @param {object} [parameters.correlationData] Customer provided correlation + * data that will be returned in Job completed events. + * * @param {object} [options] Optional Parameters. * * @param {object} [options.customHeaders] Headers that will be added to the @@ -3212,8 +3218,8 @@ export interface StreamingPolicies { * specific tracks * * @param {string} - * [parameters.envelopeEncryption.customLicenseAcquisitionUrlTemplate] - * LicenseAcquistionUrlTemplate is used to point to user speicified service to + * [parameters.envelopeEncryption.customKeyAcquisitionUrlTemplate] + * KeyAcquistionUrlTemplate is used to point to user specified service to * delivery content keys * * @param {object} [parameters.commonEncryptionCenc] Configuration of @@ -3256,7 +3262,7 @@ export interface StreamingPolicies { * * @param {string} * [parameters.commonEncryptionCbcs.contentKeys.defaultKey.label] Label can be - * used to specify Content Key when creating Stremaing Locator + * used to specify Content Key when creating a Streaming Locator * * @param {string} * [parameters.commonEncryptionCbcs.contentKeys.defaultKey.policyName] Policy @@ -3264,12 +3270,12 @@ export interface StreamingPolicies { * * @param {array} * [parameters.commonEncryptionCbcs.contentKeys.keyToTrackMappings] - * Representing tracks needs sepearete content key + * Representing tracks needs separate content key * * @param {object} [parameters.commonEncryptionCbcs.drm] Configuration of DRMs * for current encryption scheme * - * @param {object} [parameters.commonEncryptionCbcs.drm.fairPlay] Fairplay + * @param {object} [parameters.commonEncryptionCbcs.drm.fairPlay] FairPlay * configurations * * @param {string} @@ -3301,7 +3307,7 @@ export interface StreamingPolicies { * The template for a customer service to deliver keys to end users. Not * needed when using Azure Media Services for issuing keys. * - * @param {object} [parameters.noEncryption] Configuations of NoEncryption + * @param {object} [parameters.noEncryption] Configurations of NoEncryption * * @param {object} [parameters.noEncryption.enabledProtocols] Representing * supported protocols @@ -3309,10 +3315,10 @@ export interface StreamingPolicies { * @param {boolean} parameters.noEncryption.enabledProtocols.download Enable * Download protocol or not * - * @param {boolean} parameters.noEncryption.enabledProtocols.dash Enable Dash + * @param {boolean} parameters.noEncryption.enabledProtocols.dash Enable DASH * protocol or not * - * @param {boolean} parameters.noEncryption.enabledProtocols.hls Enable Hls + * @param {boolean} parameters.noEncryption.enabledProtocols.hls Enable HLS * protocol or not * * @param {boolean} parameters.noEncryption.enabledProtocols.smoothStreaming @@ -3362,8 +3368,8 @@ export interface StreamingPolicies { * specific tracks * * @param {string} - * [parameters.envelopeEncryption.customLicenseAcquisitionUrlTemplate] - * LicenseAcquistionUrlTemplate is used to point to user speicified service to + * [parameters.envelopeEncryption.customKeyAcquisitionUrlTemplate] + * KeyAcquistionUrlTemplate is used to point to user specified service to * delivery content keys * * @param {object} [parameters.commonEncryptionCenc] Configuration of @@ -3406,7 +3412,7 @@ export interface StreamingPolicies { * * @param {string} * [parameters.commonEncryptionCbcs.contentKeys.defaultKey.label] Label can be - * used to specify Content Key when creating Stremaing Locator + * used to specify Content Key when creating a Streaming Locator * * @param {string} * [parameters.commonEncryptionCbcs.contentKeys.defaultKey.policyName] Policy @@ -3414,12 +3420,12 @@ export interface StreamingPolicies { * * @param {array} * [parameters.commonEncryptionCbcs.contentKeys.keyToTrackMappings] - * Representing tracks needs sepearete content key + * Representing tracks needs separate content key * * @param {object} [parameters.commonEncryptionCbcs.drm] Configuration of DRMs * for current encryption scheme * - * @param {object} [parameters.commonEncryptionCbcs.drm.fairPlay] Fairplay + * @param {object} [parameters.commonEncryptionCbcs.drm.fairPlay] FairPlay * configurations * * @param {string} @@ -3451,7 +3457,7 @@ export interface StreamingPolicies { * The template for a customer service to deliver keys to end users. Not * needed when using Azure Media Services for issuing keys. * - * @param {object} [parameters.noEncryption] Configuations of NoEncryption + * @param {object} [parameters.noEncryption] Configurations of NoEncryption * * @param {object} [parameters.noEncryption.enabledProtocols] Representing * supported protocols @@ -3459,10 +3465,10 @@ export interface StreamingPolicies { * @param {boolean} parameters.noEncryption.enabledProtocols.download Enable * Download protocol or not * - * @param {boolean} parameters.noEncryption.enabledProtocols.dash Enable Dash + * @param {boolean} parameters.noEncryption.enabledProtocols.dash Enable DASH * protocol or not * - * @param {boolean} parameters.noEncryption.enabledProtocols.hls Enable Hls + * @param {boolean} parameters.noEncryption.enabledProtocols.hls Enable HLS * protocol or not * * @param {boolean} parameters.noEncryption.enabledProtocols.smoothStreaming @@ -3829,6 +3835,13 @@ export interface StreamingLocators { * @param {array} [parameters.contentKeys] ContentKeys used by this Streaming * Locator * + * @param {string} [parameters.alternativeMediaId] An Alternative Media + * Identifier associated with the StreamingLocator. This identifier can be + * used to distinguish different StreamingLocators for the same Asset for + * authorization purposes in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [options] Optional Parameters. * * @param {object} [options.customHeaders] Headers that will be added to the @@ -3879,6 +3892,13 @@ export interface StreamingLocators { * @param {array} [parameters.contentKeys] ContentKeys used by this Streaming * Locator * + * @param {string} [parameters.alternativeMediaId] An Alternative Media + * Identifier associated with the StreamingLocator. This identifier can be + * used to distinguish different StreamingLocators for the same Asset for + * authorization purposes in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [options] Optional Parameters. * * @param {object} [options.customHeaders] Headers that will be added to the @@ -4371,6 +4391,13 @@ export interface LiveEvents { * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -4459,6 +4486,13 @@ export interface LiveEvents { * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -4564,6 +4598,13 @@ export interface LiveEvents { * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -4647,6 +4688,13 @@ export interface LiveEvents { * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -5033,6 +5081,13 @@ export interface LiveEvents { * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -5121,6 +5176,13 @@ export interface LiveEvents { * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -5226,6 +5288,13 @@ export interface LiveEvents { * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -5309,6 +5378,13 @@ export interface LiveEvents { * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for diff --git a/lib/services/mediaServicesManagement/lib/operations/jobs.js b/lib/services/mediaServicesManagement/lib/operations/jobs.js index c650c04173..0c62f3d462 100644 --- a/lib/services/mediaServicesManagement/lib/operations/jobs.js +++ b/lib/services/mediaServicesManagement/lib/operations/jobs.js @@ -398,6 +398,9 @@ function _get(resourceGroupName, accountName, transformName, jobName, options, c * not set, the default is normal. Possible values include: 'Low', 'Normal', * 'High' * + * @param {object} [parameters.correlationData] Customer provided correlation + * data that will be returned in Job completed events. + * * @param {object} [options] Optional Parameters. * * @param {object} [options.customHeaders] Headers that will be added to the @@ -1247,6 +1250,9 @@ class Jobs { * not set, the default is normal. Possible values include: 'Low', 'Normal', * 'High' * + * @param {object} [parameters.correlationData] Customer provided correlation + * data that will be returned in Job completed events. + * * @param {object} [options] Optional Parameters. * * @param {object} [options.customHeaders] Headers that will be added to the @@ -1309,6 +1315,9 @@ class Jobs { * not set, the default is normal. Possible values include: 'Low', 'Normal', * 'High' * + * @param {object} [parameters.correlationData] Customer provided correlation + * data that will be returned in Job completed events. + * * @param {object} [options] Optional Parameters. * * @param {object} [options.customHeaders] Headers that will be added to the diff --git a/lib/services/mediaServicesManagement/lib/operations/liveEvents.js b/lib/services/mediaServicesManagement/lib/operations/liveEvents.js index bf90c13994..1736729334 100644 --- a/lib/services/mediaServicesManagement/lib/operations/liveEvents.js +++ b/lib/services/mediaServicesManagement/lib/operations/liveEvents.js @@ -381,6 +381,13 @@ function _get(resourceGroupName, accountName, liveEventName, options, callback) * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -525,6 +532,13 @@ function _create(resourceGroupName, accountName, liveEventName, parameters, opti * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -944,6 +958,13 @@ function _reset(resourceGroupName, accountName, liveEventName, options, callback * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -1215,6 +1236,13 @@ function _beginCreate(resourceGroupName, accountName, liveEventName, parameters, * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -2447,6 +2475,13 @@ class LiveEvents { * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -2547,6 +2582,13 @@ class LiveEvents { * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -2667,6 +2709,13 @@ class LiveEvents { * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -2762,6 +2811,13 @@ class LiveEvents { * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -3271,6 +3327,13 @@ class LiveEvents { * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -3371,6 +3434,13 @@ class LiveEvents { * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -3491,6 +3561,13 @@ class LiveEvents { * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for @@ -3586,6 +3663,13 @@ class LiveEvents { * @param {string} [parameters.preview.streamingPolicyName] The name of * streaming policy used for LiveEvent preview * + * @param {string} [parameters.preview.alternativeMediaId] An Alternative Media + * Identifier associated with the preview url. This identifier can be used to + * distinguish the preview of different live events for authorization purposes + * in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [parameters.encoding] The Live Event encoding. * * @param {string} [parameters.encoding.encodingType] The encoding type for diff --git a/lib/services/mediaServicesManagement/lib/operations/streamingLocators.js b/lib/services/mediaServicesManagement/lib/operations/streamingLocators.js index 65ae97f08a..e9f0facb6d 100644 --- a/lib/services/mediaServicesManagement/lib/operations/streamingLocators.js +++ b/lib/services/mediaServicesManagement/lib/operations/streamingLocators.js @@ -386,6 +386,13 @@ function _get(resourceGroupName, accountName, streamingLocatorName, options, cal * @param {array} [parameters.contentKeys] ContentKeys used by this Streaming * Locator * + * @param {string} [parameters.alternativeMediaId] An Alternative Media + * Identifier associated with the StreamingLocator. This identifier can be + * used to distinguish different StreamingLocators for the same Asset for + * authorization purposes in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [options] Optional Parameters. * * @param {object} [options.customHeaders] Headers that will be added to the @@ -1386,6 +1393,13 @@ class StreamingLocators { * @param {array} [parameters.contentKeys] ContentKeys used by this Streaming * Locator * + * @param {string} [parameters.alternativeMediaId] An Alternative Media + * Identifier associated with the StreamingLocator. This identifier can be + * used to distinguish different StreamingLocators for the same Asset for + * authorization purposes in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [options] Optional Parameters. * * @param {object} [options.customHeaders] Headers that will be added to the @@ -1448,6 +1462,13 @@ class StreamingLocators { * @param {array} [parameters.contentKeys] ContentKeys used by this Streaming * Locator * + * @param {string} [parameters.alternativeMediaId] An Alternative Media + * Identifier associated with the StreamingLocator. This identifier can be + * used to distinguish different StreamingLocators for the same Asset for + * authorization purposes in the CustomLicenseAcquisitionUrlTemplate or the + * CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in the + * StreamingPolicyName field. + * * @param {object} [options] Optional Parameters. * * @param {object} [options.customHeaders] Headers that will be added to the diff --git a/lib/services/mediaServicesManagement/lib/operations/streamingPolicies.js b/lib/services/mediaServicesManagement/lib/operations/streamingPolicies.js index c43b2bfdd7..8c1ecd78db 100644 --- a/lib/services/mediaServicesManagement/lib/operations/streamingPolicies.js +++ b/lib/services/mediaServicesManagement/lib/operations/streamingPolicies.js @@ -380,8 +380,8 @@ function _get(resourceGroupName, accountName, streamingPolicyName, options, call * specific tracks * * @param {string} - * [parameters.envelopeEncryption.customLicenseAcquisitionUrlTemplate] - * LicenseAcquistionUrlTemplate is used to point to user speicified service to + * [parameters.envelopeEncryption.customKeyAcquisitionUrlTemplate] + * KeyAcquistionUrlTemplate is used to point to user specified service to * delivery content keys * * @param {object} [parameters.commonEncryptionCenc] Configuration of @@ -424,7 +424,7 @@ function _get(resourceGroupName, accountName, streamingPolicyName, options, call * * @param {string} * [parameters.commonEncryptionCbcs.contentKeys.defaultKey.label] Label can be - * used to specify Content Key when creating Stremaing Locator + * used to specify Content Key when creating a Streaming Locator * * @param {string} * [parameters.commonEncryptionCbcs.contentKeys.defaultKey.policyName] Policy @@ -432,12 +432,12 @@ function _get(resourceGroupName, accountName, streamingPolicyName, options, call * * @param {array} * [parameters.commonEncryptionCbcs.contentKeys.keyToTrackMappings] - * Representing tracks needs sepearete content key + * Representing tracks needs separate content key * * @param {object} [parameters.commonEncryptionCbcs.drm] Configuration of DRMs * for current encryption scheme * - * @param {object} [parameters.commonEncryptionCbcs.drm.fairPlay] Fairplay + * @param {object} [parameters.commonEncryptionCbcs.drm.fairPlay] FairPlay * configurations * * @param {string} @@ -469,7 +469,7 @@ function _get(resourceGroupName, accountName, streamingPolicyName, options, call * The template for a customer service to deliver keys to end users. Not * needed when using Azure Media Services for issuing keys. * - * @param {object} [parameters.noEncryption] Configuations of NoEncryption + * @param {object} [parameters.noEncryption] Configurations of NoEncryption * * @param {object} [parameters.noEncryption.enabledProtocols] Representing * supported protocols @@ -477,10 +477,10 @@ function _get(resourceGroupName, accountName, streamingPolicyName, options, call * @param {boolean} parameters.noEncryption.enabledProtocols.download Enable * Download protocol or not * - * @param {boolean} parameters.noEncryption.enabledProtocols.dash Enable Dash + * @param {boolean} parameters.noEncryption.enabledProtocols.dash Enable DASH * protocol or not * - * @param {boolean} parameters.noEncryption.enabledProtocols.hls Enable Hls + * @param {boolean} parameters.noEncryption.enabledProtocols.hls Enable HLS * protocol or not * * @param {boolean} parameters.noEncryption.enabledProtocols.smoothStreaming @@ -1167,8 +1167,8 @@ class StreamingPolicies { * specific tracks * * @param {string} - * [parameters.envelopeEncryption.customLicenseAcquisitionUrlTemplate] - * LicenseAcquistionUrlTemplate is used to point to user speicified service to + * [parameters.envelopeEncryption.customKeyAcquisitionUrlTemplate] + * KeyAcquistionUrlTemplate is used to point to user specified service to * delivery content keys * * @param {object} [parameters.commonEncryptionCenc] Configuration of @@ -1211,7 +1211,7 @@ class StreamingPolicies { * * @param {string} * [parameters.commonEncryptionCbcs.contentKeys.defaultKey.label] Label can be - * used to specify Content Key when creating Stremaing Locator + * used to specify Content Key when creating a Streaming Locator * * @param {string} * [parameters.commonEncryptionCbcs.contentKeys.defaultKey.policyName] Policy @@ -1219,12 +1219,12 @@ class StreamingPolicies { * * @param {array} * [parameters.commonEncryptionCbcs.contentKeys.keyToTrackMappings] - * Representing tracks needs sepearete content key + * Representing tracks needs separate content key * * @param {object} [parameters.commonEncryptionCbcs.drm] Configuration of DRMs * for current encryption scheme * - * @param {object} [parameters.commonEncryptionCbcs.drm.fairPlay] Fairplay + * @param {object} [parameters.commonEncryptionCbcs.drm.fairPlay] FairPlay * configurations * * @param {string} @@ -1256,7 +1256,7 @@ class StreamingPolicies { * The template for a customer service to deliver keys to end users. Not * needed when using Azure Media Services for issuing keys. * - * @param {object} [parameters.noEncryption] Configuations of NoEncryption + * @param {object} [parameters.noEncryption] Configurations of NoEncryption * * @param {object} [parameters.noEncryption.enabledProtocols] Representing * supported protocols @@ -1264,10 +1264,10 @@ class StreamingPolicies { * @param {boolean} parameters.noEncryption.enabledProtocols.download Enable * Download protocol or not * - * @param {boolean} parameters.noEncryption.enabledProtocols.dash Enable Dash + * @param {boolean} parameters.noEncryption.enabledProtocols.dash Enable DASH * protocol or not * - * @param {boolean} parameters.noEncryption.enabledProtocols.hls Enable Hls + * @param {boolean} parameters.noEncryption.enabledProtocols.hls Enable HLS * protocol or not * * @param {boolean} parameters.noEncryption.enabledProtocols.smoothStreaming @@ -1329,8 +1329,8 @@ class StreamingPolicies { * specific tracks * * @param {string} - * [parameters.envelopeEncryption.customLicenseAcquisitionUrlTemplate] - * LicenseAcquistionUrlTemplate is used to point to user speicified service to + * [parameters.envelopeEncryption.customKeyAcquisitionUrlTemplate] + * KeyAcquistionUrlTemplate is used to point to user specified service to * delivery content keys * * @param {object} [parameters.commonEncryptionCenc] Configuration of @@ -1373,7 +1373,7 @@ class StreamingPolicies { * * @param {string} * [parameters.commonEncryptionCbcs.contentKeys.defaultKey.label] Label can be - * used to specify Content Key when creating Stremaing Locator + * used to specify Content Key when creating a Streaming Locator * * @param {string} * [parameters.commonEncryptionCbcs.contentKeys.defaultKey.policyName] Policy @@ -1381,12 +1381,12 @@ class StreamingPolicies { * * @param {array} * [parameters.commonEncryptionCbcs.contentKeys.keyToTrackMappings] - * Representing tracks needs sepearete content key + * Representing tracks needs separate content key * * @param {object} [parameters.commonEncryptionCbcs.drm] Configuration of DRMs * for current encryption scheme * - * @param {object} [parameters.commonEncryptionCbcs.drm.fairPlay] Fairplay + * @param {object} [parameters.commonEncryptionCbcs.drm.fairPlay] FairPlay * configurations * * @param {string} @@ -1418,7 +1418,7 @@ class StreamingPolicies { * The template for a customer service to deliver keys to end users. Not * needed when using Azure Media Services for issuing keys. * - * @param {object} [parameters.noEncryption] Configuations of NoEncryption + * @param {object} [parameters.noEncryption] Configurations of NoEncryption * * @param {object} [parameters.noEncryption.enabledProtocols] Representing * supported protocols @@ -1426,10 +1426,10 @@ class StreamingPolicies { * @param {boolean} parameters.noEncryption.enabledProtocols.download Enable * Download protocol or not * - * @param {boolean} parameters.noEncryption.enabledProtocols.dash Enable Dash + * @param {boolean} parameters.noEncryption.enabledProtocols.dash Enable DASH * protocol or not * - * @param {boolean} parameters.noEncryption.enabledProtocols.hls Enable Hls + * @param {boolean} parameters.noEncryption.enabledProtocols.hls Enable HLS * protocol or not * * @param {boolean} parameters.noEncryption.enabledProtocols.smoothStreaming diff --git a/lib/services/mediaServicesManagement/package.json b/lib/services/mediaServicesManagement/package.json index a8cf6557f3..dcb3cb88dd 100644 --- a/lib/services/mediaServicesManagement/package.json +++ b/lib/services/mediaServicesManagement/package.json @@ -2,7 +2,7 @@ "name": "azure-arm-mediaservices", "author": "Microsoft Corporation", "description": "AzureMediaServices Library with typescript type definitions for node", - "version": "2.0.0", + "version": "1.1.1-preview", "dependencies": { "ms-rest": "^2.3.3", "ms-rest-azure": "^2.5.5"