Skip to content

Commit

Permalink
Update to latest models
Browse files Browse the repository at this point in the history
  • Loading branch information
aws-sdk-python-automation committed Jan 21, 2022
1 parent 7409945 commit 4527f85
Show file tree
Hide file tree
Showing 4 changed files with 128 additions and 9 deletions.
5 changes: 5 additions & 0 deletions .changes/next-release/api-change-mediaconvert-47502.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"type": "api-change",
"category": "``mediaconvert``",
"description": "AWS Elemental MediaConvert SDK has added support for 4K AV1 output resolutions & 10-bit AV1 color, the ability to ingest sidecar Dolby Vision XML metadata files, and the ability to flag WebVTT and IMSC tracks for accessibility in HLS."
}
5 changes: 5 additions & 0 deletions .changes/next-release/api-change-transcribe-17106.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"type": "api-change",
"category": "``transcribe``",
"description": "Add support for granular PIIEntityTypes when using Batch ContentRedaction."
}
100 changes: 91 additions & 9 deletions botocore/data/mediaconvert/2017-08-29/service-2.json
Original file line number Diff line number Diff line change
Expand Up @@ -1928,6 +1928,14 @@
"MAX"
]
},
"Av1BitDepth": {
"type": "string",
"documentation": "Specify the Bit depth (Av1BitDepth). You can choose 8-bit (BIT_8) or 10-bit (BIT_10).",
"enum": [
"BIT_8",
"BIT_10"
]
},
"Av1FramerateControl": {
"type": "string",
"documentation": "If you are using the console, use the Framerate setting to specify the frame rate for this output. If you want to keep the same frame rate as the input video, choose Follow source. If you want to do frame rate conversion, choose a frame rate from the dropdown list or choose Custom. The framerates shown in the dropdown list are decimal approximations of fractions. If you choose Custom, specify your frame rate as a fraction. If you are creating your transcoding job specification as a JSON file without the console, use FramerateControl to specify which value the service uses for the frame rate for this output. Choose INITIALIZE_FROM_SOURCE if you want the service to use the frame rate from the input. Choose SPECIFIED if you want the service to use the frame rate you specify in the settings FramerateNumerator and FramerateDenominator.",
Expand Down Expand Up @@ -1976,6 +1984,11 @@
"locationName": "adaptiveQuantization",
"documentation": "Specify the strength of any adaptive quantization filters that you enable. The value that you choose here applies to Spatial adaptive quantization (spatialAdaptiveQuantization)."
},
"BitDepth": {
"shape": "Av1BitDepth",
"locationName": "bitDepth",
"documentation": "Specify the Bit depth (Av1BitDepth). You can choose 8-bit (BIT_8) or 10-bit (BIT_10)."
},
"FramerateControl": {
"shape": "Av1FramerateControl",
"locationName": "framerateControl",
Expand Down Expand Up @@ -3132,10 +3145,23 @@
"shape": "CmfcScte35Source",
"locationName": "scte35Source",
"documentation": "Ignore this setting unless you have SCTE-35 markers in your input video file. Choose Passthrough (PASSTHROUGH) if you want SCTE-35 markers that appear in your input to also appear in this output. Choose None (NONE) if you don't want those SCTE-35 markers in this output."
},
"TimedMetadata": {
"shape": "CmfcTimedMetadata",
"locationName": "timedMetadata",
"documentation": "Applies to CMAF outputs. Use this setting to specify whether the service inserts the ID3 timed metadata from the input in this output."
}
},
"documentation": "These settings relate to the fragmented MP4 container for the segments in your CMAF outputs."
},
"CmfcTimedMetadata": {
"type": "string",
"documentation": "Applies to CMAF outputs. Use this setting to specify whether the service inserts the ID3 timed metadata from the input in this output.",
"enum": [
"PASSTHROUGH",
"NONE"
]
},
"ColorCorrector": {
"type": "structure",
"members": {
Expand Down Expand Up @@ -5641,14 +5667,15 @@
},
"H265AdaptiveQuantization": {
"type": "string",
"documentation": "Specify the strength of any adaptive quantization filters that you enable. The value that you choose here applies to the following settings: Flicker adaptive quantization (flickerAdaptiveQuantization), Spatial adaptive quantization (spatialAdaptiveQuantization), and Temporal adaptive quantization (temporalAdaptiveQuantization).",
"documentation": "When you set Adaptive Quantization (H265AdaptiveQuantization) to Auto (AUTO), or leave blank, MediaConvert automatically applies quantization to improve the video quality of your output. Set Adaptive Quantization to Low (LOW), Medium (MEDIUM), High (HIGH), Higher (HIGHER), or Max (MAX) to manually control the strength of the quantization filter. When you do, you can specify a value for Spatial Adaptive Quantization (H265SpatialAdaptiveQuantization), Temporal Adaptive Quantization (H265TemporalAdaptiveQuantization), and Flicker Adaptive Quantization (H265FlickerAdaptiveQuantization), to further control the quantization filter. Set Adaptive Quantization to Off (OFF) to apply no quantization to your output.",
"enum": [
"OFF",
"LOW",
"MEDIUM",
"HIGH",
"HIGHER",
"MAX"
"MAX",
"AUTO"
]
},
"H265AlternateTransferFunctionSei": {
Expand Down Expand Up @@ -5833,7 +5860,7 @@
"AdaptiveQuantization": {
"shape": "H265AdaptiveQuantization",
"locationName": "adaptiveQuantization",
"documentation": "Specify the strength of any adaptive quantization filters that you enable. The value that you choose here applies to the following settings: Flicker adaptive quantization (flickerAdaptiveQuantization), Spatial adaptive quantization (spatialAdaptiveQuantization), and Temporal adaptive quantization (temporalAdaptiveQuantization)."
"documentation": "When you set Adaptive Quantization (H265AdaptiveQuantization) to Auto (AUTO), or leave blank, MediaConvert automatically applies quantization to improve the video quality of your output. Set Adaptive Quantization to Low (LOW), Medium (MEDIUM), High (HIGH), Higher (HIGHER), or Max (MAX) to manually control the strength of the quantization filter. When you do, you can specify a value for Spatial Adaptive Quantization (H265SpatialAdaptiveQuantization), Temporal Adaptive Quantization (H265TemporalAdaptiveQuantization), and Flicker Adaptive Quantization (H265FlickerAdaptiveQuantization), to further control the quantization filter. Set Adaptive Quantization to Off (OFF) to apply no quantization to your output."
},
"AlternateTransferFunctionSei": {
"shape": "H265AlternateTransferFunctionSei",
Expand Down Expand Up @@ -6770,9 +6797,22 @@
},
"documentation": "Use the image inserter feature to include a graphic overlay on your video. Enable or disable this feature for each input or output individually. For more information, see https://docs.aws.amazon.com/mediaconvert/latest/ug/graphic-overlay.html. This setting is disabled by default."
},
"ImscAccessibilitySubs": {
"type": "string",
"documentation": "Specify whether to flag this caption track as accessibility in your HLS/CMAF parent manifest. When you choose ENABLED, MediaConvert includes the parameters CHARACTERISTICS=\"public.accessibility.describes-spoken-dialog,public.accessibility.describes-music-and-sound\" and AUTOSELECT=\"YES\" in the EXT-X-MEDIA entry for this track. When you keep the default choice, DISABLED, MediaConvert leaves this parameter out.",
"enum": [
"DISABLED",
"ENABLED"
]
},
"ImscDestinationSettings": {
"type": "structure",
"members": {
"Accessibility": {
"shape": "ImscAccessibilitySubs",
"locationName": "accessibility",
"documentation": "Specify whether to flag this caption track as accessibility in your HLS/CMAF parent manifest. When you choose ENABLED, MediaConvert includes the parameters CHARACTERISTICS=\"public.accessibility.describes-spoken-dialog,public.accessibility.describes-music-and-sound\" and AUTOSELECT=\"YES\" in the EXT-X-MEDIA entry for this track. When you keep the default choice, DISABLED, MediaConvert leaves this parameter out."
},
"StylePassthrough": {
"shape": "ImscStylePassthrough",
"locationName": "stylePassthrough",
Expand Down Expand Up @@ -6827,6 +6867,11 @@
"locationName": "denoiseFilter",
"documentation": "Enable Denoise (InputDenoiseFilter) to filter noise from the input. Default is disabled. Only applicable to MPEG2, H.264, H.265, and uncompressed video inputs."
},
"DolbyVisionMetadataXml": {
"shape": "__stringMin14PatternS3XmlXMLHttpsXmlXML",
"locationName": "dolbyVisionMetadataXml",
"documentation": "Use this setting only when your video source has Dolby Vision studio mastering metadata that is carried in a separate XML file. Specify the Amazon S3 location for the metadata XML file. MediaConvert uses this file to provide global and frame-level metadata for Dolby Vision preprocessing. When you specify a file here and your input also has interleaved global and frame level metadata, MediaConvert ignores the interleaved metadata and uses only the the metadata from this external XML file. Note that your IAM service role must grant MediaConvert read permissions to this file. For more information, see https://docs.aws.amazon.com/mediaconvert/latest/ug/iam-role.html."
},
"FileInput": {
"shape": "__stringPatternS3MM2PPMM2VVMMPPEEGGMMPP3AAVVIIMMPP4FFLLVVMMPPTTMMPPGGMM4VVTTRRPPFF4VVMM2TTSSTTSS264HH264MMKKVVMMKKAAMMOOVVMMTTSSMM2TTWWMMVVaAAASSFFVVOOBB3GGPP3GGPPPPMMXXFFDDIIVVXXXXVVIIDDRRAAWWDDVVGGXXFFMM1VV3GG2VVMMFFMM3UU8WWEEBBMMLLCCHHGGXXFFMMPPEEGG2MMXXFFMMPPEEGG2MMXXFFHHDDWWAAVVYY4MMXXMMLLOOGGGGaAAATTMMOOSSHttpsMM2VVMMPPEEGGMMPP3AAVVIIMMPP4FFLLVVMMPPTTMMPPGGMM4VVTTRRPPFF4VVMM2TTSSTTSS264HH264MMKKVVMMKKAAMMOOVVMMTTSSMM2TTWWMMVVaAAASSFFVVOOBB3GGPP3GGPPPPMMXXFFDDIIVVXXXXVVIIDDRRAAWWDDVVGGXXFFMM1VV3GG2VVMMFFMM3UU8WWEEBBMMLLCCHHGGXXFFMMPPEEGG2MMXXFFMMPPEEGG2MMXXFFHHDDWWAAVVYY4MMXXMMLLOOGGGGaAAATTMMOOSS",
"locationName": "fileInput",
Expand Down Expand Up @@ -7039,6 +7084,11 @@
"locationName": "denoiseFilter",
"documentation": "Enable Denoise (InputDenoiseFilter) to filter noise from the input. Default is disabled. Only applicable to MPEG2, H.264, H.265, and uncompressed video inputs."
},
"DolbyVisionMetadataXml": {
"shape": "__stringMin14PatternS3XmlXMLHttpsXmlXML",
"locationName": "dolbyVisionMetadataXml",
"documentation": "Use this setting only when your video source has Dolby Vision studio mastering metadata that is carried in a separate XML file. Specify the Amazon S3 location for the metadata XML file. MediaConvert uses this file to provide global and frame-level metadata for Dolby Vision preprocessing. When you specify a file here and your input also has interleaved global and frame level metadata, MediaConvert ignores the interleaved metadata and uses only the the metadata from this external XML file. Note that your IAM service role must grant MediaConvert read permissions to this file. For more information, see https://docs.aws.amazon.com/mediaconvert/latest/ug/iam-role.html."
},
"FilterEnable": {
"shape": "InputFilterEnable",
"locationName": "filterEnable",
Expand Down Expand Up @@ -7833,7 +7883,8 @@
"ZUL",
"ORJ",
"QPC",
"TNG"
"TNG",
"SRP"
]
},
"ListJobTemplatesRequest": {
Expand Down Expand Up @@ -8498,7 +8549,7 @@
"TimedMetadata": {
"shape": "TimedMetadata",
"locationName": "timedMetadata",
"documentation": "Applies only to HLS outputs. Use this setting to specify whether the service inserts the ID3 timed metadata from the input in this output."
"documentation": "Applies to HLS outputs. Use this setting to specify whether the service inserts the ID3 timed metadata from the input in this output."
},
"TimedMetadataPid": {
"shape": "__integerMin32Max8182",
Expand Down Expand Up @@ -8860,10 +8911,23 @@
"shape": "MpdScte35Source",
"locationName": "scte35Source",
"documentation": "Ignore this setting unless you have SCTE-35 markers in your input video file. Choose Passthrough (PASSTHROUGH) if you want SCTE-35 markers that appear in your input to also appear in this output. Choose None (NONE) if you don't want those SCTE-35 markers in this output."
},
"TimedMetadata": {
"shape": "MpdTimedMetadata",
"locationName": "timedMetadata",
"documentation": "Applies to DASH outputs. Use this setting to specify whether the service inserts the ID3 timed metadata from the input in this output."
}
},
"documentation": "These settings relate to the fragmented MP4 container for the segments in your DASH outputs."
},
"MpdTimedMetadata": {
"type": "string",
"documentation": "Applies to DASH outputs. Use this setting to specify whether the service inserts the ID3 timed metadata from the input in this output.",
"enum": [
"PASSTHROUGH",
"NONE"
]
},
"Mpeg2AdaptiveQuantization": {
"type": "string",
"documentation": "Specify the strength of any adaptive quantization filters that you enable. The value that you choose here applies to the following settings: Spatial adaptive quantization (spatialAdaptiveQuantization), and Temporal adaptive quantization (temporalAdaptiveQuantization).",
Expand Down Expand Up @@ -10426,7 +10490,7 @@
"documentation": "Optionally, specify the encryption context that you want to use alongside your KMS key. AWS KMS uses this encryption context as additional authenticated data (AAD) to support authenticated encryption. This value must be a base64-encoded UTF-8 string holding JSON which represents a string-string map. To use this setting, you must also set Server-side encryption (S3ServerSideEncryptionType) to AWS KMS (SERVER_SIDE_ENCRYPTION_KMS). For more information about encryption context, see: https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context."
},
"KmsKeyArn": {
"shape": "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
"shape": "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912MrkAFAF0932",
"locationName": "kmsKeyArn",
"documentation": "Optionally, specify the customer master key (CMK) that you want to use to encrypt the data key that AWS uses to encrypt your output content. Enter the Amazon Resource Name (ARN) of the CMK. To use this setting, you must also set Server-side encryption (S3ServerSideEncryptionType) to AWS KMS (SERVER_SIDE_ENCRYPTION_KMS). If you set Server-side encryption to AWS KMS but don't specify a CMK here, AWS uses the AWS managed CMK associated with Amazon S3."
}
Expand Down Expand Up @@ -10755,7 +10819,7 @@
},
"TimedMetadata": {
"type": "string",
"documentation": "Applies only to HLS outputs. Use this setting to specify whether the service inserts the ID3 timed metadata from the input in this output.",
"documentation": "Applies to HLS outputs. Use this setting to specify whether the service inserts the ID3 timed metadata from the input in this output.",
"enum": [
"PASSTHROUGH",
"NONE"
Expand Down Expand Up @@ -11695,9 +11759,22 @@
},
"documentation": "Required when you set (Codec) under (AudioDescriptions)>(CodecSettings) to the value WAV."
},
"WebvttAccessibilitySubs": {
"type": "string",
"documentation": "Specify whether to flag this caption track as accessibility in your HLS/CMAF parent manifest. When you choose ENABLED, MediaConvert includes the parameters CHARACTERISTICS=\"public.accessibility.describes-spoken-dialog,public.accessibility.describes-music-and-sound\" and AUTOSELECT=\"YES\" in the EXT-X-MEDIA entry for this track. When you keep the default choice, DISABLED, MediaConvert leaves this parameter out.",
"enum": [
"DISABLED",
"ENABLED"
]
},
"WebvttDestinationSettings": {
"type": "structure",
"members": {
"Accessibility": {
"shape": "WebvttAccessibilitySubs",
"locationName": "accessibility",
"documentation": "Specify whether to flag this caption track as accessibility in your HLS/CMAF parent manifest. When you choose ENABLED, MediaConvert includes the parameters CHARACTERISTICS=\"public.accessibility.describes-spoken-dialog,public.accessibility.describes-music-and-sound\" and AUTOSELECT=\"YES\" in the EXT-X-MEDIA entry for this track. When you keep the default choice, DISABLED, MediaConvert leaves this parameter out."
},
"StylePassthrough": {
"shape": "WebvttStylePassthrough",
"locationName": "stylePassthrough",
Expand Down Expand Up @@ -12913,6 +12990,11 @@
"min": 14,
"pattern": "^((s3://(.*?)\\.(scc|SCC|ttml|TTML|dfxp|DFXP|stl|STL|srt|SRT|xml|XML|smi|SMI|vtt|VTT|webvtt|WEBVTT))|(https?://(.*?)\\.(scc|SCC|ttml|TTML|dfxp|DFXP|stl|STL|srt|SRT|xml|XML|smi|SMI|vtt|VTT|webvtt|WEBVTT)(\\?([^&=]+=[^&]+&)*[^&=]+=[^&]+)?))$"
},
"__stringMin14PatternS3XmlXMLHttpsXmlXML": {
"type": "string",
"min": 14,
"pattern": "^((s3://(.*?)\\.(xml|XML))|(https?://(.*?)\\.(xml|XML)(\\?([^&=]+=[^&]+&)*[^&=]+=[^&]+)?))$"
},
"__stringMin16Max24PatternAZaZ0922AZaZ0916": {
"type": "string",
"min": 16,
Expand Down Expand Up @@ -13033,9 +13115,9 @@
"type": "string",
"pattern": "^arn:aws(-us-gov)?:acm:"
},
"__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912": {
"__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912MrkAFAF0932": {
"type": "string",
"pattern": "^arn:aws(-us-gov|-cn)?:kms:[a-z-]{2,6}-(east|west|central|((north|south)(east|west)?))-[1-9]{1,2}:\\d{12}:key/[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
"pattern": "^arn:aws(-us-gov|-cn)?:kms:[a-z-]{2,6}-(east|west|central|((north|south)(east|west)?))-[1-9]{1,2}:\\d{12}:key/([a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}|mrk-[a-fA-F0-9]{32})$"
},
"__stringPatternDD": {
"type": "string",
Expand Down
27 changes: 27 additions & 0 deletions botocore/data/transcribe/2017-10-26/service-2.json
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,10 @@
"RedactionOutput":{
"shape":"RedactionOutput",
"documentation":"<p>The output transcript file stored in either the default S3 bucket or in a bucket you specify.</p> <p>When you choose <code>redacted</code> Amazon Transcribe outputs only the redacted transcript.</p> <p>When you choose <code>redacted_and_unredacted</code> Amazon Transcribe outputs both the redacted and unredacted transcripts.</p>"
},
"PiiEntityTypes":{
"shape":"PiiEntityTypes",
"documentation":"<p>The types of personally identifiable information (PII) you want to redact in your transcript.</p>"
}
},
"documentation":"<p>Settings for content redaction within a transcription job.</p>"
Expand Down Expand Up @@ -2269,6 +2273,29 @@
"type":"list",
"member":{"shape":"Phrase"}
},
"PiiEntityType":{
"type":"string",
"enum":[
"BANK_ACCOUNT_NUMBER",
"BANK_ROUTING",
"CREDIT_DEBIT_NUMBER",
"CREDIT_DEBIT_CVV",
"CREDIT_DEBIT_EXPIRY",
"PIN",
"EMAIL",
"ADDRESS",
"NAME",
"PHONE",
"SSN",
"ALL"
]
},
"PiiEntityTypes":{
"type":"list",
"member":{"shape":"PiiEntityType"},
"max":11,
"min":0
},
"RedactionOutput":{
"type":"string",
"enum":[
Expand Down

0 comments on commit 4527f85

Please sign in to comment.