Skip to content

Commit 4c0f2aa

Browse files
This update enables cropping for video overlays and adds a new STL to Teletext upconversion toggle to preserve styling.
1 parent 632e4d9 commit 4c0f2aa

22 files changed

+730
-148
lines changed

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

Lines changed: 51 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,8 +1444,7 @@
14441444
},
14451445
"AssociateCertificateResponse": {
14461446
"type": "structure",
1447-
"members": {
1448-
}
1447+
"members": {}
14491448
},
14501449
"AudioChannelTag": {
14511450
"type": "string",
@@ -2389,8 +2388,7 @@
23892388
},
23902389
"CancelJobResponse": {
23912390
"type": "structure",
2392-
"members": {
2393-
}
2391+
"members": {}
23942392
},
23952393
"CaptionDescription": {
23962394
"type": "structure",
@@ -2600,6 +2598,13 @@
26002598
"WEBVTT"
26012599
]
26022600
},
2601+
"CaptionSourceUpconvertSTLToTeletext": {
2602+
"type": "string",
2603+
"enum": [
2604+
"UPCONVERT",
2605+
"DISABLED"
2606+
]
2607+
},
26032608
"ChannelMapping": {
26042609
"type": "structure",
26052610
"members": {
@@ -3900,18 +3905,15 @@
39003905
},
39013906
"DeleteJobTemplateResponse": {
39023907
"type": "structure",
3903-
"members": {
3904-
}
3908+
"members": {}
39053909
},
39063910
"DeletePolicyRequest": {
39073911
"type": "structure",
3908-
"members": {
3909-
}
3912+
"members": {}
39103913
},
39113914
"DeletePolicyResponse": {
39123915
"type": "structure",
3913-
"members": {
3914-
}
3916+
"members": {}
39153917
},
39163918
"DeletePresetRequest": {
39173919
"type": "structure",
@@ -3928,8 +3930,7 @@
39283930
},
39293931
"DeletePresetResponse": {
39303932
"type": "structure",
3931-
"members": {
3932-
}
3933+
"members": {}
39333934
},
39343935
"DeleteQueueRequest": {
39353936
"type": "structure",
@@ -3946,8 +3947,7 @@
39463947
},
39473948
"DeleteQueueResponse": {
39483949
"type": "structure",
3949-
"members": {
3950-
}
3950+
"members": {}
39513951
},
39523952
"DescribeEndpointsMode": {
39533953
"type": "string",
@@ -4016,8 +4016,7 @@
40164016
},
40174017
"DisassociateCertificateResponse": {
40184018
"type": "structure",
4019-
"members": {
4020-
}
4019+
"members": {}
40214020
},
40224021
"DolbyVision": {
40234022
"type": "structure",
@@ -4958,6 +4957,10 @@
49584957
"TimeDeltaUnits": {
49594958
"shape": "FileSourceTimeDeltaUnits",
49604959
"locationName": "timeDeltaUnits"
4960+
},
4961+
"UpconvertSTLToTeletext": {
4962+
"shape": "CaptionSourceUpconvertSTLToTeletext",
4963+
"locationName": "upconvertSTLToTeletext"
49614964
}
49624965
}
49634966
},
@@ -5119,8 +5122,7 @@
51195122
},
51205123
"GetPolicyRequest": {
51215124
"type": "structure",
5122-
"members": {
5123-
}
5125+
"members": {}
51245126
},
51255127
"GetPolicyResponse": {
51265128
"type": "structure",
@@ -10470,8 +10472,7 @@
1047010472
},
1047110473
"TagResourceResponse": {
1047210474
"type": "structure",
10473-
"members": {
10474-
}
10475+
"members": {}
1047510476
},
1047610477
"TeletextDestinationSettings": {
1047710478
"type": "structure",
@@ -10852,8 +10853,7 @@
1085210853
},
1085310854
"UntagResourceResponse": {
1085410855
"type": "structure",
10855-
"members": {
10856-
}
10856+
"members": {}
1085710857
},
1085810858
"UpdateJobTemplateRequest": {
1085910859
"type": "structure",
@@ -11250,6 +11250,10 @@
1125011250
"VideoOverlay": {
1125111251
"type": "structure",
1125211252
"members": {
11253+
"Crop": {
11254+
"shape": "VideoOverlayCrop",
11255+
"locationName": "crop"
11256+
},
1125311257
"EndTimecode": {
1125411258
"shape": "__stringPattern010920405090509092",
1125511259
"locationName": "endTimecode"
@@ -11276,6 +11280,31 @@
1127611280
}
1127711281
}
1127811282
},
11283+
"VideoOverlayCrop": {
11284+
"type": "structure",
11285+
"members": {
11286+
"Height": {
11287+
"shape": "__integerMin0Max2147483647",
11288+
"locationName": "height"
11289+
},
11290+
"Unit": {
11291+
"shape": "VideoOverlayUnit",
11292+
"locationName": "unit"
11293+
},
11294+
"Width": {
11295+
"shape": "__integerMin0Max2147483647",
11296+
"locationName": "width"
11297+
},
11298+
"X": {
11299+
"shape": "__integerMin0Max2147483647",
11300+
"locationName": "x"
11301+
},
11302+
"Y": {
11303+
"shape": "__integerMin0Max2147483647",
11304+
"locationName": "y"
11305+
}
11306+
}
11307+
},
1127911308
"VideoOverlayInput": {
1128011309
"type": "structure",
1128111310
"members": {

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

Lines changed: 25 additions & 8 deletions
Large diffs are not rendered by default.

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

Lines changed: 68 additions & 30 deletions
Large diffs are not rendered by default.

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1977,6 +1977,26 @@
19771977
<property>Amazon.MediaConvert.Model.VideoOverlay.StartTimecode</property>
19781978
<pattern>^([01][0-9]|2[0-4]):[0-5][0-9]:[0-5][0-9][:;][0-9]{2}$</pattern>
19791979
</property-value-rule>
1980+
<property-value-rule>
1981+
<property>Amazon.MediaConvert.Model.VideoOverlayCrop.Height</property>
1982+
<min>0</min>
1983+
<max>2147483647</max>
1984+
</property-value-rule>
1985+
<property-value-rule>
1986+
<property>Amazon.MediaConvert.Model.VideoOverlayCrop.Width</property>
1987+
<min>0</min>
1988+
<max>2147483647</max>
1989+
</property-value-rule>
1990+
<property-value-rule>
1991+
<property>Amazon.MediaConvert.Model.VideoOverlayCrop.X</property>
1992+
<min>0</min>
1993+
<max>2147483647</max>
1994+
</property-value-rule>
1995+
<property-value-rule>
1996+
<property>Amazon.MediaConvert.Model.VideoOverlayCrop.Y</property>
1997+
<min>0</min>
1998+
<max>2147483647</max>
1999+
</property-value-rule>
19802000
<property-value-rule>
19812001
<property>Amazon.MediaConvert.Model.VideoOverlayInput.FileInput</property>
19822002
<pattern>^s3://([^\/]+\/+)+((([^\/]*)))|^https?://[^\/].*[^&amp;]$</pattern>

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -254,17 +254,17 @@ internal bool IsSetNumberBFramesBetweenReferenceFrames()
254254
/// your video output according to one or more commonly used image quality metrics. You
255255
/// can specify per frame metrics for output groups or for individual outputs. When you
256256
/// do, MediaConvert writes a CSV (Comma-Separated Values) file to your S3 output destination,
257-
/// named after the video, video codec, and metric type. For example: video_h264_PSNR.csv
258-
/// Jobs that generate per frame metrics will take longer to complete, depending on the
259-
/// resolution and complexity of your output. For example, some 4K jobs might take up
260-
/// to twice as long to complete. Note that when analyzing the video quality of your output,
261-
/// or when comparing the video quality of multiple different outputs, we generally also
262-
/// recommend a detailed visual review in a controlled environment. You can choose from
263-
/// the following per frame metrics: * PSNR: Peak Signal-to-Noise Ratio * SSIM: Structural
264-
/// Similarity Index Measure * MS_SSIM: Multi-Scale Similarity Index Measure * PSNR_HVS:
265-
/// Peak Signal-to-Noise Ratio, Human Visual System * VMAF: Video Multi-Method Assessment
266-
/// Fusion * QVBR: Quality-Defined Variable Bitrate. This option is only available when
267-
/// your output uses the QVBR rate control mode.
257+
/// named after the output name and metric type. For example: videofile_PSNR.csv Jobs
258+
/// that generate per frame metrics will take longer to complete, depending on the resolution
259+
/// and complexity of your output. For example, some 4K jobs might take up to twice as
260+
/// long to complete. Note that when analyzing the video quality of your output, or when
261+
/// comparing the video quality of multiple different outputs, we generally also recommend
262+
/// a detailed visual review in a controlled environment. You can choose from the following
263+
/// per frame metrics: * PSNR: Peak Signal-to-Noise Ratio * SSIM: Structural Similarity
264+
/// Index Measure * MS_SSIM: Multi-Scale Similarity Index Measure * PSNR_HVS: Peak Signal-to-Noise
265+
/// Ratio, Human Visual System * VMAF: Video Multi-Method Assessment Fusion * QVBR: Quality-Defined
266+
/// Variable Bitrate. This option is only available when your output uses the QVBR rate
267+
/// control mode.
268268
/// </summary>
269269
public List<string> PerFrameMetrics
270270
{

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -206,17 +206,17 @@ internal bool IsSetInterlaceMode()
206206
/// your video output according to one or more commonly used image quality metrics. You
207207
/// can specify per frame metrics for output groups or for individual outputs. When you
208208
/// do, MediaConvert writes a CSV (Comma-Separated Values) file to your S3 output destination,
209-
/// named after the video, video codec, and metric type. For example: video_h264_PSNR.csv
210-
/// Jobs that generate per frame metrics will take longer to complete, depending on the
211-
/// resolution and complexity of your output. For example, some 4K jobs might take up
212-
/// to twice as long to complete. Note that when analyzing the video quality of your output,
213-
/// or when comparing the video quality of multiple different outputs, we generally also
214-
/// recommend a detailed visual review in a controlled environment. You can choose from
215-
/// the following per frame metrics: * PSNR: Peak Signal-to-Noise Ratio * SSIM: Structural
216-
/// Similarity Index Measure * MS_SSIM: Multi-Scale Similarity Index Measure * PSNR_HVS:
217-
/// Peak Signal-to-Noise Ratio, Human Visual System * VMAF: Video Multi-Method Assessment
218-
/// Fusion * QVBR: Quality-Defined Variable Bitrate. This option is only available when
219-
/// your output uses the QVBR rate control mode.
209+
/// named after the output name and metric type. For example: videofile_PSNR.csv Jobs
210+
/// that generate per frame metrics will take longer to complete, depending on the resolution
211+
/// and complexity of your output. For example, some 4K jobs might take up to twice as
212+
/// long to complete. Note that when analyzing the video quality of your output, or when
213+
/// comparing the video quality of multiple different outputs, we generally also recommend
214+
/// a detailed visual review in a controlled environment. You can choose from the following
215+
/// per frame metrics: * PSNR: Peak Signal-to-Noise Ratio * SSIM: Structural Similarity
216+
/// Index Measure * MS_SSIM: Multi-Scale Similarity Index Measure * PSNR_HVS: Peak Signal-to-Noise
217+
/// Ratio, Human Visual System * VMAF: Video Multi-Method Assessment Fusion * QVBR: Quality-Defined
218+
/// Variable Bitrate. This option is only available when your output uses the QVBR rate
219+
/// control mode.
220220
/// </summary>
221221
public List<string> PerFrameMetrics
222222
{

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public partial class FileSourceSettings
4343
private string _sourceFile;
4444
private int? _timeDelta;
4545
private FileSourceTimeDeltaUnits _timeDeltaUnits;
46+
private CaptionSourceUpconvertSTLToTeletext _upconvertSTLToTeletext;
4647

4748
/// <summary>
4849
/// Gets and sets the property ByteRateLimit. Choose whether to limit the byte rate at
@@ -185,5 +186,24 @@ internal bool IsSetTimeDeltaUnits()
185186
return this._timeDeltaUnits != null;
186187
}
187188

189+
/// <summary>
190+
/// Gets and sets the property UpconvertSTLToTeletext. Specify whether this set of input
191+
/// captions appears in your outputs in both STL and Teletext format. If you choose Upconvert,
192+
/// MediaConvert includes the captions data in two ways: it passes the STL data through
193+
/// using the Teletext compatibility bytes fields of the Teletext wrapper, and it also
194+
/// translates the STL data into Teletext.
195+
/// </summary>
196+
public CaptionSourceUpconvertSTLToTeletext UpconvertSTLToTeletext
197+
{
198+
get { return this._upconvertSTLToTeletext; }
199+
set { this._upconvertSTLToTeletext = value; }
200+
}
201+
202+
// Check to see if UpconvertSTLToTeletext property is set
203+
internal bool IsSetUpconvertSTLToTeletext()
204+
{
205+
return this._upconvertSTLToTeletext != null;
206+
}
207+
188208
}
189209
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -681,17 +681,17 @@ internal bool IsSetParNumerator()
681681
/// your video output according to one or more commonly used image quality metrics. You
682682
/// can specify per frame metrics for output groups or for individual outputs. When you
683683
/// do, MediaConvert writes a CSV (Comma-Separated Values) file to your S3 output destination,
684-
/// named after the video, video codec, and metric type. For example: video_h264_PSNR.csv
685-
/// Jobs that generate per frame metrics will take longer to complete, depending on the
686-
/// resolution and complexity of your output. For example, some 4K jobs might take up
687-
/// to twice as long to complete. Note that when analyzing the video quality of your output,
688-
/// or when comparing the video quality of multiple different outputs, we generally also
689-
/// recommend a detailed visual review in a controlled environment. You can choose from
690-
/// the following per frame metrics: * PSNR: Peak Signal-to-Noise Ratio * SSIM: Structural
691-
/// Similarity Index Measure * MS_SSIM: Multi-Scale Similarity Index Measure * PSNR_HVS:
692-
/// Peak Signal-to-Noise Ratio, Human Visual System * VMAF: Video Multi-Method Assessment
693-
/// Fusion * QVBR: Quality-Defined Variable Bitrate. This option is only available when
694-
/// your output uses the QVBR rate control mode.
684+
/// named after the output name and metric type. For example: videofile_PSNR.csv Jobs
685+
/// that generate per frame metrics will take longer to complete, depending on the resolution
686+
/// and complexity of your output. For example, some 4K jobs might take up to twice as
687+
/// long to complete. Note that when analyzing the video quality of your output, or when
688+
/// comparing the video quality of multiple different outputs, we generally also recommend
689+
/// a detailed visual review in a controlled environment. You can choose from the following
690+
/// per frame metrics: * PSNR: Peak Signal-to-Noise Ratio * SSIM: Structural Similarity
691+
/// Index Measure * MS_SSIM: Multi-Scale Similarity Index Measure * PSNR_HVS: Peak Signal-to-Noise
692+
/// Ratio, Human Visual System * VMAF: Video Multi-Method Assessment Fusion * QVBR: Quality-Defined
693+
/// Variable Bitrate. This option is only available when your output uses the QVBR rate
694+
/// control mode.
695695
/// </summary>
696696
public List<string> PerFrameMetrics
697697
{

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -676,17 +676,17 @@ internal bool IsSetParNumerator()
676676
/// your video output according to one or more commonly used image quality metrics. You
677677
/// can specify per frame metrics for output groups or for individual outputs. When you
678678
/// do, MediaConvert writes a CSV (Comma-Separated Values) file to your S3 output destination,
679-
/// named after the video, video codec, and metric type. For example: video_h264_PSNR.csv
680-
/// Jobs that generate per frame metrics will take longer to complete, depending on the
681-
/// resolution and complexity of your output. For example, some 4K jobs might take up
682-
/// to twice as long to complete. Note that when analyzing the video quality of your output,
683-
/// or when comparing the video quality of multiple different outputs, we generally also
684-
/// recommend a detailed visual review in a controlled environment. You can choose from
685-
/// the following per frame metrics: * PSNR: Peak Signal-to-Noise Ratio * SSIM: Structural
686-
/// Similarity Index Measure * MS_SSIM: Multi-Scale Similarity Index Measure * PSNR_HVS:
687-
/// Peak Signal-to-Noise Ratio, Human Visual System * VMAF: Video Multi-Method Assessment
688-
/// Fusion * QVBR: Quality-Defined Variable Bitrate. This option is only available when
689-
/// your output uses the QVBR rate control mode.
679+
/// named after the output name and metric type. For example: videofile_PSNR.csv Jobs
680+
/// that generate per frame metrics will take longer to complete, depending on the resolution
681+
/// and complexity of your output. For example, some 4K jobs might take up to twice as
682+
/// long to complete. Note that when analyzing the video quality of your output, or when
683+
/// comparing the video quality of multiple different outputs, we generally also recommend
684+
/// a detailed visual review in a controlled environment. You can choose from the following
685+
/// per frame metrics: * PSNR: Peak Signal-to-Noise Ratio * SSIM: Structural Similarity
686+
/// Index Measure * MS_SSIM: Multi-Scale Similarity Index Measure * PSNR_HVS: Peak Signal-to-Noise
687+
/// Ratio, Human Visual System * VMAF: Video Multi-Method Assessment Fusion * QVBR: Quality-Defined
688+
/// Variable Bitrate. This option is only available when your output uses the QVBR rate
689+
/// control mode.
690690
/// </summary>
691691
public List<string> PerFrameMetrics
692692
{

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,12 @@ public void Marshall(FileSourceSettings requestObject, JsonMarshallerContext con
9595
context.Writer.Write(requestObject.TimeDeltaUnits);
9696
}
9797

98+
if(requestObject.IsSetUpconvertSTLToTeletext())
99+
{
100+
context.Writer.WritePropertyName("upconvertSTLToTeletext");
101+
context.Writer.Write(requestObject.UpconvertSTLToTeletext);
102+
}
103+
98104
}
99105

100106
/// <summary>

0 commit comments

Comments
 (0)