aws-sdk-mediapackage 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14ee0f362fa573c45e2f3951f97c8abcd6227087
-  data.tar.gz: 02f0eddfa4ad12c982810d73a539cb88b50c11c8
+  metadata.gz: 8a44a4f989828b24fc37bb51dbd0665cf00c4bf3
+  data.tar.gz: a98a89db48e94797c2bc3209cb4ee186a5188469
 SHA512:
-  metadata.gz: 63c9ff4aeaf8c3210bc06cdd112c7c431e751497c22498a3f0b950db5024bd85591dc8bda4d9ee4ea5f236064bc417100766818edcab880fd4ef838ad4ceb359
-  data.tar.gz: 2bcc36d54b61609cca6b72970f4e6a0bc4dd31568145f24c80fa22cadc369bdaa92f657540d05a9626f61ab3449ed6e79f0fc6dbdfde283c1b3a1bb4de7e6697
+  metadata.gz: 5f8e33b06a628b37135fb720888bbff73d66c1c603c924d2e4faa2e990b7ba81b6c13d1a20ce235ba90f18cec2e80d6822f8e373d77ede8189d333c3d6399a2f
+  data.tar.gz: c02e62a7add71c90cb76dfa71eed6db15f89ce85c03f6cbe3422a35a232fc55cad3953872df65b74ca86dc914d7d0d749a4b64c2833488607943f1925cf7211d

data/lib/aws-sdk-mediapackage.rb

@@ -42,6 +42,6 @@ require_relative 'aws-sdk-mediapackage/customizations'
 # @service
 module Aws::MediaPackage
 
-  GEM_VERSION = '1.0.0'
+  GEM_VERSION = '1.1.0'
 
 end

data/lib/aws-sdk-mediapackage/client.rb

@@ -188,6 +188,9 @@ module Aws::MediaPackage
     #
     # @option params [required, String] :channel_id
     #
+    # @option params [Types::CmafPackageCreateOrUpdateParameters] :cmaf_package
+    #   A Common Media Application Format (CMAF) packaging configuration.
+    #
     # @option params [Types::DashPackage] :dash_package
     #   A Dynamic Adaptive Streaming over HTTP (DASH) packaging configuration.
     #
@@ -213,6 +216,7 @@ module Aws::MediaPackage
     #
     #   * {Types::CreateOriginEndpointResponse#arn #arn} => String
     #   * {Types::CreateOriginEndpointResponse#channel_id #channel_id} => String
+    #   * {Types::CreateOriginEndpointResponse#cmaf_package #cmaf_package} => Types::CmafPackage
     #   * {Types::CreateOriginEndpointResponse#dash_package #dash_package} => Types::DashPackage
     #   * {Types::CreateOriginEndpointResponse#description #description} => String
     #   * {Types::CreateOriginEndpointResponse#hls_package #hls_package} => Types::HlsPackage
@@ -228,6 +232,35 @@ module Aws::MediaPackage
     #
     #   resp = client.create_origin_endpoint({
     #     channel_id: "__string", # required
+    #     cmaf_package: {
+    #       encryption: {
+    #         key_rotation_interval_seconds: 1,
+    #         speke_key_provider: { # required
+    #           resource_id: "__string", # required
+    #           role_arn: "__string", # required
+    #           system_ids: ["__string"], # required
+    #           url: "__string", # required
+    #         },
+    #       },
+    #       hls_manifests: [
+    #         {
+    #           ad_markers: "NONE", # accepts NONE, SCTE35_ENHANCED, PASSTHROUGH
+    #           id: "__string", # required
+    #           include_iframe_only_stream: false,
+    #           manifest_name: "__string",
+    #           playlist_type: "NONE", # accepts NONE, EVENT, VOD
+    #           playlist_window_seconds: 1,
+    #           program_date_time_interval_seconds: 1,
+    #         },
+    #       ],
+    #       segment_duration_seconds: 1,
+    #       segment_prefix: "__string",
+    #       stream_selection: {
+    #         max_video_bits_per_second: 1,
+    #         min_video_bits_per_second: 1,
+    #         stream_order: "ORIGINAL", # accepts ORIGINAL, VIDEO_BITRATE_ASCENDING, VIDEO_BITRATE_DESCENDING
+    #       },
+    #     },
     #     dash_package: {
     #       encryption: {
     #         key_rotation_interval_seconds: 1,
@@ -305,6 +338,26 @@ module Aws::MediaPackage
     #
     #   resp.arn #=> String
     #   resp.channel_id #=> String
+    #   resp.cmaf_package.encryption.key_rotation_interval_seconds #=> Integer
+    #   resp.cmaf_package.encryption.speke_key_provider.resource_id #=> String
+    #   resp.cmaf_package.encryption.speke_key_provider.role_arn #=> String
+    #   resp.cmaf_package.encryption.speke_key_provider.system_ids #=> Array
+    #   resp.cmaf_package.encryption.speke_key_provider.system_ids[0] #=> String
+    #   resp.cmaf_package.encryption.speke_key_provider.url #=> String
+    #   resp.cmaf_package.hls_manifests #=> Array
+    #   resp.cmaf_package.hls_manifests[0].ad_markers #=> String, one of "NONE", "SCTE35_ENHANCED", "PASSTHROUGH"
+    #   resp.cmaf_package.hls_manifests[0].id #=> String
+    #   resp.cmaf_package.hls_manifests[0].include_iframe_only_stream #=> Boolean
+    #   resp.cmaf_package.hls_manifests[0].manifest_name #=> String
+    #   resp.cmaf_package.hls_manifests[0].playlist_type #=> String, one of "NONE", "EVENT", "VOD"
+    #   resp.cmaf_package.hls_manifests[0].playlist_window_seconds #=> Integer
+    #   resp.cmaf_package.hls_manifests[0].program_date_time_interval_seconds #=> Integer
+    #   resp.cmaf_package.hls_manifests[0].url #=> String
+    #   resp.cmaf_package.segment_duration_seconds #=> Integer
+    #   resp.cmaf_package.segment_prefix #=> String
+    #   resp.cmaf_package.stream_selection.max_video_bits_per_second #=> Integer
+    #   resp.cmaf_package.stream_selection.min_video_bits_per_second #=> Integer
+    #   resp.cmaf_package.stream_selection.stream_order #=> String, one of "ORIGINAL", "VIDEO_BITRATE_ASCENDING", "VIDEO_BITRATE_DESCENDING"
     #   resp.dash_package.encryption.key_rotation_interval_seconds #=> Integer
     #   resp.dash_package.encryption.speke_key_provider.resource_id #=> String
     #   resp.dash_package.encryption.speke_key_provider.role_arn #=> String
@@ -453,6 +506,7 @@ module Aws::MediaPackage
     #
     #   * {Types::DescribeOriginEndpointResponse#arn #arn} => String
     #   * {Types::DescribeOriginEndpointResponse#channel_id #channel_id} => String
+    #   * {Types::DescribeOriginEndpointResponse#cmaf_package #cmaf_package} => Types::CmafPackage
     #   * {Types::DescribeOriginEndpointResponse#dash_package #dash_package} => Types::DashPackage
     #   * {Types::DescribeOriginEndpointResponse#description #description} => String
     #   * {Types::DescribeOriginEndpointResponse#hls_package #hls_package} => Types::HlsPackage
@@ -474,6 +528,26 @@ module Aws::MediaPackage
     #
     #   resp.arn #=> String
     #   resp.channel_id #=> String
+    #   resp.cmaf_package.encryption.key_rotation_interval_seconds #=> Integer
+    #   resp.cmaf_package.encryption.speke_key_provider.resource_id #=> String
+    #   resp.cmaf_package.encryption.speke_key_provider.role_arn #=> String
+    #   resp.cmaf_package.encryption.speke_key_provider.system_ids #=> Array
+    #   resp.cmaf_package.encryption.speke_key_provider.system_ids[0] #=> String
+    #   resp.cmaf_package.encryption.speke_key_provider.url #=> String
+    #   resp.cmaf_package.hls_manifests #=> Array
+    #   resp.cmaf_package.hls_manifests[0].ad_markers #=> String, one of "NONE", "SCTE35_ENHANCED", "PASSTHROUGH"
+    #   resp.cmaf_package.hls_manifests[0].id #=> String
+    #   resp.cmaf_package.hls_manifests[0].include_iframe_only_stream #=> Boolean
+    #   resp.cmaf_package.hls_manifests[0].manifest_name #=> String
+    #   resp.cmaf_package.hls_manifests[0].playlist_type #=> String, one of "NONE", "EVENT", "VOD"
+    #   resp.cmaf_package.hls_manifests[0].playlist_window_seconds #=> Integer
+    #   resp.cmaf_package.hls_manifests[0].program_date_time_interval_seconds #=> Integer
+    #   resp.cmaf_package.hls_manifests[0].url #=> String
+    #   resp.cmaf_package.segment_duration_seconds #=> Integer
+    #   resp.cmaf_package.segment_prefix #=> String
+    #   resp.cmaf_package.stream_selection.max_video_bits_per_second #=> Integer
+    #   resp.cmaf_package.stream_selection.min_video_bits_per_second #=> Integer
+    #   resp.cmaf_package.stream_selection.stream_order #=> String, one of "ORIGINAL", "VIDEO_BITRATE_ASCENDING", "VIDEO_BITRATE_DESCENDING"
     #   resp.dash_package.encryption.key_rotation_interval_seconds #=> Integer
     #   resp.dash_package.encryption.speke_key_provider.resource_id #=> String
     #   resp.dash_package.encryption.speke_key_provider.role_arn #=> String
@@ -602,6 +676,26 @@ module Aws::MediaPackage
     #   resp.origin_endpoints #=> Array
     #   resp.origin_endpoints[0].arn #=> String
     #   resp.origin_endpoints[0].channel_id #=> String
+    #   resp.origin_endpoints[0].cmaf_package.encryption.key_rotation_interval_seconds #=> Integer
+    #   resp.origin_endpoints[0].cmaf_package.encryption.speke_key_provider.resource_id #=> String
+    #   resp.origin_endpoints[0].cmaf_package.encryption.speke_key_provider.role_arn #=> String
+    #   resp.origin_endpoints[0].cmaf_package.encryption.speke_key_provider.system_ids #=> Array
+    #   resp.origin_endpoints[0].cmaf_package.encryption.speke_key_provider.system_ids[0] #=> String
+    #   resp.origin_endpoints[0].cmaf_package.encryption.speke_key_provider.url #=> String
+    #   resp.origin_endpoints[0].cmaf_package.hls_manifests #=> Array
+    #   resp.origin_endpoints[0].cmaf_package.hls_manifests[0].ad_markers #=> String, one of "NONE", "SCTE35_ENHANCED", "PASSTHROUGH"
+    #   resp.origin_endpoints[0].cmaf_package.hls_manifests[0].id #=> String
+    #   resp.origin_endpoints[0].cmaf_package.hls_manifests[0].include_iframe_only_stream #=> Boolean
+    #   resp.origin_endpoints[0].cmaf_package.hls_manifests[0].manifest_name #=> String
+    #   resp.origin_endpoints[0].cmaf_package.hls_manifests[0].playlist_type #=> String, one of "NONE", "EVENT", "VOD"
+    #   resp.origin_endpoints[0].cmaf_package.hls_manifests[0].playlist_window_seconds #=> Integer
+    #   resp.origin_endpoints[0].cmaf_package.hls_manifests[0].program_date_time_interval_seconds #=> Integer
+    #   resp.origin_endpoints[0].cmaf_package.hls_manifests[0].url #=> String
+    #   resp.origin_endpoints[0].cmaf_package.segment_duration_seconds #=> Integer
+    #   resp.origin_endpoints[0].cmaf_package.segment_prefix #=> String
+    #   resp.origin_endpoints[0].cmaf_package.stream_selection.max_video_bits_per_second #=> Integer
+    #   resp.origin_endpoints[0].cmaf_package.stream_selection.min_video_bits_per_second #=> Integer
+    #   resp.origin_endpoints[0].cmaf_package.stream_selection.stream_order #=> String, one of "ORIGINAL", "VIDEO_BITRATE_ASCENDING", "VIDEO_BITRATE_DESCENDING"
     #   resp.origin_endpoints[0].dash_package.encryption.key_rotation_interval_seconds #=> Integer
     #   resp.origin_endpoints[0].dash_package.encryption.speke_key_provider.resource_id #=> String
     #   resp.origin_endpoints[0].dash_package.encryption.speke_key_provider.role_arn #=> String
@@ -741,6 +835,9 @@ module Aws::MediaPackage
 
     # Updates an existing OriginEndpoint.
     #
+    # @option params [Types::CmafPackageCreateOrUpdateParameters] :cmaf_package
+    #   A Common Media Application Format (CMAF) packaging configuration.
+    #
     # @option params [Types::DashPackage] :dash_package
     #   A Dynamic Adaptive Streaming over HTTP (DASH) packaging configuration.
     #
@@ -766,6 +863,7 @@ module Aws::MediaPackage
     #
     #   * {Types::UpdateOriginEndpointResponse#arn #arn} => String
     #   * {Types::UpdateOriginEndpointResponse#channel_id #channel_id} => String
+    #   * {Types::UpdateOriginEndpointResponse#cmaf_package #cmaf_package} => Types::CmafPackage
     #   * {Types::UpdateOriginEndpointResponse#dash_package #dash_package} => Types::DashPackage
     #   * {Types::UpdateOriginEndpointResponse#description #description} => String
     #   * {Types::UpdateOriginEndpointResponse#hls_package #hls_package} => Types::HlsPackage
@@ -780,6 +878,35 @@ module Aws::MediaPackage
     # @example Request syntax with placeholder values
     #
     #   resp = client.update_origin_endpoint({
+    #     cmaf_package: {
+    #       encryption: {
+    #         key_rotation_interval_seconds: 1,
+    #         speke_key_provider: { # required
+    #           resource_id: "__string", # required
+    #           role_arn: "__string", # required
+    #           system_ids: ["__string"], # required
+    #           url: "__string", # required
+    #         },
+    #       },
+    #       hls_manifests: [
+    #         {
+    #           ad_markers: "NONE", # accepts NONE, SCTE35_ENHANCED, PASSTHROUGH
+    #           id: "__string", # required
+    #           include_iframe_only_stream: false,
+    #           manifest_name: "__string",
+    #           playlist_type: "NONE", # accepts NONE, EVENT, VOD
+    #           playlist_window_seconds: 1,
+    #           program_date_time_interval_seconds: 1,
+    #         },
+    #       ],
+    #       segment_duration_seconds: 1,
+    #       segment_prefix: "__string",
+    #       stream_selection: {
+    #         max_video_bits_per_second: 1,
+    #         min_video_bits_per_second: 1,
+    #         stream_order: "ORIGINAL", # accepts ORIGINAL, VIDEO_BITRATE_ASCENDING, VIDEO_BITRATE_DESCENDING
+    #       },
+    #     },
     #     dash_package: {
     #       encryption: {
     #         key_rotation_interval_seconds: 1,
@@ -857,6 +984,26 @@ module Aws::MediaPackage
     #
     #   resp.arn #=> String
     #   resp.channel_id #=> String
+    #   resp.cmaf_package.encryption.key_rotation_interval_seconds #=> Integer
+    #   resp.cmaf_package.encryption.speke_key_provider.resource_id #=> String
+    #   resp.cmaf_package.encryption.speke_key_provider.role_arn #=> String
+    #   resp.cmaf_package.encryption.speke_key_provider.system_ids #=> Array
+    #   resp.cmaf_package.encryption.speke_key_provider.system_ids[0] #=> String
+    #   resp.cmaf_package.encryption.speke_key_provider.url #=> String
+    #   resp.cmaf_package.hls_manifests #=> Array
+    #   resp.cmaf_package.hls_manifests[0].ad_markers #=> String, one of "NONE", "SCTE35_ENHANCED", "PASSTHROUGH"
+    #   resp.cmaf_package.hls_manifests[0].id #=> String
+    #   resp.cmaf_package.hls_manifests[0].include_iframe_only_stream #=> Boolean
+    #   resp.cmaf_package.hls_manifests[0].manifest_name #=> String
+    #   resp.cmaf_package.hls_manifests[0].playlist_type #=> String, one of "NONE", "EVENT", "VOD"
+    #   resp.cmaf_package.hls_manifests[0].playlist_window_seconds #=> Integer
+    #   resp.cmaf_package.hls_manifests[0].program_date_time_interval_seconds #=> Integer
+    #   resp.cmaf_package.hls_manifests[0].url #=> String
+    #   resp.cmaf_package.segment_duration_seconds #=> Integer
+    #   resp.cmaf_package.segment_prefix #=> String
+    #   resp.cmaf_package.stream_selection.max_video_bits_per_second #=> Integer
+    #   resp.cmaf_package.stream_selection.min_video_bits_per_second #=> Integer
+    #   resp.cmaf_package.stream_selection.stream_order #=> String, one of "ORIGINAL", "VIDEO_BITRATE_ASCENDING", "VIDEO_BITRATE_DESCENDING"
     #   resp.dash_package.encryption.key_rotation_interval_seconds #=> Integer
     #   resp.dash_package.encryption.speke_key_provider.resource_id #=> String
     #   resp.dash_package.encryption.speke_key_provider.role_arn #=> String
@@ -932,7 +1079,7 @@ module Aws::MediaPackage
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-mediapackage'
-      context[:gem_version] = '1.0.0'
+      context[:gem_version] = '1.1.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -16,6 +16,9 @@ module Aws::MediaPackage
     ChannelCreateParameters = Shapes::StructureShape.new(name: 'ChannelCreateParameters')
     ChannelList = Shapes::StructureShape.new(name: 'ChannelList')
     ChannelUpdateParameters = Shapes::StructureShape.new(name: 'ChannelUpdateParameters')
+    CmafEncryption = Shapes::StructureShape.new(name: 'CmafEncryption')
+    CmafPackage = Shapes::StructureShape.new(name: 'CmafPackage')
+    CmafPackageCreateOrUpdateParameters = Shapes::StructureShape.new(name: 'CmafPackageCreateOrUpdateParameters')
     CreateChannelRequest = Shapes::StructureShape.new(name: 'CreateChannelRequest')
     CreateChannelResponse = Shapes::StructureShape.new(name: 'CreateChannelResponse')
     CreateOriginEndpointRequest = Shapes::StructureShape.new(name: 'CreateOriginEndpointRequest')
@@ -34,15 +37,13 @@ module Aws::MediaPackage
     ForbiddenException = Shapes::StructureShape.new(name: 'ForbiddenException')
     HlsEncryption = Shapes::StructureShape.new(name: 'HlsEncryption')
     HlsIngest = Shapes::StructureShape.new(name: 'HlsIngest')
+    HlsManifest = Shapes::StructureShape.new(name: 'HlsManifest')
+    HlsManifestCreateOrUpdateParameters = Shapes::StructureShape.new(name: 'HlsManifestCreateOrUpdateParameters')
     HlsPackage = Shapes::StructureShape.new(name: 'HlsPackage')
     IngestEndpoint = Shapes::StructureShape.new(name: 'IngestEndpoint')
     InternalServerErrorException = Shapes::StructureShape.new(name: 'InternalServerErrorException')
     ListChannelsRequest = Shapes::StructureShape.new(name: 'ListChannelsRequest')
     ListChannelsResponse = Shapes::StructureShape.new(name: 'ListChannelsResponse')
-    ListOfChannel = Shapes::ListShape.new(name: 'ListOfChannel')
-    ListOfIngestEndpoint = Shapes::ListShape.new(name: 'ListOfIngestEndpoint')
-    ListOfOriginEndpoint = Shapes::ListShape.new(name: 'ListOfOriginEndpoint')
-    ListOf__string = Shapes::ListShape.new(name: 'ListOf__string')
     ListOriginEndpointsRequest = Shapes::StructureShape.new(name: 'ListOriginEndpointsRequest')
     ListOriginEndpointsResponse = Shapes::StructureShape.new(name: 'ListOriginEndpointsResponse')
     MaxResults = Shapes::IntegerShape.new(name: 'MaxResults')
@@ -70,8 +71,14 @@ module Aws::MediaPackage
     __boolean = Shapes::BooleanShape.new(name: '__boolean')
     __double = Shapes::FloatShape.new(name: '__double')
     __integer = Shapes::IntegerShape.new(name: '__integer')
+    __listOfChannel = Shapes::ListShape.new(name: '__listOfChannel')
+    __listOfHlsManifest = Shapes::ListShape.new(name: '__listOfHlsManifest')
+    __listOfHlsManifestCreateOrUpdateParameters = Shapes::ListShape.new(name: '__listOfHlsManifestCreateOrUpdateParameters')
+    __listOfIngestEndpoint = Shapes::ListShape.new(name: '__listOfIngestEndpoint')
+    __listOfOriginEndpoint = Shapes::ListShape.new(name: '__listOfOriginEndpoint')
+    __listOf__string = Shapes::ListShape.new(name: '__listOf__string')
+    __long = Shapes::IntegerShape.new(name: '__long')
     __string = Shapes::StringShape.new(name: '__string')
-    __timestamp = Shapes::TimestampShape.new(name: '__timestamp')
 
     Channel.add_member(:arn, Shapes::ShapeRef.new(shape: __string, location_name: "arn"))
     Channel.add_member(:description, Shapes::ShapeRef.new(shape: __string, location_name: "description"))
@@ -80,16 +87,34 @@ module Aws::MediaPackage
     Channel.struct_class = Types::Channel
 
     ChannelCreateParameters.add_member(:description, Shapes::ShapeRef.new(shape: __string, location_name: "description"))
-    ChannelCreateParameters.add_member(:id, Shapes::ShapeRef.new(shape: __string, location_name: "id"))
+    ChannelCreateParameters.add_member(:id, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "id"))
     ChannelCreateParameters.struct_class = Types::ChannelCreateParameters
 
-    ChannelList.add_member(:channels, Shapes::ShapeRef.new(shape: ListOfChannel, location_name: "channels"))
+    ChannelList.add_member(:channels, Shapes::ShapeRef.new(shape: __listOfChannel, location_name: "channels"))
     ChannelList.add_member(:next_token, Shapes::ShapeRef.new(shape: __string, location_name: "nextToken"))
     ChannelList.struct_class = Types::ChannelList
 
     ChannelUpdateParameters.add_member(:description, Shapes::ShapeRef.new(shape: __string, location_name: "description"))
     ChannelUpdateParameters.struct_class = Types::ChannelUpdateParameters
 
+    CmafEncryption.add_member(:key_rotation_interval_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "keyRotationIntervalSeconds"))
+    CmafEncryption.add_member(:speke_key_provider, Shapes::ShapeRef.new(shape: SpekeKeyProvider, required: true, location_name: "spekeKeyProvider"))
+    CmafEncryption.struct_class = Types::CmafEncryption
+
+    CmafPackage.add_member(:encryption, Shapes::ShapeRef.new(shape: CmafEncryption, location_name: "encryption"))
+    CmafPackage.add_member(:hls_manifests, Shapes::ShapeRef.new(shape: __listOfHlsManifest, location_name: "hlsManifests"))
+    CmafPackage.add_member(:segment_duration_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "segmentDurationSeconds"))
+    CmafPackage.add_member(:segment_prefix, Shapes::ShapeRef.new(shape: __string, location_name: "segmentPrefix"))
+    CmafPackage.add_member(:stream_selection, Shapes::ShapeRef.new(shape: StreamSelection, location_name: "streamSelection"))
+    CmafPackage.struct_class = Types::CmafPackage
+
+    CmafPackageCreateOrUpdateParameters.add_member(:encryption, Shapes::ShapeRef.new(shape: CmafEncryption, location_name: "encryption"))
+    CmafPackageCreateOrUpdateParameters.add_member(:hls_manifests, Shapes::ShapeRef.new(shape: __listOfHlsManifestCreateOrUpdateParameters, location_name: "hlsManifests"))
+    CmafPackageCreateOrUpdateParameters.add_member(:segment_duration_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "segmentDurationSeconds"))
+    CmafPackageCreateOrUpdateParameters.add_member(:segment_prefix, Shapes::ShapeRef.new(shape: __string, location_name: "segmentPrefix"))
+    CmafPackageCreateOrUpdateParameters.add_member(:stream_selection, Shapes::ShapeRef.new(shape: StreamSelection, location_name: "streamSelection"))
+    CmafPackageCreateOrUpdateParameters.struct_class = Types::CmafPackageCreateOrUpdateParameters
+
     CreateChannelRequest.add_member(:description, Shapes::ShapeRef.new(shape: __string, location_name: "description"))
     CreateChannelRequest.add_member(:id, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "id"))
     CreateChannelRequest.struct_class = Types::CreateChannelRequest
@@ -101,6 +126,7 @@ module Aws::MediaPackage
     CreateChannelResponse.struct_class = Types::CreateChannelResponse
 
     CreateOriginEndpointRequest.add_member(:channel_id, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "channelId"))
+    CreateOriginEndpointRequest.add_member(:cmaf_package, Shapes::ShapeRef.new(shape: CmafPackageCreateOrUpdateParameters, location_name: "cmafPackage"))
     CreateOriginEndpointRequest.add_member(:dash_package, Shapes::ShapeRef.new(shape: DashPackage, location_name: "dashPackage"))
     CreateOriginEndpointRequest.add_member(:description, Shapes::ShapeRef.new(shape: __string, location_name: "description"))
     CreateOriginEndpointRequest.add_member(:hls_package, Shapes::ShapeRef.new(shape: HlsPackage, location_name: "hlsPackage"))
@@ -109,11 +135,12 @@ module Aws::MediaPackage
     CreateOriginEndpointRequest.add_member(:mss_package, Shapes::ShapeRef.new(shape: MssPackage, location_name: "mssPackage"))
     CreateOriginEndpointRequest.add_member(:startover_window_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "startoverWindowSeconds"))
     CreateOriginEndpointRequest.add_member(:time_delay_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "timeDelaySeconds"))
-    CreateOriginEndpointRequest.add_member(:whitelist, Shapes::ShapeRef.new(shape: ListOf__string, location_name: "whitelist"))
+    CreateOriginEndpointRequest.add_member(:whitelist, Shapes::ShapeRef.new(shape: __listOf__string, location_name: "whitelist"))
     CreateOriginEndpointRequest.struct_class = Types::CreateOriginEndpointRequest
 
     CreateOriginEndpointResponse.add_member(:arn, Shapes::ShapeRef.new(shape: __string, location_name: "arn"))
     CreateOriginEndpointResponse.add_member(:channel_id, Shapes::ShapeRef.new(shape: __string, location_name: "channelId"))
+    CreateOriginEndpointResponse.add_member(:cmaf_package, Shapes::ShapeRef.new(shape: CmafPackage, location_name: "cmafPackage"))
     CreateOriginEndpointResponse.add_member(:dash_package, Shapes::ShapeRef.new(shape: DashPackage, location_name: "dashPackage"))
     CreateOriginEndpointResponse.add_member(:description, Shapes::ShapeRef.new(shape: __string, location_name: "description"))
     CreateOriginEndpointResponse.add_member(:hls_package, Shapes::ShapeRef.new(shape: HlsPackage, location_name: "hlsPackage"))
@@ -123,7 +150,7 @@ module Aws::MediaPackage
     CreateOriginEndpointResponse.add_member(:startover_window_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "startoverWindowSeconds"))
     CreateOriginEndpointResponse.add_member(:time_delay_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "timeDelaySeconds"))
     CreateOriginEndpointResponse.add_member(:url, Shapes::ShapeRef.new(shape: __string, location_name: "url"))
-    CreateOriginEndpointResponse.add_member(:whitelist, Shapes::ShapeRef.new(shape: ListOf__string, location_name: "whitelist"))
+    CreateOriginEndpointResponse.add_member(:whitelist, Shapes::ShapeRef.new(shape: __listOf__string, location_name: "whitelist"))
     CreateOriginEndpointResponse.struct_class = Types::CreateOriginEndpointResponse
 
     DashEncryption.add_member(:key_rotation_interval_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "keyRotationIntervalSeconds"))
@@ -164,6 +191,7 @@ module Aws::MediaPackage
 
     DescribeOriginEndpointResponse.add_member(:arn, Shapes::ShapeRef.new(shape: __string, location_name: "arn"))
     DescribeOriginEndpointResponse.add_member(:channel_id, Shapes::ShapeRef.new(shape: __string, location_name: "channelId"))
+    DescribeOriginEndpointResponse.add_member(:cmaf_package, Shapes::ShapeRef.new(shape: CmafPackage, location_name: "cmafPackage"))
     DescribeOriginEndpointResponse.add_member(:dash_package, Shapes::ShapeRef.new(shape: DashPackage, location_name: "dashPackage"))
     DescribeOriginEndpointResponse.add_member(:description, Shapes::ShapeRef.new(shape: __string, location_name: "description"))
     DescribeOriginEndpointResponse.add_member(:hls_package, Shapes::ShapeRef.new(shape: HlsPackage, location_name: "hlsPackage"))
@@ -173,7 +201,7 @@ module Aws::MediaPackage
     DescribeOriginEndpointResponse.add_member(:startover_window_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "startoverWindowSeconds"))
     DescribeOriginEndpointResponse.add_member(:time_delay_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "timeDelaySeconds"))
     DescribeOriginEndpointResponse.add_member(:url, Shapes::ShapeRef.new(shape: __string, location_name: "url"))
-    DescribeOriginEndpointResponse.add_member(:whitelist, Shapes::ShapeRef.new(shape: ListOf__string, location_name: "whitelist"))
+    DescribeOriginEndpointResponse.add_member(:whitelist, Shapes::ShapeRef.new(shape: __listOf__string, location_name: "whitelist"))
     DescribeOriginEndpointResponse.struct_class = Types::DescribeOriginEndpointResponse
 
     HlsEncryption.add_member(:constant_initialization_vector, Shapes::ShapeRef.new(shape: __string, location_name: "constantInitializationVector"))
@@ -183,9 +211,28 @@ module Aws::MediaPackage
     HlsEncryption.add_member(:speke_key_provider, Shapes::ShapeRef.new(shape: SpekeKeyProvider, required: true, location_name: "spekeKeyProvider"))
     HlsEncryption.struct_class = Types::HlsEncryption
 
-    HlsIngest.add_member(:ingest_endpoints, Shapes::ShapeRef.new(shape: ListOfIngestEndpoint, location_name: "ingestEndpoints"))
+    HlsIngest.add_member(:ingest_endpoints, Shapes::ShapeRef.new(shape: __listOfIngestEndpoint, location_name: "ingestEndpoints"))
     HlsIngest.struct_class = Types::HlsIngest
 
+    HlsManifest.add_member(:ad_markers, Shapes::ShapeRef.new(shape: AdMarkers, location_name: "adMarkers"))
+    HlsManifest.add_member(:id, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "id"))
+    HlsManifest.add_member(:include_iframe_only_stream, Shapes::ShapeRef.new(shape: __boolean, location_name: "includeIframeOnlyStream"))
+    HlsManifest.add_member(:manifest_name, Shapes::ShapeRef.new(shape: __string, location_name: "manifestName"))
+    HlsManifest.add_member(:playlist_type, Shapes::ShapeRef.new(shape: PlaylistType, location_name: "playlistType"))
+    HlsManifest.add_member(:playlist_window_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "playlistWindowSeconds"))
+    HlsManifest.add_member(:program_date_time_interval_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "programDateTimeIntervalSeconds"))
+    HlsManifest.add_member(:url, Shapes::ShapeRef.new(shape: __string, location_name: "url"))
+    HlsManifest.struct_class = Types::HlsManifest
+
+    HlsManifestCreateOrUpdateParameters.add_member(:ad_markers, Shapes::ShapeRef.new(shape: AdMarkers, location_name: "adMarkers"))
+    HlsManifestCreateOrUpdateParameters.add_member(:id, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "id"))
+    HlsManifestCreateOrUpdateParameters.add_member(:include_iframe_only_stream, Shapes::ShapeRef.new(shape: __boolean, location_name: "includeIframeOnlyStream"))
+    HlsManifestCreateOrUpdateParameters.add_member(:manifest_name, Shapes::ShapeRef.new(shape: __string, location_name: "manifestName"))
+    HlsManifestCreateOrUpdateParameters.add_member(:playlist_type, Shapes::ShapeRef.new(shape: PlaylistType, location_name: "playlistType"))
+    HlsManifestCreateOrUpdateParameters.add_member(:playlist_window_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "playlistWindowSeconds"))
+    HlsManifestCreateOrUpdateParameters.add_member(:program_date_time_interval_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "programDateTimeIntervalSeconds"))
+    HlsManifestCreateOrUpdateParameters.struct_class = Types::HlsManifestCreateOrUpdateParameters
+
     HlsPackage.add_member(:ad_markers, Shapes::ShapeRef.new(shape: AdMarkers, location_name: "adMarkers"))
     HlsPackage.add_member(:encryption, Shapes::ShapeRef.new(shape: HlsEncryption, location_name: "encryption"))
     HlsPackage.add_member(:include_iframe_only_stream, Shapes::ShapeRef.new(shape: __boolean, location_name: "includeIframeOnlyStream"))
@@ -206,25 +253,17 @@ module Aws::MediaPackage
     ListChannelsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: __string, location: "querystring", location_name: "nextToken"))
     ListChannelsRequest.struct_class = Types::ListChannelsRequest
 
-    ListChannelsResponse.add_member(:channels, Shapes::ShapeRef.new(shape: ListOfChannel, location_name: "channels"))
+    ListChannelsResponse.add_member(:channels, Shapes::ShapeRef.new(shape: __listOfChannel, location_name: "channels"))
     ListChannelsResponse.add_member(:next_token, Shapes::ShapeRef.new(shape: __string, location_name: "nextToken"))
     ListChannelsResponse.struct_class = Types::ListChannelsResponse
 
-    ListOfChannel.member = Shapes::ShapeRef.new(shape: Channel)
-
-    ListOfIngestEndpoint.member = Shapes::ShapeRef.new(shape: IngestEndpoint)
-
-    ListOfOriginEndpoint.member = Shapes::ShapeRef.new(shape: OriginEndpoint)
-
-    ListOf__string.member = Shapes::ShapeRef.new(shape: __string)
-
     ListOriginEndpointsRequest.add_member(:channel_id, Shapes::ShapeRef.new(shape: __string, location: "querystring", location_name: "channelId"))
     ListOriginEndpointsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxResults, location: "querystring", location_name: "maxResults"))
     ListOriginEndpointsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: __string, location: "querystring", location_name: "nextToken"))
     ListOriginEndpointsRequest.struct_class = Types::ListOriginEndpointsRequest
 
     ListOriginEndpointsResponse.add_member(:next_token, Shapes::ShapeRef.new(shape: __string, location_name: "nextToken"))
-    ListOriginEndpointsResponse.add_member(:origin_endpoints, Shapes::ShapeRef.new(shape: ListOfOriginEndpoint, location_name: "originEndpoints"))
+    ListOriginEndpointsResponse.add_member(:origin_endpoints, Shapes::ShapeRef.new(shape: __listOfOriginEndpoint, location_name: "originEndpoints"))
     ListOriginEndpointsResponse.struct_class = Types::ListOriginEndpointsResponse
 
     MssEncryption.add_member(:speke_key_provider, Shapes::ShapeRef.new(shape: SpekeKeyProvider, required: true, location_name: "spekeKeyProvider"))
@@ -238,6 +277,7 @@ module Aws::MediaPackage
 
     OriginEndpoint.add_member(:arn, Shapes::ShapeRef.new(shape: __string, location_name: "arn"))
     OriginEndpoint.add_member(:channel_id, Shapes::ShapeRef.new(shape: __string, location_name: "channelId"))
+    OriginEndpoint.add_member(:cmaf_package, Shapes::ShapeRef.new(shape: CmafPackage, location_name: "cmafPackage"))
     OriginEndpoint.add_member(:dash_package, Shapes::ShapeRef.new(shape: DashPackage, location_name: "dashPackage"))
     OriginEndpoint.add_member(:description, Shapes::ShapeRef.new(shape: __string, location_name: "description"))
     OriginEndpoint.add_member(:hls_package, Shapes::ShapeRef.new(shape: HlsPackage, location_name: "hlsPackage"))
@@ -247,25 +287,27 @@ module Aws::MediaPackage
     OriginEndpoint.add_member(:startover_window_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "startoverWindowSeconds"))
     OriginEndpoint.add_member(:time_delay_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "timeDelaySeconds"))
     OriginEndpoint.add_member(:url, Shapes::ShapeRef.new(shape: __string, location_name: "url"))
-    OriginEndpoint.add_member(:whitelist, Shapes::ShapeRef.new(shape: ListOf__string, location_name: "whitelist"))
+    OriginEndpoint.add_member(:whitelist, Shapes::ShapeRef.new(shape: __listOf__string, location_name: "whitelist"))
     OriginEndpoint.struct_class = Types::OriginEndpoint
 
-    OriginEndpointCreateParameters.add_member(:channel_id, Shapes::ShapeRef.new(shape: __string, location_name: "channelId"))
+    OriginEndpointCreateParameters.add_member(:channel_id, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "channelId"))
+    OriginEndpointCreateParameters.add_member(:cmaf_package, Shapes::ShapeRef.new(shape: CmafPackageCreateOrUpdateParameters, location_name: "cmafPackage"))
     OriginEndpointCreateParameters.add_member(:dash_package, Shapes::ShapeRef.new(shape: DashPackage, location_name: "dashPackage"))
     OriginEndpointCreateParameters.add_member(:description, Shapes::ShapeRef.new(shape: __string, location_name: "description"))
     OriginEndpointCreateParameters.add_member(:hls_package, Shapes::ShapeRef.new(shape: HlsPackage, location_name: "hlsPackage"))
-    OriginEndpointCreateParameters.add_member(:id, Shapes::ShapeRef.new(shape: __string, location_name: "id"))
+    OriginEndpointCreateParameters.add_member(:id, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "id"))
     OriginEndpointCreateParameters.add_member(:manifest_name, Shapes::ShapeRef.new(shape: __string, location_name: "manifestName"))
     OriginEndpointCreateParameters.add_member(:mss_package, Shapes::ShapeRef.new(shape: MssPackage, location_name: "mssPackage"))
     OriginEndpointCreateParameters.add_member(:startover_window_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "startoverWindowSeconds"))
     OriginEndpointCreateParameters.add_member(:time_delay_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "timeDelaySeconds"))
-    OriginEndpointCreateParameters.add_member(:whitelist, Shapes::ShapeRef.new(shape: ListOf__string, location_name: "whitelist"))
+    OriginEndpointCreateParameters.add_member(:whitelist, Shapes::ShapeRef.new(shape: __listOf__string, location_name: "whitelist"))
     OriginEndpointCreateParameters.struct_class = Types::OriginEndpointCreateParameters
 
     OriginEndpointList.add_member(:next_token, Shapes::ShapeRef.new(shape: __string, location_name: "nextToken"))
-    OriginEndpointList.add_member(:origin_endpoints, Shapes::ShapeRef.new(shape: ListOfOriginEndpoint, location_name: "originEndpoints"))
+    OriginEndpointList.add_member(:origin_endpoints, Shapes::ShapeRef.new(shape: __listOfOriginEndpoint, location_name: "originEndpoints"))
     OriginEndpointList.struct_class = Types::OriginEndpointList
 
+    OriginEndpointUpdateParameters.add_member(:cmaf_package, Shapes::ShapeRef.new(shape: CmafPackageCreateOrUpdateParameters, location_name: "cmafPackage"))
     OriginEndpointUpdateParameters.add_member(:dash_package, Shapes::ShapeRef.new(shape: DashPackage, location_name: "dashPackage"))
     OriginEndpointUpdateParameters.add_member(:description, Shapes::ShapeRef.new(shape: __string, location_name: "description"))
     OriginEndpointUpdateParameters.add_member(:hls_package, Shapes::ShapeRef.new(shape: HlsPackage, location_name: "hlsPackage"))
@@ -273,7 +315,7 @@ module Aws::MediaPackage
     OriginEndpointUpdateParameters.add_member(:mss_package, Shapes::ShapeRef.new(shape: MssPackage, location_name: "mssPackage"))
     OriginEndpointUpdateParameters.add_member(:startover_window_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "startoverWindowSeconds"))
     OriginEndpointUpdateParameters.add_member(:time_delay_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "timeDelaySeconds"))
-    OriginEndpointUpdateParameters.add_member(:whitelist, Shapes::ShapeRef.new(shape: ListOf__string, location_name: "whitelist"))
+    OriginEndpointUpdateParameters.add_member(:whitelist, Shapes::ShapeRef.new(shape: __listOf__string, location_name: "whitelist"))
     OriginEndpointUpdateParameters.struct_class = Types::OriginEndpointUpdateParameters
 
     RotateChannelCredentialsRequest.add_member(:id, Shapes::ShapeRef.new(shape: __string, required: true, location: "uri", location_name: "id"))
@@ -287,7 +329,7 @@ module Aws::MediaPackage
 
     SpekeKeyProvider.add_member(:resource_id, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "resourceId"))
     SpekeKeyProvider.add_member(:role_arn, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "roleArn"))
-    SpekeKeyProvider.add_member(:system_ids, Shapes::ShapeRef.new(shape: ListOf__string, required: true, location_name: "systemIds"))
+    SpekeKeyProvider.add_member(:system_ids, Shapes::ShapeRef.new(shape: __listOf__string, required: true, location_name: "systemIds"))
     SpekeKeyProvider.add_member(:url, Shapes::ShapeRef.new(shape: __string, required: true, location_name: "url"))
     SpekeKeyProvider.struct_class = Types::SpekeKeyProvider
 
@@ -306,6 +348,7 @@ module Aws::MediaPackage
     UpdateChannelResponse.add_member(:id, Shapes::ShapeRef.new(shape: __string, location_name: "id"))
     UpdateChannelResponse.struct_class = Types::UpdateChannelResponse
 
+    UpdateOriginEndpointRequest.add_member(:cmaf_package, Shapes::ShapeRef.new(shape: CmafPackageCreateOrUpdateParameters, location_name: "cmafPackage"))
     UpdateOriginEndpointRequest.add_member(:dash_package, Shapes::ShapeRef.new(shape: DashPackage, location_name: "dashPackage"))
     UpdateOriginEndpointRequest.add_member(:description, Shapes::ShapeRef.new(shape: __string, location_name: "description"))
     UpdateOriginEndpointRequest.add_member(:hls_package, Shapes::ShapeRef.new(shape: HlsPackage, location_name: "hlsPackage"))
@@ -314,11 +357,12 @@ module Aws::MediaPackage
     UpdateOriginEndpointRequest.add_member(:mss_package, Shapes::ShapeRef.new(shape: MssPackage, location_name: "mssPackage"))
     UpdateOriginEndpointRequest.add_member(:startover_window_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "startoverWindowSeconds"))
     UpdateOriginEndpointRequest.add_member(:time_delay_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "timeDelaySeconds"))
-    UpdateOriginEndpointRequest.add_member(:whitelist, Shapes::ShapeRef.new(shape: ListOf__string, location_name: "whitelist"))
+    UpdateOriginEndpointRequest.add_member(:whitelist, Shapes::ShapeRef.new(shape: __listOf__string, location_name: "whitelist"))
     UpdateOriginEndpointRequest.struct_class = Types::UpdateOriginEndpointRequest
 
     UpdateOriginEndpointResponse.add_member(:arn, Shapes::ShapeRef.new(shape: __string, location_name: "arn"))
     UpdateOriginEndpointResponse.add_member(:channel_id, Shapes::ShapeRef.new(shape: __string, location_name: "channelId"))
+    UpdateOriginEndpointResponse.add_member(:cmaf_package, Shapes::ShapeRef.new(shape: CmafPackage, location_name: "cmafPackage"))
     UpdateOriginEndpointResponse.add_member(:dash_package, Shapes::ShapeRef.new(shape: DashPackage, location_name: "dashPackage"))
     UpdateOriginEndpointResponse.add_member(:description, Shapes::ShapeRef.new(shape: __string, location_name: "description"))
     UpdateOriginEndpointResponse.add_member(:hls_package, Shapes::ShapeRef.new(shape: HlsPackage, location_name: "hlsPackage"))
@@ -328,9 +372,21 @@ module Aws::MediaPackage
     UpdateOriginEndpointResponse.add_member(:startover_window_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "startoverWindowSeconds"))
     UpdateOriginEndpointResponse.add_member(:time_delay_seconds, Shapes::ShapeRef.new(shape: __integer, location_name: "timeDelaySeconds"))
     UpdateOriginEndpointResponse.add_member(:url, Shapes::ShapeRef.new(shape: __string, location_name: "url"))
-    UpdateOriginEndpointResponse.add_member(:whitelist, Shapes::ShapeRef.new(shape: ListOf__string, location_name: "whitelist"))
+    UpdateOriginEndpointResponse.add_member(:whitelist, Shapes::ShapeRef.new(shape: __listOf__string, location_name: "whitelist"))
     UpdateOriginEndpointResponse.struct_class = Types::UpdateOriginEndpointResponse
 
+    __listOfChannel.member = Shapes::ShapeRef.new(shape: Channel)
+
+    __listOfHlsManifest.member = Shapes::ShapeRef.new(shape: HlsManifest)
+
+    __listOfHlsManifestCreateOrUpdateParameters.member = Shapes::ShapeRef.new(shape: HlsManifestCreateOrUpdateParameters)
+
+    __listOfIngestEndpoint.member = Shapes::ShapeRef.new(shape: IngestEndpoint)
+
+    __listOfOriginEndpoint.member = Shapes::ShapeRef.new(shape: OriginEndpoint)
+
+    __listOf__string.member = Shapes::ShapeRef.new(shape: __string)
+
 
     # @api private
     API = Seahorse::Model::Api.new.tap do |api|

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

@@ -87,6 +87,142 @@ module Aws::MediaPackage
       include Aws::Structure
     end
 
+    # A Common Media Application Format (CMAF) encryption configuration.
+    #
+    # @note When making an API call, you may pass CmafEncryption
+    #   data as a hash:
+    #
+    #       {
+    #         key_rotation_interval_seconds: 1,
+    #         speke_key_provider: { # required
+    #           resource_id: "__string", # required
+    #           role_arn: "__string", # required
+    #           system_ids: ["__string"], # required
+    #           url: "__string", # required
+    #         },
+    #       }
+    #
+    # @!attribute [rw] key_rotation_interval_seconds
+    #   Time (in seconds) between each encryption key rotation.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] speke_key_provider
+    #   A configuration for accessing an external Secure Packager and
+    #   Encoder Key Exchange (SPEKE) service that will provide encryption
+    #   keys.
+    #   @return [Types::SpekeKeyProvider]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/mediapackage-2017-10-12/CmafEncryption AWS API Documentation
+    #
+    class CmafEncryption < Struct.new(
+      :key_rotation_interval_seconds,
+      :speke_key_provider)
+      include Aws::Structure
+    end
+
+    # A Common Media Application Format (CMAF) packaging configuration.
+    #
+    # @!attribute [rw] encryption
+    #   A Common Media Application Format (CMAF) encryption configuration.
+    #   @return [Types::CmafEncryption]
+    #
+    # @!attribute [rw] hls_manifests
+    #   A list of HLS manifest configurations
+    #   @return [Array<Types::HlsManifest>]
+    #
+    # @!attribute [rw] segment_duration_seconds
+    #   Duration (in seconds) of each segment. Actual segments will be
+    #   rounded to the nearest multiple of the source segment duration.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] segment_prefix
+    #   An optional custom string that is prepended to the name of each
+    #   segment. If not specified, it defaults to the ChannelId.
+    #   @return [String]
+    #
+    # @!attribute [rw] stream_selection
+    #   A StreamSelection configuration.
+    #   @return [Types::StreamSelection]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/mediapackage-2017-10-12/CmafPackage AWS API Documentation
+    #
+    class CmafPackage < Struct.new(
+      :encryption,
+      :hls_manifests,
+      :segment_duration_seconds,
+      :segment_prefix,
+      :stream_selection)
+      include Aws::Structure
+    end
+
+    # A Common Media Application Format (CMAF) packaging configuration.
+    #
+    # @note When making an API call, you may pass CmafPackageCreateOrUpdateParameters
+    #   data as a hash:
+    #
+    #       {
+    #         encryption: {
+    #           key_rotation_interval_seconds: 1,
+    #           speke_key_provider: { # required
+    #             resource_id: "__string", # required
+    #             role_arn: "__string", # required
+    #             system_ids: ["__string"], # required
+    #             url: "__string", # required
+    #           },
+    #         },
+    #         hls_manifests: [
+    #           {
+    #             ad_markers: "NONE", # accepts NONE, SCTE35_ENHANCED, PASSTHROUGH
+    #             id: "__string", # required
+    #             include_iframe_only_stream: false,
+    #             manifest_name: "__string",
+    #             playlist_type: "NONE", # accepts NONE, EVENT, VOD
+    #             playlist_window_seconds: 1,
+    #             program_date_time_interval_seconds: 1,
+    #           },
+    #         ],
+    #         segment_duration_seconds: 1,
+    #         segment_prefix: "__string",
+    #         stream_selection: {
+    #           max_video_bits_per_second: 1,
+    #           min_video_bits_per_second: 1,
+    #           stream_order: "ORIGINAL", # accepts ORIGINAL, VIDEO_BITRATE_ASCENDING, VIDEO_BITRATE_DESCENDING
+    #         },
+    #       }
+    #
+    # @!attribute [rw] encryption
+    #   A Common Media Application Format (CMAF) encryption configuration.
+    #   @return [Types::CmafEncryption]
+    #
+    # @!attribute [rw] hls_manifests
+    #   A list of HLS manifest configurations
+    #   @return [Array<Types::HlsManifestCreateOrUpdateParameters>]
+    #
+    # @!attribute [rw] segment_duration_seconds
+    #   Duration (in seconds) of each segment. Actual segments will be
+    #   rounded to the nearest multiple of the source segment duration.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] segment_prefix
+    #   An optional custom string that is prepended to the name of each
+    #   segment. If not specified, it defaults to the ChannelId.
+    #   @return [String]
+    #
+    # @!attribute [rw] stream_selection
+    #   A StreamSelection configuration.
+    #   @return [Types::StreamSelection]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/mediapackage-2017-10-12/CmafPackageCreateOrUpdateParameters AWS API Documentation
+    #
+    class CmafPackageCreateOrUpdateParameters < Struct.new(
+      :encryption,
+      :hls_manifests,
+      :segment_duration_seconds,
+      :segment_prefix,
+      :stream_selection)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass CreateChannelRequest
     #   data as a hash:
     #
@@ -137,6 +273,35 @@ module Aws::MediaPackage
     #
     #       {
     #         channel_id: "__string", # required
+    #         cmaf_package: {
+    #           encryption: {
+    #             key_rotation_interval_seconds: 1,
+    #             speke_key_provider: { # required
+    #               resource_id: "__string", # required
+    #               role_arn: "__string", # required
+    #               system_ids: ["__string"], # required
+    #               url: "__string", # required
+    #             },
+    #           },
+    #           hls_manifests: [
+    #             {
+    #               ad_markers: "NONE", # accepts NONE, SCTE35_ENHANCED, PASSTHROUGH
+    #               id: "__string", # required
+    #               include_iframe_only_stream: false,
+    #               manifest_name: "__string",
+    #               playlist_type: "NONE", # accepts NONE, EVENT, VOD
+    #               playlist_window_seconds: 1,
+    #               program_date_time_interval_seconds: 1,
+    #             },
+    #           ],
+    #           segment_duration_seconds: 1,
+    #           segment_prefix: "__string",
+    #           stream_selection: {
+    #             max_video_bits_per_second: 1,
+    #             min_video_bits_per_second: 1,
+    #             stream_order: "ORIGINAL", # accepts ORIGINAL, VIDEO_BITRATE_ASCENDING, VIDEO_BITRATE_DESCENDING
+    #           },
+    #         },
     #         dash_package: {
     #           encryption: {
     #             key_rotation_interval_seconds: 1,
@@ -213,6 +378,10 @@ module Aws::MediaPackage
     # @!attribute [rw] channel_id
     #   @return [String]
     #
+    # @!attribute [rw] cmaf_package
+    #   A Common Media Application Format (CMAF) packaging configuration.
+    #   @return [Types::CmafPackageCreateOrUpdateParameters]
+    #
     # @!attribute [rw] dash_package
     #   A Dynamic Adaptive Streaming over HTTP (DASH) packaging
     #   configuration.
@@ -248,6 +417,7 @@ module Aws::MediaPackage
     #
     class CreateOriginEndpointRequest < Struct.new(
       :channel_id,
+      :cmaf_package,
       :dash_package,
       :description,
       :hls_package,
@@ -266,6 +436,10 @@ module Aws::MediaPackage
     # @!attribute [rw] channel_id
     #   @return [String]
     #
+    # @!attribute [rw] cmaf_package
+    #   A Common Media Application Format (CMAF) packaging configuration.
+    #   @return [Types::CmafPackage]
+    #
     # @!attribute [rw] dash_package
     #   A Dynamic Adaptive Streaming over HTTP (DASH) packaging
     #   configuration.
@@ -305,6 +479,7 @@ module Aws::MediaPackage
     class CreateOriginEndpointResponse < Struct.new(
       :arn,
       :channel_id,
+      :cmaf_package,
       :dash_package,
       :description,
       :hls_package,
@@ -537,6 +712,10 @@ module Aws::MediaPackage
     # @!attribute [rw] channel_id
     #   @return [String]
     #
+    # @!attribute [rw] cmaf_package
+    #   A Common Media Application Format (CMAF) packaging configuration.
+    #   @return [Types::CmafPackage]
+    #
     # @!attribute [rw] dash_package
     #   A Dynamic Adaptive Streaming over HTTP (DASH) packaging
     #   configuration.
@@ -576,6 +755,7 @@ module Aws::MediaPackage
     class DescribeOriginEndpointResponse < Struct.new(
       :arn,
       :channel_id,
+      :cmaf_package,
       :dash_package,
       :description,
       :hls_package,
@@ -655,6 +835,148 @@ module Aws::MediaPackage
       include Aws::Structure
     end
 
+    # A HTTP Live Streaming (HLS) manifest configuration.
+    #
+    # @!attribute [rw] ad_markers
+    #   This setting controls how ad markers are included in the packaged
+    #   OriginEndpoint. "NONE" will omit all SCTE-35 ad markers from the
+    #   output. "PASSTHROUGH" causes the manifest to contain a copy of the
+    #   SCTE-35 ad markers (comments) taken directly from the input HTTP
+    #   Live Streaming (HLS) manifest. "SCTE35\_ENHANCED" generates ad
+    #   markers and blackout tags based on SCTE-35 messages in the input
+    #   source.
+    #   @return [String]
+    #
+    # @!attribute [rw] id
+    #   The ID of the manifest. The ID must be unique within the
+    #   OriginEndpoint and it cannot be changed after it is created.
+    #   @return [String]
+    #
+    # @!attribute [rw] include_iframe_only_stream
+    #   When enabled, an I-Frame only stream will be included in the output.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] manifest_name
+    #   An optional short string appended to the end of the OriginEndpoint
+    #   URL. If not specified, defaults to the manifestName for the
+    #   OriginEndpoint.
+    #   @return [String]
+    #
+    # @!attribute [rw] playlist_type
+    #   The HTTP Live Streaming (HLS) playlist type. When either "EVENT"
+    #   or "VOD" is specified, a corresponding EXT-X-PLAYLIST-TYPE entry
+    #   will be included in the media playlist.
+    #   @return [String]
+    #
+    # @!attribute [rw] playlist_window_seconds
+    #   Time window (in seconds) contained in each parent manifest.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] program_date_time_interval_seconds
+    #   The interval (in seconds) between each EXT-X-PROGRAM-DATE-TIME tag
+    #   inserted into manifests. Additionally, when an interval is specified
+    #   ID3Timed Metadata messages will be generated every 5 seconds using
+    #   the ingest time of the content. If the interval is not specified, or
+    #   set to 0, then no EXT-X-PROGRAM-DATE-TIME tags will be inserted into
+    #   manifests and no ID3Timed Metadata messages will be generated. Note
+    #   that irrespective of this parameter, if any ID3 Timed Metadata is
+    #   found in HTTP Live Streaming (HLS) input, it will be passed through
+    #   to HLS output.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] url
+    #   The URL of the packaged OriginEndpoint for consumption.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/mediapackage-2017-10-12/HlsManifest AWS API Documentation
+    #
+    class HlsManifest < Struct.new(
+      :ad_markers,
+      :id,
+      :include_iframe_only_stream,
+      :manifest_name,
+      :playlist_type,
+      :playlist_window_seconds,
+      :program_date_time_interval_seconds,
+      :url)
+      include Aws::Structure
+    end
+
+    # A HTTP Live Streaming (HLS) manifest configuration.
+    #
+    # @note When making an API call, you may pass HlsManifestCreateOrUpdateParameters
+    #   data as a hash:
+    #
+    #       {
+    #         ad_markers: "NONE", # accepts NONE, SCTE35_ENHANCED, PASSTHROUGH
+    #         id: "__string", # required
+    #         include_iframe_only_stream: false,
+    #         manifest_name: "__string",
+    #         playlist_type: "NONE", # accepts NONE, EVENT, VOD
+    #         playlist_window_seconds: 1,
+    #         program_date_time_interval_seconds: 1,
+    #       }
+    #
+    # @!attribute [rw] ad_markers
+    #   This setting controls how ad markers are included in the packaged
+    #   OriginEndpoint. "NONE" will omit all SCTE-35 ad markers from the
+    #   output. "PASSTHROUGH" causes the manifest to contain a copy of the
+    #   SCTE-35 ad markers (comments) taken directly from the input HTTP
+    #   Live Streaming (HLS) manifest. "SCTE35\_ENHANCED" generates ad
+    #   markers and blackout tags based on SCTE-35 messages in the input
+    #   source.
+    #   @return [String]
+    #
+    # @!attribute [rw] id
+    #   The ID of the manifest. The ID must be unique within the
+    #   OriginEndpoint and it cannot be changed after it is created.
+    #   @return [String]
+    #
+    # @!attribute [rw] include_iframe_only_stream
+    #   When enabled, an I-Frame only stream will be included in the output.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] manifest_name
+    #   An optional short string appended to the end of the OriginEndpoint
+    #   URL. If not specified, defaults to the manifestName for the
+    #   OriginEndpoint.
+    #   @return [String]
+    #
+    # @!attribute [rw] playlist_type
+    #   The HTTP Live Streaming (HLS) playlist type. When either "EVENT"
+    #   or "VOD" is specified, a corresponding EXT-X-PLAYLIST-TYPE entry
+    #   will be included in the media playlist.
+    #   @return [String]
+    #
+    # @!attribute [rw] playlist_window_seconds
+    #   Time window (in seconds) contained in each parent manifest.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] program_date_time_interval_seconds
+    #   The interval (in seconds) between each EXT-X-PROGRAM-DATE-TIME tag
+    #   inserted into manifests. Additionally, when an interval is specified
+    #   ID3Timed Metadata messages will be generated every 5 seconds using
+    #   the ingest time of the content. If the interval is not specified, or
+    #   set to 0, then no EXT-X-PROGRAM-DATE-TIME tags will be inserted into
+    #   manifests and no ID3Timed Metadata messages will be generated. Note
+    #   that irrespective of this parameter, if any ID3 Timed Metadata is
+    #   found in HTTP Live Streaming (HLS) input, it will be passed through
+    #   to HLS output.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/mediapackage-2017-10-12/HlsManifestCreateOrUpdateParameters AWS API Documentation
+    #
+    class HlsManifestCreateOrUpdateParameters < Struct.new(
+      :ad_markers,
+      :id,
+      :include_iframe_only_stream,
+      :manifest_name,
+      :playlist_type,
+      :playlist_window_seconds,
+      :program_date_time_interval_seconds)
+      include Aws::Structure
+    end
+
     # An HTTP Live Streaming (HLS) packaging configuration.
     #
     # @note When making an API call, you may pass HlsPackage
@@ -942,6 +1264,10 @@ module Aws::MediaPackage
     #   The ID of the Channel the OriginEndpoint is associated with.
     #   @return [String]
     #
+    # @!attribute [rw] cmaf_package
+    #   A Common Media Application Format (CMAF) packaging configuration.
+    #   @return [Types::CmafPackage]
+    #
     # @!attribute [rw] dash_package
     #   A Dynamic Adaptive Streaming over HTTP (DASH) packaging
     #   configuration.
@@ -993,6 +1319,7 @@ module Aws::MediaPackage
     class OriginEndpoint < Struct.new(
       :arn,
       :channel_id,
+      :cmaf_package,
       :dash_package,
       :description,
       :hls_package,
@@ -1013,6 +1340,10 @@ module Aws::MediaPackage
     #   with. This cannot be changed after the OriginEndpoint is created.
     #   @return [String]
     #
+    # @!attribute [rw] cmaf_package
+    #   A Common Media Application Format (CMAF) packaging configuration.
+    #   @return [Types::CmafPackageCreateOrUpdateParameters]
+    #
     # @!attribute [rw] dash_package
     #   A Dynamic Adaptive Streaming over HTTP (DASH) packaging
     #   configuration.
@@ -1061,6 +1392,7 @@ module Aws::MediaPackage
     #
     class OriginEndpointCreateParameters < Struct.new(
       :channel_id,
+      :cmaf_package,
       :dash_package,
       :description,
       :hls_package,
@@ -1094,6 +1426,10 @@ module Aws::MediaPackage
 
     # Configuration parameters for updating an existing OriginEndpoint.
     #
+    # @!attribute [rw] cmaf_package
+    #   A Common Media Application Format (CMAF) packaging configuration.
+    #   @return [Types::CmafPackageCreateOrUpdateParameters]
+    #
     # @!attribute [rw] dash_package
     #   A Dynamic Adaptive Streaming over HTTP (DASH) packaging
     #   configuration.
@@ -1135,6 +1471,7 @@ module Aws::MediaPackage
     # @see http://docs.aws.amazon.com/goto/WebAPI/mediapackage-2017-10-12/OriginEndpointUpdateParameters AWS API Documentation
     #
     class OriginEndpointUpdateParameters < Struct.new(
+      :cmaf_package,
       :dash_package,
       :description,
       :hls_package,
@@ -1307,6 +1644,35 @@ module Aws::MediaPackage
     #   data as a hash:
     #
     #       {
+    #         cmaf_package: {
+    #           encryption: {
+    #             key_rotation_interval_seconds: 1,
+    #             speke_key_provider: { # required
+    #               resource_id: "__string", # required
+    #               role_arn: "__string", # required
+    #               system_ids: ["__string"], # required
+    #               url: "__string", # required
+    #             },
+    #           },
+    #           hls_manifests: [
+    #             {
+    #               ad_markers: "NONE", # accepts NONE, SCTE35_ENHANCED, PASSTHROUGH
+    #               id: "__string", # required
+    #               include_iframe_only_stream: false,
+    #               manifest_name: "__string",
+    #               playlist_type: "NONE", # accepts NONE, EVENT, VOD
+    #               playlist_window_seconds: 1,
+    #               program_date_time_interval_seconds: 1,
+    #             },
+    #           ],
+    #           segment_duration_seconds: 1,
+    #           segment_prefix: "__string",
+    #           stream_selection: {
+    #             max_video_bits_per_second: 1,
+    #             min_video_bits_per_second: 1,
+    #             stream_order: "ORIGINAL", # accepts ORIGINAL, VIDEO_BITRATE_ASCENDING, VIDEO_BITRATE_DESCENDING
+    #           },
+    #         },
     #         dash_package: {
     #           encryption: {
     #             key_rotation_interval_seconds: 1,
@@ -1380,6 +1746,10 @@ module Aws::MediaPackage
     #         whitelist: ["__string"],
     #       }
     #
+    # @!attribute [rw] cmaf_package
+    #   A Common Media Application Format (CMAF) packaging configuration.
+    #   @return [Types::CmafPackageCreateOrUpdateParameters]
+    #
     # @!attribute [rw] dash_package
     #   A Dynamic Adaptive Streaming over HTTP (DASH) packaging
     #   configuration.
@@ -1414,6 +1784,7 @@ module Aws::MediaPackage
     # @see http://docs.aws.amazon.com/goto/WebAPI/mediapackage-2017-10-12/UpdateOriginEndpointRequest AWS API Documentation
     #
     class UpdateOriginEndpointRequest < Struct.new(
+      :cmaf_package,
       :dash_package,
       :description,
       :hls_package,
@@ -1432,6 +1803,10 @@ module Aws::MediaPackage
     # @!attribute [rw] channel_id
     #   @return [String]
     #
+    # @!attribute [rw] cmaf_package
+    #   A Common Media Application Format (CMAF) packaging configuration.
+    #   @return [Types::CmafPackage]
+    #
     # @!attribute [rw] dash_package
     #   A Dynamic Adaptive Streaming over HTTP (DASH) packaging
     #   configuration.
@@ -1471,6 +1846,7 @@ module Aws::MediaPackage
     class UpdateOriginEndpointResponse < Struct.new(
       :arn,
       :channel_id,
+      :cmaf_package,
       :dash_package,
       :description,
       :hls_package,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-mediapackage
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: AWS SDK for Ruby - MediaPackage