diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/api/Azure.ResourceManager.Media.netstandard2.0.cs b/sdk/mediaservices/Azure.ResourceManager.Media/api/Azure.ResourceManager.Media.netstandard2.0.cs index beee9522f1a2..e3fd835a2ee7 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/api/Azure.ResourceManager.Media.netstandard2.0.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/api/Azure.ResourceManager.Media.netstandard2.0.cs @@ -1161,6 +1161,10 @@ public CrossSiteAccessPolicies() { } public string ClientAccessPolicy { get { throw null; } set { } } public string CrossDomainPolicy { get { throw null; } set { } } } + public partial class DDAudio : Azure.ResourceManager.Media.Models.MediaAudioBase + { + public DDAudio() { } + } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public readonly partial struct DeinterlaceMode : System.IEquatable { @@ -1235,6 +1239,7 @@ internal EdgeUsageDataEventHub() { } public static Azure.ResourceManager.Media.Models.EncoderNamedPreset ContentAwareEncoding { get { throw null; } } public static Azure.ResourceManager.Media.Models.EncoderNamedPreset ContentAwareEncodingExperimental { get { throw null; } } public static Azure.ResourceManager.Media.Models.EncoderNamedPreset CopyAllBitrateNonInterleaved { get { throw null; } } + public static Azure.ResourceManager.Media.Models.EncoderNamedPreset DDGoodQualityAudio { get { throw null; } } public static Azure.ResourceManager.Media.Models.EncoderNamedPreset H264MultipleBitrate1080P { get { throw null; } } public static Azure.ResourceManager.Media.Models.EncoderNamedPreset H264MultipleBitrate720P { get { throw null; } } public static Azure.ResourceManager.Media.Models.EncoderNamedPreset H264MultipleBitrateSD { get { throw null; } } @@ -1301,11 +1306,20 @@ public EnvelopeEncryption() { } public string CustomKeyAcquisitionUriTemplate { get { throw null; } set { } } public Azure.ResourceManager.Media.Models.MediaEnabledProtocols EnabledProtocols { get { throw null; } set { } } } + public partial class Fade + { + public Fade(System.TimeSpan duration, string fadeColor) { } + public System.TimeSpan Duration { get { throw null; } set { } } + public string FadeColor { get { throw null; } set { } } + public string Start { get { throw null; } set { } } + } public partial class FilteringOperations { public FilteringOperations() { } public Azure.ResourceManager.Media.Models.RectangularWindow Crop { get { throw null; } set { } } public Azure.ResourceManager.Media.Models.DeinterlaceSettings Deinterlace { get { throw null; } set { } } + public Azure.ResourceManager.Media.Models.Fade FadeIn { get { throw null; } set { } } + public Azure.ResourceManager.Media.Models.Fade FadeOut { get { throw null; } set { } } public System.Collections.Generic.IList Overlays { get { throw null; } } public Azure.ResourceManager.Media.Models.RotationSetting? Rotation { get { throw null; } set { } } } @@ -1889,6 +1903,7 @@ internal MediaJobError() { } private readonly object _dummy; private readonly int _dummyPrimitive; public MediaJobErrorCategory(string value) { throw null; } + public static Azure.ResourceManager.Media.Models.MediaJobErrorCategory Account { get { throw null; } } public static Azure.ResourceManager.Media.Models.MediaJobErrorCategory Configuration { get { throw null; } } public static Azure.ResourceManager.Media.Models.MediaJobErrorCategory Content { get { throw null; } } public static Azure.ResourceManager.Media.Models.MediaJobErrorCategory Download { get { throw null; } } @@ -1915,6 +1930,7 @@ internal MediaJobError() { } public static Azure.ResourceManager.Media.Models.MediaJobErrorCode ContentUnsupported { get { throw null; } } public static Azure.ResourceManager.Media.Models.MediaJobErrorCode DownloadNotAccessible { get { throw null; } } public static Azure.ResourceManager.Media.Models.MediaJobErrorCode DownloadTransientError { get { throw null; } } + public static Azure.ResourceManager.Media.Models.MediaJobErrorCode IdentityUnsupported { get { throw null; } } public static Azure.ResourceManager.Media.Models.MediaJobErrorCode ServiceError { get { throw null; } } public static Azure.ResourceManager.Media.Models.MediaJobErrorCode ServiceTransientError { get { throw null; } } public static Azure.ResourceManager.Media.Models.MediaJobErrorCode UploadNotAccessible { get { throw null; } } @@ -2414,6 +2430,7 @@ public partial class StandardEncoderPreset : Azure.ResourceManager.Media.Models. { public StandardEncoderPreset(System.Collections.Generic.IEnumerable codecs, System.Collections.Generic.IEnumerable formats) { } public System.Collections.Generic.IList Codecs { get { throw null; } } + public System.Collections.Generic.IDictionary ExperimentalOptions { get { throw null; } } public Azure.ResourceManager.Media.Models.FilteringOperations Filters { get { throw null; } set { } } public System.Collections.Generic.IList Formats { get { throw null; } } } diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/ChannelMapping.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/ChannelMapping.cs index a831dce51027..ee0f59493a9f 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/ChannelMapping.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/ChannelMapping.cs @@ -37,7 +37,7 @@ public ChannelMapping(string value) public static ChannelMapping FrontRight { get; } = new ChannelMapping(FrontRightValue); /// The Center Channel. public static ChannelMapping Center { get; } = new ChannelMapping(CenterValue); - /// Low Frequency Effects Channel. Sometimes referred to as the Subwoofer. + /// Low Frequency Effects Channel. Sometimes referred to as the subwoofer. public static ChannelMapping LowFrequencyEffects { get; } = new ChannelMapping(LowFrequencyEffectsValue); /// The Back Left Channel. Sometimes referred to as the Left Surround Channel. public static ChannelMapping BackLeft { get; } = new ChannelMapping(BackLeftValue); diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/ContentKeyPolicyFairPlayConfiguration.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/ContentKeyPolicyFairPlayConfiguration.cs index 49e9468220d0..c0e8a744adbd 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/ContentKeyPolicyFairPlayConfiguration.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/ContentKeyPolicyFairPlayConfiguration.cs @@ -13,7 +13,7 @@ namespace Azure.ResourceManager.Media.Models public partial class ContentKeyPolicyFairPlayConfiguration : ContentKeyPolicyConfiguration { /// Initializes a new instance of ContentKeyPolicyFairPlayConfiguration. - /// The key that must be used as FairPlay Application Secret key. + /// The key that must be used as FairPlay Application Secret key. This needs to be base64 encoded. /// The password encrypting FairPlay certificate in PKCS 12 (pfx) format. /// The Base64 representation of FairPlay certificate in PKCS 12 (pfx) format (including private key). /// The rental and lease key type. @@ -30,7 +30,7 @@ public ContentKeyPolicyFairPlayConfiguration(byte[] applicationSecretKey, string /// Initializes a new instance of ContentKeyPolicyFairPlayConfiguration. /// The discriminator for derived types. - /// The key that must be used as FairPlay Application Secret key. + /// The key that must be used as FairPlay Application Secret key. This needs to be base64 encoded. /// The password encrypting FairPlay certificate in PKCS 12 (pfx) format. /// The Base64 representation of FairPlay certificate in PKCS 12 (pfx) format (including private key). /// The rental and lease key type. @@ -47,7 +47,7 @@ internal ContentKeyPolicyFairPlayConfiguration(string odataType, byte[] applicat OdataType = odataType ?? "#Microsoft.Media.ContentKeyPolicyFairPlayConfiguration"; } - /// The key that must be used as FairPlay Application Secret key. + /// The key that must be used as FairPlay Application Secret key. This needs to be base64 encoded. public byte[] ApplicationSecretKey { get; set; } /// The password encrypting FairPlay certificate in PKCS 12 (pfx) format. public string FairPlayPfxPassword { get; set; } diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/DDAudio.Serialization.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/DDAudio.Serialization.cs new file mode 100644 index 000000000000..f2267ae1b2b2 --- /dev/null +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/DDAudio.Serialization.cs @@ -0,0 +1,96 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System.Text.Json; +using Azure.Core; + +namespace Azure.ResourceManager.Media.Models +{ + public partial class DDAudio : IUtf8JsonSerializable + { + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) + { + writer.WriteStartObject(); + if (Optional.IsDefined(Channels)) + { + writer.WritePropertyName("channels"); + writer.WriteNumberValue(Channels.Value); + } + if (Optional.IsDefined(SamplingRate)) + { + writer.WritePropertyName("samplingRate"); + writer.WriteNumberValue(SamplingRate.Value); + } + if (Optional.IsDefined(Bitrate)) + { + writer.WritePropertyName("bitrate"); + writer.WriteNumberValue(Bitrate.Value); + } + writer.WritePropertyName("@odata.type"); + writer.WriteStringValue(OdataType); + if (Optional.IsDefined(Label)) + { + writer.WritePropertyName("label"); + writer.WriteStringValue(Label); + } + writer.WriteEndObject(); + } + + internal static DDAudio DeserializeDDAudio(JsonElement element) + { + Optional channels = default; + Optional samplingRate = default; + Optional bitrate = default; + string odataType = default; + Optional label = default; + foreach (var property in element.EnumerateObject()) + { + if (property.NameEquals("channels")) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + property.ThrowNonNullablePropertyIsNull(); + continue; + } + channels = property.Value.GetInt32(); + continue; + } + if (property.NameEquals("samplingRate")) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + property.ThrowNonNullablePropertyIsNull(); + continue; + } + samplingRate = property.Value.GetInt32(); + continue; + } + if (property.NameEquals("bitrate")) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + property.ThrowNonNullablePropertyIsNull(); + continue; + } + bitrate = property.Value.GetInt32(); + continue; + } + if (property.NameEquals("@odata.type")) + { + odataType = property.Value.GetString(); + continue; + } + if (property.NameEquals("label")) + { + label = property.Value.GetString(); + continue; + } + } + return new DDAudio(odataType, label.Value, Optional.ToNullable(channels), Optional.ToNullable(samplingRate), Optional.ToNullable(bitrate)); + } + } +} diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/DDAudio.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/DDAudio.cs new file mode 100644 index 000000000000..714c1eede679 --- /dev/null +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/DDAudio.cs @@ -0,0 +1,30 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +namespace Azure.ResourceManager.Media.Models +{ + /// Describes Dolby Digital Audio Codec (AC3) audio encoding settings. The current implementation for Dolby Digital Audio support are: Audio channel numbers at 1((mono), 2(stereo), 6(5.1side); Audio sampling frequency rates at: 32K/44.1K/48K Hz; Audio bitrate values as AC3 specification supports: 32000, 40000, 48000, 56000, 64000, 80000, 96000, 112000, 128000, 160000, 192000, 224000, 256000, 320000, 384000, 448000, 512000, 576000, 640000 bps. + public partial class DDAudio : MediaAudioBase + { + /// Initializes a new instance of DDAudio. + public DDAudio() + { + OdataType = "#Microsoft.Media.DDAudio"; + } + + /// Initializes a new instance of DDAudio. + /// The discriminator for derived types. + /// An optional label for the codec. The label can be used to control muxing behavior. + /// The number of channels in the audio. + /// The sampling rate to use for encoding in hertz. + /// The bitrate, in bits per second, of the output encoded audio. + internal DDAudio(string odataType, string label, int? channels, int? samplingRate, int? bitrate) : base(odataType, label, channels, samplingRate, bitrate) + { + OdataType = odataType ?? "#Microsoft.Media.DDAudio"; + } + } +} diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/EncoderNamedPreset.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/EncoderNamedPreset.cs index f8c98935cd7a..83b264495edd 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/EncoderNamedPreset.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/EncoderNamedPreset.cs @@ -27,6 +27,7 @@ public EncoderNamedPreset(string value) private const string H264SingleBitrate1080PValue = "H264SingleBitrate1080p"; private const string AdaptiveStreamingValue = "AdaptiveStreaming"; private const string AacGoodQualityAudioValue = "AACGoodQualityAudio"; + private const string DDGoodQualityAudioValue = "DDGoodQualityAudio"; private const string ContentAwareEncodingExperimentalValue = "ContentAwareEncodingExperimental"; private const string ContentAwareEncodingValue = "ContentAwareEncoding"; private const string CopyAllBitrateNonInterleavedValue = "CopyAllBitrateNonInterleaved"; @@ -47,8 +48,10 @@ public EncoderNamedPreset(string value) public static EncoderNamedPreset H264SingleBitrate1080P { get; } = new EncoderNamedPreset(H264SingleBitrate1080PValue); /// Produces a set of GOP aligned MP4 files with H.264 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. public static EncoderNamedPreset AdaptiveStreaming { get; } = new EncoderNamedPreset(AdaptiveStreamingValue); - /// Produces a single MP4 file containing only stereo audio encoded at 192 kbps. + /// Produces a single MP4 file containing only AAC stereo audio encoded at 192 kbps. public static EncoderNamedPreset AacGoodQualityAudio { get; } = new EncoderNamedPreset(AacGoodQualityAudioValue); + /// Produces a single MP4 file containing only DD(Digital Dolby) stereo audio encoded at 192 kbps. + public static EncoderNamedPreset DDGoodQualityAudio { get; } = new EncoderNamedPreset(DDGoodQualityAudioValue); /// 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. public static EncoderNamedPreset ContentAwareEncodingExperimental { get; } = new EncoderNamedPreset(ContentAwareEncodingExperimentalValue); /// 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. diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/Fade.Serialization.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/Fade.Serialization.cs new file mode 100644 index 000000000000..70ab1248730a --- /dev/null +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/Fade.Serialization.cs @@ -0,0 +1,57 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Text.Json; +using Azure.Core; + +namespace Azure.ResourceManager.Media.Models +{ + public partial class Fade : IUtf8JsonSerializable + { + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) + { + writer.WriteStartObject(); + writer.WritePropertyName("duration"); + writer.WriteStringValue(Duration, "P"); + writer.WritePropertyName("fadeColor"); + writer.WriteStringValue(FadeColor); + if (Optional.IsDefined(Start)) + { + writer.WritePropertyName("start"); + writer.WriteStringValue(Start); + } + writer.WriteEndObject(); + } + + internal static Fade DeserializeFade(JsonElement element) + { + TimeSpan duration = default; + string fadeColor = default; + Optional start = default; + foreach (var property in element.EnumerateObject()) + { + if (property.NameEquals("duration")) + { + duration = property.Value.GetTimeSpan("P"); + continue; + } + if (property.NameEquals("fadeColor")) + { + fadeColor = property.Value.GetString(); + continue; + } + if (property.NameEquals("start")) + { + start = property.Value.GetString(); + continue; + } + } + return new Fade(duration, fadeColor, start.Value); + } + } +} diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/Fade.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/Fade.cs new file mode 100644 index 000000000000..f881e9d8b41e --- /dev/null +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/Fade.cs @@ -0,0 +1,46 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using Azure.Core; + +namespace Azure.ResourceManager.Media.Models +{ + /// Describes the properties of a Fade effect applied to the input media. + public partial class Fade + { + /// Initializes a new instance of Fade. + /// The Duration of the fade effect in the video. The value can be in ISO 8601 format (For example, PT05S to fade In/Out a color during 5 seconds), or a frame count (For example, 10 to fade 10 frames from the start time), or a relative value to stream duration (For example, 10% to fade 10% of stream duration). + /// The Color for the fade In/Out. it can be on the CSS Level1 colors https://developer.mozilla.org/en-US/docs/Web/CSS/color_value/color_keywords or an RGB/hex value: e.g: rgb(255,0,0), 0xFF0000 or #FF0000. + /// is null. + public Fade(TimeSpan duration, string fadeColor) + { + Argument.AssertNotNull(fadeColor, nameof(fadeColor)); + + Duration = duration; + FadeColor = fadeColor; + } + + /// Initializes a new instance of Fade. + /// The Duration of the fade effect in the video. The value can be in ISO 8601 format (For example, PT05S to fade In/Out a color during 5 seconds), or a frame count (For example, 10 to fade 10 frames from the start time), or a relative value to stream duration (For example, 10% to fade 10% of stream duration). + /// The Color for the fade In/Out. it can be on the CSS Level1 colors https://developer.mozilla.org/en-US/docs/Web/CSS/color_value/color_keywords or an RGB/hex value: e.g: rgb(255,0,0), 0xFF0000 or #FF0000. + /// The position in the input video from where to start fade. The value can be in ISO 8601 format (For example, PT05S to start at 5 seconds), or a frame count (For example, 10 to start at the 10th frame), or a relative value to stream duration (For example, 10% to start at 10% of stream duration). Default is 0. + internal Fade(TimeSpan duration, string fadeColor, string start) + { + Duration = duration; + FadeColor = fadeColor; + Start = start; + } + + /// The Duration of the fade effect in the video. The value can be in ISO 8601 format (For example, PT05S to fade In/Out a color during 5 seconds), or a frame count (For example, 10 to fade 10 frames from the start time), or a relative value to stream duration (For example, 10% to fade 10% of stream duration). + public TimeSpan Duration { get; set; } + /// The Color for the fade In/Out. it can be on the CSS Level1 colors https://developer.mozilla.org/en-US/docs/Web/CSS/color_value/color_keywords or an RGB/hex value: e.g: rgb(255,0,0), 0xFF0000 or #FF0000. + public string FadeColor { get; set; } + /// The position in the input video from where to start fade. The value can be in ISO 8601 format (For example, PT05S to start at 5 seconds), or a frame count (For example, 10 to start at the 10th frame), or a relative value to stream duration (For example, 10% to start at 10% of stream duration). Default is 0. + public string Start { get; set; } + } +} diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/FilteringOperations.Serialization.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/FilteringOperations.Serialization.cs index 1c153bde3a44..be5abc58ae8d 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/FilteringOperations.Serialization.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/FilteringOperations.Serialization.cs @@ -31,6 +31,16 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("crop"); writer.WriteObjectValue(Crop); } + if (Optional.IsDefined(FadeIn)) + { + writer.WritePropertyName("fadeIn"); + writer.WriteObjectValue(FadeIn); + } + if (Optional.IsDefined(FadeOut)) + { + writer.WritePropertyName("fadeOut"); + writer.WriteObjectValue(FadeOut); + } if (Optional.IsCollectionDefined(Overlays)) { writer.WritePropertyName("overlays"); @@ -49,6 +59,8 @@ internal static FilteringOperations DeserializeFilteringOperations(JsonElement e Optional deinterlace = default; Optional rotation = default; Optional crop = default; + Optional fadeIn = default; + Optional fadeOut = default; Optional> overlays = default; foreach (var property in element.EnumerateObject()) { @@ -82,6 +94,26 @@ internal static FilteringOperations DeserializeFilteringOperations(JsonElement e crop = RectangularWindow.DeserializeRectangularWindow(property.Value); continue; } + if (property.NameEquals("fadeIn")) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + property.ThrowNonNullablePropertyIsNull(); + continue; + } + fadeIn = Fade.DeserializeFade(property.Value); + continue; + } + if (property.NameEquals("fadeOut")) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + property.ThrowNonNullablePropertyIsNull(); + continue; + } + fadeOut = Fade.DeserializeFade(property.Value); + continue; + } if (property.NameEquals("overlays")) { if (property.Value.ValueKind == JsonValueKind.Null) @@ -98,7 +130,7 @@ internal static FilteringOperations DeserializeFilteringOperations(JsonElement e continue; } } - return new FilteringOperations(deinterlace.Value, Optional.ToNullable(rotation), crop.Value, Optional.ToList(overlays)); + return new FilteringOperations(deinterlace.Value, Optional.ToNullable(rotation), crop.Value, fadeIn.Value, fadeOut.Value, Optional.ToList(overlays)); } } } diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/FilteringOperations.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/FilteringOperations.cs index 968b85a3d217..c2966c687667 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/FilteringOperations.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/FilteringOperations.cs @@ -23,16 +23,20 @@ public FilteringOperations() /// The de-interlacing settings. /// The rotation, if any, to be applied to the input video, before it is encoded. Default is Auto. /// The parameters for the rectangular window with which to crop the input video. + /// Describes the properties of a Fade effect applied to the input media. + /// Describes the properties of a Fade effect applied to the input media. /// /// The properties of overlays to be applied to the input video. These could be audio, image or video overlays. /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. /// The available derived classes include and . /// - internal FilteringOperations(DeinterlaceSettings deinterlace, RotationSetting? rotation, RectangularWindow crop, IList overlays) + internal FilteringOperations(DeinterlaceSettings deinterlace, RotationSetting? rotation, RectangularWindow crop, Fade fadeIn, Fade fadeOut, IList overlays) { Deinterlace = deinterlace; Rotation = rotation; Crop = crop; + FadeIn = fadeIn; + FadeOut = fadeOut; Overlays = overlays; } @@ -42,6 +46,10 @@ internal FilteringOperations(DeinterlaceSettings deinterlace, RotationSetting? r public RotationSetting? Rotation { get; set; } /// The parameters for the rectangular window with which to crop the input video. public RectangularWindow Crop { get; set; } + /// Describes the properties of a Fade effect applied to the input media. + public Fade FadeIn { get; set; } + /// Describes the properties of a Fade effect applied to the input media. + public Fade FadeOut { get; set; } /// /// The properties of overlays to be applied to the input video. These could be audio, image or video overlays. /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/JpgFormat.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/JpgFormat.cs index 2f405acdaae0..7f9b38bbec35 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/JpgFormat.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/JpgFormat.cs @@ -14,7 +14,7 @@ namespace Azure.ResourceManager.Media.Models public partial class JpgFormat : OutputImageFileFormat { /// Initializes a new instance of JpgFormat. - /// The pattern of the file names for the generated output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {Bitrate} - The audio/video bitrate. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. + /// The file naming pattern used for the creation of output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {AudioStream} - string "Audio" plus audio stream number(start from 1). {Bitrate} - The audio/video bitrate in kbps. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. /// is null. public JpgFormat(string filenamePattern) : base(filenamePattern) { @@ -25,7 +25,7 @@ public JpgFormat(string filenamePattern) : base(filenamePattern) /// Initializes a new instance of JpgFormat. /// The discriminator for derived types. - /// The pattern of the file names for the generated output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {Bitrate} - The audio/video bitrate. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. + /// The file naming pattern used for the creation of output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {AudioStream} - string "Audio" plus audio stream number(start from 1). {Bitrate} - The audio/video bitrate in kbps. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. internal JpgFormat(string odataType, string filenamePattern) : base(odataType, filenamePattern) { OdataType = odataType ?? "#Microsoft.Media.JpgFormat"; diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaAudioBase.Serialization.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaAudioBase.Serialization.cs index 0fbfe996a923..3a00a5df2ca9 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaAudioBase.Serialization.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaAudioBase.Serialization.cs @@ -47,6 +47,7 @@ internal static MediaAudioBase DeserializeMediaAudioBase(JsonElement element) switch (discriminator.GetString()) { case "#Microsoft.Media.AacAudio": return AacAudio.DeserializeAacAudio(element); + case "#Microsoft.Media.DDAudio": return DDAudio.DeserializeDDAudio(element); } } Optional channels = default; diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaAudioBase.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaAudioBase.cs index ffd972139c76..e4a59dbd1184 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaAudioBase.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaAudioBase.cs @@ -10,7 +10,7 @@ namespace Azure.ResourceManager.Media.Models /// /// Defines the common properties for all audio codecs. /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. - /// The available derived classes include . + /// The available derived classes include and . /// public partial class MediaAudioBase : MediaCodecBase { diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaCodecBase.Serialization.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaCodecBase.Serialization.cs index 34808c3c6869..e778d564b6cc 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaCodecBase.Serialization.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaCodecBase.Serialization.cs @@ -35,6 +35,7 @@ internal static MediaCodecBase DeserializeMediaCodecBase(JsonElement element) case "#Microsoft.Media.Audio": return MediaAudioBase.DeserializeMediaAudioBase(element); case "#Microsoft.Media.CopyAudio": return CodecCopyAudio.DeserializeCodecCopyAudio(element); case "#Microsoft.Media.CopyVideo": return CodecCopyVideo.DeserializeCodecCopyVideo(element); + case "#Microsoft.Media.DDAudio": return DDAudio.DeserializeDDAudio(element); case "#Microsoft.Media.H264Video": return H264Video.DeserializeH264Video(element); case "#Microsoft.Media.H265Video": return H265Video.DeserializeH265Video(element); case "#Microsoft.Media.Image": return MediaImageBase.DeserializeMediaImageBase(element); diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaCodecBase.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaCodecBase.cs index 1fac77ee0b53..37c8b7d4dee5 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaCodecBase.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaCodecBase.cs @@ -10,7 +10,7 @@ namespace Azure.ResourceManager.Media.Models /// /// Describes the basic properties of all codecs. /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. - /// The available derived classes include , , , , , , , , and . + /// The available derived classes include , , , , , , , , , and . /// public abstract partial class MediaCodecBase { diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaFormatBase.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaFormatBase.cs index e4d767024af7..b863ee26a6a2 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaFormatBase.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaFormatBase.cs @@ -18,7 +18,7 @@ namespace Azure.ResourceManager.Media.Models public abstract partial class MediaFormatBase { /// Initializes a new instance of MediaFormatBase. - /// The pattern of the file names for the generated output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {Bitrate} - The audio/video bitrate. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. + /// The file naming pattern used for the creation of output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {AudioStream} - string "Audio" plus audio stream number(start from 1). {Bitrate} - The audio/video bitrate in kbps. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. /// is null. protected MediaFormatBase(string filenamePattern) { @@ -29,7 +29,7 @@ protected MediaFormatBase(string filenamePattern) /// Initializes a new instance of MediaFormatBase. /// The discriminator for derived types. - /// The pattern of the file names for the generated output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {Bitrate} - The audio/video bitrate. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. + /// The file naming pattern used for the creation of output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {AudioStream} - string "Audio" plus audio stream number(start from 1). {Bitrate} - The audio/video bitrate in kbps. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. internal MediaFormatBase(string odataType, string filenamePattern) { OdataType = odataType; @@ -38,7 +38,7 @@ internal MediaFormatBase(string odataType, string filenamePattern) /// The discriminator for derived types. internal string OdataType { get; set; } - /// The pattern of the file names for the generated output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {Bitrate} - The audio/video bitrate. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. + /// The file naming pattern used for the creation of output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {AudioStream} - string "Audio" plus audio stream number(start from 1). {Bitrate} - The audio/video bitrate in kbps. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. public string FilenamePattern { get; set; } } } diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaJobErrorCategory.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaJobErrorCategory.cs index b610f5bb9654..a40269f74725 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaJobErrorCategory.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaJobErrorCategory.cs @@ -27,6 +27,7 @@ public MediaJobErrorCategory(string value) private const string UploadValue = "Upload"; private const string ConfigurationValue = "Configuration"; private const string ContentValue = "Content"; + private const string AccountValue = "Account"; /// The error is service related. public static MediaJobErrorCategory Service { get; } = new MediaJobErrorCategory(ServiceValue); @@ -38,6 +39,8 @@ public MediaJobErrorCategory(string value) public static MediaJobErrorCategory Configuration { get; } = new MediaJobErrorCategory(ConfigurationValue); /// The error is related to data in the input files. public static MediaJobErrorCategory Content { get; } = new MediaJobErrorCategory(ContentValue); + /// The error is related to account information. + public static MediaJobErrorCategory Account { get; } = new MediaJobErrorCategory(AccountValue); /// Determines if two values are the same. public static bool operator ==(MediaJobErrorCategory left, MediaJobErrorCategory right) => left.Equals(right); /// Determines if two values are not the same. diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaJobErrorCode.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaJobErrorCode.cs index 4b57231c63e7..016d97aaaaa8 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaJobErrorCode.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MediaJobErrorCode.cs @@ -31,6 +31,7 @@ public MediaJobErrorCode(string value) private const string ConfigurationUnsupportedValue = "ConfigurationUnsupported"; private const string ContentMalformedValue = "ContentMalformed"; private const string ContentUnsupportedValue = "ContentUnsupported"; + private const string IdentityUnsupportedValue = "IdentityUnsupported"; /// Fatal service error, please contact support. public static MediaJobErrorCode ServiceError { get; } = new MediaJobErrorCode(ServiceErrorValue); @@ -50,6 +51,8 @@ public MediaJobErrorCode(string value) public static MediaJobErrorCode ContentMalformed { get; } = new MediaJobErrorCode(ContentMalformedValue); /// There was a problem with the format of the input (not valid media file, or an unsupported file/codec), check the validity of the input files. public static MediaJobErrorCode ContentUnsupported { get; } = new MediaJobErrorCode(ContentUnsupportedValue); + /// There was an error verifying to the account identity. Check and fix the identity configurations and retry. If unsuccessful, please contact support. + public static MediaJobErrorCode IdentityUnsupported { get; } = new MediaJobErrorCode(IdentityUnsupportedValue); /// Determines if two values are the same. public static bool operator ==(MediaJobErrorCode left, MediaJobErrorCode right) => left.Equals(right); /// Determines if two values are not the same. diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/Mp4Format.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/Mp4Format.cs index b73176d9f436..78551da34abb 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/Mp4Format.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/Mp4Format.cs @@ -15,7 +15,7 @@ namespace Azure.ResourceManager.Media.Models public partial class Mp4Format : MultiBitrateFormat { /// Initializes a new instance of Mp4Format. - /// The pattern of the file names for the generated output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {Bitrate} - The audio/video bitrate. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. + /// The file naming pattern used for the creation of output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {AudioStream} - string "Audio" plus audio stream number(start from 1). {Bitrate} - The audio/video bitrate in kbps. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. /// is null. public Mp4Format(string filenamePattern) : base(filenamePattern) { @@ -26,7 +26,7 @@ public Mp4Format(string filenamePattern) : base(filenamePattern) /// Initializes a new instance of Mp4Format. /// The discriminator for derived types. - /// The pattern of the file names for the generated output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {Bitrate} - The audio/video bitrate. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. + /// The file naming pattern used for the creation of output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {AudioStream} - string "Audio" plus audio stream number(start from 1). {Bitrate} - The audio/video bitrate in kbps. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. /// The list of output files to produce. Each entry in the list is a set of audio and video layer labels to be muxed together . internal Mp4Format(string odataType, string filenamePattern, IList outputFiles) : base(odataType, filenamePattern, outputFiles) { diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MultiBitrateFormat.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MultiBitrateFormat.cs index 95ec1fe97133..94bc71081296 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MultiBitrateFormat.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/MultiBitrateFormat.cs @@ -19,7 +19,7 @@ namespace Azure.ResourceManager.Media.Models public partial class MultiBitrateFormat : MediaFormatBase { /// Initializes a new instance of MultiBitrateFormat. - /// The pattern of the file names for the generated output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {Bitrate} - The audio/video bitrate. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. + /// The file naming pattern used for the creation of output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {AudioStream} - string "Audio" plus audio stream number(start from 1). {Bitrate} - The audio/video bitrate in kbps. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. /// is null. public MultiBitrateFormat(string filenamePattern) : base(filenamePattern) { @@ -31,7 +31,7 @@ public MultiBitrateFormat(string filenamePattern) : base(filenamePattern) /// Initializes a new instance of MultiBitrateFormat. /// The discriminator for derived types. - /// The pattern of the file names for the generated output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {Bitrate} - The audio/video bitrate. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. + /// The file naming pattern used for the creation of output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {AudioStream} - string "Audio" plus audio stream number(start from 1). {Bitrate} - The audio/video bitrate in kbps. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. /// The list of output files to produce. Each entry in the list is a set of audio and video layer labels to be muxed together . internal MultiBitrateFormat(string odataType, string filenamePattern, IList outputFiles) : base(odataType, filenamePattern) { diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/OutputImageFileFormat.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/OutputImageFileFormat.cs index e44ca5c3ed62..d971b331078d 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/OutputImageFileFormat.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/OutputImageFileFormat.cs @@ -18,7 +18,7 @@ namespace Azure.ResourceManager.Media.Models public partial class OutputImageFileFormat : MediaFormatBase { /// Initializes a new instance of OutputImageFileFormat. - /// The pattern of the file names for the generated output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {Bitrate} - The audio/video bitrate. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. + /// The file naming pattern used for the creation of output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {AudioStream} - string "Audio" plus audio stream number(start from 1). {Bitrate} - The audio/video bitrate in kbps. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. /// is null. public OutputImageFileFormat(string filenamePattern) : base(filenamePattern) { @@ -29,7 +29,7 @@ public OutputImageFileFormat(string filenamePattern) : base(filenamePattern) /// Initializes a new instance of OutputImageFileFormat. /// The discriminator for derived types. - /// The pattern of the file names for the generated output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {Bitrate} - The audio/video bitrate. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. + /// The file naming pattern used for the creation of output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {AudioStream} - string "Audio" plus audio stream number(start from 1). {Bitrate} - The audio/video bitrate in kbps. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. internal OutputImageFileFormat(string odataType, string filenamePattern) : base(odataType, filenamePattern) { OdataType = odataType ?? "#Microsoft.Media.ImageFormat"; diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/PngFormat.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/PngFormat.cs index 2edd8151e5f3..4b62cc644ea2 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/PngFormat.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/PngFormat.cs @@ -14,7 +14,7 @@ namespace Azure.ResourceManager.Media.Models public partial class PngFormat : OutputImageFileFormat { /// Initializes a new instance of PngFormat. - /// The pattern of the file names for the generated output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {Bitrate} - The audio/video bitrate. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. + /// The file naming pattern used for the creation of output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {AudioStream} - string "Audio" plus audio stream number(start from 1). {Bitrate} - The audio/video bitrate in kbps. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. /// is null. public PngFormat(string filenamePattern) : base(filenamePattern) { @@ -25,7 +25,7 @@ public PngFormat(string filenamePattern) : base(filenamePattern) /// Initializes a new instance of PngFormat. /// The discriminator for derived types. - /// The pattern of the file names for the generated output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {Bitrate} - The audio/video bitrate. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. + /// The file naming pattern used for the creation of output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {AudioStream} - string "Audio" plus audio stream number(start from 1). {Bitrate} - The audio/video bitrate in kbps. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. internal PngFormat(string odataType, string filenamePattern) : base(odataType, filenamePattern) { OdataType = odataType ?? "#Microsoft.Media.PngFormat"; diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/StandardEncoderPreset.Serialization.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/StandardEncoderPreset.Serialization.cs index 483379419139..6ad520d7ae95 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/StandardEncoderPreset.Serialization.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/StandardEncoderPreset.Serialization.cs @@ -16,6 +16,17 @@ public partial class StandardEncoderPreset : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); + if (Optional.IsCollectionDefined(ExperimentalOptions)) + { + writer.WritePropertyName("experimentalOptions"); + writer.WriteStartObject(); + foreach (var item in ExperimentalOptions) + { + writer.WritePropertyName(item.Key); + writer.WriteStringValue(item.Value); + } + writer.WriteEndObject(); + } if (Optional.IsDefined(Filters)) { writer.WritePropertyName("filters"); @@ -42,12 +53,28 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) internal static StandardEncoderPreset DeserializeStandardEncoderPreset(JsonElement element) { + Optional> experimentalOptions = default; Optional filters = default; IList codecs = default; IList formats = default; string odataType = default; foreach (var property in element.EnumerateObject()) { + if (property.NameEquals("experimentalOptions")) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + property.ThrowNonNullablePropertyIsNull(); + continue; + } + Dictionary dictionary = new Dictionary(); + foreach (var property0 in property.Value.EnumerateObject()) + { + dictionary.Add(property0.Name, property0.Value.GetString()); + } + experimentalOptions = dictionary; + continue; + } if (property.NameEquals("filters")) { if (property.Value.ValueKind == JsonValueKind.Null) @@ -84,7 +111,7 @@ internal static StandardEncoderPreset DeserializeStandardEncoderPreset(JsonEleme continue; } } - return new StandardEncoderPreset(odataType, filters.Value, codecs, formats); + return new StandardEncoderPreset(odataType, Optional.ToDictionary(experimentalOptions), filters.Value, codecs, formats); } } } diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/StandardEncoderPreset.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/StandardEncoderPreset.cs index a4c0ccdf1f26..6736a536b7b2 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/StandardEncoderPreset.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/StandardEncoderPreset.cs @@ -19,7 +19,7 @@ public partial class StandardEncoderPreset : MediaTransformPreset /// /// The list of codecs to be used when encoding the input video. /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. - /// The available derived classes include , , , , , , , , and . + /// The available derived classes include , , , , , , , , , and . /// /// /// The list of outputs to be produced by the encoder. @@ -32,6 +32,7 @@ public StandardEncoderPreset(IEnumerable codecs, IEnumerable(); Codecs = codecs.ToList(); Formats = formats.ToList(); OdataType = "#Microsoft.Media.StandardEncoderPreset"; @@ -39,31 +40,35 @@ public StandardEncoderPreset(IEnumerable codecs, IEnumerable Initializes a new instance of StandardEncoderPreset. /// The discriminator for derived types. + /// Dictionary containing key value pairs for parameters not exposed in the preset itself. /// One or more filtering operations that are applied to the input media before encoding. /// /// The list of codecs to be used when encoding the input video. /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. - /// The available derived classes include , , , , , , , , and . + /// The available derived classes include , , , , , , , , , and . /// /// /// The list of outputs to be produced by the encoder. /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. /// The available derived classes include , , , , and . /// - internal StandardEncoderPreset(string odataType, FilteringOperations filters, IList codecs, IList formats) : base(odataType) + internal StandardEncoderPreset(string odataType, IDictionary experimentalOptions, FilteringOperations filters, IList codecs, IList formats) : base(odataType) { + ExperimentalOptions = experimentalOptions; Filters = filters; Codecs = codecs; Formats = formats; OdataType = odataType ?? "#Microsoft.Media.StandardEncoderPreset"; } + /// Dictionary containing key value pairs for parameters not exposed in the preset itself. + public IDictionary ExperimentalOptions { get; } /// One or more filtering operations that are applied to the input media before encoding. public FilteringOperations Filters { get; set; } /// /// The list of codecs to be used when encoding the input video. /// Please note is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes. - /// The available derived classes include , , , , , , , , and . + /// The available derived classes include , , , , , , , , , and . /// public IList Codecs { get; } /// diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/TransportStreamFormat.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/TransportStreamFormat.cs index ed95f1f838d3..826f33e4a63c 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/TransportStreamFormat.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/TransportStreamFormat.cs @@ -15,7 +15,7 @@ namespace Azure.ResourceManager.Media.Models public partial class TransportStreamFormat : MultiBitrateFormat { /// Initializes a new instance of TransportStreamFormat. - /// The pattern of the file names for the generated output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {Bitrate} - The audio/video bitrate. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. + /// The file naming pattern used for the creation of output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {AudioStream} - string "Audio" plus audio stream number(start from 1). {Bitrate} - The audio/video bitrate in kbps. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. /// is null. public TransportStreamFormat(string filenamePattern) : base(filenamePattern) { @@ -26,7 +26,7 @@ public TransportStreamFormat(string filenamePattern) : base(filenamePattern) /// Initializes a new instance of TransportStreamFormat. /// The discriminator for derived types. - /// The pattern of the file names for the generated output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {Bitrate} - The audio/video bitrate. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. + /// The file naming pattern used for the creation of output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {AudioStream} - string "Audio" plus audio stream number(start from 1). {Bitrate} - The audio/video bitrate in kbps. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. /// The list of output files to produce. Each entry in the list is a set of audio and video layer labels to be muxed together . internal TransportStreamFormat(string odataType, string filenamePattern, IList outputFiles) : base(odataType, filenamePattern, outputFiles) { diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/UnknownFormat.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/UnknownFormat.cs index 850690083391..763e08bf5fbe 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/UnknownFormat.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/Models/UnknownFormat.cs @@ -12,7 +12,7 @@ internal partial class UnknownFormat : MediaFormatBase { /// Initializes a new instance of UnknownFormat. /// The discriminator for derived types. - /// The pattern of the file names for the generated output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {Bitrate} - The audio/video bitrate. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. + /// The file naming pattern used for the creation of output files. The following macros are supported in the file name: {Basename} - An expansion macro that will use the name of the input video file. If the base name(the file suffix is not included) of the input video file is less than 32 characters long, the base name of input video files will be used. If the length of base name of the input video file exceeds 32 characters, the base name is truncated to the first 32 characters in total length. {Extension} - The appropriate extension for this format. {Label} - The label assigned to the codec/layer. {Index} - A unique index for thumbnails. Only applicable to thumbnails. {AudioStream} - string "Audio" plus audio stream number(start from 1). {Bitrate} - The audio/video bitrate in kbps. Not applicable to thumbnails. {Codec} - The type of the audio/video codec. {Resolution} - The video resolution. Any unsubstituted macros will be collapsed and removed from the filename. internal UnknownFormat(string odataType, string filenamePattern) : base(odataType, filenamePattern) { OdataType = odataType ?? "Unknown"; diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/RestOperations/JobsRestOperations.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/RestOperations/JobsRestOperations.cs index 34a050b5c3d8..eb3f4f6de3f1 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/RestOperations/JobsRestOperations.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/RestOperations/JobsRestOperations.cs @@ -33,7 +33,7 @@ public JobsRestOperations(HttpPipeline pipeline, string applicationId, Uri endpo { _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline)); _endpoint = endpoint ?? new Uri("https://management.azure.com"); - _apiVersion = apiVersion ?? "2021-11-01"; + _apiVersion = apiVersion ?? "2022-07-01"; _userAgent = new TelemetryDetails(GetType().Assembly, applicationId); } diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/RestOperations/TransformsRestOperations.cs b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/RestOperations/TransformsRestOperations.cs index 519f8acbca8c..dd61f1270593 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/RestOperations/TransformsRestOperations.cs +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/Generated/RestOperations/TransformsRestOperations.cs @@ -33,7 +33,7 @@ public TransformsRestOperations(HttpPipeline pipeline, string applicationId, Uri { _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline)); _endpoint = endpoint ?? new Uri("https://management.azure.com"); - _apiVersion = apiVersion ?? "2021-11-01"; + _apiVersion = apiVersion ?? "2022-07-01"; _userAgent = new TelemetryDetails(GetType().Assembly, applicationId); } diff --git a/sdk/mediaservices/Azure.ResourceManager.Media/src/autorest.md b/sdk/mediaservices/Azure.ResourceManager.Media/src/autorest.md index 5a55fc2f3b25..0dc6a9e2c33c 100644 --- a/sdk/mediaservices/Azure.ResourceManager.Media/src/autorest.md +++ b/sdk/mediaservices/Azure.ResourceManager.Media/src/autorest.md @@ -8,7 +8,7 @@ azure-arm: true csharp: true library-name: Media namespace: Azure.ResourceManager.Media -require: https://github.com/Azure/azure-rest-api-specs/blob/aefbcc5fb18a3b33f401394ebeae01df0733c830/specification/mediaservices/resource-manager/readme.md +require: /mnt/vss/_work/1/s/azure-rest-api-specs/specification/mediaservices/resource-manager/readme.md output-folder: $(this-folder)/Generated clear-output-folder: true skip-csproj: true