Skip to content

Commit b74df26

Browse files
This release adds support for the AVC3 codec and fixes an alignment issue with Japanese vertical captions.
1 parent 3cb80c8 commit b74df26

File tree

10 files changed

+130
-16
lines changed

10 files changed

+130
-16
lines changed

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5315,6 +5315,10 @@
53155315
"UnregisteredSeiTimecode": {
53165316
"shape": "H264UnregisteredSeiTimecode",
53175317
"locationName": "unregisteredSeiTimecode"
5318+
},
5319+
"WriteMp4PackagingType": {
5320+
"shape": "H264WriteMp4PackagingType",
5321+
"locationName": "writeMp4PackagingType"
53185322
}
53195323
}
53205324
},
@@ -5361,6 +5365,13 @@
53615365
"ENABLED"
53625366
]
53635367
},
5368+
"H264WriteMp4PackagingType": {
5369+
"type": "string",
5370+
"enum": [
5371+
"AVC1",
5372+
"AVC3"
5373+
]
5374+
},
53645375
"H265AdaptiveQuantization": {
53655376
"type": "string",
53665377
"enum": [
@@ -7143,7 +7154,7 @@
71437154
"locationName": "contentReference"
71447155
},
71457156
"CredentialsSecretName": {
7146-
"shape": "__stringMin1Max2048PatternArnAwsAwsUsGovAwsCnSecretsmanagerUsGovApCaCnEuSaCentralNorthSouthEastWestDD12SecretAZAZ09",
7157+
"shape": "__stringMin1Max2048PatternArnAZSecretsmanagerWD12SecretAZAZ09",
71477158
"locationName": "credentialsSecretName"
71487159
},
71497160
"FileOffset": {
@@ -12525,11 +12536,11 @@
1252512536
"min": 1,
1252612537
"max": 20
1252712538
},
12528-
"__stringMin1Max2048PatternArnAwsAwsUsGovAwsCnSecretsmanagerUsGovApCaCnEuSaCentralNorthSouthEastWestDD12SecretAZAZ09": {
12539+
"__stringMin1Max2048PatternArnAZSecretsmanagerWD12SecretAZAZ09": {
1252912540
"type": "string",
1253012541
"min": 1,
1253112542
"max": 2048,
12532-
"pattern": "^(arn:(aws|aws-us-gov|aws-cn):secretsmanager:(us(-gov)?|ap|ca|cn|eu|sa)-(central|(north|south)?(east|west)?)-\\d:\\d{12}:secret:)?[a-zA-Z0-9_\\/_+=.@-]*$"
12543+
"pattern": "^(arn:[a-z-]+:secretsmanager:[\\w-]+:\\d{12}:secret:)?[a-zA-Z0-9_\\/_+=.@-]*$"
1253312544
},
1253412545
"__stringMin1Max256": {
1253512546
"type": "string",

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1827,6 +1827,12 @@
18271827
"H264Settings$UnregisteredSeiTimecode": "Inserts timecode for each frame as 4 bytes of an unregistered SEI message."
18281828
}
18291829
},
1830+
"H264WriteMp4PackagingType": {
1831+
"base": "Specify how SPS and PPS NAL units are written in your output MP4 container, according to ISO/IEC 14496-15. If the location of these parameters doesn't matter in your workflow: Keep the default value, AVC1. MediaConvert writes SPS and PPS NAL units in the sample description ('stsd') box (but not into samples directly). To write SPS and PPS NAL units directly into samples (but not in the 'stsd' box): Choose AVC3. When you do, note that your output might not play properly with some downstream systems or players.",
1832+
"refs": {
1833+
"H264Settings$WriteMp4PackagingType": "Specify how SPS and PPS NAL units are written in your output MP4 container, according to ISO/IEC 14496-15. If the location of these parameters doesn't matter in your workflow: Keep the default value, AVC1. MediaConvert writes SPS and PPS NAL units in the sample description ('stsd') box (but not into samples directly). To write SPS and PPS NAL units directly into samples (but not in the 'stsd' box): Choose AVC3. When you do, note that your output might not play properly with some downstream systems or players."
1834+
}
1835+
},
18301836
"H265AdaptiveQuantization": {
18311837
"base": "When you set Adaptive Quantization to Auto, or leave blank, MediaConvert automatically applies quantization to improve the video quality of your output. Set Adaptive Quantization to Low, Medium, High, Higher, or Max to manually control the strength of the quantization filter. When you do, you can specify a value for Spatial Adaptive Quantization, Temporal Adaptive Quantization, and Flicker Adaptive Quantization, to further control the quantization filter. Set Adaptive Quantization to Off to apply no quantization to your output.",
18321838
"refs": {
@@ -4660,8 +4666,8 @@
46604666
"__integerMin1Max150": {
46614667
"base": null,
46624668
"refs": {
4663-
"JobSettings$FollowSource": "Specify the input that MediaConvert references for your default output settings. MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio for all outputs that you don't manually specify different output settings for. Enabling this setting will disable \"Follow source\" for all other inputs. If MediaConvert cannot follow your source, for example if you specify an audio-only input, MediaConvert uses the first followable input instead. In your JSON job specification, enter an integer from 1 to 150 corresponding to the order of your inputs.",
4664-
"JobTemplateSettings$FollowSource": "Specify the input that MediaConvert references for your default output settings. MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio for all outputs that you don't manually specify different output settings for. Enabling this setting will disable \"Follow source\" for all other inputs. If MediaConvert cannot follow your source, for example if you specify an audio-only input, MediaConvert uses the first followable input instead. In your JSON job specification, enter an integer from 1 to 150 corresponding to the order of your inputs."
4669+
"JobSettings$FollowSource": "Specify the input that MediaConvert references for your default output settings. MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio for all outputs that you don't manually specify different output settings for. Enabling this setting will disable \"Follow source\" for all other inputs. If MediaConvert cannot follow your source, for example if you specify an audio-only input, MediaConvert uses the first followable input instead. In your JSON job specification, enter an integer from 1 to 150 corresponding to the order of your inputs.",
4670+
"JobTemplateSettings$FollowSource": "Specify the input that MediaConvert references for your default output settings. MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio for all outputs that you don't manually specify different output settings for. Enabling this setting will disable \"Follow source\" for all other inputs. If MediaConvert cannot follow your source, for example if you specify an audio-only input, MediaConvert uses the first followable input instead. In your JSON job specification, enter an integer from 1 to 150 corresponding to the order of your inputs."
46654671
}
46664672
},
46674673
"__integerMin1Max17895697": {
@@ -5661,7 +5667,7 @@
56615667
"NielsenNonLinearWatermarkSettings$EpisodeId": "Optional. If this asset uses an episode ID with Nielsen, provide it here."
56625668
}
56635669
},
5664-
"__stringMin1Max2048PatternArnAwsAwsUsGovAwsCnSecretsmanagerUsGovApCaCnEuSaCentralNorthSouthEastWestDD12SecretAZAZ09": {
5670+
"__stringMin1Max2048PatternArnAZSecretsmanagerWD12SecretAZAZ09": {
56655671
"base": null,
56665672
"refs": {
56675673
"KantarWatermarkSettings$CredentialsSecretName": "Provide the name of the AWS Secrets Manager secret where your Kantar credentials are stored. Note that your MediaConvert service role must provide access to this secret. For more information, see https://docs.aws.amazon.com/mediaconvert/latest/ug/granting-permissions-for-mediaconvert-to-access-secrets-manager-secret.html. For instructions on creating a secret, see https://docs.aws.amazon.com/secretsmanager/latest/userguide/tutorials_basic.html, in the AWS Secrets Manager User Guide."

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

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6306,6 +6306,11 @@
63066306
"shape": "H264UnregisteredSeiTimecode",
63076307
"locationName": "unregisteredSeiTimecode",
63086308
"documentation": "Inserts timecode for each frame as 4 bytes of an unregistered SEI message."
6309+
},
6310+
"WriteMp4PackagingType": {
6311+
"shape": "H264WriteMp4PackagingType",
6312+
"locationName": "writeMp4PackagingType",
6313+
"documentation": "Specify how SPS and PPS NAL units are written in your output MP4 container, according to ISO/IEC 14496-15. If the location of these parameters doesn't matter in your workflow: Keep the default value, AVC1. MediaConvert writes SPS and PPS NAL units in the sample description ('stsd') box (but not into samples directly). To write SPS and PPS NAL units directly into samples (but not in the 'stsd' box): Choose AVC3. When you do, note that your output might not play properly with some downstream systems or players."
63096314
}
63106315
},
63116316
"documentation": "Required when you set Codec to the value H_264."
@@ -6359,6 +6364,14 @@
63596364
"ENABLED"
63606365
]
63616366
},
6367+
"H264WriteMp4PackagingType": {
6368+
"type": "string",
6369+
"documentation": "Specify how SPS and PPS NAL units are written in your output MP4 container, according to ISO/IEC 14496-15. If the location of these parameters doesn't matter in your workflow: Keep the default value, AVC1. MediaConvert writes SPS and PPS NAL units in the sample description ('stsd') box (but not into samples directly). To write SPS and PPS NAL units directly into samples (but not in the 'stsd' box): Choose AVC3. When you do, note that your output might not play properly with some downstream systems or players.",
6370+
"enum": [
6371+
"AVC1",
6372+
"AVC3"
6373+
]
6374+
},
63626375
"H265AdaptiveQuantization": {
63636376
"type": "string",
63646377
"documentation": "When you set Adaptive Quantization to Auto, or leave blank, MediaConvert automatically applies quantization to improve the video quality of your output. Set Adaptive Quantization to Low, Medium, High, Higher, or Max to manually control the strength of the quantization filter. When you do, you can specify a value for Spatial Adaptive Quantization, Temporal Adaptive Quantization, and Flicker Adaptive Quantization, to further control the quantization filter. Set Adaptive Quantization to Off to apply no quantization to your output.",
@@ -8281,7 +8294,7 @@
82818294
"FollowSource": {
82828295
"shape": "__integerMin1Max150",
82838296
"locationName": "followSource",
8284-
"documentation": "Specify the input that MediaConvert references for your default output settings. MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio for all outputs that you don't manually specify different output settings for. Enabling this setting will disable \"Follow source\" for all other inputs. If MediaConvert cannot follow your source, for example if you specify an audio-only input, MediaConvert uses the first followable input instead. In your JSON job specification, enter an integer from 1 to 150 corresponding to the order of your inputs."
8297+
"documentation": "Specify the input that MediaConvert references for your default output settings. MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio for all outputs that you don't manually specify different output settings for. Enabling this setting will disable \"Follow source\" for all other inputs. If MediaConvert cannot follow your source, for example if you specify an audio-only input, MediaConvert uses the first followable input instead. In your JSON job specification, enter an integer from 1 to 150 corresponding to the order of your inputs."
82858298
},
82868299
"Inputs": {
82878300
"shape": "__listOfInput",
@@ -8452,7 +8465,7 @@
84528465
"FollowSource": {
84538466
"shape": "__integerMin1Max150",
84548467
"locationName": "followSource",
8455-
"documentation": "Specify the input that MediaConvert references for your default output settings. MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio for all outputs that you don't manually specify different output settings for. Enabling this setting will disable \"Follow source\" for all other inputs. If MediaConvert cannot follow your source, for example if you specify an audio-only input, MediaConvert uses the first followable input instead. In your JSON job specification, enter an integer from 1 to 150 corresponding to the order of your inputs."
8468+
"documentation": "Specify the input that MediaConvert references for your default output settings. MediaConvert uses this input's Resolution, Frame rate, and Pixel aspect ratio for all outputs that you don't manually specify different output settings for. Enabling this setting will disable \"Follow source\" for all other inputs. If MediaConvert cannot follow your source, for example if you specify an audio-only input, MediaConvert uses the first followable input instead. In your JSON job specification, enter an integer from 1 to 150 corresponding to the order of your inputs."
84568469
},
84578470
"Inputs": {
84588471
"shape": "__listOfInputTemplate",
@@ -8511,7 +8524,7 @@
85118524
"documentation": "Specify a unique identifier for Kantar to use for this piece of content."
85128525
},
85138526
"CredentialsSecretName": {
8514-
"shape": "__stringMin1Max2048PatternArnAwsAwsUsGovAwsCnSecretsmanagerUsGovApCaCnEuSaCentralNorthSouthEastWestDD12SecretAZAZ09",
8527+
"shape": "__stringMin1Max2048PatternArnAZSecretsmanagerWD12SecretAZAZ09",
85158528
"locationName": "credentialsSecretName",
85168529
"documentation": "Provide the name of the AWS Secrets Manager secret where your Kantar credentials are stored. Note that your MediaConvert service role must provide access to this secret. For more information, see https://docs.aws.amazon.com/mediaconvert/latest/ug/granting-permissions-for-mediaconvert-to-access-secrets-manager-secret.html. For instructions on creating a secret, see https://docs.aws.amazon.com/secretsmanager/latest/userguide/tutorials_basic.html, in the AWS Secrets Manager User Guide."
85178530
},
@@ -14720,11 +14733,11 @@
1472014733
"min": 1,
1472114734
"max": 20
1472214735
},
14723-
"__stringMin1Max2048PatternArnAwsAwsUsGovAwsCnSecretsmanagerUsGovApCaCnEuSaCentralNorthSouthEastWestDD12SecretAZAZ09": {
14736+
"__stringMin1Max2048PatternArnAZSecretsmanagerWD12SecretAZAZ09": {
1472414737
"type": "string",
1472514738
"min": 1,
1472614739
"max": 2048,
14727-
"pattern": "^(arn:(aws|aws-us-gov|aws-cn):secretsmanager:(us(-gov)?|ap|ca|cn|eu|sa)-(central|(north|south)?(east|west)?)-\\d:\\d{12}:secret:)?[a-zA-Z0-9_\\/_+=.@-]*$"
14740+
"pattern": "^(arn:[a-z-]+:secretsmanager:[\\w-]+:\\d{12}:secret:)?[a-zA-Z0-9_\\/_+=.@-]*$"
1472814741
},
1472914742
"__stringMin1Max256": {
1473014743
"type": "string",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1262,7 +1262,7 @@
12621262
<property>Amazon.MediaConvert.Model.KantarWatermarkSettings.CredentialsSecretName</property>
12631263
<min>1</min>
12641264
<max>2048</max>
1265-
<pattern>^(arn:(aws|aws-us-gov|aws-cn):secretsmanager:(us(-gov)?|ap|ca|cn|eu|sa)-(central|(north|south)?(east|west)?)-\d:\d{12}:secret:)?[a-zA-Z0-9_\/_+=.@-]*$</pattern>
1265+
<pattern>^(arn:[a-z-]+:secretsmanager:[\w-]+:\d{12}:secret:)?[a-zA-Z0-9_\/_+=.@-]*$</pattern>
12661266
</property-value-rule>
12671267
<property-value-rule>
12681268
<property>Amazon.MediaConvert.Model.KantarWatermarkSettings.KantarLicenseId</property>

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public partial class H264Settings
7878
private H264Telecine _telecine;
7979
private H264TemporalAdaptiveQuantization _temporalAdaptiveQuantization;
8080
private H264UnregisteredSeiTimecode _unregisteredSeiTimecode;
81+
private H264WriteMp4PackagingType _writeMp4PackagingType;
8182

8283
/// <summary>
8384
/// Gets and sets the property AdaptiveQuantization. Keep the default value, Auto, for
@@ -986,5 +987,26 @@ internal bool IsSetUnregisteredSeiTimecode()
986987
return this._unregisteredSeiTimecode != null;
987988
}
988989

990+
/// <summary>
991+
/// Gets and sets the property WriteMp4PackagingType. Specify how SPS and PPS NAL units
992+
/// are written in your output MP4 container, according to ISO/IEC 14496-15. If the location
993+
/// of these parameters doesn't matter in your workflow: Keep the default value, AVC1.
994+
/// MediaConvert writes SPS and PPS NAL units in the sample description ('stsd') box (but
995+
/// not into samples directly). To write SPS and PPS NAL units directly into samples (but
996+
/// not in the 'stsd' box): Choose AVC3. When you do, note that your output might not
997+
/// play properly with some downstream systems or players.
998+
/// </summary>
999+
public H264WriteMp4PackagingType WriteMp4PackagingType
1000+
{
1001+
get { return this._writeMp4PackagingType; }
1002+
set { this._writeMp4PackagingType = value; }
1003+
}
1004+
1005+
// Check to see if WriteMp4PackagingType property is set
1006+
internal bool IsSetWriteMp4PackagingType()
1007+
{
1008+
return this._writeMp4PackagingType != null;
1009+
}
1010+
9891011
}
9901012
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,12 @@ public void Marshall(H264Settings requestObject, JsonMarshallerContext context)
329329
context.Writer.Write(requestObject.UnregisteredSeiTimecode);
330330
}
331331

332+
if(requestObject.IsSetWriteMp4PackagingType())
333+
{
334+
context.Writer.WritePropertyName("writeMp4PackagingType");
335+
context.Writer.Write(requestObject.WriteMp4PackagingType);
336+
}
337+
332338
}
333339

334340
/// <summary>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,12 @@ public H264Settings Unmarshall(JsonUnmarshallerContext context)
330330
unmarshalledObject.UnregisteredSeiTimecode = unmarshaller.Unmarshall(context);
331331
continue;
332332
}
333+
if (context.TestExpression("writeMp4PackagingType", targetDepth))
334+
{
335+
var unmarshaller = StringUnmarshaller.Instance;
336+
unmarshalledObject.WriteMp4PackagingType = unmarshaller.Unmarshall(context);
337+
continue;
338+
}
333339
}
334340
return unmarshalledObject;
335341
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ internal bool IsSetExtendedDataServices()
137137

138138
/// <summary>
139139
/// Gets and sets the property FollowSource. Specify the input that MediaConvert references
140-
/// for your default output settings. MediaConvert uses this input's Resolution, Frame
141-
/// rate, and Pixel aspect ratio for all outputs that you don't manually specify different
140+
/// for your default output settings. MediaConvert uses this input's Resolution, Frame
141+
/// rate, and Pixel aspect ratio for all outputs that you don't manually specify different
142142
/// output settings for. Enabling this setting will disable "Follow source" for all other
143143
/// inputs. If MediaConvert cannot follow your source, for example if you specify an
144144
/// audio-only input, MediaConvert uses the first followable input instead. In your JSON

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ internal bool IsSetExtendedDataServices()
138138

139139
/// <summary>
140140
/// Gets and sets the property FollowSource. Specify the input that MediaConvert references
141-
/// for your default output settings. MediaConvert uses this input's Resolution, Frame
142-
/// rate, and Pixel aspect ratio for all outputs that you don't manually specify different
141+
/// for your default output settings. MediaConvert uses this input's Resolution, Frame
142+
/// rate, and Pixel aspect ratio for all outputs that you don't manually specify different
143143
/// output settings for. Enabling this setting will disable "Follow source" for all other
144144
/// inputs. If MediaConvert cannot follow your source, for example if you specify an
145145
/// audio-only input, MediaConvert uses the first followable input instead. In your JSON

0 commit comments

Comments
 (0)