aws-sdk-mediaconvert 1.69.0 → 1.73.0

data/lib/aws-sdk-mediaconvert/client_api.rb

@@ -111,6 +111,7 @@ module Aws::MediaConvert
     CmafMpdProfile = Shapes::StringShape.new(name: 'CmafMpdProfile')
     CmafPtsOffsetHandlingForBFrames = Shapes::StringShape.new(name: 'CmafPtsOffsetHandlingForBFrames')
     CmafSegmentControl = Shapes::StringShape.new(name: 'CmafSegmentControl')
+    CmafSegmentLengthControl = Shapes::StringShape.new(name: 'CmafSegmentLengthControl')
     CmafStreamInfResolution = Shapes::StringShape.new(name: 'CmafStreamInfResolution')
     CmafTargetDurationCompatibilityMode = Shapes::StringShape.new(name: 'CmafTargetDurationCompatibilityMode')
     CmafWriteDASHManifest = Shapes::StringShape.new(name: 'CmafWriteDASHManifest')
@@ -132,6 +133,7 @@ module Aws::MediaConvert
     ConflictException = Shapes::StructureShape.new(name: 'ConflictException')
     ContainerSettings = Shapes::StructureShape.new(name: 'ContainerSettings')
     ContainerType = Shapes::StringShape.new(name: 'ContainerType')
+    CopyProtectionAction = Shapes::StringShape.new(name: 'CopyProtectionAction')
     CreateJobRequest = Shapes::StructureShape.new(name: 'CreateJobRequest')
     CreateJobResponse = Shapes::StructureShape.new(name: 'CreateJobResponse')
     CreateJobTemplateRequest = Shapes::StructureShape.new(name: 'CreateJobTemplateRequest')
@@ -150,6 +152,7 @@ module Aws::MediaConvert
     DashIsoPlaybackDeviceCompatibility = Shapes::StringShape.new(name: 'DashIsoPlaybackDeviceCompatibility')
     DashIsoPtsOffsetHandlingForBFrames = Shapes::StringShape.new(name: 'DashIsoPtsOffsetHandlingForBFrames')
     DashIsoSegmentControl = Shapes::StringShape.new(name: 'DashIsoSegmentControl')
+    DashIsoSegmentLengthControl = Shapes::StringShape.new(name: 'DashIsoSegmentLengthControl')
     DashIsoWriteSegmentTimelineInRepresentation = Shapes::StringShape.new(name: 'DashIsoWriteSegmentTimelineInRepresentation')
     DecryptionMode = Shapes::StringShape.new(name: 'DecryptionMode')
     DeinterlaceAlgorithm = Shapes::StringShape.new(name: 'DeinterlaceAlgorithm')
@@ -221,6 +224,7 @@ module Aws::MediaConvert
     EsamSettings = Shapes::StructureShape.new(name: 'EsamSettings')
     EsamSignalProcessingNotification = Shapes::StructureShape.new(name: 'EsamSignalProcessingNotification')
     ExceptionBody = Shapes::StructureShape.new(name: 'ExceptionBody')
+    ExtendedDataServices = Shapes::StructureShape.new(name: 'ExtendedDataServices')
     F4vMoovPlacement = Shapes::StringShape.new(name: 'F4vMoovPlacement')
     F4vSettings = Shapes::StructureShape.new(name: 'F4vSettings')
     FileGroupSettings = Shapes::StructureShape.new(name: 'FileGroupSettings')
@@ -317,6 +321,7 @@ module Aws::MediaConvert
     HlsProgramDateTime = Shapes::StringShape.new(name: 'HlsProgramDateTime')
     HlsRenditionGroupSettings = Shapes::StructureShape.new(name: 'HlsRenditionGroupSettings')
     HlsSegmentControl = Shapes::StringShape.new(name: 'HlsSegmentControl')
+    HlsSegmentLengthControl = Shapes::StringShape.new(name: 'HlsSegmentLengthControl')
     HlsSettings = Shapes::StructureShape.new(name: 'HlsSettings')
     HlsStreamInfResolution = Shapes::StringShape.new(name: 'HlsStreamInfResolution')
     HlsTargetDurationCompatibilityMode = Shapes::StringShape.new(name: 'HlsTargetDurationCompatibilityMode')
@@ -363,6 +368,7 @@ module Aws::MediaConvert
     M2tsAudioBufferModel = Shapes::StringShape.new(name: 'M2tsAudioBufferModel')
     M2tsAudioDuration = Shapes::StringShape.new(name: 'M2tsAudioDuration')
     M2tsBufferModel = Shapes::StringShape.new(name: 'M2tsBufferModel')
+    M2tsDataPtsControl = Shapes::StringShape.new(name: 'M2tsDataPtsControl')
     M2tsEbpAudioInterval = Shapes::StringShape.new(name: 'M2tsEbpAudioInterval')
     M2tsEbpPlacement = Shapes::StringShape.new(name: 'M2tsEbpPlacement')
     M2tsEsRateInPes = Shapes::StringShape.new(name: 'M2tsEsRateInPes')
@@ -376,6 +382,7 @@ module Aws::MediaConvert
     M2tsSegmentationStyle = Shapes::StringShape.new(name: 'M2tsSegmentationStyle')
     M2tsSettings = Shapes::StructureShape.new(name: 'M2tsSettings')
     M3u8AudioDuration = Shapes::StringShape.new(name: 'M3u8AudioDuration')
+    M3u8DataPtsControl = Shapes::StringShape.new(name: 'M3u8DataPtsControl')
     M3u8NielsenId3 = Shapes::StringShape.new(name: 'M3u8NielsenId3')
     M3u8PcrControl = Shapes::StringShape.new(name: 'M3u8PcrControl')
     M3u8Scte35Source = Shapes::StringShape.new(name: 'M3u8Scte35Source')
@@ -427,6 +434,7 @@ module Aws::MediaConvert
     MsSmoothAdditionalManifest = Shapes::StructureShape.new(name: 'MsSmoothAdditionalManifest')
     MsSmoothAudioDeduplication = Shapes::StringShape.new(name: 'MsSmoothAudioDeduplication')
     MsSmoothEncryptionSettings = Shapes::StructureShape.new(name: 'MsSmoothEncryptionSettings')
+    MsSmoothFragmentLengthControl = Shapes::StringShape.new(name: 'MsSmoothFragmentLengthControl')
     MsSmoothGroupSettings = Shapes::StructureShape.new(name: 'MsSmoothGroupSettings')
     MsSmoothManifestEncoding = Shapes::StringShape.new(name: 'MsSmoothManifestEncoding')
     MxfAfdSignaling = Shapes::StringShape.new(name: 'MxfAfdSignaling')
@@ -534,6 +542,7 @@ module Aws::MediaConvert
     Vc3Settings = Shapes::StructureShape.new(name: 'Vc3Settings')
     Vc3SlowPal = Shapes::StringShape.new(name: 'Vc3SlowPal')
     Vc3Telecine = Shapes::StringShape.new(name: 'Vc3Telecine')
+    VchipAction = Shapes::StringShape.new(name: 'VchipAction')
     VideoCodec = Shapes::StringShape.new(name: 'VideoCodec')
     VideoCodecSettings = Shapes::StructureShape.new(name: 'VideoCodecSettings')
     VideoDescription = Shapes::StructureShape.new(name: 'VideoDescription')
@@ -1012,6 +1021,7 @@ module Aws::MediaConvert
     CmafGroupSettings.add_member(:pts_offset_handling_for_b_frames, Shapes::ShapeRef.new(shape: CmafPtsOffsetHandlingForBFrames, location_name: "ptsOffsetHandlingForBFrames"))
     CmafGroupSettings.add_member(:segment_control, Shapes::ShapeRef.new(shape: CmafSegmentControl, location_name: "segmentControl"))
     CmafGroupSettings.add_member(:segment_length, Shapes::ShapeRef.new(shape: __integerMin1Max2147483647, location_name: "segmentLength"))
+    CmafGroupSettings.add_member(:segment_length_control, Shapes::ShapeRef.new(shape: CmafSegmentLengthControl, location_name: "segmentLengthControl"))
     CmafGroupSettings.add_member(:stream_inf_resolution, Shapes::ShapeRef.new(shape: CmafStreamInfResolution, location_name: "streamInfResolution"))
     CmafGroupSettings.add_member(:target_duration_compatibility_mode, Shapes::ShapeRef.new(shape: CmafTargetDurationCompatibilityMode, location_name: "targetDurationCompatibilityMode"))
     CmafGroupSettings.add_member(:write_dash_manifest, Shapes::ShapeRef.new(shape: CmafWriteDASHManifest, location_name: "writeDashManifest"))
@@ -1129,6 +1139,7 @@ module Aws::MediaConvert
     DashIsoGroupSettings.add_member(:pts_offset_handling_for_b_frames, Shapes::ShapeRef.new(shape: DashIsoPtsOffsetHandlingForBFrames, location_name: "ptsOffsetHandlingForBFrames"))
     DashIsoGroupSettings.add_member(:segment_control, Shapes::ShapeRef.new(shape: DashIsoSegmentControl, location_name: "segmentControl"))
     DashIsoGroupSettings.add_member(:segment_length, Shapes::ShapeRef.new(shape: __integerMin1Max2147483647, location_name: "segmentLength"))
+    DashIsoGroupSettings.add_member(:segment_length_control, Shapes::ShapeRef.new(shape: DashIsoSegmentLengthControl, location_name: "segmentLengthControl"))
     DashIsoGroupSettings.add_member(:write_segment_timeline_in_representation, Shapes::ShapeRef.new(shape: DashIsoWriteSegmentTimelineInRepresentation, location_name: "writeSegmentTimelineInRepresentation"))
     DashIsoGroupSettings.struct_class = Types::DashIsoGroupSettings
 
@@ -1289,6 +1300,10 @@ module Aws::MediaConvert
     ExceptionBody.add_member(:message, Shapes::ShapeRef.new(shape: __string, location_name: "message"))
     ExceptionBody.struct_class = Types::ExceptionBody
 
+    ExtendedDataServices.add_member(:copy_protection_action, Shapes::ShapeRef.new(shape: CopyProtectionAction, location_name: "copyProtectionAction"))
+    ExtendedDataServices.add_member(:vchip_action, Shapes::ShapeRef.new(shape: VchipAction, location_name: "vchipAction"))
+    ExtendedDataServices.struct_class = Types::ExtendedDataServices
+
     F4vSettings.add_member(:moov_placement, Shapes::ShapeRef.new(shape: F4vMoovPlacement, location_name: "moovPlacement"))
     F4vSettings.struct_class = Types::F4vSettings
 
@@ -1488,6 +1503,7 @@ module Aws::MediaConvert
     HlsGroupSettings.add_member(:program_date_time_period, Shapes::ShapeRef.new(shape: __integerMin0Max3600, location_name: "programDateTimePeriod"))
     HlsGroupSettings.add_member(:segment_control, Shapes::ShapeRef.new(shape: HlsSegmentControl, location_name: "segmentControl"))
     HlsGroupSettings.add_member(:segment_length, Shapes::ShapeRef.new(shape: __integerMin1Max2147483647, location_name: "segmentLength"))
+    HlsGroupSettings.add_member(:segment_length_control, Shapes::ShapeRef.new(shape: HlsSegmentLengthControl, location_name: "segmentLengthControl"))
     HlsGroupSettings.add_member(:segments_per_subdirectory, Shapes::ShapeRef.new(shape: __integerMin1Max2147483647, location_name: "segmentsPerSubdirectory"))
     HlsGroupSettings.add_member(:stream_inf_resolution, Shapes::ShapeRef.new(shape: HlsStreamInfResolution, location_name: "streamInfResolution"))
     HlsGroupSettings.add_member(:target_duration_compatibility_mode, Shapes::ShapeRef.new(shape: HlsTargetDurationCompatibilityMode, location_name: "targetDurationCompatibilityMode"))
@@ -1626,6 +1642,7 @@ module Aws::MediaConvert
     JobSettings.add_member(:ad_avail_offset, Shapes::ShapeRef.new(shape: __integerMinNegative1000Max1000, location_name: "adAvailOffset"))
     JobSettings.add_member(:avail_blanking, Shapes::ShapeRef.new(shape: AvailBlanking, location_name: "availBlanking"))
     JobSettings.add_member(:esam, Shapes::ShapeRef.new(shape: EsamSettings, location_name: "esam"))
+    JobSettings.add_member(:extended_data_services, Shapes::ShapeRef.new(shape: ExtendedDataServices, location_name: "extendedDataServices"))
     JobSettings.add_member(:inputs, Shapes::ShapeRef.new(shape: __listOfInput, location_name: "inputs"))
     JobSettings.add_member(:kantar_watermark, Shapes::ShapeRef.new(shape: KantarWatermarkSettings, location_name: "kantarWatermark"))
     JobSettings.add_member(:motion_image_inserter, Shapes::ShapeRef.new(shape: MotionImageInserter, location_name: "motionImageInserter"))
@@ -1654,6 +1671,7 @@ module Aws::MediaConvert
     JobTemplateSettings.add_member(:ad_avail_offset, Shapes::ShapeRef.new(shape: __integerMinNegative1000Max1000, location_name: "adAvailOffset"))
     JobTemplateSettings.add_member(:avail_blanking, Shapes::ShapeRef.new(shape: AvailBlanking, location_name: "availBlanking"))
     JobTemplateSettings.add_member(:esam, Shapes::ShapeRef.new(shape: EsamSettings, location_name: "esam"))
+    JobTemplateSettings.add_member(:extended_data_services, Shapes::ShapeRef.new(shape: ExtendedDataServices, location_name: "extendedDataServices"))
     JobTemplateSettings.add_member(:inputs, Shapes::ShapeRef.new(shape: __listOfInputTemplate, location_name: "inputs"))
     JobTemplateSettings.add_member(:kantar_watermark, Shapes::ShapeRef.new(shape: KantarWatermarkSettings, location_name: "kantarWatermark"))
     JobTemplateSettings.add_member(:motion_image_inserter, Shapes::ShapeRef.new(shape: MotionImageInserter, location_name: "motionImageInserter"))
@@ -1737,6 +1755,7 @@ module Aws::MediaConvert
     M2tsSettings.add_member(:audio_pids, Shapes::ShapeRef.new(shape: __listOf__integerMin32Max8182, location_name: "audioPids"))
     M2tsSettings.add_member(:bitrate, Shapes::ShapeRef.new(shape: __integerMin0Max2147483647, location_name: "bitrate"))
     M2tsSettings.add_member(:buffer_model, Shapes::ShapeRef.new(shape: M2tsBufferModel, location_name: "bufferModel"))
+    M2tsSettings.add_member(:data_pts_control, Shapes::ShapeRef.new(shape: M2tsDataPtsControl, location_name: "dataPTSControl"))
     M2tsSettings.add_member(:dvb_nit_settings, Shapes::ShapeRef.new(shape: DvbNitSettings, location_name: "dvbNitSettings"))
     M2tsSettings.add_member(:dvb_sdt_settings, Shapes::ShapeRef.new(shape: DvbSdtSettings, location_name: "dvbSdtSettings"))
     M2tsSettings.add_member(:dvb_sub_pids, Shapes::ShapeRef.new(shape: __listOf__integerMin32Max8182, location_name: "dvbSubPids"))
@@ -1773,6 +1792,7 @@ module Aws::MediaConvert
     M3u8Settings.add_member(:audio_duration, Shapes::ShapeRef.new(shape: M3u8AudioDuration, location_name: "audioDuration"))
     M3u8Settings.add_member(:audio_frames_per_pes, Shapes::ShapeRef.new(shape: __integerMin0Max2147483647, location_name: "audioFramesPerPes"))
     M3u8Settings.add_member(:audio_pids, Shapes::ShapeRef.new(shape: __listOf__integerMin32Max8182, location_name: "audioPids"))
+    M3u8Settings.add_member(:data_pts_control, Shapes::ShapeRef.new(shape: M3u8DataPtsControl, location_name: "dataPTSControl"))
     M3u8Settings.add_member(:max_pcr_interval, Shapes::ShapeRef.new(shape: __integerMin0Max500, location_name: "maxPcrInterval"))
     M3u8Settings.add_member(:nielsen_id_3, Shapes::ShapeRef.new(shape: M3u8NielsenId3, location_name: "nielsenId3"))
     M3u8Settings.add_member(:pat_interval, Shapes::ShapeRef.new(shape: __integerMin0Max1000, location_name: "patInterval"))
@@ -1887,6 +1907,7 @@ module Aws::MediaConvert
     MsSmoothGroupSettings.add_member(:destination_settings, Shapes::ShapeRef.new(shape: DestinationSettings, location_name: "destinationSettings"))
     MsSmoothGroupSettings.add_member(:encryption, Shapes::ShapeRef.new(shape: MsSmoothEncryptionSettings, location_name: "encryption"))
     MsSmoothGroupSettings.add_member(:fragment_length, Shapes::ShapeRef.new(shape: __integerMin1Max2147483647, location_name: "fragmentLength"))
+    MsSmoothGroupSettings.add_member(:fragment_length_control, Shapes::ShapeRef.new(shape: MsSmoothFragmentLengthControl, location_name: "fragmentLengthControl"))
     MsSmoothGroupSettings.add_member(:manifest_encoding, Shapes::ShapeRef.new(shape: MsSmoothManifestEncoding, location_name: "manifestEncoding"))
     MsSmoothGroupSettings.struct_class = Types::MsSmoothGroupSettings
 
@@ -2077,6 +2098,7 @@ module Aws::MediaConvert
     S3DestinationSettings.struct_class = Types::S3DestinationSettings
 
     S3EncryptionSettings.add_member(:encryption_type, Shapes::ShapeRef.new(shape: S3ServerSideEncryptionType, location_name: "encryptionType"))
+    S3EncryptionSettings.add_member(:kms_encryption_context, Shapes::ShapeRef.new(shape: __stringPatternAZaZ0902, location_name: "kmsEncryptionContext"))
     S3EncryptionSettings.add_member(:kms_key_arn, Shapes::ShapeRef.new(shape: __stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912, location_name: "kmsKeyArn"))
     S3EncryptionSettings.struct_class = Types::S3EncryptionSettings
 

data/lib/aws-sdk-mediaconvert/types.rb

@@ -2674,6 +2674,7 @@ module Aws::MediaConvert
     #             },
     #             encryption: {
     #               encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #               kms_encryption_context: "__stringPatternAZaZ0902",
     #               kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #             },
     #           },
@@ -2707,6 +2708,7 @@ module Aws::MediaConvert
     #         pts_offset_handling_for_b_frames: "ZERO_BASED", # accepts ZERO_BASED, MATCH_INITIAL_PTS
     #         segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #         segment_length: 1,
+    #         segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #         stream_inf_resolution: "INCLUDE", # accepts INCLUDE, EXCLUDE
     #         target_duration_compatibility_mode: "LEGACY", # accepts LEGACY, SPEC_COMPLIANT
     #         write_dash_manifest: "DISABLED", # accepts DISABLED, ENABLED
@@ -2760,12 +2762,10 @@ module Aws::MediaConvert
     #   @return [Types::CmafEncryptionSettings]
     #
     # @!attribute [rw] fragment_length
-    #   Length of fragments to generate (in seconds). Fragment length must
-    #   be compatible with GOP size and Framerate. Note that fragments will
-    #   end on the next keyframe after this number of seconds, so actual
-    #   fragment length may be longer. When Emit Single File is checked, the
-    #   fragmentation is internal to a single output file and it does not
-    #   cause the creation of many output files as in other output types.
+    #   Specify the length, in whole seconds, of the mp4 fragments. When you
+    #   don't specify a value, MediaConvert defaults to 2. Related setting:
+    #   Use Fragment length control (FragmentLengthControl) to specify
+    #   whether the encoder enforces this value strictly.
     #   @return [Integer]
     #
     # @!attribute [rw] image_based_trick_play
@@ -2847,18 +2847,24 @@ module Aws::MediaConvert
     #   @return [String]
     #
     # @!attribute [rw] segment_length
-    #   Use this setting to specify the length, in seconds, of each
-    #   individual CMAF segment. This value applies to the whole package;
-    #   that is, to every output in the output group. Note that segments end
-    #   on the first keyframe after this number of seconds, so the actual
-    #   segment length might be slightly longer. If you set Segment control
-    #   (CmafSegmentControl) to single file, the service puts the content of
-    #   each output in a single file that has metadata that marks these
-    #   segments. If you set it to segmented files, the service creates
-    #   multiple files for each output, each with the content of one
-    #   segment.
+    #   Specify the length, in whole seconds, of each segment. When you
+    #   don't specify a value, MediaConvert defaults to 10. Related
+    #   settings: Use Segment length control (SegmentLengthControl) to
+    #   specify whether the encoder enforces this value strictly. Use
+    #   Segment control (CmafSegmentControl) to specify whether MediaConvert
+    #   creates separate segment files or one content file that has metadata
+    #   to mark the segment boundaries.
     #   @return [Integer]
     #
+    # @!attribute [rw] segment_length_control
+    #   Specify how you want MediaConvert to determine the segment length.
+    #   Choose Exact (EXACT) to have the encoder use the exact length that
+    #   you specify with the setting Segment length (SegmentLength). This
+    #   might result in extra I-frames. Choose Multiple of GOP
+    #   (GOP\_MULTIPLE) to have the encoder round up the segment lengths to
+    #   match the next GOP boundary.
+    #   @return [String]
+    #
     # @!attribute [rw] stream_inf_resolution
     #   Include or exclude RESOLUTION attribute for video in
     #   EXT-X-STREAM-INF tag of variant manifest.
@@ -2918,6 +2924,7 @@ module Aws::MediaConvert
       :pts_offset_handling_for_b_frames,
       :segment_control,
       :segment_length,
+      :segment_length_control,
       :stream_inf_resolution,
       :target_duration_compatibility_mode,
       :write_dash_manifest,
@@ -3210,6 +3217,7 @@ module Aws::MediaConvert
     #           audio_pids: [1],
     #           bitrate: 1,
     #           buffer_model: "MULTIPLEX", # accepts MULTIPLEX, NONE
+    #           data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #           dvb_nit_settings: {
     #             network_id: 1,
     #             network_name: "__stringMin1Max256",
@@ -3259,6 +3267,7 @@ module Aws::MediaConvert
     #           audio_duration: "DEFAULT_CODEC_DURATION", # accepts DEFAULT_CODEC_DURATION, MATCH_VIDEO_DURATION
     #           audio_frames_per_pes: 1,
     #           audio_pids: [1],
+    #           data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #           max_pcr_interval: 1,
     #           nielsen_id_3: "INSERT", # accepts INSERT, NONE
     #           pat_interval: 1,
@@ -3413,6 +3422,10 @@ module Aws::MediaConvert
     #               scc_xml: "__stringPatternSNSignalProcessingNotificationNS",
     #             },
     #           },
+    #           extended_data_services: {
+    #             copy_protection_action: "PASSTHROUGH", # accepts PASSTHROUGH, STRIP
+    #             vchip_action: "PASSTHROUGH", # accepts PASSTHROUGH, STRIP
+    #           },
     #           inputs: [
     #             {
     #               audio_selector_groups: {
@@ -3646,6 +3659,7 @@ module Aws::MediaConvert
     #                       },
     #                       encryption: {
     #                         encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                         kms_encryption_context: "__stringPatternAZaZ0902",
     #                         kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                       },
     #                     },
@@ -3679,6 +3693,7 @@ module Aws::MediaConvert
     #                   pts_offset_handling_for_b_frames: "ZERO_BASED", # accepts ZERO_BASED, MATCH_INITIAL_PTS
     #                   segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #                   segment_length: 1,
+    #                   segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                   stream_inf_resolution: "INCLUDE", # accepts INCLUDE, EXCLUDE
     #                   target_duration_compatibility_mode: "LEGACY", # accepts LEGACY, SPEC_COMPLIANT
     #                   write_dash_manifest: "DISABLED", # accepts DISABLED, ENABLED
@@ -3702,6 +3717,7 @@ module Aws::MediaConvert
     #                       },
     #                       encryption: {
     #                         encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                         kms_encryption_context: "__stringPatternAZaZ0902",
     #                         kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                       },
     #                     },
@@ -3724,6 +3740,7 @@ module Aws::MediaConvert
     #                   pts_offset_handling_for_b_frames: "ZERO_BASED", # accepts ZERO_BASED, MATCH_INITIAL_PTS
     #                   segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #                   segment_length: 1,
+    #                   segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                   write_segment_timeline_in_representation: "ENABLED", # accepts ENABLED, DISABLED
     #                 },
     #                 file_group_settings: {
@@ -3735,6 +3752,7 @@ module Aws::MediaConvert
     #                       },
     #                       encryption: {
     #                         encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                         kms_encryption_context: "__stringPatternAZaZ0902",
     #                         kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                       },
     #                     },
@@ -3769,6 +3787,7 @@ module Aws::MediaConvert
     #                       },
     #                       encryption: {
     #                         encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                         kms_encryption_context: "__stringPatternAZaZ0902",
     #                         kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                       },
     #                     },
@@ -3803,6 +3822,7 @@ module Aws::MediaConvert
     #                   program_date_time_period: 1,
     #                   segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #                   segment_length: 1,
+    #                   segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                   segments_per_subdirectory: 1,
     #                   stream_inf_resolution: "INCLUDE", # accepts INCLUDE, EXCLUDE
     #                   target_duration_compatibility_mode: "LEGACY", # accepts LEGACY, SPEC_COMPLIANT
@@ -3826,6 +3846,7 @@ module Aws::MediaConvert
     #                       },
     #                       encryption: {
     #                         encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                         kms_encryption_context: "__stringPatternAZaZ0902",
     #                         kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                       },
     #                     },
@@ -3839,6 +3860,7 @@ module Aws::MediaConvert
     #                     },
     #                   },
     #                   fragment_length: 1,
+    #                   fragment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                   manifest_encoding: "UTF8", # accepts UTF8, UTF16
     #                 },
     #                 type: "HLS_GROUP_SETTINGS", # accepts HLS_GROUP_SETTINGS, DASH_ISO_GROUP_SETTINGS, FILE_GROUP_SETTINGS, MS_SMOOTH_GROUP_SETTINGS, CMAF_GROUP_SETTINGS
@@ -4080,6 +4102,7 @@ module Aws::MediaConvert
     #                       audio_pids: [1],
     #                       bitrate: 1,
     #                       buffer_model: "MULTIPLEX", # accepts MULTIPLEX, NONE
+    #                       data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #                       dvb_nit_settings: {
     #                         network_id: 1,
     #                         network_name: "__stringMin1Max256",
@@ -4129,6 +4152,7 @@ module Aws::MediaConvert
     #                       audio_duration: "DEFAULT_CODEC_DURATION", # accepts DEFAULT_CODEC_DURATION, MATCH_VIDEO_DURATION
     #                       audio_frames_per_pes: 1,
     #                       audio_pids: [1],
+    #                       data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #                       max_pcr_interval: 1,
     #                       nielsen_id_3: "INSERT", # accepts INSERT, NONE
     #                       pat_interval: 1,
@@ -4239,7 +4263,7 @@ module Aws::MediaConvert
     #                         codec_profile: "BASELINE", # accepts BASELINE, HIGH, HIGH_10BIT, HIGH_422, HIGH_422_10BIT, MAIN
     #                         dynamic_sub_gop: "ADAPTIVE", # accepts ADAPTIVE, STATIC
     #                         entropy_encoding: "CABAC", # accepts CABAC, CAVLC
-    #                         field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD
+    #                         field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD, MBAFF
     #                         flicker_adaptive_quantization: "DISABLED", # accepts DISABLED, ENABLED
     #                         framerate_control: "INITIALIZE_FROM_SOURCE", # accepts INITIALIZE_FROM_SOURCE, SPECIFIED
     #                         framerate_conversion_algorithm: "DUPLICATE_DROP", # accepts DUPLICATE_DROP, INTERPOLATE, FRAMEFORMER
@@ -4760,6 +4784,10 @@ module Aws::MediaConvert
     #               scc_xml: "__stringPatternSNSignalProcessingNotificationNS",
     #             },
     #           },
+    #           extended_data_services: {
+    #             copy_protection_action: "PASSTHROUGH", # accepts PASSTHROUGH, STRIP
+    #             vchip_action: "PASSTHROUGH", # accepts PASSTHROUGH, STRIP
+    #           },
     #           inputs: [
     #             {
     #               audio_selector_groups: {
@@ -4985,6 +5013,7 @@ module Aws::MediaConvert
     #                       },
     #                       encryption: {
     #                         encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                         kms_encryption_context: "__stringPatternAZaZ0902",
     #                         kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                       },
     #                     },
@@ -5018,6 +5047,7 @@ module Aws::MediaConvert
     #                   pts_offset_handling_for_b_frames: "ZERO_BASED", # accepts ZERO_BASED, MATCH_INITIAL_PTS
     #                   segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #                   segment_length: 1,
+    #                   segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                   stream_inf_resolution: "INCLUDE", # accepts INCLUDE, EXCLUDE
     #                   target_duration_compatibility_mode: "LEGACY", # accepts LEGACY, SPEC_COMPLIANT
     #                   write_dash_manifest: "DISABLED", # accepts DISABLED, ENABLED
@@ -5041,6 +5071,7 @@ module Aws::MediaConvert
     #                       },
     #                       encryption: {
     #                         encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                         kms_encryption_context: "__stringPatternAZaZ0902",
     #                         kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                       },
     #                     },
@@ -5063,6 +5094,7 @@ module Aws::MediaConvert
     #                   pts_offset_handling_for_b_frames: "ZERO_BASED", # accepts ZERO_BASED, MATCH_INITIAL_PTS
     #                   segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #                   segment_length: 1,
+    #                   segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                   write_segment_timeline_in_representation: "ENABLED", # accepts ENABLED, DISABLED
     #                 },
     #                 file_group_settings: {
@@ -5074,6 +5106,7 @@ module Aws::MediaConvert
     #                       },
     #                       encryption: {
     #                         encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                         kms_encryption_context: "__stringPatternAZaZ0902",
     #                         kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                       },
     #                     },
@@ -5108,6 +5141,7 @@ module Aws::MediaConvert
     #                       },
     #                       encryption: {
     #                         encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                         kms_encryption_context: "__stringPatternAZaZ0902",
     #                         kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                       },
     #                     },
@@ -5142,6 +5176,7 @@ module Aws::MediaConvert
     #                   program_date_time_period: 1,
     #                   segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #                   segment_length: 1,
+    #                   segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                   segments_per_subdirectory: 1,
     #                   stream_inf_resolution: "INCLUDE", # accepts INCLUDE, EXCLUDE
     #                   target_duration_compatibility_mode: "LEGACY", # accepts LEGACY, SPEC_COMPLIANT
@@ -5165,6 +5200,7 @@ module Aws::MediaConvert
     #                       },
     #                       encryption: {
     #                         encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                         kms_encryption_context: "__stringPatternAZaZ0902",
     #                         kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                       },
     #                     },
@@ -5178,6 +5214,7 @@ module Aws::MediaConvert
     #                     },
     #                   },
     #                   fragment_length: 1,
+    #                   fragment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                   manifest_encoding: "UTF8", # accepts UTF8, UTF16
     #                 },
     #                 type: "HLS_GROUP_SETTINGS", # accepts HLS_GROUP_SETTINGS, DASH_ISO_GROUP_SETTINGS, FILE_GROUP_SETTINGS, MS_SMOOTH_GROUP_SETTINGS, CMAF_GROUP_SETTINGS
@@ -5419,6 +5456,7 @@ module Aws::MediaConvert
     #                       audio_pids: [1],
     #                       bitrate: 1,
     #                       buffer_model: "MULTIPLEX", # accepts MULTIPLEX, NONE
+    #                       data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #                       dvb_nit_settings: {
     #                         network_id: 1,
     #                         network_name: "__stringMin1Max256",
@@ -5468,6 +5506,7 @@ module Aws::MediaConvert
     #                       audio_duration: "DEFAULT_CODEC_DURATION", # accepts DEFAULT_CODEC_DURATION, MATCH_VIDEO_DURATION
     #                       audio_frames_per_pes: 1,
     #                       audio_pids: [1],
+    #                       data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #                       max_pcr_interval: 1,
     #                       nielsen_id_3: "INSERT", # accepts INSERT, NONE
     #                       pat_interval: 1,
@@ -5578,7 +5617,7 @@ module Aws::MediaConvert
     #                         codec_profile: "BASELINE", # accepts BASELINE, HIGH, HIGH_10BIT, HIGH_422, HIGH_422_10BIT, MAIN
     #                         dynamic_sub_gop: "ADAPTIVE", # accepts ADAPTIVE, STATIC
     #                         entropy_encoding: "CABAC", # accepts CABAC, CAVLC
-    #                         field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD
+    #                         field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD, MBAFF
     #                         flicker_adaptive_quantization: "DISABLED", # accepts DISABLED, ENABLED
     #                         framerate_control: "INITIALIZE_FROM_SOURCE", # accepts INITIALIZE_FROM_SOURCE, SPECIFIED
     #                         framerate_conversion_algorithm: "DUPLICATE_DROP", # accepts DUPLICATE_DROP, INTERPOLATE, FRAMEFORMER
@@ -6268,6 +6307,7 @@ module Aws::MediaConvert
     #               audio_pids: [1],
     #               bitrate: 1,
     #               buffer_model: "MULTIPLEX", # accepts MULTIPLEX, NONE
+    #               data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #               dvb_nit_settings: {
     #                 network_id: 1,
     #                 network_name: "__stringMin1Max256",
@@ -6317,6 +6357,7 @@ module Aws::MediaConvert
     #               audio_duration: "DEFAULT_CODEC_DURATION", # accepts DEFAULT_CODEC_DURATION, MATCH_VIDEO_DURATION
     #               audio_frames_per_pes: 1,
     #               audio_pids: [1],
+    #               data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #               max_pcr_interval: 1,
     #               nielsen_id_3: "INSERT", # accepts INSERT, NONE
     #               pat_interval: 1,
@@ -6413,7 +6454,7 @@ module Aws::MediaConvert
     #                 codec_profile: "BASELINE", # accepts BASELINE, HIGH, HIGH_10BIT, HIGH_422, HIGH_422_10BIT, MAIN
     #                 dynamic_sub_gop: "ADAPTIVE", # accepts ADAPTIVE, STATIC
     #                 entropy_encoding: "CABAC", # accepts CABAC, CAVLC
-    #                 field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD
+    #                 field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD, MBAFF
     #                 flicker_adaptive_quantization: "DISABLED", # accepts DISABLED, ENABLED
     #                 framerate_control: "INITIALIZE_FROM_SOURCE", # accepts INITIALIZE_FROM_SOURCE, SPECIFIED
     #                 framerate_conversion_algorithm: "DUPLICATE_DROP", # accepts DUPLICATE_DROP, INTERPOLATE, FRAMEFORMER
@@ -6989,6 +7030,7 @@ module Aws::MediaConvert
     #             },
     #             encryption: {
     #               encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #               kms_encryption_context: "__stringPatternAZaZ0902",
     #               kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #             },
     #           },
@@ -7011,6 +7053,7 @@ module Aws::MediaConvert
     #         pts_offset_handling_for_b_frames: "ZERO_BASED", # accepts ZERO_BASED, MATCH_INITIAL_PTS
     #         segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #         segment_length: 1,
+    #         segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #         write_segment_timeline_in_representation: "ENABLED", # accepts ENABLED, DISABLED
     #       }
     #
@@ -7139,14 +7182,24 @@ module Aws::MediaConvert
     #   @return [String]
     #
     # @!attribute [rw] segment_length
-    #   Length of mpd segments to create (in seconds). Note that segments
-    #   will end on the next keyframe after this number of seconds, so
-    #   actual segment length may be longer. When Emit Single File is
-    #   checked, the segmentation is internal to a single output file and it
-    #   does not cause the creation of many output files as in other output
-    #   types.
+    #   Specify the length, in whole seconds, of each segment. When you
+    #   don't specify a value, MediaConvert defaults to 30. Related
+    #   settings: Use Segment length control (SegmentLengthControl) to
+    #   specify whether the encoder enforces this value strictly. Use
+    #   Segment control (DashIsoSegmentControl) to specify whether
+    #   MediaConvert creates separate segment files or one content file that
+    #   has metadata to mark the segment boundaries.
     #   @return [Integer]
     #
+    # @!attribute [rw] segment_length_control
+    #   Specify how you want MediaConvert to determine the segment length.
+    #   Choose Exact (EXACT) to have the encoder use the exact length that
+    #   you specify with the setting Segment length (SegmentLength). This
+    #   might result in extra I-frames. Choose Multiple of GOP
+    #   (GOP\_MULTIPLE) to have the encoder round up the segment lengths to
+    #   match the next GOP boundary.
+    #   @return [String]
+    #
     # @!attribute [rw] write_segment_timeline_in_representation
     #   If you get an HTTP error in the 400 range when you play back your
     #   DASH output, enable this setting and run your transcoding job again.
@@ -7176,6 +7229,7 @@ module Aws::MediaConvert
       :pts_offset_handling_for_b_frames,
       :segment_control,
       :segment_length,
+      :segment_length_control,
       :write_segment_timeline_in_representation)
       SENSITIVE = []
       include Aws::Structure
@@ -7391,6 +7445,7 @@ module Aws::MediaConvert
     #           },
     #           encryption: {
     #             encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #             kms_encryption_context: "__stringPatternAZaZ0902",
     #             kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #           },
     #         },
@@ -8568,6 +8623,38 @@ module Aws::MediaConvert
       include Aws::Structure
     end
 
+    # Hexadecimal value as per EIA-608 Line 21 Data Services, section
+    # 9.5.1.5 05h Content Advisory.
+    #
+    # @note When making an API call, you may pass ExtendedDataServices
+    #   data as a hash:
+    #
+    #       {
+    #         copy_protection_action: "PASSTHROUGH", # accepts PASSTHROUGH, STRIP
+    #         vchip_action: "PASSTHROUGH", # accepts PASSTHROUGH, STRIP
+    #       }
+    #
+    # @!attribute [rw] copy_protection_action
+    #   The action to take on copy and redistribution control XDS packets.
+    #   If you select PASSTHROUGH, packets will not be changed. If you
+    #   select STRIP, any packets will be removed in output captions.
+    #   @return [String]
+    #
+    # @!attribute [rw] vchip_action
+    #   The action to take on content advisory XDS packets. If you select
+    #   PASSTHROUGH, packets will not be changed. If you select STRIP, any
+    #   packets will be removed in output captions.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/mediaconvert-2017-08-29/ExtendedDataServices AWS API Documentation
+    #
+    class ExtendedDataServices < Struct.new(
+      :copy_protection_action,
+      :vchip_action)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Settings for F4v container
     #
     # @note When making an API call, you may pass F4vSettings
@@ -8609,6 +8696,7 @@ module Aws::MediaConvert
     #             },
     #             encryption: {
     #               encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #               kms_encryption_context: "__stringPatternAZaZ0902",
     #               kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #             },
     #           },
@@ -8986,7 +9074,7 @@ module Aws::MediaConvert
     #         codec_profile: "BASELINE", # accepts BASELINE, HIGH, HIGH_10BIT, HIGH_422, HIGH_422_10BIT, MAIN
     #         dynamic_sub_gop: "ADAPTIVE", # accepts ADAPTIVE, STATIC
     #         entropy_encoding: "CABAC", # accepts CABAC, CAVLC
-    #         field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD
+    #         field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD, MBAFF
     #         flicker_adaptive_quantization: "DISABLED", # accepts DISABLED, ENABLED
     #         framerate_control: "INITIALIZE_FROM_SOURCE", # accepts INITIALIZE_FROM_SOURCE, SPECIFIED
     #         framerate_conversion_algorithm: "DUPLICATE_DROP", # accepts DUPLICATE_DROP, INTERPOLATE, FRAMEFORMER
@@ -9074,9 +9162,12 @@ module Aws::MediaConvert
     #   @return [String]
     #
     # @!attribute [rw] field_encoding
-    #   Keep the default value, PAFF, to have MediaConvert use PAFF encoding
-    #   for interlaced outputs. Choose Force field (FORCE\_FIELD) to disable
-    #   PAFF encoding and create separate interlaced fields.
+    #   The video encoding method for your MPEG-4 AVC output. Keep the
+    #   default value, PAFF, to have MediaConvert use PAFF encoding for
+    #   interlaced outputs. Choose Force field (FORCE\_FIELD) to disable
+    #   PAFF encoding and create separate interlaced fields. Choose MBAFF to
+    #   disable PAFF and have MediaConvert use MBAFF encoding for interlaced
+    #   outputs.
     #   @return [String]
     #
     # @!attribute [rw] flicker_adaptive_quantization
@@ -9215,7 +9306,10 @@ module Aws::MediaConvert
     #   @return [Integer]
     #
     # @!attribute [rw] number_b_frames_between_reference_frames
-    #   Number of B-frames between reference frames.
+    #   Specify the number of B-frames that MediaConvert puts between
+    #   reference frames in this output. Valid values are whole numbers from
+    #   0 through 7. When you don't specify a value, MediaConvert defaults
+    #   to 2.
     #   @return [Integer]
     #
     # @!attribute [rw] number_reference_frames
@@ -9743,7 +9837,10 @@ module Aws::MediaConvert
     #   @return [Integer]
     #
     # @!attribute [rw] number_b_frames_between_reference_frames
-    #   Number of B-frames between reference frames.
+    #   Specify the number of B-frames that MediaConvert puts between
+    #   reference frames in this output. Valid values are whole numbers from
+    #   0 through 7. When you don't specify a value, MediaConvert defaults
+    #   to 2.
     #   @return [Integer]
     #
     # @!attribute [rw] number_reference_frames
@@ -10335,6 +10432,7 @@ module Aws::MediaConvert
     #             },
     #             encryption: {
     #               encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #               kms_encryption_context: "__stringPatternAZaZ0902",
     #               kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #             },
     #           },
@@ -10369,6 +10467,7 @@ module Aws::MediaConvert
     #         program_date_time_period: 1,
     #         segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #         segment_length: 1,
+    #         segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #         segments_per_subdirectory: 1,
     #         stream_inf_resolution: "INCLUDE", # accepts INCLUDE, EXCLUDE
     #         target_duration_compatibility_mode: "LEGACY", # accepts LEGACY, SPEC_COMPLIANT
@@ -10524,11 +10623,24 @@ module Aws::MediaConvert
     #   @return [String]
     #
     # @!attribute [rw] segment_length
-    #   Length of MPEG-2 Transport Stream segments to create (in seconds).
-    #   Note that segments will end on the next keyframe after this number
-    #   of seconds, so actual segment length may be longer.
+    #   Specify the length, in whole seconds, of each segment. When you
+    #   don't specify a value, MediaConvert defaults to 10. Related
+    #   settings: Use Segment length control (SegmentLengthControl) to
+    #   specify whether the encoder enforces this value strictly. Use
+    #   Segment control (HlsSegmentControl) to specify whether MediaConvert
+    #   creates separate segment files or one content file that has metadata
+    #   to mark the segment boundaries.
     #   @return [Integer]
     #
+    # @!attribute [rw] segment_length_control
+    #   Specify how you want MediaConvert to determine the segment length.
+    #   Choose Exact (EXACT) to have the encoder use the exact length that
+    #   you specify with the setting Segment length (SegmentLength). This
+    #   might result in extra I-frames. Choose Multiple of GOP
+    #   (GOP\_MULTIPLE) to have the encoder round up the segment lengths to
+    #   match the next GOP boundary.
+    #   @return [String]
+    #
     # @!attribute [rw] segments_per_subdirectory
     #   Number of segments to write to a subdirectory before starting a new
     #   one. directoryStructure must be SINGLE\_DIRECTORY for this setting
@@ -10591,6 +10703,7 @@ module Aws::MediaConvert
       :program_date_time_period,
       :segment_control,
       :segment_length,
+      :segment_length_control,
       :segments_per_subdirectory,
       :stream_inf_resolution,
       :target_duration_compatibility_mode,
@@ -12001,6 +12114,10 @@ module Aws::MediaConvert
     #             scc_xml: "__stringPatternSNSignalProcessingNotificationNS",
     #           },
     #         },
+    #         extended_data_services: {
+    #           copy_protection_action: "PASSTHROUGH", # accepts PASSTHROUGH, STRIP
+    #           vchip_action: "PASSTHROUGH", # accepts PASSTHROUGH, STRIP
+    #         },
     #         inputs: [
     #           {
     #             audio_selector_groups: {
@@ -12234,6 +12351,7 @@ module Aws::MediaConvert
     #                     },
     #                     encryption: {
     #                       encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                       kms_encryption_context: "__stringPatternAZaZ0902",
     #                       kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                     },
     #                   },
@@ -12267,6 +12385,7 @@ module Aws::MediaConvert
     #                 pts_offset_handling_for_b_frames: "ZERO_BASED", # accepts ZERO_BASED, MATCH_INITIAL_PTS
     #                 segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #                 segment_length: 1,
+    #                 segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                 stream_inf_resolution: "INCLUDE", # accepts INCLUDE, EXCLUDE
     #                 target_duration_compatibility_mode: "LEGACY", # accepts LEGACY, SPEC_COMPLIANT
     #                 write_dash_manifest: "DISABLED", # accepts DISABLED, ENABLED
@@ -12290,6 +12409,7 @@ module Aws::MediaConvert
     #                     },
     #                     encryption: {
     #                       encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                       kms_encryption_context: "__stringPatternAZaZ0902",
     #                       kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                     },
     #                   },
@@ -12312,6 +12432,7 @@ module Aws::MediaConvert
     #                 pts_offset_handling_for_b_frames: "ZERO_BASED", # accepts ZERO_BASED, MATCH_INITIAL_PTS
     #                 segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #                 segment_length: 1,
+    #                 segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                 write_segment_timeline_in_representation: "ENABLED", # accepts ENABLED, DISABLED
     #               },
     #               file_group_settings: {
@@ -12323,6 +12444,7 @@ module Aws::MediaConvert
     #                     },
     #                     encryption: {
     #                       encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                       kms_encryption_context: "__stringPatternAZaZ0902",
     #                       kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                     },
     #                   },
@@ -12357,6 +12479,7 @@ module Aws::MediaConvert
     #                     },
     #                     encryption: {
     #                       encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                       kms_encryption_context: "__stringPatternAZaZ0902",
     #                       kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                     },
     #                   },
@@ -12391,6 +12514,7 @@ module Aws::MediaConvert
     #                 program_date_time_period: 1,
     #                 segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #                 segment_length: 1,
+    #                 segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                 segments_per_subdirectory: 1,
     #                 stream_inf_resolution: "INCLUDE", # accepts INCLUDE, EXCLUDE
     #                 target_duration_compatibility_mode: "LEGACY", # accepts LEGACY, SPEC_COMPLIANT
@@ -12414,6 +12538,7 @@ module Aws::MediaConvert
     #                     },
     #                     encryption: {
     #                       encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                       kms_encryption_context: "__stringPatternAZaZ0902",
     #                       kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                     },
     #                   },
@@ -12427,6 +12552,7 @@ module Aws::MediaConvert
     #                   },
     #                 },
     #                 fragment_length: 1,
+    #                 fragment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                 manifest_encoding: "UTF8", # accepts UTF8, UTF16
     #               },
     #               type: "HLS_GROUP_SETTINGS", # accepts HLS_GROUP_SETTINGS, DASH_ISO_GROUP_SETTINGS, FILE_GROUP_SETTINGS, MS_SMOOTH_GROUP_SETTINGS, CMAF_GROUP_SETTINGS
@@ -12668,6 +12794,7 @@ module Aws::MediaConvert
     #                     audio_pids: [1],
     #                     bitrate: 1,
     #                     buffer_model: "MULTIPLEX", # accepts MULTIPLEX, NONE
+    #                     data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #                     dvb_nit_settings: {
     #                       network_id: 1,
     #                       network_name: "__stringMin1Max256",
@@ -12717,6 +12844,7 @@ module Aws::MediaConvert
     #                     audio_duration: "DEFAULT_CODEC_DURATION", # accepts DEFAULT_CODEC_DURATION, MATCH_VIDEO_DURATION
     #                     audio_frames_per_pes: 1,
     #                     audio_pids: [1],
+    #                     data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #                     max_pcr_interval: 1,
     #                     nielsen_id_3: "INSERT", # accepts INSERT, NONE
     #                     pat_interval: 1,
@@ -12827,7 +12955,7 @@ module Aws::MediaConvert
     #                       codec_profile: "BASELINE", # accepts BASELINE, HIGH, HIGH_10BIT, HIGH_422, HIGH_422_10BIT, MAIN
     #                       dynamic_sub_gop: "ADAPTIVE", # accepts ADAPTIVE, STATIC
     #                       entropy_encoding: "CABAC", # accepts CABAC, CAVLC
-    #                       field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD
+    #                       field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD, MBAFF
     #                       flicker_adaptive_quantization: "DISABLED", # accepts DISABLED, ENABLED
     #                       framerate_control: "INITIALIZE_FROM_SOURCE", # accepts INITIALIZE_FROM_SOURCE, SPECIFIED
     #                       framerate_conversion_algorithm: "DUPLICATE_DROP", # accepts DUPLICATE_DROP, INTERPOLATE, FRAMEFORMER
@@ -13191,6 +13319,11 @@ module Aws::MediaConvert
     #   ad insertion, you can ignore these settings.
     #   @return [Types::EsamSettings]
     #
+    # @!attribute [rw] extended_data_services
+    #   Hexadecimal value as per EIA-608 Line 21 Data Services, section
+    #   9.5.1.5 05h Content Advisory.
+    #   @return [Types::ExtendedDataServices]
+    #
     # @!attribute [rw] inputs
     #   Use Inputs (inputs) to define source file used in the transcode job.
     #   There can be multiple inputs add in a job. These inputs will be
@@ -13270,6 +13403,7 @@ module Aws::MediaConvert
       :ad_avail_offset,
       :avail_blanking,
       :esam,
+      :extended_data_services,
       :inputs,
       :kantar_watermark,
       :motion_image_inserter,
@@ -13388,6 +13522,10 @@ module Aws::MediaConvert
     #             scc_xml: "__stringPatternSNSignalProcessingNotificationNS",
     #           },
     #         },
+    #         extended_data_services: {
+    #           copy_protection_action: "PASSTHROUGH", # accepts PASSTHROUGH, STRIP
+    #           vchip_action: "PASSTHROUGH", # accepts PASSTHROUGH, STRIP
+    #         },
     #         inputs: [
     #           {
     #             audio_selector_groups: {
@@ -13613,6 +13751,7 @@ module Aws::MediaConvert
     #                     },
     #                     encryption: {
     #                       encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                       kms_encryption_context: "__stringPatternAZaZ0902",
     #                       kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                     },
     #                   },
@@ -13646,6 +13785,7 @@ module Aws::MediaConvert
     #                 pts_offset_handling_for_b_frames: "ZERO_BASED", # accepts ZERO_BASED, MATCH_INITIAL_PTS
     #                 segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #                 segment_length: 1,
+    #                 segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                 stream_inf_resolution: "INCLUDE", # accepts INCLUDE, EXCLUDE
     #                 target_duration_compatibility_mode: "LEGACY", # accepts LEGACY, SPEC_COMPLIANT
     #                 write_dash_manifest: "DISABLED", # accepts DISABLED, ENABLED
@@ -13669,6 +13809,7 @@ module Aws::MediaConvert
     #                     },
     #                     encryption: {
     #                       encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                       kms_encryption_context: "__stringPatternAZaZ0902",
     #                       kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                     },
     #                   },
@@ -13691,6 +13832,7 @@ module Aws::MediaConvert
     #                 pts_offset_handling_for_b_frames: "ZERO_BASED", # accepts ZERO_BASED, MATCH_INITIAL_PTS
     #                 segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #                 segment_length: 1,
+    #                 segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                 write_segment_timeline_in_representation: "ENABLED", # accepts ENABLED, DISABLED
     #               },
     #               file_group_settings: {
@@ -13702,6 +13844,7 @@ module Aws::MediaConvert
     #                     },
     #                     encryption: {
     #                       encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                       kms_encryption_context: "__stringPatternAZaZ0902",
     #                       kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                     },
     #                   },
@@ -13736,6 +13879,7 @@ module Aws::MediaConvert
     #                     },
     #                     encryption: {
     #                       encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                       kms_encryption_context: "__stringPatternAZaZ0902",
     #                       kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                     },
     #                   },
@@ -13770,6 +13914,7 @@ module Aws::MediaConvert
     #                 program_date_time_period: 1,
     #                 segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #                 segment_length: 1,
+    #                 segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                 segments_per_subdirectory: 1,
     #                 stream_inf_resolution: "INCLUDE", # accepts INCLUDE, EXCLUDE
     #                 target_duration_compatibility_mode: "LEGACY", # accepts LEGACY, SPEC_COMPLIANT
@@ -13793,6 +13938,7 @@ module Aws::MediaConvert
     #                     },
     #                     encryption: {
     #                       encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                       kms_encryption_context: "__stringPatternAZaZ0902",
     #                       kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                     },
     #                   },
@@ -13806,6 +13952,7 @@ module Aws::MediaConvert
     #                   },
     #                 },
     #                 fragment_length: 1,
+    #                 fragment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                 manifest_encoding: "UTF8", # accepts UTF8, UTF16
     #               },
     #               type: "HLS_GROUP_SETTINGS", # accepts HLS_GROUP_SETTINGS, DASH_ISO_GROUP_SETTINGS, FILE_GROUP_SETTINGS, MS_SMOOTH_GROUP_SETTINGS, CMAF_GROUP_SETTINGS
@@ -14047,6 +14194,7 @@ module Aws::MediaConvert
     #                     audio_pids: [1],
     #                     bitrate: 1,
     #                     buffer_model: "MULTIPLEX", # accepts MULTIPLEX, NONE
+    #                     data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #                     dvb_nit_settings: {
     #                       network_id: 1,
     #                       network_name: "__stringMin1Max256",
@@ -14096,6 +14244,7 @@ module Aws::MediaConvert
     #                     audio_duration: "DEFAULT_CODEC_DURATION", # accepts DEFAULT_CODEC_DURATION, MATCH_VIDEO_DURATION
     #                     audio_frames_per_pes: 1,
     #                     audio_pids: [1],
+    #                     data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #                     max_pcr_interval: 1,
     #                     nielsen_id_3: "INSERT", # accepts INSERT, NONE
     #                     pat_interval: 1,
@@ -14206,7 +14355,7 @@ module Aws::MediaConvert
     #                       codec_profile: "BASELINE", # accepts BASELINE, HIGH, HIGH_10BIT, HIGH_422, HIGH_422_10BIT, MAIN
     #                       dynamic_sub_gop: "ADAPTIVE", # accepts ADAPTIVE, STATIC
     #                       entropy_encoding: "CABAC", # accepts CABAC, CAVLC
-    #                       field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD
+    #                       field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD, MBAFF
     #                       flicker_adaptive_quantization: "DISABLED", # accepts DISABLED, ENABLED
     #                       framerate_control: "INITIALIZE_FROM_SOURCE", # accepts INITIALIZE_FROM_SOURCE, SPECIFIED
     #                       framerate_conversion_algorithm: "DUPLICATE_DROP", # accepts DUPLICATE_DROP, INTERPOLATE, FRAMEFORMER
@@ -14570,6 +14719,11 @@ module Aws::MediaConvert
     #   ad insertion, you can ignore these settings.
     #   @return [Types::EsamSettings]
     #
+    # @!attribute [rw] extended_data_services
+    #   Hexadecimal value as per EIA-608 Line 21 Data Services, section
+    #   9.5.1.5 05h Content Advisory.
+    #   @return [Types::ExtendedDataServices]
+    #
     # @!attribute [rw] inputs
     #   Use Inputs (inputs) to define the source file used in the transcode
     #   job. There can only be one input in a job template. Using the API,
@@ -14649,6 +14803,7 @@ module Aws::MediaConvert
       :ad_avail_offset,
       :avail_blanking,
       :esam,
+      :extended_data_services,
       :inputs,
       :kantar_watermark,
       :motion_image_inserter,
@@ -15169,6 +15324,7 @@ module Aws::MediaConvert
     #         audio_pids: [1],
     #         bitrate: 1,
     #         buffer_model: "MULTIPLEX", # accepts MULTIPLEX, NONE
+    #         data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #         dvb_nit_settings: {
     #           network_id: 1,
     #           network_name: "__stringMin1Max256",
@@ -15263,6 +15419,14 @@ module Aws::MediaConvert
     #   play back the stream without interruptions.
     #   @return [String]
     #
+    # @!attribute [rw] data_pts_control
+    #   If you select ALIGN\_TO\_VIDEO, MediaConvert writes captions and
+    #   data packets with Presentation Timestamp (PTS) values greater than
+    #   or equal to the first video packet PTS (MediaConvert drops captions
+    #   and data packets with lesser PTS values). Keep the default value
+    #   (AUTO) to allow all PTS values.
+    #   @return [String]
+    #
     # @!attribute [rw] dvb_nit_settings
     #   Use these settings to insert a DVB Network Information Table (NIT)
     #   in the transport stream of this output. When you work directly in
@@ -15484,6 +15648,7 @@ module Aws::MediaConvert
       :audio_pids,
       :bitrate,
       :buffer_model,
+      :data_pts_control,
       :dvb_nit_settings,
       :dvb_sdt_settings,
       :dvb_sub_pids,
@@ -15529,6 +15694,7 @@ module Aws::MediaConvert
     #         audio_duration: "DEFAULT_CODEC_DURATION", # accepts DEFAULT_CODEC_DURATION, MATCH_VIDEO_DURATION
     #         audio_frames_per_pes: 1,
     #         audio_pids: [1],
+    #         data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #         max_pcr_interval: 1,
     #         nielsen_id_3: "INSERT", # accepts INSERT, NONE
     #         pat_interval: 1,
@@ -15575,6 +15741,14 @@ module Aws::MediaConvert
     #   in ranges and/or by comma separation.
     #   @return [Array<Integer>]
     #
+    # @!attribute [rw] data_pts_control
+    #   If you select ALIGN\_TO\_VIDEO, MediaConvert writes captions and
+    #   data packets with Presentation Timestamp (PTS) values greater than
+    #   or equal to the first video packet PTS (MediaConvert drops captions
+    #   and data packets with lesser PTS values). Keep the default value
+    #   (AUTO) to allow all PTS values.
+    #   @return [String]
+    #
     # @!attribute [rw] max_pcr_interval
     #   Specify the maximum time, in milliseconds, between Program Clock
     #   References (PCRs) inserted into the transport stream.
@@ -15666,6 +15840,7 @@ module Aws::MediaConvert
       :audio_duration,
       :audio_frames_per_pes,
       :audio_pids,
+      :data_pts_control,
       :max_pcr_interval,
       :nielsen_id_3,
       :pat_interval,
@@ -16280,14 +16455,16 @@ module Aws::MediaConvert
     #   @return [Integer]
     #
     # @!attribute [rw] gop_size
-    #   GOP Length (keyframe interval) in frames or seconds. Must be greater
-    #   than zero.
+    #   Specify the interval between keyframes, in seconds or frames, for
+    #   this output. Default: 12 Related settings: When you specify the GOP
+    #   size in seconds, set GOP mode control (GopSizeUnits) to Specified,
+    #   seconds (SECONDS). The default value for GOP mode control
+    #   (GopSizeUnits) is Frames (FRAMES).
     #   @return [Float]
     #
     # @!attribute [rw] gop_size_units
-    #   Indicates if the GOP Size in MPEG2 is specified in frames or
-    #   seconds. If seconds the system will convert the GOP Size into a
-    #   frame count at run time.
+    #   Specify the units for GOP size (GopSize). If you don't specify a
+    #   value here, by default the encoder measures GOP size in frames.
     #   @return [String]
     #
     # @!attribute [rw] hrd_buffer_initial_fill_percentage
@@ -16341,7 +16518,10 @@ module Aws::MediaConvert
     #   @return [Integer]
     #
     # @!attribute [rw] number_b_frames_between_reference_frames
-    #   Number of B-frames between reference frames.
+    #   Specify the number of B-frames that MediaConvert puts between
+    #   reference frames in this output. Valid values are whole numbers from
+    #   0 through 7. When you don't specify a value, MediaConvert defaults
+    #   to 2.
     #   @return [Integer]
     #
     # @!attribute [rw] par_control
@@ -16623,6 +16803,7 @@ module Aws::MediaConvert
     #             },
     #             encryption: {
     #               encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #               kms_encryption_context: "__stringPatternAZaZ0902",
     #               kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #             },
     #           },
@@ -16636,6 +16817,7 @@ module Aws::MediaConvert
     #           },
     #         },
     #         fragment_length: 1,
+    #         fragment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #         manifest_encoding: "UTF8", # accepts UTF8, UTF16
     #       }
     #
@@ -16672,11 +16854,23 @@ module Aws::MediaConvert
     #   @return [Types::MsSmoothEncryptionSettings]
     #
     # @!attribute [rw] fragment_length
-    #   Use Fragment length (FragmentLength) to specify the mp4 fragment
-    #   sizes in seconds. Fragment length must be compatible with GOP size
-    #   and frame rate.
+    #   Specify how you want MediaConvert to determine the fragment length.
+    #   Choose Exact (EXACT) to have the encoder use the exact length that
+    #   you specify with the setting Fragment length (FragmentLength). This
+    #   might result in extra I-frames. Choose Multiple of GOP
+    #   (GOP\_MULTIPLE) to have the encoder round up the segment lengths to
+    #   match the next GOP boundary.
     #   @return [Integer]
     #
+    # @!attribute [rw] fragment_length_control
+    #   Specify how you want MediaConvert to determine the fragment length.
+    #   Choose Exact (EXACT) to have the encoder use the exact length that
+    #   you specify with the setting Fragment length (FragmentLength). This
+    #   might result in extra I-frames. Choose Multiple of GOP
+    #   (GOP\_MULTIPLE) to have the encoder round up the segment lengths to
+    #   match the next GOP boundary.
+    #   @return [String]
+    #
     # @!attribute [rw] manifest_encoding
     #   Use Manifest encoding (MsSmoothManifestEncoding) to specify the
     #   encoding format for the server and client manifest. Valid options
@@ -16692,6 +16886,7 @@ module Aws::MediaConvert
       :destination_settings,
       :encryption,
       :fragment_length,
+      :fragment_length_control,
       :manifest_encoding)
       SENSITIVE = []
       include Aws::Structure
@@ -17486,6 +17681,7 @@ module Aws::MediaConvert
     #             audio_pids: [1],
     #             bitrate: 1,
     #             buffer_model: "MULTIPLEX", # accepts MULTIPLEX, NONE
+    #             data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #             dvb_nit_settings: {
     #               network_id: 1,
     #               network_name: "__stringMin1Max256",
@@ -17535,6 +17731,7 @@ module Aws::MediaConvert
     #             audio_duration: "DEFAULT_CODEC_DURATION", # accepts DEFAULT_CODEC_DURATION, MATCH_VIDEO_DURATION
     #             audio_frames_per_pes: 1,
     #             audio_pids: [1],
+    #             data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #             max_pcr_interval: 1,
     #             nielsen_id_3: "INSERT", # accepts INSERT, NONE
     #             pat_interval: 1,
@@ -17645,7 +17842,7 @@ module Aws::MediaConvert
     #               codec_profile: "BASELINE", # accepts BASELINE, HIGH, HIGH_10BIT, HIGH_422, HIGH_422_10BIT, MAIN
     #               dynamic_sub_gop: "ADAPTIVE", # accepts ADAPTIVE, STATIC
     #               entropy_encoding: "CABAC", # accepts CABAC, CAVLC
-    #               field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD
+    #               field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD, MBAFF
     #               flicker_adaptive_quantization: "DISABLED", # accepts DISABLED, ENABLED
     #               framerate_control: "INITIALIZE_FROM_SOURCE", # accepts INITIALIZE_FROM_SOURCE, SPECIFIED
     #               framerate_conversion_algorithm: "DUPLICATE_DROP", # accepts DUPLICATE_DROP, INTERPOLATE, FRAMEFORMER
@@ -18130,6 +18327,7 @@ module Aws::MediaConvert
     #                 },
     #                 encryption: {
     #                   encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                   kms_encryption_context: "__stringPatternAZaZ0902",
     #                   kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                 },
     #               },
@@ -18163,6 +18361,7 @@ module Aws::MediaConvert
     #             pts_offset_handling_for_b_frames: "ZERO_BASED", # accepts ZERO_BASED, MATCH_INITIAL_PTS
     #             segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #             segment_length: 1,
+    #             segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #             stream_inf_resolution: "INCLUDE", # accepts INCLUDE, EXCLUDE
     #             target_duration_compatibility_mode: "LEGACY", # accepts LEGACY, SPEC_COMPLIANT
     #             write_dash_manifest: "DISABLED", # accepts DISABLED, ENABLED
@@ -18186,6 +18385,7 @@ module Aws::MediaConvert
     #                 },
     #                 encryption: {
     #                   encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                   kms_encryption_context: "__stringPatternAZaZ0902",
     #                   kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                 },
     #               },
@@ -18208,6 +18408,7 @@ module Aws::MediaConvert
     #             pts_offset_handling_for_b_frames: "ZERO_BASED", # accepts ZERO_BASED, MATCH_INITIAL_PTS
     #             segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #             segment_length: 1,
+    #             segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #             write_segment_timeline_in_representation: "ENABLED", # accepts ENABLED, DISABLED
     #           },
     #           file_group_settings: {
@@ -18219,6 +18420,7 @@ module Aws::MediaConvert
     #                 },
     #                 encryption: {
     #                   encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                   kms_encryption_context: "__stringPatternAZaZ0902",
     #                   kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                 },
     #               },
@@ -18253,6 +18455,7 @@ module Aws::MediaConvert
     #                 },
     #                 encryption: {
     #                   encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                   kms_encryption_context: "__stringPatternAZaZ0902",
     #                   kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                 },
     #               },
@@ -18287,6 +18490,7 @@ module Aws::MediaConvert
     #             program_date_time_period: 1,
     #             segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #             segment_length: 1,
+    #             segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #             segments_per_subdirectory: 1,
     #             stream_inf_resolution: "INCLUDE", # accepts INCLUDE, EXCLUDE
     #             target_duration_compatibility_mode: "LEGACY", # accepts LEGACY, SPEC_COMPLIANT
@@ -18310,6 +18514,7 @@ module Aws::MediaConvert
     #                 },
     #                 encryption: {
     #                   encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                   kms_encryption_context: "__stringPatternAZaZ0902",
     #                   kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                 },
     #               },
@@ -18323,6 +18528,7 @@ module Aws::MediaConvert
     #               },
     #             },
     #             fragment_length: 1,
+    #             fragment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #             manifest_encoding: "UTF8", # accepts UTF8, UTF16
     #           },
     #           type: "HLS_GROUP_SETTINGS", # accepts HLS_GROUP_SETTINGS, DASH_ISO_GROUP_SETTINGS, FILE_GROUP_SETTINGS, MS_SMOOTH_GROUP_SETTINGS, CMAF_GROUP_SETTINGS
@@ -18564,6 +18770,7 @@ module Aws::MediaConvert
     #                 audio_pids: [1],
     #                 bitrate: 1,
     #                 buffer_model: "MULTIPLEX", # accepts MULTIPLEX, NONE
+    #                 data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #                 dvb_nit_settings: {
     #                   network_id: 1,
     #                   network_name: "__stringMin1Max256",
@@ -18613,6 +18820,7 @@ module Aws::MediaConvert
     #                 audio_duration: "DEFAULT_CODEC_DURATION", # accepts DEFAULT_CODEC_DURATION, MATCH_VIDEO_DURATION
     #                 audio_frames_per_pes: 1,
     #                 audio_pids: [1],
+    #                 data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #                 max_pcr_interval: 1,
     #                 nielsen_id_3: "INSERT", # accepts INSERT, NONE
     #                 pat_interval: 1,
@@ -18723,7 +18931,7 @@ module Aws::MediaConvert
     #                   codec_profile: "BASELINE", # accepts BASELINE, HIGH, HIGH_10BIT, HIGH_422, HIGH_422_10BIT, MAIN
     #                   dynamic_sub_gop: "ADAPTIVE", # accepts ADAPTIVE, STATIC
     #                   entropy_encoding: "CABAC", # accepts CABAC, CAVLC
-    #                   field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD
+    #                   field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD, MBAFF
     #                   flicker_adaptive_quantization: "DISABLED", # accepts DISABLED, ENABLED
     #                   framerate_control: "INITIALIZE_FROM_SOURCE", # accepts INITIALIZE_FROM_SOURCE, SPECIFIED
     #                   framerate_conversion_algorithm: "DUPLICATE_DROP", # accepts DUPLICATE_DROP, INTERPOLATE, FRAMEFORMER
@@ -19133,6 +19341,7 @@ module Aws::MediaConvert
     #               },
     #               encryption: {
     #                 encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                 kms_encryption_context: "__stringPatternAZaZ0902",
     #                 kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #               },
     #             },
@@ -19166,6 +19375,7 @@ module Aws::MediaConvert
     #           pts_offset_handling_for_b_frames: "ZERO_BASED", # accepts ZERO_BASED, MATCH_INITIAL_PTS
     #           segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #           segment_length: 1,
+    #           segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #           stream_inf_resolution: "INCLUDE", # accepts INCLUDE, EXCLUDE
     #           target_duration_compatibility_mode: "LEGACY", # accepts LEGACY, SPEC_COMPLIANT
     #           write_dash_manifest: "DISABLED", # accepts DISABLED, ENABLED
@@ -19189,6 +19399,7 @@ module Aws::MediaConvert
     #               },
     #               encryption: {
     #                 encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                 kms_encryption_context: "__stringPatternAZaZ0902",
     #                 kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #               },
     #             },
@@ -19211,6 +19422,7 @@ module Aws::MediaConvert
     #           pts_offset_handling_for_b_frames: "ZERO_BASED", # accepts ZERO_BASED, MATCH_INITIAL_PTS
     #           segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #           segment_length: 1,
+    #           segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #           write_segment_timeline_in_representation: "ENABLED", # accepts ENABLED, DISABLED
     #         },
     #         file_group_settings: {
@@ -19222,6 +19434,7 @@ module Aws::MediaConvert
     #               },
     #               encryption: {
     #                 encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                 kms_encryption_context: "__stringPatternAZaZ0902",
     #                 kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #               },
     #             },
@@ -19256,6 +19469,7 @@ module Aws::MediaConvert
     #               },
     #               encryption: {
     #                 encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                 kms_encryption_context: "__stringPatternAZaZ0902",
     #                 kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #               },
     #             },
@@ -19290,6 +19504,7 @@ module Aws::MediaConvert
     #           program_date_time_period: 1,
     #           segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #           segment_length: 1,
+    #           segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #           segments_per_subdirectory: 1,
     #           stream_inf_resolution: "INCLUDE", # accepts INCLUDE, EXCLUDE
     #           target_duration_compatibility_mode: "LEGACY", # accepts LEGACY, SPEC_COMPLIANT
@@ -19313,6 +19528,7 @@ module Aws::MediaConvert
     #               },
     #               encryption: {
     #                 encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                 kms_encryption_context: "__stringPatternAZaZ0902",
     #                 kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #               },
     #             },
@@ -19326,6 +19542,7 @@ module Aws::MediaConvert
     #             },
     #           },
     #           fragment_length: 1,
+    #           fragment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #           manifest_encoding: "UTF8", # accepts UTF8, UTF16
     #         },
     #         type: "HLS_GROUP_SETTINGS", # accepts HLS_GROUP_SETTINGS, DASH_ISO_GROUP_SETTINGS, FILE_GROUP_SETTINGS, MS_SMOOTH_GROUP_SETTINGS, CMAF_GROUP_SETTINGS
@@ -19745,6 +19962,7 @@ module Aws::MediaConvert
     #             audio_pids: [1],
     #             bitrate: 1,
     #             buffer_model: "MULTIPLEX", # accepts MULTIPLEX, NONE
+    #             data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #             dvb_nit_settings: {
     #               network_id: 1,
     #               network_name: "__stringMin1Max256",
@@ -19794,6 +20012,7 @@ module Aws::MediaConvert
     #             audio_duration: "DEFAULT_CODEC_DURATION", # accepts DEFAULT_CODEC_DURATION, MATCH_VIDEO_DURATION
     #             audio_frames_per_pes: 1,
     #             audio_pids: [1],
+    #             data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #             max_pcr_interval: 1,
     #             nielsen_id_3: "INSERT", # accepts INSERT, NONE
     #             pat_interval: 1,
@@ -19890,7 +20109,7 @@ module Aws::MediaConvert
     #               codec_profile: "BASELINE", # accepts BASELINE, HIGH, HIGH_10BIT, HIGH_422, HIGH_422_10BIT, MAIN
     #               dynamic_sub_gop: "ADAPTIVE", # accepts ADAPTIVE, STATIC
     #               entropy_encoding: "CABAC", # accepts CABAC, CAVLC
-    #               field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD
+    #               field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD, MBAFF
     #               flicker_adaptive_quantization: "DISABLED", # accepts DISABLED, ENABLED
     #               framerate_control: "INITIALIZE_FROM_SOURCE", # accepts INITIALIZE_FROM_SOURCE, SPECIFIED
     #               framerate_conversion_algorithm: "DUPLICATE_DROP", # accepts DUPLICATE_DROP, INTERPOLATE, FRAMEFORMER
@@ -20825,6 +21044,7 @@ module Aws::MediaConvert
     #         },
     #         encryption: {
     #           encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #           kms_encryption_context: "__stringPatternAZaZ0902",
     #           kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #         },
     #       }
@@ -20858,6 +21078,7 @@ module Aws::MediaConvert
     #
     #       {
     #         encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #         kms_encryption_context: "__stringPatternAZaZ0902",
     #         kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #       }
     #
@@ -20877,6 +21098,18 @@ module Aws::MediaConvert
     #   setting KMS ARN (kmsKeyArn).
     #   @return [String]
     #
+    # @!attribute [rw] kms_encryption_context
+    #   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.
+    #   @return [String]
+    #
     # @!attribute [rw] kms_key_arn
     #   Optionally, specify the customer master key (CMK) that you want to
     #   use to encrypt the data key that AWS uses to encrypt your output
@@ -20892,6 +21125,7 @@ module Aws::MediaConvert
     #
     class S3EncryptionSettings < Struct.new(
       :encryption_type,
+      :kms_encryption_context,
       :kms_key_arn)
       SENSITIVE = []
       include Aws::Structure
@@ -21527,6 +21761,10 @@ module Aws::MediaConvert
     #               scc_xml: "__stringPatternSNSignalProcessingNotificationNS",
     #             },
     #           },
+    #           extended_data_services: {
+    #             copy_protection_action: "PASSTHROUGH", # accepts PASSTHROUGH, STRIP
+    #             vchip_action: "PASSTHROUGH", # accepts PASSTHROUGH, STRIP
+    #           },
     #           inputs: [
     #             {
     #               audio_selector_groups: {
@@ -21752,6 +21990,7 @@ module Aws::MediaConvert
     #                       },
     #                       encryption: {
     #                         encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                         kms_encryption_context: "__stringPatternAZaZ0902",
     #                         kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                       },
     #                     },
@@ -21785,6 +22024,7 @@ module Aws::MediaConvert
     #                   pts_offset_handling_for_b_frames: "ZERO_BASED", # accepts ZERO_BASED, MATCH_INITIAL_PTS
     #                   segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #                   segment_length: 1,
+    #                   segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                   stream_inf_resolution: "INCLUDE", # accepts INCLUDE, EXCLUDE
     #                   target_duration_compatibility_mode: "LEGACY", # accepts LEGACY, SPEC_COMPLIANT
     #                   write_dash_manifest: "DISABLED", # accepts DISABLED, ENABLED
@@ -21808,6 +22048,7 @@ module Aws::MediaConvert
     #                       },
     #                       encryption: {
     #                         encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                         kms_encryption_context: "__stringPatternAZaZ0902",
     #                         kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                       },
     #                     },
@@ -21830,6 +22071,7 @@ module Aws::MediaConvert
     #                   pts_offset_handling_for_b_frames: "ZERO_BASED", # accepts ZERO_BASED, MATCH_INITIAL_PTS
     #                   segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #                   segment_length: 1,
+    #                   segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                   write_segment_timeline_in_representation: "ENABLED", # accepts ENABLED, DISABLED
     #                 },
     #                 file_group_settings: {
@@ -21841,6 +22083,7 @@ module Aws::MediaConvert
     #                       },
     #                       encryption: {
     #                         encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                         kms_encryption_context: "__stringPatternAZaZ0902",
     #                         kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                       },
     #                     },
@@ -21875,6 +22118,7 @@ module Aws::MediaConvert
     #                       },
     #                       encryption: {
     #                         encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                         kms_encryption_context: "__stringPatternAZaZ0902",
     #                         kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                       },
     #                     },
@@ -21909,6 +22153,7 @@ module Aws::MediaConvert
     #                   program_date_time_period: 1,
     #                   segment_control: "SINGLE_FILE", # accepts SINGLE_FILE, SEGMENTED_FILES
     #                   segment_length: 1,
+    #                   segment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                   segments_per_subdirectory: 1,
     #                   stream_inf_resolution: "INCLUDE", # accepts INCLUDE, EXCLUDE
     #                   target_duration_compatibility_mode: "LEGACY", # accepts LEGACY, SPEC_COMPLIANT
@@ -21932,6 +22177,7 @@ module Aws::MediaConvert
     #                       },
     #                       encryption: {
     #                         encryption_type: "SERVER_SIDE_ENCRYPTION_S3", # accepts SERVER_SIDE_ENCRYPTION_S3, SERVER_SIDE_ENCRYPTION_KMS
+    #                         kms_encryption_context: "__stringPatternAZaZ0902",
     #                         kms_key_arn: "__stringPatternArnAwsUsGovCnKmsAZ26EastWestCentralNorthSouthEastWest1912D12KeyAFAF098AFAF094AFAF094AFAF094AFAF0912",
     #                       },
     #                     },
@@ -21945,6 +22191,7 @@ module Aws::MediaConvert
     #                     },
     #                   },
     #                   fragment_length: 1,
+    #                   fragment_length_control: "EXACT", # accepts EXACT, GOP_MULTIPLE
     #                   manifest_encoding: "UTF8", # accepts UTF8, UTF16
     #                 },
     #                 type: "HLS_GROUP_SETTINGS", # accepts HLS_GROUP_SETTINGS, DASH_ISO_GROUP_SETTINGS, FILE_GROUP_SETTINGS, MS_SMOOTH_GROUP_SETTINGS, CMAF_GROUP_SETTINGS
@@ -22186,6 +22433,7 @@ module Aws::MediaConvert
     #                       audio_pids: [1],
     #                       bitrate: 1,
     #                       buffer_model: "MULTIPLEX", # accepts MULTIPLEX, NONE
+    #                       data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #                       dvb_nit_settings: {
     #                         network_id: 1,
     #                         network_name: "__stringMin1Max256",
@@ -22235,6 +22483,7 @@ module Aws::MediaConvert
     #                       audio_duration: "DEFAULT_CODEC_DURATION", # accepts DEFAULT_CODEC_DURATION, MATCH_VIDEO_DURATION
     #                       audio_frames_per_pes: 1,
     #                       audio_pids: [1],
+    #                       data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #                       max_pcr_interval: 1,
     #                       nielsen_id_3: "INSERT", # accepts INSERT, NONE
     #                       pat_interval: 1,
@@ -22345,7 +22594,7 @@ module Aws::MediaConvert
     #                         codec_profile: "BASELINE", # accepts BASELINE, HIGH, HIGH_10BIT, HIGH_422, HIGH_422_10BIT, MAIN
     #                         dynamic_sub_gop: "ADAPTIVE", # accepts ADAPTIVE, STATIC
     #                         entropy_encoding: "CABAC", # accepts CABAC, CAVLC
-    #                         field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD
+    #                         field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD, MBAFF
     #                         flicker_adaptive_quantization: "DISABLED", # accepts DISABLED, ENABLED
     #                         framerate_control: "INITIALIZE_FROM_SOURCE", # accepts INITIALIZE_FROM_SOURCE, SPECIFIED
     #                         framerate_conversion_algorithm: "DUPLICATE_DROP", # accepts DUPLICATE_DROP, INTERPOLATE, FRAMEFORMER
@@ -23022,6 +23271,7 @@ module Aws::MediaConvert
     #               audio_pids: [1],
     #               bitrate: 1,
     #               buffer_model: "MULTIPLEX", # accepts MULTIPLEX, NONE
+    #               data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #               dvb_nit_settings: {
     #                 network_id: 1,
     #                 network_name: "__stringMin1Max256",
@@ -23071,6 +23321,7 @@ module Aws::MediaConvert
     #               audio_duration: "DEFAULT_CODEC_DURATION", # accepts DEFAULT_CODEC_DURATION, MATCH_VIDEO_DURATION
     #               audio_frames_per_pes: 1,
     #               audio_pids: [1],
+    #               data_pts_control: "AUTO", # accepts AUTO, ALIGN_TO_VIDEO
     #               max_pcr_interval: 1,
     #               nielsen_id_3: "INSERT", # accepts INSERT, NONE
     #               pat_interval: 1,
@@ -23167,7 +23418,7 @@ module Aws::MediaConvert
     #                 codec_profile: "BASELINE", # accepts BASELINE, HIGH, HIGH_10BIT, HIGH_422, HIGH_422_10BIT, MAIN
     #                 dynamic_sub_gop: "ADAPTIVE", # accepts ADAPTIVE, STATIC
     #                 entropy_encoding: "CABAC", # accepts CABAC, CAVLC
-    #                 field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD
+    #                 field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD, MBAFF
     #                 flicker_adaptive_quantization: "DISABLED", # accepts DISABLED, ENABLED
     #                 framerate_control: "INITIALIZE_FROM_SOURCE", # accepts INITIALIZE_FROM_SOURCE, SPECIFIED
     #                 framerate_conversion_algorithm: "DUPLICATE_DROP", # accepts DUPLICATE_DROP, INTERPOLATE, FRAMEFORMER
@@ -23812,7 +24063,7 @@ module Aws::MediaConvert
     #           codec_profile: "BASELINE", # accepts BASELINE, HIGH, HIGH_10BIT, HIGH_422, HIGH_422_10BIT, MAIN
     #           dynamic_sub_gop: "ADAPTIVE", # accepts ADAPTIVE, STATIC
     #           entropy_encoding: "CABAC", # accepts CABAC, CAVLC
-    #           field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD
+    #           field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD, MBAFF
     #           flicker_adaptive_quantization: "DISABLED", # accepts DISABLED, ENABLED
     #           framerate_control: "INITIALIZE_FROM_SOURCE", # accepts INITIALIZE_FROM_SOURCE, SPECIFIED
     #           framerate_conversion_algorithm: "DUPLICATE_DROP", # accepts DUPLICATE_DROP, INTERPOLATE, FRAMEFORMER
@@ -24171,7 +24422,7 @@ module Aws::MediaConvert
     #             codec_profile: "BASELINE", # accepts BASELINE, HIGH, HIGH_10BIT, HIGH_422, HIGH_422_10BIT, MAIN
     #             dynamic_sub_gop: "ADAPTIVE", # accepts ADAPTIVE, STATIC
     #             entropy_encoding: "CABAC", # accepts CABAC, CAVLC
-    #             field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD
+    #             field_encoding: "PAFF", # accepts PAFF, FORCE_FIELD, MBAFF
     #             flicker_adaptive_quantization: "DISABLED", # accepts DISABLED, ENABLED
     #             framerate_control: "INITIALIZE_FROM_SOURCE", # accepts INITIALIZE_FROM_SOURCE, SPECIFIED
     #             framerate_conversion_algorithm: "DUPLICATE_DROP", # accepts DUPLICATE_DROP, INTERPOLATE, FRAMEFORMER