Skip to content

Commit c2286cd

Browse files
Adds SlowPalPitchCorrection to audio pitch correction settings. Enables opacity for VideoOverlays. Adds REMUX_ALL option to enable multi-rendition passthrough to VideoSelector for allow listed accounts.
1 parent 3251c6f commit c2286cd

33 files changed

+961
-62
lines changed

generator/ServiceModels/mediaconvert/mediaconvert-2017-08-29.api.json

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1804,6 +1804,10 @@
18041804
"shape": "AudioNormalizationSettings",
18051805
"locationName": "audioNormalizationSettings"
18061806
},
1807+
"AudioPitchCorrectionSettings": {
1808+
"shape": "AudioPitchCorrectionSettings",
1809+
"locationName": "audioPitchCorrectionSettings"
1810+
},
18071811
"AudioSourceName": {
18081812
"shape": "__stringMax2048",
18091813
"locationName": "audioSourceName"
@@ -1922,6 +1926,15 @@
19221926
}
19231927
}
19241928
},
1929+
"AudioPitchCorrectionSettings": {
1930+
"type": "structure",
1931+
"members": {
1932+
"SlowPalPitchCorrection": {
1933+
"shape": "SlowPalPitchCorrection",
1934+
"locationName": "slowPalPitchCorrection"
1935+
}
1936+
}
1937+
},
19251938
"AudioProperties": {
19261939
"type": "structure",
19271940
"members": {
@@ -1998,6 +2011,10 @@
19982011
"shape": "AudioSelectorType",
19992012
"locationName": "selectorType"
20002013
},
2014+
"Streams": {
2015+
"shape": "__listOf__integerMin1Max2147483647",
2016+
"locationName": "streams"
2017+
},
20012018
"Tracks": {
20022019
"shape": "__listOf__integerMin1Max2147483647",
20032020
"locationName": "tracks"
@@ -2020,7 +2037,8 @@
20202037
"TRACK",
20212038
"LANGUAGE_CODE",
20222039
"HLS_RENDITION_GROUP",
2023-
"ALL_PCM"
2040+
"ALL_PCM",
2041+
"STREAM"
20242042
]
20252043
},
20262044
"AudioTypeControl": {
@@ -4126,7 +4144,8 @@
41264144
"enum": [
41274145
"BASIC",
41284146
"COMPACT",
4129-
"DISTINCT"
4147+
"DISTINCT",
4148+
"FULL"
41304149
]
41314150
},
41324151
"DataProperties": {
@@ -10032,6 +10051,15 @@
1003210051
}
1003310052
}
1003410053
},
10054+
"PassthroughSettings": {
10055+
"type": "structure",
10056+
"members": {
10057+
"VideoSelectorMode": {
10058+
"shape": "VideoSelectorMode",
10059+
"locationName": "videoSelectorMode"
10060+
}
10061+
}
10062+
},
1003510063
"Policy": {
1003610064
"type": "structure",
1003710065
"members": {
@@ -10800,6 +10828,13 @@
1080010828
"ENABLED"
1080110829
]
1080210830
},
10831+
"SlowPalPitchCorrection": {
10832+
"type": "string",
10833+
"enum": [
10834+
"DISABLED",
10835+
"ENABLED"
10836+
]
10837+
},
1080310838
"SpekeKeyProvider": {
1080410839
"type": "structure",
1080510840
"members": {
@@ -11168,6 +11203,10 @@
1116811203
"TrackSourceSettings": {
1116911204
"type": "structure",
1117011205
"members": {
11206+
"StreamNumber": {
11207+
"shape": "__integerMin1Max2147483647",
11208+
"locationName": "streamNumber"
11209+
},
1117111210
"TrackNumber": {
1117211211
"shape": "__integerMin1Max2147483647",
1117311212
"locationName": "trackNumber"
@@ -11631,6 +11670,10 @@
1163111670
"shape": "Mpeg2Settings",
1163211671
"locationName": "mpeg2Settings"
1163311672
},
11673+
"PassthroughSettings": {
11674+
"shape": "PassthroughSettings",
11675+
"locationName": "passthroughSettings"
11676+
},
1163411677
"ProresSettings": {
1163511678
"shape": "ProresSettings",
1163611679
"locationName": "proresSettings"
@@ -11849,6 +11892,10 @@
1184911892
"shape": "__integerMinNegative1Max2147483647",
1185011893
"locationName": "height"
1185111894
},
11895+
"Opacity": {
11896+
"shape": "__integerMin0Max100",
11897+
"locationName": "opacity"
11898+
},
1185211899
"Unit": {
1185311900
"shape": "VideoOverlayUnit",
1185411901
"locationName": "unit"
@@ -12026,6 +12073,13 @@
1202612073
}
1202712074
}
1202812075
},
12076+
"VideoSelectorMode": {
12077+
"type": "string",
12078+
"enum": [
12079+
"AUTO",
12080+
"REMUX_ALL"
12081+
]
12082+
},
1202912083
"VideoSelectorType": {
1203012084
"type": "string",
1203112085
"enum": [

generator/ServiceModels/mediaconvert/mediaconvert-2017-08-29.docs.json

Lines changed: 42 additions & 15 deletions
Large diffs are not rendered by default.

generator/ServiceModels/mediaconvert/mediaconvert-2017-08-29.normal.json

Lines changed: 80 additions & 15 deletions
Large diffs are not rendered by default.

sdk/code-analysis/ServiceAnalysis/MediaConvert/Generated/PropertyValueRules.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1968,6 +1968,11 @@
19681968
<property>Amazon.MediaConvert.Model.TimecodeConfig.TimestampOffset</property>
19691969
<pattern>^([0-9]{4})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$</pattern>
19701970
</property-value-rule>
1971+
<property-value-rule>
1972+
<property>Amazon.MediaConvert.Model.TrackSourceSettings.StreamNumber</property>
1973+
<min>1</min>
1974+
<max>2147483647</max>
1975+
</property-value-rule>
19711976
<property-value-rule>
19721977
<property>Amazon.MediaConvert.Model.TrackSourceSettings.TrackNumber</property>
19731978
<min>1</min>
@@ -2064,6 +2069,11 @@
20642069
<min>-1</min>
20652070
<max>2147483647</max>
20662071
</property-value-rule>
2072+
<property-value-rule>
2073+
<property>Amazon.MediaConvert.Model.VideoOverlayPosition.Opacity</property>
2074+
<min>0</min>
2075+
<max>100</max>
2076+
</property-value-rule>
20672077
<property-value-rule>
20682078
<property>Amazon.MediaConvert.Model.VideoOverlayPosition.Width</property>
20692079
<min>-1</min>

sdk/src/Services/MediaConvert/Generated/Model/AudioDescription.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public partial class AudioDescription
4040
{
4141
private AudioChannelTaggingSettings _audioChannelTaggingSettings;
4242
private AudioNormalizationSettings _audioNormalizationSettings;
43+
private AudioPitchCorrectionSettings _audioPitchCorrectionSettings;
4344
private string _audioSourceName;
4445
private int? _audioType;
4546
private AudioTypeControl _audioTypeControl;
@@ -85,6 +86,22 @@ internal bool IsSetAudioNormalizationSettings()
8586
return this._audioNormalizationSettings != null;
8687
}
8788

89+
/// <summary>
90+
/// Gets and sets the property AudioPitchCorrectionSettings. Settings for audio pitch
91+
/// correction during framerate conversion.
92+
/// </summary>
93+
public AudioPitchCorrectionSettings AudioPitchCorrectionSettings
94+
{
95+
get { return this._audioPitchCorrectionSettings; }
96+
set { this._audioPitchCorrectionSettings = value; }
97+
}
98+
99+
// Check to see if AudioPitchCorrectionSettings property is set
100+
internal bool IsSetAudioPitchCorrectionSettings()
101+
{
102+
return this._audioPitchCorrectionSettings != null;
103+
}
104+
88105
/// <summary>
89106
/// Gets and sets the property AudioSourceName. Specifies which audio data to use from
90107
/// each input. In the simplest case, specify an "Audio Selector":#inputs-audio_selector
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
/*
17+
* Do not modify this file. This file is generated from the mediaconvert-2017-08-29.normal.json service model.
18+
*/
19+
using System;
20+
using System.Collections.Generic;
21+
using System.Xml.Serialization;
22+
using System.Text;
23+
using System.IO;
24+
using System.Net;
25+
26+
using Amazon.Runtime;
27+
using Amazon.Runtime.Internal;
28+
29+
#pragma warning disable CS0612,CS0618,CS1570
30+
namespace Amazon.MediaConvert.Model
31+
{
32+
/// <summary>
33+
/// Settings for audio pitch correction during framerate conversion.
34+
/// </summary>
35+
public partial class AudioPitchCorrectionSettings
36+
{
37+
private SlowPalPitchCorrection _slowPalPitchCorrection;
38+
39+
/// <summary>
40+
/// Gets and sets the property SlowPalPitchCorrection. Use Slow PAL pitch correction to
41+
/// compensate for audio pitch changes during slow PAL frame rate conversion. This setting
42+
/// only applies when Slow PAL is enabled in your output video codec settings. To automatically
43+
/// apply audio pitch correction: Choose Enabled. MediaConvert automatically applies a
44+
/// pitch correction to your output to match the original content's audio pitch. To not
45+
/// apply audio pitch correction: Keep the default value, Disabled.
46+
/// </summary>
47+
public SlowPalPitchCorrection SlowPalPitchCorrection
48+
{
49+
get { return this._slowPalPitchCorrection; }
50+
set { this._slowPalPitchCorrection = value; }
51+
}
52+
53+
// Check to see if SlowPalPitchCorrection property is set
54+
internal bool IsSetSlowPalPitchCorrection()
55+
{
56+
return this._slowPalPitchCorrection != null;
57+
}
58+
59+
}
60+
}

sdk/src/Services/MediaConvert/Generated/Model/AudioSelector.cs

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public partial class AudioSelector
4646
private int? _programSelection;
4747
private RemixSettings _remixSettings;
4848
private AudioSelectorType _selectorType;
49+
private List<int> _streams = AWSConfigs.InitializeCollections ? new List<int>() : null;
4950
private List<int> _tracks = AWSConfigs.InitializeCollections ? new List<int>() : null;
5051

5152
/// <summary>
@@ -245,14 +246,24 @@ internal bool IsSetRemixSettings()
245246
/// within your input. The default is Track. PID: Select audio by specifying the Packet
246247
/// Identifier (PID) values for MPEG Transport Stream inputs. Use this when you know the
247248
/// exact PID values of your audio streams. Track: Default. Select audio by track number.
248-
/// This is the most common option and works with most input container formats. Language
249-
/// code: Select audio by language using an ISO 639-2 or ISO 639-3 three-letter code in
250-
/// all capital letters. Use this when your source has embedded language metadata and
251-
/// you want to select tracks based on their language. HLS rendition group: Select audio
252-
/// from an HLS rendition group. Use this when your input is an HLS package with multiple
253-
/// audio renditions and you want to select specific rendition groups. All PCM: Select
254-
/// all uncompressed PCM audio tracks from your input automatically. This is useful when
255-
/// you want to include all PCM audio tracks without specifying individual track numbers.
249+
/// This is the most common option and works with most input container formats. If more
250+
/// types of audio data get recognized in the future, these numberings may shift, but
251+
/// the numberings used for Stream mode will not. Language code: Select audio by language
252+
/// using an ISO 639-2 or ISO 639-3 three-letter code in all capital letters. Use
253+
/// this when your source has embedded language metadata and you want to select tracks
254+
/// based on their language. HLS rendition group: Select audio from an HLS rendition group.
255+
/// Use this when your input is an HLS package with multiple audio renditions and you
256+
/// want to select specific rendition groups. All PCM: Select all uncompressed PCM audio
257+
/// tracks from your input automatically. This is useful when you want to include all
258+
/// PCM audio tracks without specifying individual track numbers. Stream: Select audio
259+
/// by stream number. Stream numbers include all tracks in the source file, regardless
260+
/// of type, and correspond to either the order of tracks in the file, or if applicable,
261+
/// the stream number metadata of the track. Although all tracks count toward these stream
262+
/// numbers, in this audio selector context, only the stream number of a track containing
263+
/// audio data may be used. If your source file contains a track which is not recognized
264+
/// by the service, then the corresponding stream number will still be reserved for future
265+
/// use. If more types of audio data get recognized in the future, these numberings will
266+
/// not shift.
256267
/// </summary>
257268
public AudioSelectorType SelectorType
258269
{
@@ -266,11 +277,33 @@ internal bool IsSetSelectorType()
266277
return this._selectorType != null;
267278
}
268279

280+
/// <summary>
281+
/// Gets and sets the property Streams. Identify a track from the input audio to include
282+
/// in this selector by entering the stream index number. These numberings count all tracks
283+
/// in the input file, but only a track containing audio data may be used here. To include
284+
/// several tracks in a single audio selector, specify multiple tracks as follows. Using
285+
/// the console, enter a comma-separated list. For example, type "1,2,3" to include tracks
286+
/// 1 through 3.
287+
/// </summary>
288+
public List<int> Streams
289+
{
290+
get { return this._streams; }
291+
set { this._streams = value; }
292+
}
293+
294+
// Check to see if Streams property is set
295+
internal bool IsSetStreams()
296+
{
297+
return this._streams != null && (this._streams.Count > 0 || !AWSConfigs.InitializeCollections);
298+
}
299+
269300
/// <summary>
270301
/// Gets and sets the property Tracks. Identify a track from the input audio to include
271-
/// in this selector by entering the track index number. To include several tracks in
272-
/// a single audio selector, specify multiple tracks as follows. Using the console, enter
273-
/// a comma-separated list. For example, type "1,2,3" to include tracks 1 through 3.
302+
/// in this selector by entering the track index number. These numberings include only
303+
/// tracks recognized as audio. If the service recognizes more types of audio tracks in
304+
/// the future, these numberings may shift. To include several tracks in a single audio
305+
/// selector, specify multiple tracks as follows. Using the console, enter a comma-separated
306+
/// list. For example, type "1,2,3" to include tracks 1 through 3.
274307
/// </summary>
275308
public List<int> Tracks
276309
{

sdk/src/Services/MediaConvert/Generated/Model/CmafGroupSettings.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,14 @@ internal bool IsSetDashIFrameTrickPlayNameModifier()
160160

161161
/// <summary>
162162
/// Gets and sets the property DashManifestStyle. Specify how MediaConvert writes SegmentTimeline
163-
/// in your output DASH manifest. To write a SegmentTimeline in each video Representation:
164-
/// Keep the default value, Basic. To write a common SegmentTimeline in the video AdaptationSet:
165-
/// Choose Compact. Note that MediaConvert will still write a SegmentTimeline in any Representation
166-
/// that does not share a common timeline. To write a video AdaptationSet for each different
163+
/// in your output DASH manifest. To write a SegmentTimeline for outputs that you also
164+
/// specify a Name modifier for: Keep the default value, Basic. Note that if you do not
165+
/// specify a name modifier for an output, MediaConvert will not write a SegmentTimeline
166+
/// for it. To write a common SegmentTimeline in the video AdaptationSet: Choose Compact.
167+
/// Note that MediaConvert will still write a SegmentTimeline in any Representation that
168+
/// does not share a common timeline. To write a video AdaptationSet for each different
167169
/// output framerate, and a common SegmentTimeline in each AdaptationSet: Choose Distinct.
170+
/// To write a SegmentTimeline in each AdaptationSet: Choose Full.
168171
/// </summary>
169172
public DashManifestStyle DashManifestStyle
170173
{

sdk/src/Services/MediaConvert/Generated/Model/DashIsoGroupSettings.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,14 @@ internal bool IsSetDashIFrameTrickPlayNameModifier()
140140

141141
/// <summary>
142142
/// Gets and sets the property DashManifestStyle. Specify how MediaConvert writes SegmentTimeline
143-
/// in your output DASH manifest. To write a SegmentTimeline in each video Representation:
144-
/// Keep the default value, Basic. To write a common SegmentTimeline in the video AdaptationSet:
145-
/// Choose Compact. Note that MediaConvert will still write a SegmentTimeline in any Representation
146-
/// that does not share a common timeline. To write a video AdaptationSet for each different
143+
/// in your output DASH manifest. To write a SegmentTimeline for outputs that you also
144+
/// specify a Name modifier for: Keep the default value, Basic. Note that if you do not
145+
/// specify a name modifier for an output, MediaConvert will not write a SegmentTimeline
146+
/// for it. To write a common SegmentTimeline in the video AdaptationSet: Choose Compact.
147+
/// Note that MediaConvert will still write a SegmentTimeline in any Representation that
148+
/// does not share a common timeline. To write a video AdaptationSet for each different
147149
/// output framerate, and a common SegmentTimeline in each AdaptationSet: Choose Distinct.
150+
/// To write a SegmentTimeline in each AdaptationSet: Choose Full.
148151
/// </summary>
149152
public DashManifestStyle DashManifestStyle
150153
{

sdk/src/Services/MediaConvert/Generated/Model/Internal/MarshallTransformations/AudioDescriptionMarshaller.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,17 @@ public void Marshall(AudioDescription requestObject, JsonMarshallerContext conte
7070
context.Writer.WriteObjectEnd();
7171
}
7272

73+
if(requestObject.IsSetAudioPitchCorrectionSettings())
74+
{
75+
context.Writer.WritePropertyName("audioPitchCorrectionSettings");
76+
context.Writer.WriteObjectStart();
77+
78+
var marshaller = AudioPitchCorrectionSettingsMarshaller.Instance;
79+
marshaller.Marshall(requestObject.AudioPitchCorrectionSettings, context);
80+
81+
context.Writer.WriteObjectEnd();
82+
}
83+
7384
if(requestObject.IsSetAudioSourceName())
7485
{
7586
context.Writer.WritePropertyName("audioSourceName");

0 commit comments

Comments
 (0)