Skip to content

Commit ba12755

Browse files
zhangyan133SDKAutoYan Zhang (WICRESOFT NORTH AMERICA LTD)
authored
T1 media 2021 02 24 (Azure#16903)
* CodeGen from PR 12681 in Azure/azure-rest-api-specs [Hub Generated] Review request for Microsoft.Media to add version stable/2020-05-01 (Azure#12681) * update to new swaggers * fix some validation issues * change ErrorResponse to types.json for test * Add systemData to other entities * Fix encoding json to not use errorResponse test * fix validation error * updating examples with latest fixes * fixing a few validation errors * fix validation errors * Fix validation error. * fix int max len issue * test,version,CHANGELOG Co-authored-by: SDKAuto <sdkautomation@microsoft.com> Co-authored-by: Yan Zhang (WICRESOFT NORTH AMERICA LTD) <v-yanzhang@microsoft.com>
1 parent 73315fe commit ba12755

File tree

6 files changed

+1931
-187
lines changed

6 files changed

+1931
-187
lines changed

‎sdk/media/azure-mgmt-media/CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
# Release History
22

3+
## 3.1.0 (2021-02-24)
4+
5+
**Features**
6+
7+
- Model MediaService has a new parameter system_data
8+
- Model MetricSpecification has a new parameter lock_aggregation_type
9+
- Model StreamingPolicy has a new parameter system_data
10+
- Model AssetFilter has a new parameter system_data
11+
- Model LiveEvent has a new parameter system_data
12+
- Model ContentKeyPolicy has a new parameter system_data
13+
- Model FaceDetectorPreset has a new parameter blur_type
14+
- Model FaceDetectorPreset has a new parameter mode
15+
- Model Transform has a new parameter system_data
16+
- Model JobInputClip has a new parameter input_definitions
17+
- Model JobInputHttp has a new parameter input_definitions
18+
- Model AccountFilter has a new parameter system_data
19+
- Model Job has a new parameter system_data
20+
- Model JobInputAsset has a new parameter input_definitions
21+
- Model StreamingEndpoint has a new parameter system_data
22+
- Model StreamingLocator has a new parameter system_data
23+
- Model Asset has a new parameter system_data
24+
325
## 3.0.0 (2020-10-19)
426

527
**Features**

‎sdk/media/azure-mgmt-media/azure/mgmt/media/models/__init__.py‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
from ._models_py3 import Audio
2626
from ._models_py3 import AudioAnalyzerPreset
2727
from ._models_py3 import AudioOverlay
28+
from ._models_py3 import AudioTrackDescriptor
2829
from ._models_py3 import AzureEntityResource
2930
from ._models_py3 import BuiltInStandardEncoderPreset
3031
from ._models_py3 import CbcsDrmConfiguration
@@ -76,11 +77,18 @@
7677
from ._models_py3 import FilterTrackSelection
7778
from ._models_py3 import FirstQuality
7879
from ._models_py3 import Format
80+
from ._models_py3 import FromAllInputFile
81+
from ._models_py3 import FromEachInputFile
7982
from ._models_py3 import H264Layer
8083
from ._models_py3 import H264Video
84+
from ._models_py3 import H265Layer
85+
from ._models_py3 import H265Video
86+
from ._models_py3 import H265VideoLayer
8187
from ._models_py3 import Hls
8288
from ._models_py3 import Image
8389
from ._models_py3 import ImageFormat
90+
from ._models_py3 import InputDefinition
91+
from ._models_py3 import InputFile
8492
from ._models_py3 import IPAccessControl
8593
from ._models_py3 import IPRange
8694
from ._models_py3 import Job
@@ -91,6 +99,7 @@
9199
from ._models_py3 import JobInputClip
92100
from ._models_py3 import JobInputHttp
93101
from ._models_py3 import JobInputs
102+
from ._models_py3 import JobInputSequence
94103
from ._models_py3 import JobOutput
95104
from ._models_py3 import JobOutputAsset
96105
from ._models_py3 import JpgFormat
@@ -145,6 +154,10 @@
145154
from ._models_py3 import ProxyResource
146155
from ._models_py3 import Rectangle
147156
from ._models_py3 import Resource
157+
from ._models_py3 import SelectAudioTrackByAttribute
158+
from ._models_py3 import SelectAudioTrackById
159+
from ._models_py3 import SelectVideoTrackByAttribute
160+
from ._models_py3 import SelectVideoTrackById
148161
from ._models_py3 import ServiceSpecification
149162
from ._models_py3 import StandardEncoderPreset
150163
from ._models_py3 import StorageAccount
@@ -162,6 +175,8 @@
162175
from ._models_py3 import StreamingPolicyPlayReadyConfiguration
163176
from ._models_py3 import StreamingPolicyWidevineConfiguration
164177
from ._models_py3 import SyncStorageKeysInput
178+
from ._models_py3 import SystemData
179+
from ._models_py3 import TrackDescriptor
165180
from ._models_py3 import TrackedResource
166181
from ._models_py3 import TrackPropertyCondition
167182
from ._models_py3 import TrackSelection
@@ -173,6 +188,7 @@
173188
from ._models_py3 import VideoAnalyzerPreset
174189
from ._models_py3 import VideoLayer
175190
from ._models_py3 import VideoOverlay
191+
from ._models_py3 import VideoTrackDescriptor
176192
except (SyntaxError, ImportError):
177193
from ._models import AacAudio
178194
from ._models import AbsoluteClipTime
@@ -189,6 +205,7 @@
189205
from ._models import Audio
190206
from ._models import AudioAnalyzerPreset
191207
from ._models import AudioOverlay
208+
from ._models import AudioTrackDescriptor
192209
from ._models import AzureEntityResource
193210
from ._models import BuiltInStandardEncoderPreset
194211
from ._models import CbcsDrmConfiguration
@@ -240,11 +257,18 @@
240257
from ._models import FilterTrackSelection
241258
from ._models import FirstQuality
242259
from ._models import Format
260+
from ._models import FromAllInputFile
261+
from ._models import FromEachInputFile
243262
from ._models import H264Layer
244263
from ._models import H264Video
264+
from ._models import H265Layer
265+
from ._models import H265Video
266+
from ._models import H265VideoLayer
245267
from ._models import Hls
246268
from ._models import Image
247269
from ._models import ImageFormat
270+
from ._models import InputDefinition
271+
from ._models import InputFile
248272
from ._models import IPAccessControl
249273
from ._models import IPRange
250274
from ._models import Job
@@ -255,6 +279,7 @@
255279
from ._models import JobInputClip
256280
from ._models import JobInputHttp
257281
from ._models import JobInputs
282+
from ._models import JobInputSequence
258283
from ._models import JobOutput
259284
from ._models import JobOutputAsset
260285
from ._models import JpgFormat
@@ -309,6 +334,10 @@
309334
from ._models import ProxyResource
310335
from ._models import Rectangle
311336
from ._models import Resource
337+
from ._models import SelectAudioTrackByAttribute
338+
from ._models import SelectAudioTrackById
339+
from ._models import SelectVideoTrackByAttribute
340+
from ._models import SelectVideoTrackById
312341
from ._models import ServiceSpecification
313342
from ._models import StandardEncoderPreset
314343
from ._models import StorageAccount
@@ -326,6 +355,8 @@
326355
from ._models import StreamingPolicyPlayReadyConfiguration
327356
from ._models import StreamingPolicyWidevineConfiguration
328357
from ._models import SyncStorageKeysInput
358+
from ._models import SystemData
359+
from ._models import TrackDescriptor
329360
from ._models import TrackedResource
330361
from ._models import TrackPropertyCondition
331362
from ._models import TrackSelection
@@ -337,6 +368,7 @@
337368
from ._models import VideoAnalyzerPreset
338369
from ._models import VideoLayer
339370
from ._models import VideoOverlay
371+
from ._models import VideoTrackDescriptor
340372
from ._paged_models import AccountFilterPaged
341373
from ._paged_models import AssetFilterPaged
342374
from ._paged_models import AssetPaged
@@ -353,6 +385,7 @@
353385
from ._azure_media_services_enums import (
354386
FilterTrackPropertyType,
355387
FilterTrackPropertyCompareOperation,
388+
CreatedByType,
356389
MetricUnit,
357390
MetricAggregationType,
358391
StorageAccountType,
@@ -369,9 +402,16 @@
369402
ContentKeyPolicyRestrictionTokenType,
370403
ContentKeyPolicyFairPlayRentalAndLeaseKeyType,
371404
AacAudioProfile,
405+
H265VideoProfile,
372406
StretchMode,
373407
VideoSyncMode,
408+
H265Complexity,
409+
ChannelMapping,
410+
TrackAttribute,
411+
AttributeFilter,
374412
AnalysisResolution,
413+
FaceRedactorMode,
414+
BlurType,
375415
AudioAnalysisMode,
376416
DeinterlaceParity,
377417
DeinterlaceMode,
@@ -416,6 +456,7 @@
416456
'Audio',
417457
'AudioAnalyzerPreset',
418458
'AudioOverlay',
459+
'AudioTrackDescriptor',
419460
'AzureEntityResource',
420461
'BuiltInStandardEncoderPreset',
421462
'CbcsDrmConfiguration',
@@ -467,11 +508,18 @@
467508
'FilterTrackSelection',
468509
'FirstQuality',
469510
'Format',
511+
'FromAllInputFile',
512+
'FromEachInputFile',
470513
'H264Layer',
471514
'H264Video',
515+
'H265Layer',
516+
'H265Video',
517+
'H265VideoLayer',
472518
'Hls',
473519
'Image',
474520
'ImageFormat',
521+
'InputDefinition',
522+
'InputFile',
475523
'IPAccessControl',
476524
'IPRange',
477525
'Job',
@@ -482,6 +530,7 @@
482530
'JobInputClip',
483531
'JobInputHttp',
484532
'JobInputs',
533+
'JobInputSequence',
485534
'JobOutput',
486535
'JobOutputAsset',
487536
'JpgFormat',
@@ -536,6 +585,10 @@
536585
'ProxyResource',
537586
'Rectangle',
538587
'Resource',
588+
'SelectAudioTrackByAttribute',
589+
'SelectAudioTrackById',
590+
'SelectVideoTrackByAttribute',
591+
'SelectVideoTrackById',
539592
'ServiceSpecification',
540593
'StandardEncoderPreset',
541594
'StorageAccount',
@@ -553,6 +606,8 @@
553606
'StreamingPolicyPlayReadyConfiguration',
554607
'StreamingPolicyWidevineConfiguration',
555608
'SyncStorageKeysInput',
609+
'SystemData',
610+
'TrackDescriptor',
556611
'TrackedResource',
557612
'TrackPropertyCondition',
558613
'TrackSelection',
@@ -564,6 +619,7 @@
564619
'VideoAnalyzerPreset',
565620
'VideoLayer',
566621
'VideoOverlay',
622+
'VideoTrackDescriptor',
567623
'AccountFilterPaged',
568624
'OperationPaged',
569625
'MediaServicePaged',
@@ -579,6 +635,7 @@
579635
'StreamingEndpointPaged',
580636
'FilterTrackPropertyType',
581637
'FilterTrackPropertyCompareOperation',
638+
'CreatedByType',
582639
'MetricUnit',
583640
'MetricAggregationType',
584641
'StorageAccountType',
@@ -595,9 +652,16 @@
595652
'ContentKeyPolicyRestrictionTokenType',
596653
'ContentKeyPolicyFairPlayRentalAndLeaseKeyType',
597654
'AacAudioProfile',
655+
'H265VideoProfile',
598656
'StretchMode',
599657
'VideoSyncMode',
658+
'H265Complexity',
659+
'ChannelMapping',
660+
'TrackAttribute',
661+
'AttributeFilter',
600662
'AnalysisResolution',
663+
'FaceRedactorMode',
664+
'BlurType',
601665
'AudioAnalysisMode',
602666
'DeinterlaceParity',
603667
'DeinterlaceMode',

‎sdk/media/azure-mgmt-media/azure/mgmt/media/models/_azure_media_services_enums.py‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ class FilterTrackPropertyCompareOperation(str, Enum):
2828
not_equal = "NotEqual" #: The not equal operation.
2929

3030

31+
class CreatedByType(str, Enum):
32+
33+
user = "User"
34+
application = "Application"
35+
managed_identity = "ManagedIdentity"
36+
key = "Key"
37+
38+
3139
class MetricUnit(str, Enum):
3240

3341
bytes = "Bytes" #: The number of bytes.
@@ -140,6 +148,12 @@ class AacAudioProfile(str, Enum):
140148
he_aac_v2 = "HeAacV2" #: Specifies that the output audio is to be encoded into HE-AAC v2 profile.
141149

142150

151+
class H265VideoProfile(str, Enum):
152+
153+
auto = "Auto" #: Tells the encoder to automatically determine the appropriate H.265 profile.
154+
main = "Main" #: Main profile (https://x265.readthedocs.io/en/default/cli.html?highlight=profile#profile-level-tier)
155+
156+
143157
class StretchMode(str, Enum):
144158

145159
none = "None" #: Strictly respect the output resolution without considering the pixel aspect ratio or display aspect ratio of the input video.
@@ -155,12 +169,61 @@ class VideoSyncMode(str, Enum):
155169
vfr = "Vfr" #: Similar to the Passthrough mode, but if the input has frames that have duplicate timestamps, then only one frame is passed through to the output, and others are dropped. Recommended when the number of output frames is expected to be equal to the number of input frames. For example, the output is used to calculate a quality metric like PSNR against the input
156170

157171

172+
class H265Complexity(str, Enum):
173+
174+
speed = "Speed" #: Tells the encoder to use settings that are optimized for faster encoding. Quality is sacrificed to decrease encoding time.
175+
balanced = "Balanced" #: Tells the encoder to use settings that achieve a balance between speed and quality.
176+
quality = "Quality" #: Tells the encoder to use settings that are optimized to produce higher quality output at the expense of slower overall encode time.
177+
178+
179+
class ChannelMapping(str, Enum):
180+
181+
front_left = "FrontLeft" #: The Front Left Channel.
182+
front_right = "FrontRight" #: The Front Right Channel.
183+
center = "Center" #: The Center Channel.
184+
low_frequency_effects = "LowFrequencyEffects" #: Low Frequency Effects Channel. Sometimes referred to as the Subwoofer.
185+
back_left = "BackLeft" #: The Back Left Channel. Sometimes referred to as the Left Surround Channel.
186+
back_right = "BackRight" #: The Back Right Channel. Sometimes referred to as the Right Surround Channel.
187+
stereo_left = "StereoLeft" #: The Left Stereo channel. Sometimes referred to as Down Mix Left.
188+
stereo_right = "StereoRight" #: The Right Stereo channel. Sometimes referred to as Down Mix Right.
189+
190+
191+
class TrackAttribute(str, Enum):
192+
193+
bitrate = "Bitrate" #: The bitrate of the track.
194+
language = "Language" #: The language of the track.
195+
196+
197+
class AttributeFilter(str, Enum):
198+
199+
all = "All" #: All tracks will be included.
200+
top = "Top" #: The first track will be included when the attribute is sorted in descending order. Generally used to select the largest bitrate.
201+
bottom = "Bottom" #: The first track will be included when the attribute is sorted in ascending order. Generally used to select the smallest bitrate.
202+
value_equals = "ValueEquals" #: Any tracks that have an attribute equal to the value given will be included.
203+
204+
158205
class AnalysisResolution(str, Enum):
159206

160207
source_resolution = "SourceResolution"
161208
standard_definition = "StandardDefinition"
162209

163210

211+
class FaceRedactorMode(str, Enum):
212+
213+
analyze = "Analyze" #: Analyze mode detects faces and outputs a metadata file with the results. Allows editing of the metadata file before faces are blurred with Redact mode.
214+
redact = "Redact" #: Redact mode consumes the metadata file from Analyze mode and redacts the faces found.
215+
combined = "Combined" #: Combined mode does the Analyze and Redact steps in one pass when editing the analyzed faces is not desired.
216+
217+
218+
class BlurType(str, Enum):
219+
220+
box = "Box" #: Box: debug filter, bounding box only
221+
low = "Low" #: Low: box-car blur filter
222+
med = "Med" #: Med: Gaussian blur filter
223+
high = "High" #: High: Confuse blur filter
224+
black = "Black" #: Black: Black out filter
225+
226+
164227
class AudioAnalysisMode(str, Enum):
165228

166229
standard = "Standard" #: Performs all operations included in the Basic mode, additionally performing language detection and speaker diarization.
@@ -226,6 +289,11 @@ class EncoderNamedPreset(str, Enum):
226289
h264_multiple_bitrate1080p = "H264MultipleBitrate1080p" #: 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 180p.
227290
h264_multiple_bitrate720p = "H264MultipleBitrate720p" #: Produces a set of 6 GOP-aligned MP4 files, ranging from 3400 kbps to 400 kbps, and stereo AAC audio. Resolution starts at 720p and goes down to 180p.
228291
h264_multiple_bitrate_sd = "H264MultipleBitrateSD" #: Produces a set of 5 GOP-aligned MP4 files, ranging from 1900kbps to 400 kbps, and stereo AAC audio. Resolution starts at 480p and goes down to 240p.
292+
h265_content_aware_encoding = "H265ContentAwareEncoding" #: 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.
293+
h265_adaptive_streaming = "H265AdaptiveStreaming" #: Produces a set of GOP aligned MP4 files with H.265 video and stereo AAC audio. Auto-generates a bitrate ladder based on the input resolution, bitrate and frame rate. The auto-generated preset will never exceed the input resolution. For example, if the input is 720p, output will remain 720p at best.
294+
h265_single_bitrate720p = "H265SingleBitrate720p" #: Produces an MP4 file where the video is encoded with H.265 codec at 1800 kbps and a picture height of 720 pixels, and the stereo audio is encoded with AAC-LC codec at 128 kbps.
295+
h265_single_bitrate1080p = "H265SingleBitrate1080p" #: Produces an MP4 file where the video is encoded with H.265 codec at 3500 kbps and a picture height of 1080 pixels, and the stereo audio is encoded with AAC-LC codec at 128 kbps.
296+
h265_single_bitrate4_k = "H265SingleBitrate4K" #: Produces an MP4 file where the video is encoded with H.265 codec at 9500 kbps and a picture height of 2160 pixels, and the stereo audio is encoded with AAC-LC codec at 128 kbps.
229297

230298

231299
class InsightsType(str, Enum):

0 commit comments

Comments
 (0)