diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/ContentKeyPolicies.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/ContentKeyPolicies.json index 2df77971fd91..8e6ddf20122f 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/ContentKeyPolicies.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/ContentKeyPolicies.json @@ -8,7 +8,7 @@ "description": "This Swagger was generated by the API Framework.", "version": "2018-07-01" }, - "host": "management.azure.com", + "host": "management.azure.com", "consumes": [ "application/json" ], @@ -152,7 +152,7 @@ "description": "Passing the video portion of protected content to an Unknown Output is allowed but with constrained resolution." } ], - "modelAsString": true + "modelAsExtensible": true }, "description": "Configures Unknown output handling settings of the license." }, @@ -263,7 +263,7 @@ "description": "Persistent license. Allows offline playback." } ], - "modelAsString": true + "modelAsExtensible": true }, "description": "The license type." }, @@ -299,7 +299,7 @@ "description": "Ultraviolet streaming content type." } ], - "modelAsString": true + "modelAsExtensible": true }, "description": "The PlayReady content type." } @@ -500,7 +500,7 @@ "description": "JSON Web Token." } ], - "modelAsString": true + "modelAsExtensible": true }, "description": "The type of token." }, @@ -611,6 +611,7 @@ "enum": [ "Unknown", "Undefined", + "DualExpiry", "PersistentUnlimited", "PersistentLimited" ], @@ -625,6 +626,10 @@ "value": "Undefined", "description": "Key duration is not specified." }, + { + "value": "DualExpiry", + "description": "Dual expiry for offline rental." + }, { "value": "PersistentUnlimited", "description": "Content key can be persisted with an unlimited duration" @@ -634,7 +639,7 @@ "description": "Content key can be persisted and the valid duration is limited by the Rental Duration value" } ], - "modelAsString": true + "modelAsExtensible": true }, "description": "The rental and lease key type." }, @@ -642,6 +647,10 @@ "type": "integer", "format": "int64", "description": "The rental duration. Must be greater than or equal to 0." + }, + "offlineRentalConfiguration": { + "$ref": "#/definitions/ContentKeyPolicyFairPlayOfflineRentalConfiguration", + "description": "The FairPlay offline rental configuration." } }, "type": "object", @@ -654,6 +663,26 @@ ], "description": "Specifies a configuration for FairPlay licenses." }, + "ContentKeyPolicyFairPlayOfflineRentalConfiguration": { + "properties": { + "storageDurationSeconds": { + "type": "integer", + "format": "int64", + "description": "The storage duration. Must be greater than or equal to 0." + }, + "playbackDurationSeconds": { + "type": "integer", + "format": "int64", + "description": "The playback duration. Must be greater than or equal to 0." + } + }, + "type": "object", + "required": [ + "storageDuration", + "playbackDuration" + ], + "description": "FairPlay Offline rental configuration." + }, "ContentKeyPolicyOption": { "properties": { "policyOptionId": { @@ -844,7 +873,7 @@ "in": "query", "required": false, "type": "string", - "description": "Specifies the key by which the result collection should be ordered." + "description": "Specifies the the key by which the result collection should be ordered." } ], "x-ms-pageable": { @@ -855,7 +884,7 @@ "Lists all Content Key Policies": { "$ref": "examples/content-key-policies-list-all.json" }, - "Lists Content Key Policies ordered by last modified.": { + "Lists Content Key Policies ordered by last modifed.": { "$ref": "examples/content-key-policies-list-by-lastModified.json" }, "Lists Content Key Policies with created and last modified filters.": { @@ -1165,4 +1194,4 @@ "description": "The Version of the API to be used with the client request." } } -} +} \ No newline at end of file diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Encoding.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Encoding.json index 963de86b4961..4a6baa5d546d 100644 --- a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Encoding.json +++ b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Encoding.json @@ -152,6 +152,13 @@ "modelAsString": true }, "description": "Specifies the maximum resolution at which your video is analyzed. The default behavior is \"SourceResolution,\" which will keep the input video at its original resolution when analyzed. Using \"StandardDefinition\" will resize input videos to standard definition while preserving the appropriate aspect ratio. It will only resize if the video is of higher resolution. For example, a 1920x1080 input would be scaled to 640x360 before processing. Switching to \"StandardDefinition\" will reduce the time it takes to process high resolution video. It may also reduce the cost of using this component (see https://azure.microsoft.com/en-us/pricing/details/media-services/#analytics for details). However, faces that end up being too small in the resized video may not be detected." + }, + "experimentalOptions": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Dictionary containing key value pairs for parameters not exposed in the preset itself" } }, "type": "object", @@ -167,7 +174,14 @@ "properties": { "audioLanguage": { "type": "string", - "description": "The language for the audio payload in the input using the BCP-47 format of 'language tag-region' (e.g: 'en-US'). The list of supported languages are English ('en-US' and 'en-GB'), Spanish ('es-ES' and 'es-MX'), French ('fr-FR'), Italian ('it-IT'), Japanese ('ja-JP'), Portuguese ('pt-BR'), Chinese ('zh-CN'), German ('de-DE'), Arabic ('ar-EG' and 'ar-SY'), Russian ('ru-RU'), Hindi ('hi-IN'), and Korean ('ko-KR'). If you know the language of your content, it is recommended that you specify it. If the language isn't specified or set to null, automatic language detection will choose the first language detected and process with the selected language for the duration of the file. This language detection feature currently supports English, Chinese, French, German, Italian, Japanese, Spanish, Russian, and Portuguese. It does not currently support dynamically switching between languages after the first language is detected. The automatic detection works best with audio recordings with clearly discernable speech. If automatic detection fails to find the language, transcription would fallback to 'en-US'.\"" + "description": "The language for the audio payload in the input using the BCP-47 format of 'language tag-region' (e.g: 'en-US'). If you know the language of your content, it is recommended that you specify it. If the language isn't specified or set to null, automatic language detection will choose the first language detected and process with the selected language for the duration of the file. It does not currently support dynamically switching between languages after the first language is detected. The automatic detection works best with audio recordings with clearly discernable speech. If automatic detection fails to find the language, transcription would fallback to 'en-US'.\" The list of supported languages is available here: https://go.microsoft.com/fwlink/?linkid=2109463" + }, + "experimentalOptions": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "Dictionary containing key value pairs for parameters not exposed in the preset itself" } }, "type": "object", @@ -851,6 +865,7 @@ "AdaptiveStreaming", "AACGoodQualityAudio", "ContentAwareEncodingExperimental", + "ContentAwareEncoding", "H264MultipleBitrate1080p", "H264MultipleBitrate720p", "H264MultipleBitrateSD" @@ -882,6 +897,10 @@ "value": "ContentAwareEncodingExperimental", "description": "Exposes an experimental preset for content-aware encoding. Given any input content, the service attempts to automatically determine the optimal number of layers, appropriate bitrate and resolution settings for delivery by adaptive streaming. The underlying algorithms will continue to evolve over time. The output will contain MP4 files with video and audio interleaved." }, + { + "value": "ContentAwareEncoding", + "description": "Produces a set of GOP-aligned MP4s by using content-aware encoding. Given any input content, the service performs an initial lightweight analysis of the input content, and uses the results to determine the optimal number of layers, appropriate bitrate and resolution settings for delivery by adaptive streaming. This preset is particularly effective for low and medium complexity videos, where the output files will be at lower bitrates but at a quality that still delivers a good experience to viewers. The output will contain MP4 files with video and audio interleaved." + }, { "value": "H264MultipleBitrate1080p", "description": "Produces a set of 8 GOP-aligned MP4 files, ranging from 6000 kbps to 400 kbps, and stereo AAC audio. Resolution starts at 1080p and goes down to 360p." @@ -1197,7 +1216,7 @@ "time": { "type": "string", "format": "duration", - "description": "The time position on the timeline of the input media. It is usually specified as an ISO8601 period. e.g PT30S for 30 seconds." + "description": "The time position on the timeline of the input media. It is usually speicified as an ISO8601 period. e.g PT30S for 30 seconds." } }, "type": "object", @@ -1331,6 +1350,20 @@ "label": { "type": "string", "description": "A label that is assigned to a JobOutput in order to help uniquely identify it. This is useful when your Transform has more than one TransformOutput, whereby your Job has more than one JobOutput. In such cases, when you submit the Job, you will add two or more JobOutputs, in the same order as TransformOutputs in the Transform. Subsequently, when you retrieve the Job, either through events or on a GET request, you can use the label to easily identify the JobOutput. If a label is not provided, a default value of '{presetName}_{outputIndex}' will be used, where the preset name is the name of the preset in the corresponding TransformOutput and the output index is the relative index of the this JobOutput within the Job. Note that this index is the same as the relative index of the corresponding TransformOutput within its Transform." + }, + "startTime": { + "type": "string", + "format": "date-time", + "description": "The UTC date and time at which this Job Output began processing.", + "readOnly": true, + "x-nullable": true + }, + "endTime": { + "type": "string", + "format": "date-time", + "description": "The UTC date and time at which this Job Output finished processing.", + "readOnly": true, + "x-nullable": true } }, "type": "object", @@ -1628,6 +1661,20 @@ "type": "string" }, "description": "Customer provided key, value pairs that will be returned in Job and JobOutput state events." + }, + "startTime": { + "type": "string", + "format": "date-time", + "description": "The UTC date and time at which this Job began processing.", + "readOnly": true, + "x-nullable": true + }, + "endTime": { + "type": "string", + "format": "date-time", + "description": "The UTC date and time at which this Job finished processing.", + "readOnly": true, + "x-nullable": true } }, "type": "object", @@ -1768,7 +1815,7 @@ "in": "query", "required": false, "type": "string", - "description": "Specifies the key by which the result collection should be ordered." + "description": "Specifies the the key by which the result collection should be ordered." } ], "x-ms-pageable": { @@ -2051,7 +2098,7 @@ "in": "query", "required": false, "type": "string", - "description": "Specifies the key by which the result collection should be ordered." + "description": "Specifies the the key by which the result collection should be ordered." } ], "x-ms-pageable": { @@ -2398,4 +2445,4 @@ "description": "The Version of the API to be used with the client request." } } -} +} \ No newline at end of file