From 874aef0a75c6a49f70aa68b72dcd92c689071238 Mon Sep 17 00:00:00 2001 From: Eddie Goynes Date: Wed, 17 Nov 2021 13:57:22 -0800 Subject: [PATCH] Update to version v5.3.0 --- .gitignore | 11 +- CHANGELOG.md | 24 + LICENSE.txt | 2 +- NOTICE.txt | 2 +- README.md | 59 +- deployment/video-on-demand-on-aws.yaml | 105 + source/archive-source/index.js | 2 +- source/archive-source/lib/error.js | 2 +- source/archive-source/lib/index.spec.js | 2 +- source/custom-resource/index.js | 2 +- source/custom-resource/lib/cfn/index.js | 2 +- source/custom-resource/lib/cfn/index.spec.js | 2 +- .../custom-resource/lib/mediaconvert/index.js | 89 +- .../lib/mediaconvert/index.spec.js | 2 +- ..._Avc_Aac_16x9_1280x720p_4.5Mbps_qvbr.json} | 15 +- ...4_Avc_Aac_16x9_1920x1080p_6Mbps_qvbr.json} | 15 +- ..._Mp4_Hevc_Aac_16x9_3840x2160p_20Mbps.json} | 15 +- ...Hevc_Aac_16x9_3840x2160p_20Mbps_qvbr.json} | 15 +- ..._Mp4_Avc_16x9_1280x720p_3.5Mbps_qvbr.json} | 15 +- ..._Mp4_Avc_16x9_1280x720p_5.0Mbps_qvbr.json} | 15 +- ..._Mp4_Avc_16x9_1280x720p_6.5Mbps_qvbr.json} | 15 +- ...Mp4_Avc_16x9_1920x1080p_8.5Mbps_qvbr.json} | 15 +- ...h_Mp4_Avc_16x9_480x270p_0.4Mbps_qvbr.json} | 15 +- ...h_Mp4_Avc_16x9_640x360p_0.6Mbps_qvbr.json} | 15 +- ...h_Mp4_Avc_16x9_640x360p_1.2Mbps_qvbr.json} | 15 +- ...h_Mp4_Avc_16x9_960x540p_3.5Mbps_qvbr.json} | 15 +- ..._Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr.json} | 15 +- ..._Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr.json} | 15 +- ..._Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr.json} | 15 +- ...Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr.json} | 15 +- ...s_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr.json} | 15 +- ...s_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr.json} | 4 +- ...s_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr.json} | 15 +- ...s_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr.json} | 15 +- .../templates/1080p_avc_aac_16x9.json | 101 +- .../templates/1080p_avc_aac_16x9_mvod.json | 51 +- .../1080p_avc_aac_16x9_mvod_no_preset.json | 177 +- .../templates/1080p_avc_aac_16x9_qvbr.json | 101 +- .../1080p_avc_aac_16x9_qvbr_no_preset.json | 563 +-- .../templates/2160p_avc_aac_16x9.json | 106 +- .../templates/2160p_avc_aac_16x9_mvod.json | 56 +- .../2160p_avc_aac_16x9_mvod_no_preset.json | 174 +- .../templates/2160p_avc_aac_16x9_qvbr.json | 106 +- .../2160p_avc_aac_16x9_qvbr_no_preset.json | 561 +-- .../templates/720p_avc_aac_16x9.json | 88 +- .../templates/720p_avc_aac_16x9_mvod.json | 42 +- .../720p_avc_aac_16x9_mvod_no_preset.json | 163 +- .../templates/720p_avc_aac_16x9_qvbr.json | 88 +- .../720p_avc_aac_16x9_qvbr_no_preset.json | 480 +-- .../lib/mediapackage/cloudfront.js | 14 +- .../lib/mediapackage/cloudfront.spec.js | 2 +- .../custom-resource/lib/mediapackage/index.js | 8 +- .../lib/mediapackage/index.spec.js | 2 +- source/custom-resource/lib/metrics/index.js | 2 +- .../custom-resource/lib/metrics/index.spec.js | 2 +- source/custom-resource/lib/s3/index.js | 232 +- source/custom-resource/lib/s3/index.spec.js | 2 +- source/custom-resource/package-lock.json | 3133 ----------------- source/custom-resource/package.json | 6 +- source/dynamo/index.js | 5 +- source/dynamo/lib/error.js | 2 +- source/dynamo/lib/index.spec.js | 2 +- source/encode/index.js | 11 +- source/encode/lib/error.js | 2 +- source/encode/lib/index.spec.js | 2 +- source/error-handler/index.js | 8 +- source/error-handler/lib/index.spec.js | 2 +- source/input-validate/index.js | 4 +- source/input-validate/lib/error.js | 2 +- source/input-validate/lib/index.spec.js | 2 +- source/media-package-assets/index.js | 4 +- source/media-package-assets/lib/error.js | 2 +- source/media-package-assets/lib/index.spec.js | 2 +- source/output-validate/index.js | 7 +- source/output-validate/lib/error.js | 2 +- source/output-validate/lib/index.spec.js | 2 +- source/profiler/index.js | 5 +- source/profiler/lib/error.js | 2 +- source/profiler/lib/index.spec.js | 2 +- source/sns-notification/index.js | 5 +- source/sns-notification/lib/error.js | 2 +- source/sns-notification/lib/index.spec.js | 2 +- source/sqs-publish/index.js | 3 +- source/step-functions/index.js | 5 +- source/step-functions/lib/error.js | 2 +- source/step-functions/lib/index.spec.js | 2 +- 86 files changed, 759 insertions(+), 6187 deletions(-) rename source/custom-resource/lib/mediaconvert/presets/{_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr.json => _Mp4_Avc_Aac_16x9_1280x720p_4.5Mbps_qvbr.json} (85%) rename source/custom-resource/lib/mediaconvert/presets/{_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps_qvbr.json => _Mp4_Avc_Aac_16x9_1920x1080p_6Mbps_qvbr.json} (85%) rename source/custom-resource/lib/mediaconvert/presets/{_Mp4_Hevc_Aac_16x9_3840x2160p_24Hz_20Mbps.json => _Mp4_Hevc_Aac_16x9_3840x2160p_20Mbps.json} (85%) rename source/custom-resource/lib/mediaconvert/presets/{_Mp4_Hevc_Aac_16x9_3840x2160p_24Hz_20Mbps_qvbr.json => _Mp4_Hevc_Aac_16x9_3840x2160p_20Mbps_qvbr.json} (85%) rename source/custom-resource/lib/mediaconvert/presets/{_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3.5Mbps_qvbr.json => _Ott_Dash_Mp4_Avc_16x9_1280x720p_3.5Mbps_qvbr.json} (80%) rename source/custom-resource/lib/mediaconvert/presets/{_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5.0Mbps_qvbr.json => _Ott_Dash_Mp4_Avc_16x9_1280x720p_5.0Mbps_qvbr.json} (80%) rename source/custom-resource/lib/mediaconvert/presets/{_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.5Mbps_qvbr.json => _Ott_Dash_Mp4_Avc_16x9_1280x720p_6.5Mbps_qvbr.json} (80%) rename source/custom-resource/lib/mediaconvert/presets/{_Ott_Dash_Mp4_Avc_16x9_1920x1080p_30Hz_8.5Mbps_qvbr.json => _Ott_Dash_Mp4_Avc_16x9_1920x1080p_8.5Mbps_qvbr.json} (80%) rename source/custom-resource/lib/mediaconvert/presets/{_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps_qvbr.json => _Ott_Dash_Mp4_Avc_16x9_480x270p_0.4Mbps_qvbr.json} (80%) rename source/custom-resource/lib/mediaconvert/presets/{_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_0.6Mbps_qvbr.json => _Ott_Dash_Mp4_Avc_16x9_640x360p_0.6Mbps_qvbr.json} (80%) rename source/custom-resource/lib/mediaconvert/presets/{_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.2Mbps_qvbr.json => _Ott_Dash_Mp4_Avc_16x9_640x360p_1.2Mbps_qvbr.json} (80%) rename source/custom-resource/lib/mediaconvert/presets/{_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps_qvbr.json => _Ott_Dash_Mp4_Avc_16x9_960x540p_3.5Mbps_qvbr.json} (80%) rename source/custom-resource/lib/mediaconvert/presets/{_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr.json => _Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr.json} (87%) rename source/custom-resource/lib/mediaconvert/presets/{_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr.json => _Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr.json} (87%) rename source/custom-resource/lib/mediaconvert/presets/{_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr.json => _Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr.json} (87%) rename source/custom-resource/lib/mediaconvert/presets/{_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr.json => _Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr.json} (87%) rename source/custom-resource/lib/mediaconvert/presets/{_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr.json => _Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr.json} (87%) rename source/custom-resource/lib/mediaconvert/presets/{_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr.json => _Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr.json} (96%) rename source/custom-resource/lib/mediaconvert/presets/{_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr.json => _Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr.json} (87%) rename source/custom-resource/lib/mediaconvert/presets/{_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr.json => _Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr.json} (87%) delete mode 100644 source/custom-resource/package-lock.json diff --git a/.gitignore b/.gitignore index edfc18b7..509c06af 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,6 @@ **/regional-s3-assets **/open-source **/.zip -**/tmp -**/out-tsc # python output **/__pycache__ @@ -16,18 +14,11 @@ # dependencies **/node_modules - -# e2e -**/e2e/*.js -**/e2e/*.map +package-lock.json # misc **/npm-debug.log -**/testem.log -# **/package-lock.json **/.vscode/settings.json -*~ -~* # System Files **/.DS_Store diff --git a/CHANGELOG.md b/CHANGELOG.md index 38268fd6..f687c881 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,30 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + + +## [5.3.0] - 2021-11-17 +### Added +- Added new input file types wmv, mkv, m3u8, mpeg, webm, and h264. +- Now allowing uppercase input file types to run the end to end video encoding workflow. +- Added the MXF and mxf file types. Closes this request (https://github.com/aws-solutions/video-on-demand-on-aws/issues/124) +- Additional headers added to Amazon CloudFront distribution attached to destination bucket for the out/* prefix. This will allow easier playback of content on modern browsers. Additional headers whitelisted are Origin, Access-Control-Allow-Origin, Access-Control-Request-Method, and Access-Control-Request-Headers. +- Additional methods added to Amazon CloudFront distribution for destination bucket. Head and options added. + +### Changed +- Added steps in Readme to make building the project more clear. +- Added Readme build step to ensure bucket ownership when uploading build files. +- Removed deinterlacer preprocessor from templates to reduce costs. This causes MediaConvert jobs to run in Basic Tier mode instead of Pro Tier. +- Modified job templates that force output frame rate to 30, 24, or 15 fps to instead follow the source fps of your video file. This allows 60fps content, as well as PAL 25/50 fps video files to have their frame rate preserved. +- Removed Dash and MP4 outputs, leaving just the HLS output. This saves costs running this solution. +- Removed SelectorType and Tracks from job profiles, we will auto pick the first track. This allows audio only videos to encode without having an error. +- Changed AWS MediaConvert templates codecLevel to auto to allow for more supported input file types. +- Changed AWS MediaConvert audio track to auto to allow for video only workflows. This allows video files without audio track to work with the included AWS MediaConvert profiles. + +### Fixed +- Fixed naming in the MediaConvert custom resource. Closes this PR (https://github.com/aws-solutions/video-on-demand-on-aws/pull/84) +- Update Axios package to 0.21.1 + ## [5.2.0] - 2020-12-10 ### Added - Support for S3 Signature Version4 for pre-signed URLs (https://github.com/awslabs/video-on-demand-on-aws/pull/111) diff --git a/LICENSE.txt b/LICENSE.txt index e59e533e..2528575e 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2019 - 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright - Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/NOTICE.txt b/NOTICE.txt index 080a98b0..4f82c9ee 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,6 +1,6 @@ Video on Demand on AWS -Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. ********************** THIRD PARTY COMPONENTS diff --git a/README.md b/README.md index a3807d06..766e5d5c 100644 --- a/README.md +++ b/README.md @@ -4,16 +4,31 @@ How to implement a video-on-demand workflow on AWS leveraging AWS Step Functions Source code for [Video on Demand on AWS](https://aws.amazon.com/solutions/video-on-demand-on-aws/) solution. ## On this Page -- [Architecture Overview](#architecture-overview) -- [Deployment](#deployment) -- [Workflow Configuration](#workflow-configuration) -- [Source Metadata Option](#source-metadata-option) -- [Encoding Templates](#encoding-templates) -- [QVBR Mode](#qvbr-mode) -- [Accelerated Transcoding](#accelerated-transcoding) -- [Source Code](#source-code) -- [Creating a custom Build](#creating-a-custom-build) -- [Additional Resources](#additional-resources) +- [Video on Demand on AWS](#video-on-demand-on-aws) + - [On this Page](#on-this-page) + - [Architecture Overview](#architecture-overview) + - [Deployment](#deployment) + - [Workflow Configuration](#workflow-configuration) + - [Environment Variables:](#environment-variables) + - [WorkFlow Triggers](#workflow-triggers) + - [Source Video Option](#source-video-option) + - [Source Metadata Option](#source-metadata-option) + - [Encoding Templates](#encoding-templates) + - [QVBR Mode](#qvbr-mode) + - [Accelerated Transcoding](#accelerated-transcoding) + - [Source code](#source-code) + - [Node.js 12](#nodejs-12) + - [Python 3.7](#python-37) + - [Creating a custom build](#creating-a-custom-build) + - [Prerequisites:](#prerequisites) + - [1. Running unit tests for customization](#1-running-unit-tests-for-customization) + - [2. Create an Amazon S3 Bucket](#2-create-an-amazon-s3-bucket) + - [3. Build MediaInfo](#3-build-mediainfo) + - [4. Create the deployment packages](#4-create-the-deployment-packages) + - [5. Launch the CloudFormation template.](#5-launch-the-cloudformation-template) + - [Additional Resources](#additional-resources) + - [Services](#services) + - [Other Solutions and Demos](#other-solutions-and-demos) ## Architecture Overview ![Architecture](architecture.png) @@ -195,7 +210,8 @@ For more information, check out the [MediaInfo site](https://mediaarea.net/en/Me ### 4. Create the deployment packages -Build the distributable: +First change directory into the deployment directory. +Run the following commands to build the distribution. ``` chmod +x ./build-s3-dist.sh ./build-s3-dist.sh my-bucket video-on-demand-on-aws version @@ -203,6 +219,11 @@ chmod +x ./build-s3-dist.sh > **Notes**: The _build-s3-dist_ script expects the bucket name as one of its parameters, and this value should not include the region suffix. +Run this command to ensure that you are an owner of the AWS S3 bucket you are uploading files to. +``` +aws s3api head-bucket --bucket my-bucket-us-east-1 --expected-bucket-owner +``` + Deploy the distributable to the Amazon S3 bucket in your account: ``` aws s3 cp ./regional-s3-assets/ s3://my-bucket-us-east-1/video-on-demand-on-aws/version/ --recursive --acl bucket-owner-full-control @@ -230,16 +251,9 @@ aws s3 cp ./regional-s3-assets/ s3://my-bucket-us-east-1/video-on-demand-on-aws/ - [Live to VOD with Machine Learning](https://github.com/aws-samples/aws-elemental-instant-video-highlights) - [Demo SPEKE Reference Server](https://github.com/awslabs/speke-reference-server) - - -This solution collects anonymous operational metrics to help AWS improve the -quality of features of the solution. For more information, including how to disable -this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/video-on-demand/appendix-h.html). - - *** -Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. +Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -252,3 +266,10 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + +*** + +This solution collects anonymous operational metrics to help AWS improve the +quality of features of the solution. For more information, including how to disable +this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/video-on-demand/appendix-h.html). + diff --git a/deployment/video-on-demand-on-aws.yaml b/deployment/video-on-demand-on-aws.yaml index ab737379..3858f52f 100644 --- a/deployment/video-on-demand-on-aws.yaml +++ b/deployment/video-on-demand-on-aws.yaml @@ -611,6 +611,14 @@ Resources: Environment: Variables: AWS_NODEJS_CONNECTION_REUSE_ENABLED: "1" + SOLUTION_IDENTIFIER: "AwsSolution/SO0021/%%VERSION%%" + Metadata: + cfn_nag: + rules_to_suppress: + - id: W89 + reason: "Lambda functions do not need a VPC" + - id: W92 + reason: "Lambda do not need ReservedConcurrentExecutions in this case" StepFunctionsRole: Type: AWS::IAM::Role @@ -672,6 +680,14 @@ Resources: ProcessWorkflow: !Sub "arn:${AWS::Partition}:states:${AWS::Region}:${AWS::AccountId}:stateMachine:${AWS::StackName}-process" PublishWorkflow: !Sub "arn:${AWS::Partition}:states:${AWS::Region}:${AWS::AccountId}:stateMachine:${AWS::StackName}-publish" ErrorHandler: !GetAtt ErrorHandler.Arn + SOLUTION_IDENTIFIER: "AwsSolution/SO0021/%%VERSION%%" + Metadata: + cfn_nag: + rules_to_suppress: + - id: W89 + reason: "Lambda functions do not need a VPC" + - id: W92 + reason: "Lambda do not need ReservedConcurrentExecutions in this case" InputValidateRole: Type: AWS::IAM::Role @@ -754,6 +770,14 @@ Resources: EnableSns: !Ref EnableSns EnableSqs: !Ref EnableSqs AcceleratedTranscoding: !Ref AcceleratedTranscoding + SOLUTION_IDENTIFIER: "AwsSolution/SO0021/%%VERSION%%" + Metadata: + cfn_nag: + rules_to_suppress: + - id: W89 + reason: "Lambda functions do not need a VPC" + - id: W92 + reason: "Lambda do not need ReservedConcurrentExecutions in this case" MediainfoRole: Type: AWS::IAM::Role @@ -810,6 +834,14 @@ Resources: Environment: Variables: ErrorHandler: !GetAtt ErrorHandler.Arn + SOLUTION_IDENTIFIER: "AwsSolution/SO0021/%%VERSION%%" + Metadata: + cfn_nag: + rules_to_suppress: + - id: W89 + reason: "Lambda functions do not need a VPC" + - id: W92 + reason: "Lambda do not need ReservedConcurrentExecutions in this case" DynamoUpdateRole: Type: AWS::IAM::Role @@ -867,6 +899,14 @@ Resources: AWS_NODEJS_CONNECTION_REUSE_ENABLED: "1" DynamoDBTable: !Ref DynamoDBTable ErrorHandler: !GetAtt ErrorHandler.Arn + SOLUTION_IDENTIFIER: "AwsSolution/SO0021/%%VERSION%%" + Metadata: + cfn_nag: + rules_to_suppress: + - id: W89 + reason: "Lambda functions do not need a VPC" + - id: W92 + reason: "Lambda do not need ReservedConcurrentExecutions in this case" ProfilerRole: Type: AWS::IAM::Role @@ -924,6 +964,14 @@ Resources: AWS_NODEJS_CONNECTION_REUSE_ENABLED: "1" DynamoDBTable: !Ref DynamoDBTable ErrorHandler: !GetAtt ErrorHandler.Arn + SOLUTION_IDENTIFIER: "AwsSolution/SO0021/%%VERSION%%" + Metadata: + cfn_nag: + rules_to_suppress: + - id: W89 + reason: "Lambda functions do not need a VPC" + - id: W92 + reason: "Lambda do not need ReservedConcurrentExecutions in this case" EncodeRole: Type: AWS::IAM::Role @@ -988,6 +1036,14 @@ Resources: ErrorHandler: !GetAtt ErrorHandler.Arn MediaConvertRole: !GetAtt MediaConvertRole.Arn EndPoint: !GetAtt MediaConvertEndPoint.EndpointUrl + SOLUTION_IDENTIFIER: "AwsSolution/SO0021/%%VERSION%%" + Metadata: + cfn_nag: + rules_to_suppress: + - id: W89 + reason: "Lambda functions do not need a VPC" + - id: W92 + reason: "Lambda do not need ReservedConcurrentExecutions in this case" OutputValidateRole: Type: AWS::IAM::Role @@ -1051,6 +1107,14 @@ Resources: DynamoDBTable: !Ref DynamoDBTable ErrorHandler: !GetAtt ErrorHandler.Arn EndPoint: !GetAtt MediaConvertEndPoint.EndpointUrl + SOLUTION_IDENTIFIER: "AwsSolution/SO0021/%%VERSION%%" + Metadata: + cfn_nag: + rules_to_suppress: + - id: W89 + reason: "Lambda functions do not need a VPC" + - id: W92 + reason: "Lambda do not need ReservedConcurrentExecutions in this case" ArchiveSourceRole: Type: AWS::IAM::Role @@ -1107,6 +1171,14 @@ Resources: Variables: AWS_NODEJS_CONNECTION_REUSE_ENABLED: "1" ErrorHandler: !GetAtt ErrorHandler.Arn + SOLUTION_IDENTIFIER: "AwsSolution/SO0021/%%VERSION%%" + Metadata: + cfn_nag: + rules_to_suppress: + - id: W89 + reason: "Lambda functions do not need a VPC" + - id: W92 + reason: "Lambda do not need ReservedConcurrentExecutions in this case" SqsSendMessageRole: Type: AWS::IAM::Role @@ -1172,6 +1244,15 @@ Resources: AWS_NODEJS_CONNECTION_REUSE_ENABLED: "1" ErrorHandler: !GetAtt ErrorHandler.Arn SqsQueue: !Ref SqsQueue + SOLUTION_IDENTIFIER: "AwsSolution/SO0021/%%VERSION%%" + Metadata: + cfn_nag: + rules_to_suppress: + - id: W89 + reason: "Lambda functions do not need a VPC" + - id: W92 + reason: "Lambda do not need ReservedConcurrentExecutions in this case" + SnsNotificationRole: Type: AWS::IAM::Role Properties: @@ -1232,6 +1313,14 @@ Resources: AWS_NODEJS_CONNECTION_REUSE_ENABLED: "1" ErrorHandler: !GetAtt ErrorHandler.Arn SnsTopic: !Ref SnsTopic + SOLUTION_IDENTIFIER: "AwsSolution/SO0021/%%VERSION%%" + Metadata: + cfn_nag: + rules_to_suppress: + - id: W89 + reason: "Lambda functions do not need a VPC" + - id: W92 + reason: "Lambda do not need ReservedConcurrentExecutions in this case" MediaPackageAssetsRole: Type: AWS::IAM::Role @@ -1295,6 +1384,14 @@ Resources: GroupId: !GetAtt MediaPackageVod.GroupId GroupDomainName: !GetAtt MediaPackageVod.GroupDomainName MediaPackageVodRole: !GetAtt MediaPackageVodRole.Arn + SOLUTION_IDENTIFIER: "AwsSolution/SO0021/%%VERSION%%" + Metadata: + cfn_nag: + rules_to_suppress: + - id: W89 + reason: "Lambda functions do not need a VPC" + - id: W92 + reason: "Lambda do not need ReservedConcurrentExecutions in this case" ErrorHandlerRole: Type: AWS::IAM::Role @@ -1355,6 +1452,14 @@ Resources: AWS_NODEJS_CONNECTION_REUSE_ENABLED: "1" DynamoDBTable: !Ref DynamoDBTable SnsTopic: !Ref SnsTopic + SOLUTION_IDENTIFIER: "AwsSolution/SO0021/%%VERSION%%" + Metadata: + cfn_nag: + rules_to_suppress: + - id: W89 + reason: "Lambda functions do not need a VPC" + - id: W92 + reason: "Lambda do not need ReservedConcurrentExecutions in this case" IngestWorkflow: Type: AWS::StepFunctions::StateMachine diff --git a/source/archive-source/index.js b/source/archive-source/index.js index edb4f78e..60e32e69 100644 --- a/source/archive-source/index.js +++ b/source/archive-source/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/archive-source/lib/error.js b/source/archive-source/lib/error.js index 53b6be3f..91da391b 100644 --- a/source/archive-source/lib/error.js +++ b/source/archive-source/lib/error.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/archive-source/lib/index.spec.js b/source/archive-source/lib/index.spec.js index 7d257d35..c87a9d9b 100644 --- a/source/archive-source/lib/index.spec.js +++ b/source/archive-source/lib/index.spec.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/custom-resource/index.js b/source/custom-resource/index.js index 18433900..9e91baa6 100644 --- a/source/custom-resource/index.js +++ b/source/custom-resource/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/custom-resource/lib/cfn/index.js b/source/custom-resource/lib/cfn/index.js index b2c9927c..f2806594 100644 --- a/source/custom-resource/lib/cfn/index.js +++ b/source/custom-resource/lib/cfn/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/custom-resource/lib/cfn/index.spec.js b/source/custom-resource/lib/cfn/index.spec.js index 4ca9c19f..56fd25c6 100644 --- a/source/custom-resource/lib/cfn/index.spec.js +++ b/source/custom-resource/lib/cfn/index.spec.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/custom-resource/lib/mediaconvert/index.js b/source/custom-resource/lib/mediaconvert/index.js index f62deaba..4fba34a4 100644 --- a/source/custom-resource/lib/mediaconvert/index.js +++ b/source/custom-resource/lib/mediaconvert/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * @@ -19,80 +19,80 @@ const DESCRIPTION = 'video on demand on aws'; const qvbrPresets = [ { - name: '_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr', - file: './lib/mediaconvert/presets/_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr.json' + name: '_Mp4_Avc_Aac_16x9_1280x720p_4.5Mbps_qvbr', + file: './lib/mediaconvert/presets/_Mp4_Avc_Aac_16x9_1280x720p_4.5Mbps_qvbr.json' }, { - name: '_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps_qvbr', - file: './lib/mediaconvert/presets/_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps_qvbr.json' + name: '_Mp4_Avc_Aac_16x9_1920x1080p_6Mbps_qvbr', + file: './lib/mediaconvert/presets/_Mp4_Avc_Aac_16x9_1920x1080p_6Mbps_qvbr.json' }, { - name: '_Mp4_Hevc_Aac_16x9_3840x2160p_24Hz_20Mbps_qvbr', - file: './lib/mediaconvert/presets/_Mp4_Hevc_Aac_16x9_3840x2160p_24Hz_20Mbps_qvbr.json' + name: '_Mp4_Hevc_Aac_16x9_3840x2160p_20Mbps_qvbr', + file: './lib/mediaconvert/presets/_Mp4_Hevc_Aac_16x9_3840x2160p_20Mbps_qvbr.json' }, { - name: '_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.5Mbps_qvbr', - file: './lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.5Mbps_qvbr.json' + name: '_Ott_Dash_Mp4_Avc_16x9_1280x720p_6.5Mbps_qvbr', + file: './lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_6.5Mbps_qvbr.json' }, { - name: '_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps_qvbr', - file: './lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps_qvbr.json' + name: '_Ott_Dash_Mp4_Avc_16x9_480x270p_0.4Mbps_qvbr', + file: './lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_480x270p_0.4Mbps_qvbr.json' }, { - name: '_Ott_Dash_Mp4_Avc_16x9_1920x1080p_30Hz_8.5Mbps_qvbr', - file: './lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1920x1080p_30Hz_8.5Mbps_qvbr.json' + name: '_Ott_Dash_Mp4_Avc_16x9_1920x1080p_8.5Mbps_qvbr', + file: './lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1920x1080p_8.5Mbps_qvbr.json' }, { - name: '_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_0.6Mbps_qvbr', - file: './lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_0.6Mbps_qvbr.json' + name: '_Ott_Dash_Mp4_Avc_16x9_640x360p_0.6Mbps_qvbr', + file: './lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_640x360p_0.6Mbps_qvbr.json' }, { - name: '_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3.5Mbps_qvbr', - file: './lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3.5Mbps_qvbr.json' + name: '_Ott_Dash_Mp4_Avc_16x9_1280x720p_3.5Mbps_qvbr', + file: './lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_3.5Mbps_qvbr.json' }, { - name: '_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.2Mbps_qvbr', - file: './lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.2Mbps_qvbr.json' + name: '_Ott_Dash_Mp4_Avc_16x9_640x360p_1.2Mbps_qvbr', + file: './lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_640x360p_1.2Mbps_qvbr.json' }, { - name: '_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5.0Mbps_qvbr', - file: './lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5.0Mbps_qvbr.json' + name: '_Ott_Dash_Mp4_Avc_16x9_1280x720p_5.0Mbps_qvbr', + file: './lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_5.0Mbps_qvbr.json' }, { - name: '_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps_qvbr', - file: './lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps_qvbr.json' + name: '_Ott_Dash_Mp4_Avc_16x9_960x540p_3.5Mbps_qvbr', + file: './lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_960x540p_3.5Mbps_qvbr.json' }, { - name: '_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr', - file: './lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr.json' + name: '_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr', + file: './lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr.json' }, { - name: '_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr', - file: './lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr.json' + name: '_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr', + file: './lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr.json' }, { - name: '_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr', - file: './lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr.json' + name: '_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr', + file: './lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr.json' }, { - name: '_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr', - file: './lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr.json' + name: '_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr', + file: './lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr.json' }, { - name: '_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr', - file: './lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr.json' + name: '_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr', + file: './lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr.json' }, { - name: '_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr', - file: './lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr.json' + name: '_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr', + file: './lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr.json' }, { - name: '_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr', - file: './lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr.json' + name: '_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr', + file: './lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr.json' }, { - name: '_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr', - file: './lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr.json' + name: '_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr', + file: './lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr.json' } ]; @@ -160,7 +160,7 @@ const mediaPackageTemplatesNoPreset = [ // Get the Account regional MediaConvert endpoint for making API calls const GetEndpoints = async () => { - const mediaconvert = new AWS.MediaConvert(); + const mediaconvert = new AWS.MediaConvert({customUserAgent: process.env.SOLUTION_IDENTIFIER}); const data = await mediaconvert.describeEndpoints().promise(); return { @@ -182,7 +182,8 @@ const _createTemplates = async (instance, templates, stackName) => { const Create = async (config) => { const mediaconvert = new AWS.MediaConvert({ endpoint: config.EndPoint, - region: process.env.AWS_REGION + region: process.env.AWS_REGION, + customUserAgent: process.env.SOLUTION_IDENTIFIER }); await _createTemplates(mediaconvert, mediaPackageTemplatesNoPreset, config.StackName); @@ -194,7 +195,8 @@ const Create = async (config) => { const Update = async (config) => { const mediaconvert = new AWS.MediaConvert({ endpoint: config.EndPoint, - region: process.env.AWS_REGION + region: process.env.AWS_REGION, + customUserAgent: process.env.SOLUTION_IDENTIFIER }); let templatesNoPreset = 'false'; @@ -238,7 +240,8 @@ const _deleteTemplates = async (instance, templates, stackName) => { const Delete = async (config) => { const mediaconvert = new AWS.MediaConvert({ endpoint: config.EndPoint, - region: process.env.AWS_REGION + region: process.env.AWS_REGION, + customUserAgent: process.env.SOLUTION_IDENTIFIER }); try { diff --git a/source/custom-resource/lib/mediaconvert/index.spec.js b/source/custom-resource/lib/mediaconvert/index.spec.js index 9fce87fc..56b9813b 100644 --- a/source/custom-resource/lib/mediaconvert/index.spec.js +++ b/source/custom-resource/lib/mediaconvert/index.spec.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/custom-resource/lib/mediaconvert/presets/_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Mp4_Avc_Aac_16x9_1280x720p_4.5Mbps_qvbr.json similarity index 85% rename from source/custom-resource/lib/mediaconvert/presets/_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Mp4_Avc_Aac_16x9_1280x720p_4.5Mbps_qvbr.json index f851a834..f8ebc2d7 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Mp4_Avc_Aac_16x9_1280x720p_4.5Mbps_qvbr.json @@ -8,12 +8,9 @@ "TemporalAdaptiveQuantization": "ENABLED", "Softness": 0, "Syntax": "DEFAULT", - "FramerateNumerator": 24000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, + "FramerateControl": "INITIALIZE_FROM_SOURCE", "QvbrSettings": { "QvbrQualityLevel": 8 }, @@ -39,19 +36,11 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_4", "NumberBFramesBetweenReferenceFrames": 3, "HrdBufferSize": 9000000 } }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Mp4_Avc_Aac_16x9_1920x1080p_6Mbps_qvbr.json similarity index 85% rename from source/custom-resource/lib/mediaconvert/presets/_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Mp4_Avc_Aac_16x9_1920x1080p_6Mbps_qvbr.json index 31c1757c..b8b86db8 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Mp4_Avc_Aac_16x9_1920x1080p_6Mbps_qvbr.json @@ -8,12 +8,9 @@ "TemporalAdaptiveQuantization": "ENABLED", "Softness": 0, "Syntax": "DEFAULT", - "FramerateNumerator": 24000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, + "FramerateControl": "INITIALIZE_FROM_SOURCE", "QvbrSettings": { "QvbrQualityLevel": 8 }, @@ -39,19 +36,11 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_4", "NumberBFramesBetweenReferenceFrames": 1, "HrdBufferSize": 12000000 } }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Mp4_Hevc_Aac_16x9_3840x2160p_24Hz_20Mbps.json b/source/custom-resource/lib/mediaconvert/presets/_Mp4_Hevc_Aac_16x9_3840x2160p_20Mbps.json similarity index 85% rename from source/custom-resource/lib/mediaconvert/presets/_Mp4_Hevc_Aac_16x9_3840x2160p_24Hz_20Mbps.json rename to source/custom-resource/lib/mediaconvert/presets/_Mp4_Hevc_Aac_16x9_3840x2160p_20Mbps.json index 277d0cca..37679967 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Mp4_Hevc_Aac_16x9_3840x2160p_24Hz_20Mbps.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Mp4_Hevc_Aac_16x9_3840x2160p_20Mbps.json @@ -2,16 +2,13 @@ "VideoDescription": { "CodecSettings": { "H265Settings": { - "NumberReferenceFrames": 3, "SpatialAdaptiveQuantization": "ENABLED", "TemporalAdaptiveQuantization": "ENABLED", - "FramerateNumerator": 24000, "Tiles": "ENABLED", "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "CodecProfile": "MAIN_MAIN", - "FramerateDenominator": 1001, "Bitrate": 20000000, "RateControlMode": "CBR", "GopBReference": "ENABLED", @@ -34,20 +31,12 @@ "AlternateTransferFunctionSei": "DISABLED", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "AUTO", "GopClosedCadence": 1, "HrdBufferSize": 16000000 }, "Codec": "H_265" }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Mp4_Hevc_Aac_16x9_3840x2160p_24Hz_20Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Mp4_Hevc_Aac_16x9_3840x2160p_20Mbps_qvbr.json similarity index 85% rename from source/custom-resource/lib/mediaconvert/presets/_Mp4_Hevc_Aac_16x9_3840x2160p_24Hz_20Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Mp4_Hevc_Aac_16x9_3840x2160p_20Mbps_qvbr.json index 72865578..d879bd10 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Mp4_Hevc_Aac_16x9_3840x2160p_24Hz_20Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Mp4_Hevc_Aac_16x9_3840x2160p_20Mbps_qvbr.json @@ -2,16 +2,13 @@ "VideoDescription": { "CodecSettings": { "H265Settings": { - "NumberReferenceFrames": 3, "SpatialAdaptiveQuantization": "ENABLED", "TemporalAdaptiveQuantization": "ENABLED", - "FramerateNumerator": 24000, "Tiles": "ENABLED", "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "CodecProfile": "MAIN_MAIN", - "FramerateDenominator": 1001, "QvbrSettings": { "QvbrQualityLevel": 8 }, @@ -37,20 +34,12 @@ "AlternateTransferFunctionSei": "DISABLED", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "AUTO", "GopClosedCadence": 1, "HrdBufferSize": 16000000 }, "Codec": "H_265" }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3.5Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_3.5Mbps_qvbr.json similarity index 80% rename from source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3.5Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_3.5Mbps_qvbr.json index f1d1cc8c..de47a1ee 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3.5Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_3.5Mbps_qvbr.json @@ -7,12 +7,9 @@ "SpatialAdaptiveQuantization": "ENABLED", "TemporalAdaptiveQuantization": "ENABLED", "Syntax": "DEFAULT", - "FramerateNumerator": 30000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, + "FramerateControl": "INITIALIZE_FROM_SOURCE", "QvbrSettings": { "QvbrQualityLevel": 7 }, @@ -38,19 +35,11 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_4", "NumberBFramesBetweenReferenceFrames": 3, "HrdBufferSize": 7000000 } }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5.0Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_5.0Mbps_qvbr.json similarity index 80% rename from source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5.0Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_5.0Mbps_qvbr.json index 3aec7c51..6cecaebc 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5.0Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_5.0Mbps_qvbr.json @@ -7,12 +7,9 @@ "SpatialAdaptiveQuantization": "ENABLED", "TemporalAdaptiveQuantization": "ENABLED", "Syntax": "DEFAULT", - "FramerateNumerator": 30000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, + "FramerateControl": "INITIALIZE_FROM_SOURCE", "QvbrSettings": { "QvbrQualityLevel": 8 }, @@ -38,19 +35,11 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_4", "NumberBFramesBetweenReferenceFrames": 3, "HrdBufferSize": 10000000 } }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.5Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_6.5Mbps_qvbr.json similarity index 80% rename from source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.5Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_6.5Mbps_qvbr.json index 84ad2f72..d4623984 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.5Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1280x720p_6.5Mbps_qvbr.json @@ -7,12 +7,9 @@ "SpatialAdaptiveQuantization": "ENABLED", "TemporalAdaptiveQuantization": "ENABLED", "Syntax": "DEFAULT", - "FramerateNumerator": 30000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, + "FramerateControl": "INITIALIZE_FROM_SOURCE", "QvbrSettings": { "QvbrQualityLevel": 8 }, @@ -38,19 +35,11 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_4", "NumberBFramesBetweenReferenceFrames": 3, "HrdBufferSize": 13000000 } }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1920x1080p_30Hz_8.5Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1920x1080p_8.5Mbps_qvbr.json similarity index 80% rename from source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1920x1080p_30Hz_8.5Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1920x1080p_8.5Mbps_qvbr.json index 3ffd560a..52ae3209 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1920x1080p_30Hz_8.5Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_1920x1080p_8.5Mbps_qvbr.json @@ -7,12 +7,9 @@ "SpatialAdaptiveQuantization": "ENABLED", "TemporalAdaptiveQuantization": "ENABLED", "Syntax": "DEFAULT", - "FramerateNumerator": 30000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, + "FramerateControl": "INITIALIZE_FROM_SOURCE", "QvbrSettings": { "QvbrQualityLevel": 8 }, @@ -38,19 +35,11 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_4", "NumberBFramesBetweenReferenceFrames": 1, "HrdBufferSize": 17000000 } }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_480x270p_0.4Mbps_qvbr.json similarity index 80% rename from source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_480x270p_0.4Mbps_qvbr.json index 8a1d7669..5cec4215 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_480x270p_0.4Mbps_qvbr.json @@ -7,12 +7,9 @@ "SpatialAdaptiveQuantization": "ENABLED", "TemporalAdaptiveQuantization": "ENABLED", "Syntax": "DEFAULT", - "FramerateNumerator": 15000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, + "FramerateControl": "INITIALIZE_FROM_SOURCE", "QvbrSettings": { "QvbrQualityLevel": 7 }, @@ -38,19 +35,11 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_3_1", "NumberBFramesBetweenReferenceFrames": 3, "HrdBufferSize": 800000 } }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_0.6Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_640x360p_0.6Mbps_qvbr.json similarity index 80% rename from source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_0.6Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_640x360p_0.6Mbps_qvbr.json index 985a5395..bc5b2d12 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_0.6Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_640x360p_0.6Mbps_qvbr.json @@ -7,12 +7,9 @@ "SpatialAdaptiveQuantization": "ENABLED", "TemporalAdaptiveQuantization": "ENABLED", "Syntax": "DEFAULT", - "FramerateNumerator": 30000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, + "FramerateControl": "INITIALIZE_FROM_SOURCE", "QvbrSettings": { "QvbrQualityLevel": 8 }, @@ -38,19 +35,11 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_3_1", "NumberBFramesBetweenReferenceFrames": 3, "HrdBufferSize": 1200000 } }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.2Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_640x360p_1.2Mbps_qvbr.json similarity index 80% rename from source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.2Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_640x360p_1.2Mbps_qvbr.json index 5ee1188b..634d9d21 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.2Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_640x360p_1.2Mbps_qvbr.json @@ -7,12 +7,9 @@ "SpatialAdaptiveQuantization": "ENABLED", "TemporalAdaptiveQuantization": "ENABLED", "Syntax": "DEFAULT", - "FramerateNumerator": 30000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, + "FramerateControl": "INITIALIZE_FROM_SOURCE", "QvbrSettings": { "QvbrQualityLevel": 7 }, @@ -38,19 +35,11 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_3_1", "NumberBFramesBetweenReferenceFrames": 3, "HrdBufferSize": 2400000 } }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_960x540p_3.5Mbps_qvbr.json similarity index 80% rename from source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_960x540p_3.5Mbps_qvbr.json index 20da6b01..e3e75283 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Ott_Dash_Mp4_Avc_16x9_960x540p_3.5Mbps_qvbr.json @@ -7,12 +7,9 @@ "SpatialAdaptiveQuantization": "ENABLED", "TemporalAdaptiveQuantization": "ENABLED", "Syntax": "DEFAULT", - "FramerateNumerator": 30000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, + "FramerateControl": "INITIALIZE_FROM_SOURCE", "QvbrSettings": { "QvbrQualityLevel": 7 }, @@ -38,19 +35,11 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_4", "NumberBFramesBetweenReferenceFrames": 3, "HrdBufferSize": 7000000 } }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr.json similarity index 87% rename from source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr.json index 414854bc..d98350c0 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr.json @@ -7,12 +7,9 @@ "SpatialAdaptiveQuantization": "ENABLED", "TemporalAdaptiveQuantization": "ENABLED", "Syntax": "DEFAULT", - "FramerateNumerator": 30000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, + "FramerateControl": "INITIALIZE_FROM_SOURCE", "QvbrSettings": { "QvbrQualityLevel": 7 }, @@ -38,19 +35,11 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_4", "NumberBFramesBetweenReferenceFrames": 3, "HrdBufferSize": 7000000 } }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr.json similarity index 87% rename from source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr.json index 7076722b..1c9de866 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr.json @@ -7,12 +7,9 @@ "SpatialAdaptiveQuantization": "ENABLED", "TemporalAdaptiveQuantization": "ENABLED", "Syntax": "DEFAULT", - "FramerateNumerator": 30000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, + "FramerateControl": "INITIALIZE_FROM_SOURCE", "QvbrSettings": { "QvbrQualityLevel": 8 }, @@ -38,19 +35,11 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_4", "NumberBFramesBetweenReferenceFrames": 3, "HrdBufferSize": 10000000 } }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr.json similarity index 87% rename from source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr.json index 8c6da4c4..ab9bcaab 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr.json @@ -7,12 +7,9 @@ "SpatialAdaptiveQuantization": "ENABLED", "TemporalAdaptiveQuantization": "ENABLED", "Syntax": "DEFAULT", - "FramerateNumerator": 30000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, + "FramerateControl": "INITIALIZE_FROM_SOURCE", "QvbrSettings": { "QvbrQualityLevel": 8 }, @@ -38,19 +35,11 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_4", "NumberBFramesBetweenReferenceFrames": 3, "HrdBufferSize": 13000000 } }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr.json similarity index 87% rename from source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr.json index 4147e5d8..bedeeb8b 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr.json @@ -7,12 +7,9 @@ "SpatialAdaptiveQuantization": "ENABLED", "TemporalAdaptiveQuantization": "ENABLED", "Syntax": "DEFAULT", - "FramerateNumerator": 30000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, + "FramerateControl": "INITIALIZE_FROM_SOURCE", "QvbrSettings": { "QvbrQualityLevel": 8 }, @@ -38,19 +35,11 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_4", "NumberBFramesBetweenReferenceFrames": 1, "HrdBufferSize": 17000000 } }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr.json similarity index 87% rename from source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr.json index ce11709f..fd159d7e 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr.json @@ -7,12 +7,9 @@ "SpatialAdaptiveQuantization": "ENABLED", "TemporalAdaptiveQuantization": "ENABLED", "Syntax": "DEFAULT", - "FramerateNumerator": 15000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, + "FramerateControl": "INITIALIZE_FROM_SOURCE", "QvbrSettings": { "QvbrQualityLevel": 7 }, @@ -38,19 +35,11 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_3_1", "NumberBFramesBetweenReferenceFrames": 3, "HrdBufferSize": 800000 } }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr.json similarity index 96% rename from source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr.json index 3b84947a..b873c162 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr.json @@ -10,9 +10,8 @@ "FramerateNumerator": 30000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, "QvbrSettings": { "QvbrQualityLevel": 7 }, @@ -38,7 +37,6 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_3_1", "NumberBFramesBetweenReferenceFrames": 3, "HrdBufferSize": 1200000 } diff --git a/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr.json similarity index 87% rename from source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr.json index 72a1b4ef..7054b76d 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr.json @@ -7,12 +7,9 @@ "SpatialAdaptiveQuantization": "ENABLED", "TemporalAdaptiveQuantization": "ENABLED", "Syntax": "DEFAULT", - "FramerateNumerator": 30000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, + "FramerateControl": "INITIALIZE_FROM_SOURCE", "QvbrSettings": { "QvbrQualityLevel": 7 }, @@ -38,19 +35,11 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_3_1", "NumberBFramesBetweenReferenceFrames": 3, "HrdBufferSize": 2400000 } }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr.json b/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr.json similarity index 87% rename from source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr.json rename to source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr.json index a37805ff..936d80f1 100644 --- a/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/presets/_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr.json @@ -7,12 +7,9 @@ "SpatialAdaptiveQuantization": "ENABLED", "TemporalAdaptiveQuantization": "ENABLED", "Syntax": "DEFAULT", - "FramerateNumerator": 30000, "MinIInterval": 0, "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "NumberReferenceFrames": 3, - "FramerateDenominator": 1001, + "FramerateControl": "INITIALIZE_FROM_SOURCE", "QvbrSettings": { "QvbrQualityLevel": 7 }, @@ -38,19 +35,11 @@ "FramerateConversionAlgorithm": "DUPLICATE_DROP", "ParNumerator": 1, "SceneChangeDetect": "ENABLED", - "CodecLevel": "LEVEL_4", "NumberBFramesBetweenReferenceFrames": 3, "HrdBufferSize": 7000000 } }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, + "DropFrameTimecode": "ENABLED", "RespondToAfd": "NONE", "Sharpness": 50, "AfdSignaling": "NONE", diff --git a/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9.json b/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9.json index ae8ba873..299d2e89 100644 --- a/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9.json +++ b/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9.json @@ -5,59 +5,40 @@ "Settings": { "AdAvailOffset": 0, "OutputGroups": [ - { - "Name": "File Group", - "OutputGroupSettings": { - "Type": "FILE_GROUP_SETTINGS", - "FileGroupSettings": {} - }, - "Outputs": [ - { - "Preset": "System-Generic_Hd_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps", - "Extension": "mp4", - "NameModifier": "_Generic_Hd_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps" - }, - { - "Preset": "System-Generic_Hd_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps", - "Extension": "mp4", - "NameModifier": "_Generic_Hd_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps" - } - ] - }, { "Name": "Apple HLS", "Outputs": [ { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_400Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_400Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_600Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_600Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1200Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1200Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3500Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3500Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3500Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3500Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5000Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5000Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6500Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6500Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8500Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8500Kbps" } ], "OutputGroupSettings": { @@ -80,56 +61,6 @@ "StreamInfResolution": "INCLUDE" } } - }, - { - "Name": "DASH ISO", - "Outputs": [ - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_400Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_0.6Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_600Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.2Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1200Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3500Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3.5Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3500Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5.0Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5000Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.5Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6500Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_1920x1080p_30Hz_8.5Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1920x1080p_30Hz_8500Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Aac_He_96Kbps", - "NameModifier": "_Ott_Dash_Mp4_Aac_He_96Kbps" - } - ], - "OutputGroupSettings": { - "Type": "DASH_ISO_GROUP_SETTINGS", - "DashIsoGroupSettings": { - "SegmentLength": 30, - "FragmentLength": 3, - "SegmentControl": "SEGMENTED_FILES", - "HbbtvCompliance": "NONE" - } - } } ] } diff --git a/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9_mvod.json b/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9_mvod.json index 3e7844bf..c69ec0c1 100644 --- a/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9_mvod.json +++ b/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9_mvod.json @@ -5,59 +5,40 @@ "Settings": { "AdAvailOffset": 0, "OutputGroups": [ - { - "Name": "File Group", - "OutputGroupSettings": { - "Type": "FILE_GROUP_SETTINGS", - "FileGroupSettings": {} - }, - "Outputs": [ - { - "Preset": "_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps_qvbr", - "Extension": "mp4", - "NameModifier": "_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps_qvbr" - }, - { - "Preset": "_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr", - "Extension": "mp4", - "NameModifier": "_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr" - } - ] - }, { "Name": "Apple HLS", "Outputs": [ { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr" } ], "OutputGroupSettings": { diff --git a/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9_mvod_no_preset.json b/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9_mvod_no_preset.json index d6a8fb44..c106389c 100644 --- a/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9_mvod_no_preset.json +++ b/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9_mvod_no_preset.json @@ -5,113 +5,6 @@ "Settings": { "AdAvailOffset": 0, "OutputGroups": [ - { - "Name": "File Group", - "Outputs": [ - { - "ContainerSettings": { - "Container": "MP4", - "Mp4Settings": { - "CslgAtom": "INCLUDE", - "FreeSpaceBox": "EXCLUDE", - "MoovPlacement": "PROGRESSIVE_DOWNLOAD" - } - }, - "VideoDescription": { - "Width": 1920, - "ScalingBehavior": "DEFAULT", - "Height": 1080, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "Softness": 0, - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 21250000, - "MaxBitrate": 8500000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 9 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 24, - "MinIInterval": 0, - "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "AudioDescriptions": [ - { - "AudioTypeControl": "FOLLOW_INPUT", - "AudioSourceName": "Audio Selector 1", - "CodecSettings": { - "Codec": "AAC", - "AacSettings": { - "AudioDescriptionBroadcasterMix": "NORMAL", - "Bitrate": 160000, - "RateControlMode": "CBR", - "CodecProfile": "LC", - "CodingMode": "CODING_MODE_2_0", - "RawFormat": "NONE", - "SampleRate": 48000, - "Specification": "MPEG4" - } - }, - "LanguageCodeControl": "FOLLOW_INPUT", - "AudioType": 0 - } - ], - "Extension": "mp4", - "NameModifier": "_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_8.5Mbps_qvbr" - } - ], - "OutputGroupSettings": { - "Type": "FILE_GROUP_SETTINGS", - "FileGroupSettings": { - } - } - }, { "Name": "Apple HLS", "Outputs": [ @@ -152,13 +45,6 @@ "Width": 480, "ScalingBehavior": "DEFAULT", "Height": 270, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -169,7 +55,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -183,17 +68,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 7 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 15, "MinIInterval": 0, "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -232,7 +115,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr" }, { "ContainerSettings": { @@ -271,13 +154,6 @@ "Width": 640, "ScalingBehavior": "DEFAULT", "Height": 360, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -288,7 +164,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -302,17 +177,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 7 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -351,7 +224,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.5Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.5Mbps_qvbr" }, { "ContainerSettings": { @@ -390,13 +263,6 @@ "Width": 960, "ScalingBehavior": "DEFAULT", "Height": 540, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -407,7 +273,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -421,17 +286,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 8 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -470,7 +333,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr" }, { "ContainerSettings": { @@ -509,13 +372,6 @@ "Width": 1280, "ScalingBehavior": "DEFAULT", "Height": 720, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -526,7 +382,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -540,17 +395,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 8 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -589,7 +442,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.0Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.0Mbps_qvbr" }, { "ContainerSettings": { @@ -628,13 +481,6 @@ "Width": 1920, "ScalingBehavior": "DEFAULT", "Height": 1080, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -645,7 +491,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -659,17 +504,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 9 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -708,7 +551,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr" } ], "OutputGroupSettings": { diff --git a/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9_qvbr.json b/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9_qvbr.json index bdcbb9bb..4df28a8b 100644 --- a/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9_qvbr.json @@ -5,59 +5,40 @@ "Settings": { "AdAvailOffset": 0, "OutputGroups": [ - { - "Name": "File Group", - "OutputGroupSettings": { - "Type": "FILE_GROUP_SETTINGS", - "FileGroupSettings": {} - }, - "Outputs": [ - { - "Preset": "_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps_qvbr", - "Extension": "mp4", - "NameModifier": "_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps_qvbr" - }, - { - "Preset": "_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr", - "Extension": "mp4", - "NameModifier": "_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr" - } - ] - }, { "Name": "Apple HLS", "Outputs": [ { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr" } ], "OutputGroupSettings": { @@ -80,56 +61,6 @@ "StreamInfResolution": "INCLUDE" } } - }, - { - "Name": "DASH ISO", - "Outputs": [ - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_0.6Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_0.6Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.2Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.2Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3.5Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5.0Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5.0Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.5Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.5Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_1920x1080p_30Hz_8.5Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1920x1080p_30Hz_8.5Mbps_qvbr" - }, - { - "Preset": "System-Ott_Dash_Mp4_Aac_He_96Kbps", - "NameModifier": "_Ott_Dash_Mp4_Aac_He_96Kbps" - } - ], - "OutputGroupSettings": { - "Type": "DASH_ISO_GROUP_SETTINGS", - "DashIsoGroupSettings": { - "SegmentLength": 30, - "FragmentLength": 3, - "SegmentControl": "SEGMENTED_FILES", - "HbbtvCompliance": "NONE" - } - } } ] } diff --git a/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9_qvbr_no_preset.json b/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9_qvbr_no_preset.json index 12255942..1d219220 100644 --- a/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9_qvbr_no_preset.json +++ b/source/custom-resource/lib/mediaconvert/templates/1080p_avc_aac_16x9_qvbr_no_preset.json @@ -5,113 +5,6 @@ "Queue": "Default", "Settings": { "OutputGroups": [ - { - "Name": "File Group", - "Outputs": [ - { - "ContainerSettings": { - "Container": "MP4", - "Mp4Settings": { - "CslgAtom": "INCLUDE", - "FreeSpaceBox": "EXCLUDE", - "MoovPlacement": "PROGRESSIVE_DOWNLOAD" - } - }, - "VideoDescription": { - "Width": 1920, - "ScalingBehavior": "DEFAULT", - "Height": 1080, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "Softness": 0, - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 21250000, - "MaxBitrate": 8500000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 9 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 24, - "MinIInterval": 0, - "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "AudioDescriptions": [ - { - "AudioTypeControl": "FOLLOW_INPUT", - "AudioSourceName": "Audio Selector 1", - "CodecSettings": { - "Codec": "AAC", - "AacSettings": { - "AudioDescriptionBroadcasterMix": "NORMAL", - "Bitrate": 160000, - "RateControlMode": "CBR", - "CodecProfile": "LC", - "CodingMode": "CODING_MODE_2_0", - "RawFormat": "NONE", - "SampleRate": 48000, - "Specification": "MPEG4" - } - }, - "LanguageCodeControl": "FOLLOW_INPUT", - "AudioType": 0 - } - ], - "Extension": "mp4", - "NameModifier": "_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_8.5Mbps_qvbr" - } - ], - "OutputGroupSettings": { - "Type": "FILE_GROUP_SETTINGS", - "FileGroupSettings": { - } - } - }, { "Name": "Apple HLS", "Outputs": [ @@ -152,13 +45,6 @@ "Width": 480, "ScalingBehavior": "DEFAULT", "Height": 270, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -169,7 +55,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -183,17 +68,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 7 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 15, "MinIInterval": 0, "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -232,7 +115,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr" }, { "ContainerSettings": { @@ -271,13 +154,6 @@ "Width": 640, "ScalingBehavior": "DEFAULT", "Height": 360, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -288,7 +164,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -302,17 +177,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 7 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -351,7 +224,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.5Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.5Mbps_qvbr" }, { "ContainerSettings": { @@ -390,13 +263,6 @@ "Width": 960, "ScalingBehavior": "DEFAULT", "Height": 540, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -407,7 +273,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -421,17 +286,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 8 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -470,7 +333,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr" }, { "ContainerSettings": { @@ -509,13 +372,6 @@ "Width": 1280, "ScalingBehavior": "DEFAULT", "Height": 720, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -526,7 +382,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -540,17 +395,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 8 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -589,7 +442,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.0Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.0Mbps_qvbr" }, { "ContainerSettings": { @@ -628,13 +481,6 @@ "Width": 1920, "ScalingBehavior": "DEFAULT", "Height": 1080, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -645,7 +491,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -659,17 +504,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 9 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -708,7 +551,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr" } ], "OutputGroupSettings": { @@ -731,392 +574,6 @@ "StreamInfResolution": "INCLUDE" } } - }, - { - "Name": "DASH ISO", - "Outputs": [ - { - "ContainerSettings": { - "Container": "MPD" - }, - "VideoDescription": { - "Width": 480, - "ScalingBehavior": "DEFAULT", - "Height": 270, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 1000000, - "MaxBitrate": 400000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 7 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 15, - "MinIInterval": 0, - "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps_qvbr" - }, - { - "ContainerSettings": { - "Container": "MPD" - }, - "VideoDescription": { - "Width": 640, - "ScalingBehavior": "DEFAULT", - "Height": 360, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 3750000, - "MaxBitrate": 1500000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 7 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 30, - "MinIInterval": 0, - "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.5Mbps_qvbr" - }, - { - "ContainerSettings": { - "Container": "MPD" - }, - "VideoDescription": { - "Width": 960, - "ScalingBehavior": "DEFAULT", - "Height": 540, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 8750000, - "MaxBitrate": 3500000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 8 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 30, - "MinIInterval": 0, - "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps_qvbr" - }, - { - "ContainerSettings": { - "Container": "MPD" - }, - "VideoDescription": { - "Width": 1280, - "ScalingBehavior": "DEFAULT", - "Height": 720, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 15000000, - "MaxBitrate": 6000000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 8 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 30, - "MinIInterval": 0, - "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.0Mbps_qvbr" - }, - { - "ContainerSettings": { - "Container": "MPD" - }, - "VideoDescription": { - "Width": 1920, - "ScalingBehavior": "DEFAULT", - "Height": 1080, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 21250000, - "MaxBitrate": 8500000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 8 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 30, - "MinIInterval": 0, - "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1920x1080p_30Hz_8.5Mbps_qvbr" - }, - { - "ContainerSettings": { - "Container": "MPD" - }, - "AudioDescriptions": [ - { - "AudioTypeControl": "FOLLOW_INPUT", - "AudioSourceName": "Audio Selector 1", - "CodecSettings": { - "Codec": "AAC", - "AacSettings": { - "AudioDescriptionBroadcasterMix": "NORMAL", - "Bitrate": 96000, - "RateControlMode": "CBR", - "CodecProfile": "HEV1", - "CodingMode": "CODING_MODE_2_0", - "RawFormat": "NONE", - "SampleRate": 48000, - "Specification": "MPEG4" - } - }, - "LanguageCodeControl": "FOLLOW_INPUT", - "AudioType": 0 - } - ], - "NameModifier": "_Ott_Dash_Mp4_Aac_He_96Kbps" - } - ], - "OutputGroupSettings": { - "Type": "DASH_ISO_GROUP_SETTINGS", - "DashIsoGroupSettings": { - "SegmentLength": 30, - "FragmentLength": 3, - "SegmentControl": "SEGMENTED_FILES", - "HbbtvCompliance": "NONE" - } - } } ], "AdAvailOffset": 0 diff --git a/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9.json b/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9.json index 3fa4e507..c8b7d4fd 100644 --- a/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9.json +++ b/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9.json @@ -5,64 +5,40 @@ "Settings": { "AdAvailOffset": 0, "OutputGroups": [ - { - "Name": "File Group", - "OutputGroupSettings": { - "Type": "FILE_GROUP_SETTINGS", - "FileGroupSettings": {} - }, - "Outputs": [ - { - "Preset": "System-Generic_Uhd_Mp4_Hevc_Aac_16x9_3840x2160p_24Hz_8Mbps", - "Extension": "mp4", - "NameModifier": "_Generic_Uhd_Mp4_Hevc_Aac_16x9_3840x2160p_24Hz_8Mbps" - }, - { - "Preset": "System-Generic_Hd_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps", - "Extension": "mp4", - "NameModifier": "_Generic_Hd_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps" - }, - { - "Preset": "System-Generic_Hd_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps", - "Extension": "mp4", - "NameModifier": "_Generic_Hd_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps" - } - ] - }, { "Name": "Apple HLS", "Outputs": [ { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_400Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_400Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_600Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_600Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1200Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1200Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3500Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3500Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3500Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3500Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5000Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5000Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6500Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6500Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8500Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8500Kbps" } ], "OutputGroupSettings": { @@ -85,56 +61,6 @@ "StreamInfResolution": "INCLUDE" } } - }, - { - "Name": "DASH ISO", - "Outputs": [ - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_400Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_0.6Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_600Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.2Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1200Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3500Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3.5Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3500Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5.0Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5000Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.5Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6500Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_1920x1080p_30Hz_8.5Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1920x1080p_30Hz_8500Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Aac_He_96Kbps", - "NameModifier": "_Ott_Dash_Mp4_Aac_He_96Kbps" - } - ], - "OutputGroupSettings": { - "Type": "DASH_ISO_GROUP_SETTINGS", - "DashIsoGroupSettings": { - "SegmentLength": 30, - "FragmentLength": 3, - "SegmentControl": "SEGMENTED_FILES", - "HbbtvCompliance": "NONE" - } - } } ] } diff --git a/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9_mvod.json b/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9_mvod.json index 610c94cc..baeac60e 100644 --- a/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9_mvod.json +++ b/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9_mvod.json @@ -5,64 +5,40 @@ "Settings": { "AdAvailOffset": 0, "OutputGroups": [ - { - "Name": "File Group", - "OutputGroupSettings": { - "Type": "FILE_GROUP_SETTINGS", - "FileGroupSettings": {} - }, - "Outputs": [ - { - "Preset": "_Mp4_Hevc_Aac_16x9_3840x2160p_24Hz_20Mbps_qvbr", - "Extension": "mp4", - "NameModifier": "_Mp4_Hevc_Aac_16x9_3840x2160p_24Hz_20Mbps_qvbr" - }, - { - "Preset": "_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps_qvbr", - "Extension": "mp4", - "NameModifier": "_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps_qvbr" - }, - { - "Preset": "_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr", - "Extension": "mp4", - "NameModifier": "_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr" - } - ] - }, { "Name": "Apple HLS", "Outputs": [ { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr" } ], "OutputGroupSettings": { diff --git a/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9_mvod_no_preset.json b/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9_mvod_no_preset.json index 6ebf6fdd..1825e4dd 100644 --- a/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9_mvod_no_preset.json +++ b/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9_mvod_no_preset.json @@ -5,110 +5,6 @@ "Settings": { "AdAvailOffset": 0, "OutputGroups": [ - { - "Name": "File Group", - "OutputGroupSettings": { - "Type": "FILE_GROUP_SETTINGS", - "FileGroupSettings": {} - }, - "Outputs": [ - { - "ContainerSettings": { - "Container": "MP4", - "Mp4Settings": { - "CslgAtom": "INCLUDE", - "FreeSpaceBox": "EXCLUDE", - "MoovPlacement": "PROGRESSIVE_DOWNLOAD" - } - }, - "VideoDescription": { - "CodecSettings": { - "H265Settings": { - "NumberReferenceFrames": 3, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FramerateNumerator": 24, - "Tiles": "ENABLED", - "MinIInterval": 0, - "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "CodecProfile": "MAIN_HIGH", - "FramerateDenominator": 1, - "QvbrSettings": { - "QvbrQualityLevel": 9 - }, - "MaxBitrate": 15000000, - "RateControlMode": "QVBR", - "GopBReference": "ENABLED", - "GopSizeUnits": "SECONDS", - "FlickerAdaptiveQuantization": "ENABLED", - "Telecine": "NONE", - "ParDenominator": 1, - "AdaptiveQuantization": "HIGH", - "TemporalIds": "DISABLED", - "InterlaceMode": "PROGRESSIVE", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "HrdBufferInitialFillPercentage": 90, - "SlowPal": "DISABLED", - "NumberBFramesBetweenReferenceFrames": 5, - "SampleAdaptiveOffsetFilterMode": "ADAPTIVE", - "GopSize": 3, - "ParControl": "SPECIFIED", - "Slices": 4, - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "AlternateTransferFunctionSei": "DISABLED", - "ParNumerator": 1, - "SceneChangeDetect": "ENABLED", - "CodecLevel": "AUTO", - "GopClosedCadence": 1, - "HrdBufferSize": 30000000 - }, - "Codec": "H_265" - }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, - "RespondToAfd": "NONE", - "Sharpness": 100, - "AfdSignaling": "NONE", - "Height": 2160, - "Width": 3840, - "ScalingBehavior": "DEFAULT", - "ColorMetadata": "INSERT", - "AntiAlias": "ENABLED", - "TimecodeInsertion": "DISABLED" - }, - "AudioDescriptions": [ - { - "CodecSettings": { - "Codec": "AAC", - "AacSettings": { - "CodecProfile": "LC", - "Specification": "MPEG4", - "RateControlMode": "CBR", - "AudioDescriptionBroadcasterMix": "NORMAL", - "SampleRate": 48000, - "Bitrate": 160000, - "CodingMode": "CODING_MODE_2_0", - "RawFormat": "NONE" - } - }, - "AudioSourceName": "Audio Selector 1", - "AudioTypeControl": "FOLLOW_INPUT", - "LanguageCodeControl": "FOLLOW_INPUT", - "AudioType": 0 - } - ], - "Extension": "mp4", - "NameModifier": "_Mp4_Hevc_Aac_16x9_3840x2160p_24Hz_15Mbps_qvbr" - } - ] - }, { "Name": "Apple HLS", "Outputs": [ @@ -149,13 +45,6 @@ "Width": 480, "ScalingBehavior": "DEFAULT", "Height": 270, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -166,7 +55,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -180,17 +68,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 7 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 15, "MinIInterval": 0, "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -229,7 +115,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr" }, { "ContainerSettings": { @@ -268,13 +154,6 @@ "Width": 640, "ScalingBehavior": "DEFAULT", "Height": 360, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -285,7 +164,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -299,17 +177,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 7 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -348,7 +224,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.5Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.5Mbps_qvbr" }, { "ContainerSettings": { @@ -387,13 +263,6 @@ "Width": 960, "ScalingBehavior": "DEFAULT", "Height": 540, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -404,7 +273,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -418,17 +286,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 8 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -467,7 +333,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr" }, { "ContainerSettings": { @@ -506,13 +372,6 @@ "Width": 1280, "ScalingBehavior": "DEFAULT", "Height": 720, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -523,7 +382,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -537,17 +395,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 8 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -586,7 +442,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.0Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.0Mbps_qvbr" }, { "ContainerSettings": { @@ -625,13 +481,6 @@ "Width": 1920, "ScalingBehavior": "DEFAULT", "Height": 1080, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -642,7 +491,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -656,17 +504,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 9 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -705,7 +551,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr" } ], "OutputGroupSettings": { diff --git a/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9_qvbr.json b/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9_qvbr.json index 4712db36..847ce9aa 100644 --- a/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9_qvbr.json @@ -5,64 +5,40 @@ "Settings": { "AdAvailOffset": 0, "OutputGroups": [ - { - "Name": "File Group", - "OutputGroupSettings": { - "Type": "FILE_GROUP_SETTINGS", - "FileGroupSettings": {} - }, - "Outputs": [ - { - "Preset": "_Mp4_Hevc_Aac_16x9_3840x2160p_24Hz_20Mbps_qvbr", - "Extension": "mp4", - "NameModifier": "_Mp4_Hevc_Aac_16x9_3840x2160p_24Hz_20Mbps_qvbr" - }, - { - "Preset": "_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps_qvbr", - "Extension": "mp4", - "NameModifier": "_Mp4_Avc_Aac_16x9_1920x1080p_24Hz_6Mbps_qvbr" - }, - { - "Preset": "_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr", - "Extension": "mp4", - "NameModifier": "_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr" - } - ] - }, { "Name": "Apple HLS", "Outputs": [ { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr" } ], "OutputGroupSettings": { @@ -85,56 +61,6 @@ "StreamInfResolution": "INCLUDE" } } - }, - { - "Name": "DASH ISO", - "Outputs": [ - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_0.6Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_0.6Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.2Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.2Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3.5Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5.0Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5.0Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.5Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.5Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_1920x1080p_30Hz_8.5Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1920x1080p_30Hz_8.5Mbps_qvbr" - }, - { - "Preset": "System-Ott_Dash_Mp4_Aac_He_96Kbps", - "NameModifier": "_Ott_Dash_Mp4_Aac_He_96Kbps" - } - ], - "OutputGroupSettings": { - "Type": "DASH_ISO_GROUP_SETTINGS", - "DashIsoGroupSettings": { - "SegmentLength": 30, - "FragmentLength": 3, - "SegmentControl": "SEGMENTED_FILES", - "HbbtvCompliance": "NONE" - } - } } ] } diff --git a/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9_qvbr_no_preset.json b/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9_qvbr_no_preset.json index 8648d66f..6299da88 100644 --- a/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9_qvbr_no_preset.json +++ b/source/custom-resource/lib/mediaconvert/templates/2160p_avc_aac_16x9_qvbr_no_preset.json @@ -5,111 +5,6 @@ "Queue": "Default", "Settings": { "OutputGroups": [ - { - "Name": "File Group", - "Outputs": [ - { - "ContainerSettings": { - "Container": "MP4", - "Mp4Settings": { - "CslgAtom": "INCLUDE", - "FreeSpaceBox": "EXCLUDE", - "MoovPlacement": "PROGRESSIVE_DOWNLOAD" - } - }, - "VideoDescription": { - "CodecSettings": { - "H265Settings": { - "NumberReferenceFrames": 3, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FramerateNumerator": 24, - "Tiles": "ENABLED", - "MinIInterval": 0, - "UnregisteredSeiTimecode": "DISABLED", - "FramerateControl": "SPECIFIED", - "CodecProfile": "MAIN_HIGH", - "FramerateDenominator": 1, - "QvbrSettings": { - "QvbrQualityLevel": 9 - }, - "MaxBitrate": 15000000, - "RateControlMode": "QVBR", - "GopBReference": "ENABLED", - "GopSizeUnits": "SECONDS", - "FlickerAdaptiveQuantization": "ENABLED", - "Telecine": "NONE", - "ParDenominator": 1, - "AdaptiveQuantization": "HIGH", - "TemporalIds": "DISABLED", - "InterlaceMode": "PROGRESSIVE", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "HrdBufferInitialFillPercentage": 90, - "SlowPal": "DISABLED", - "NumberBFramesBetweenReferenceFrames": 5, - "SampleAdaptiveOffsetFilterMode": "ADAPTIVE", - "GopSize": 3, - "ParControl": "SPECIFIED", - "Slices": 4, - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "AlternateTransferFunctionSei": "DISABLED", - "ParNumerator": 1, - "SceneChangeDetect": "ENABLED", - "CodecLevel": "AUTO", - "GopClosedCadence": 1, - "HrdBufferSize": 30000000 - }, - "Codec": "H_265" - }, - "DropFrameTimecode": "ENABLED", - "VideoPreprocessors": { - "Deinterlacer": { - "Control": "NORMAL", - "Mode": "DEINTERLACE", - "Algorithm": "INTERPOLATE" - } - }, - "RespondToAfd": "NONE", - "Sharpness": 100, - "AfdSignaling": "NONE", - "Height": 2160, - "Width": 3840, - "ScalingBehavior": "DEFAULT", - "ColorMetadata": "INSERT", - "AntiAlias": "ENABLED", - "TimecodeInsertion": "DISABLED" - }, - "AudioDescriptions": [ - { - "AudioTypeControl": "FOLLOW_INPUT", - "AudioSourceName": "Audio Selector 1", - "CodecSettings": { - "Codec": "AAC", - "AacSettings": { - "AudioDescriptionBroadcasterMix": "NORMAL", - "Bitrate": 160000, - "RateControlMode": "CBR", - "CodecProfile": "LC", - "CodingMode": "CODING_MODE_2_0", - "RawFormat": "NONE", - "SampleRate": 48000, - "Specification": "MPEG4" - } - }, - "LanguageCodeControl": "FOLLOW_INPUT", - "AudioType": 0 - } - ], - "Extension": "mp4", - "NameModifier": "_Mp4_Avc_Aac_16x9_3840x2160p_24Hz_15Mbps_qvbr" - } - ], - "OutputGroupSettings": { - "Type": "FILE_GROUP_SETTINGS", - "FileGroupSettings": { - } - } - }, { "Name": "Apple HLS", "Outputs": [ @@ -150,13 +45,6 @@ "Width": 480, "ScalingBehavior": "DEFAULT", "Height": 270, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -167,7 +55,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -181,17 +68,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 7 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 15, "MinIInterval": 0, "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -230,7 +115,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr" }, { "ContainerSettings": { @@ -269,13 +154,6 @@ "Width": 640, "ScalingBehavior": "DEFAULT", "Height": 360, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -286,7 +164,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -300,17 +177,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 7 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -349,7 +224,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.5Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.5Mbps_qvbr" }, { "ContainerSettings": { @@ -388,13 +263,6 @@ "Width": 960, "ScalingBehavior": "DEFAULT", "Height": 540, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -405,7 +273,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -419,17 +286,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 8 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -468,7 +333,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr" }, { "ContainerSettings": { @@ -507,13 +372,6 @@ "Width": 1280, "ScalingBehavior": "DEFAULT", "Height": 720, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -524,7 +382,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -538,17 +395,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 8 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -587,7 +442,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.0Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.0Mbps_qvbr" }, { "ContainerSettings": { @@ -626,13 +481,6 @@ "Width": 1920, "ScalingBehavior": "DEFAULT", "Height": 1080, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -643,7 +491,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -657,17 +504,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 9 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -706,7 +551,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_30Hz_8.5Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1920x1080p_8.5Mbps_qvbr" } ], "OutputGroupSettings": { @@ -729,392 +574,6 @@ "StreamInfResolution": "INCLUDE" } } - }, - { - "Name": "DASH ISO", - "Outputs": [ - { - "ContainerSettings": { - "Container": "MPD" - }, - "VideoDescription": { - "Width": 480, - "ScalingBehavior": "DEFAULT", - "Height": 270, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 1000000, - "MaxBitrate": 400000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 7 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 15, - "MinIInterval": 0, - "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps_qvbr" - }, - { - "ContainerSettings": { - "Container": "MPD" - }, - "VideoDescription": { - "Width": 640, - "ScalingBehavior": "DEFAULT", - "Height": 360, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 3750000, - "MaxBitrate": 1500000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 7 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 30, - "MinIInterval": 0, - "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.5Mbps_qvbr" - }, - { - "ContainerSettings": { - "Container": "MPD" - }, - "VideoDescription": { - "Width": 960, - "ScalingBehavior": "DEFAULT", - "Height": 540, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 8750000, - "MaxBitrate": 3500000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 8 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 30, - "MinIInterval": 0, - "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps_qvbr" - }, - { - "ContainerSettings": { - "Container": "MPD" - }, - "VideoDescription": { - "Width": 1280, - "ScalingBehavior": "DEFAULT", - "Height": 720, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 15000000, - "MaxBitrate": 6000000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 8 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 30, - "MinIInterval": 0, - "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.0Mbps_qvbr" - }, - { - "ContainerSettings": { - "Container": "MPD" - }, - "VideoDescription": { - "Width": 1920, - "ScalingBehavior": "DEFAULT", - "Height": 1080, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 21250000, - "MaxBitrate": 8500000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 8 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 30, - "MinIInterval": 0, - "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1920x1080p_30Hz_8.5Mbps_qvbr" - }, - { - "ContainerSettings": { - "Container": "MPD" - }, - "AudioDescriptions": [ - { - "AudioTypeControl": "FOLLOW_INPUT", - "AudioSourceName": "Audio Selector 1", - "CodecSettings": { - "Codec": "AAC", - "AacSettings": { - "AudioDescriptionBroadcasterMix": "NORMAL", - "Bitrate": 96000, - "RateControlMode": "CBR", - "CodecProfile": "HEV1", - "CodingMode": "CODING_MODE_2_0", - "RawFormat": "NONE", - "SampleRate": 48000, - "Specification": "MPEG4" - } - }, - "LanguageCodeControl": "FOLLOW_INPUT", - "AudioType": 0 - } - ], - "NameModifier": "_Ott_Dash_Mp4_Aac_He_96Kbps" - } - ], - "OutputGroupSettings": { - "Type": "DASH_ISO_GROUP_SETTINGS", - "DashIsoGroupSettings": { - "SegmentLength": 30, - "FragmentLength": 3, - "SegmentControl": "SEGMENTED_FILES", - "HbbtvCompliance": "NONE" - } - } } ], "AdAvailOffset": 0 diff --git a/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9.json b/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9.json index 0502170c..2902e4ad 100644 --- a/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9.json +++ b/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9.json @@ -5,50 +5,36 @@ "Settings": { "AdAvailOffset": 0, "OutputGroups": [ - { - "Name": "File Group", - "OutputGroupSettings": { - "Type": "FILE_GROUP_SETTINGS", - "FileGroupSettings": {} - }, - "Outputs": [ - { - "Preset": "System-Generic_Hd_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps", - "Extension": "mp4", - "NameModifier": "_Generic_Hd_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps" - } - ] - }, { "Name": "Apple HLS", "Outputs": [ { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_400Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_400Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_600Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_600Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1200Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1200Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3500Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3500Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3500Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3500Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5000Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5000Kbps" }, { - "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6500Kbps" + "Preset": "System-Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6500Kbps" } ], "OutputGroupSettings": { @@ -71,52 +57,6 @@ "StreamInfResolution": "INCLUDE" } } - }, - { - "Name": "DASH ISO", - "Outputs": [ - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_400Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_0.6Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_600Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.2Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1200Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3500Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3.5Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3500Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5.0Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5000Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.5Mbps", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6500Kbps" - }, - { - "Preset": "System-Ott_Dash_Mp4_Aac_He_96Kbps", - "NameModifier": "_Ott_Dash_Mp4_Aac_He_96Kbps" - } - ], - "OutputGroupSettings": { - "Type": "DASH_ISO_GROUP_SETTINGS", - "DashIsoGroupSettings": { - "SegmentLength": 30, - "FragmentLength": 3, - "SegmentControl": "SEGMENTED_FILES", - "HbbtvCompliance": "NONE" - } - } } ] } diff --git a/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9_mvod.json b/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9_mvod.json index 8c97550f..26daebe3 100644 --- a/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9_mvod.json +++ b/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9_mvod.json @@ -5,50 +5,36 @@ "Settings": { "AdAvailOffset": 0, "OutputGroups": [ - { - "Name": "File Group", - "OutputGroupSettings": { - "Type": "FILE_GROUP_SETTINGS", - "FileGroupSettings": {} - }, - "Outputs": [ - { - "Preset": "_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr", - "Extension": "mp4", - "NameModifier": "_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr" - } - ] - }, { "Name": "Apple HLS", "Outputs": [ { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr" } ], "OutputGroupSettings": { diff --git a/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9_mvod_no_preset.json b/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9_mvod_no_preset.json index 35a34fd4..2285b57a 100644 --- a/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9_mvod_no_preset.json +++ b/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9_mvod_no_preset.json @@ -5,113 +5,6 @@ "Settings": { "AdAvailOffset": 0, "OutputGroups": [ - { - "Name": "File Group", - "Outputs": [ - { - "ContainerSettings": { - "Container": "MP4", - "Mp4Settings": { - "CslgAtom": "INCLUDE", - "FreeSpaceBox": "EXCLUDE", - "MoovPlacement": "PROGRESSIVE_DOWNLOAD" - } - }, - "VideoDescription": { - "Width": 1280, - "ScalingBehavior": "DEFAULT", - "Height": 720, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "Softness": 0, - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 15000000, - "MaxBitrate": 6000000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 8 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 24, - "MinIInterval": 0, - "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "AudioDescriptions": [ - { - "AudioTypeControl": "FOLLOW_INPUT", - "AudioSourceName": "Audio Selector 1", - "CodecSettings": { - "Codec": "AAC", - "AacSettings": { - "AudioDescriptionBroadcasterMix": "NORMAL", - "Bitrate": 160000, - "RateControlMode": "CBR", - "CodecProfile": "LC", - "CodingMode": "CODING_MODE_2_0", - "RawFormat": "NONE", - "SampleRate": 48000, - "Specification": "MPEG4" - } - }, - "LanguageCodeControl": "FOLLOW_INPUT", - "AudioType": 0 - } - ], - "Extension": "mp4", - "NameModifier": "_Mp4_Avc_Aac_16x9_1280x720p_24Hz_8.5Mbps_qvbr" - } - ], - "OutputGroupSettings": { - "Type": "FILE_GROUP_SETTINGS", - "FileGroupSettings": { - } - } - }, { "Name": "Apple HLS", "Outputs": [ @@ -152,13 +45,6 @@ "Width": 480, "ScalingBehavior": "DEFAULT", "Height": 270, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -169,7 +55,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -183,17 +68,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 7 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 15, "MinIInterval": 0, "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -232,7 +115,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr" }, { "ContainerSettings": { @@ -271,13 +154,6 @@ "Width": 640, "ScalingBehavior": "DEFAULT", "Height": 360, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -288,7 +164,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -302,17 +177,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 7 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -351,7 +224,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.5Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.5Mbps_qvbr" }, { "ContainerSettings": { @@ -390,13 +263,6 @@ "Width": 960, "ScalingBehavior": "DEFAULT", "Height": 540, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -407,7 +273,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -421,17 +286,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 8 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -470,7 +333,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr" }, { "ContainerSettings": { @@ -509,13 +372,6 @@ "Width": 1280, "ScalingBehavior": "DEFAULT", "Height": 720, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -526,7 +382,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -540,17 +395,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 8 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -589,7 +442,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.0Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.0Mbps_qvbr" } ], "OutputGroupSettings": { diff --git a/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9_qvbr.json b/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9_qvbr.json index 82247c3a..5294ba19 100644 --- a/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9_qvbr.json +++ b/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9_qvbr.json @@ -5,50 +5,36 @@ "Settings": { "AdAvailOffset": 0, "OutputGroups": [ - { - "Name": "File Group", - "OutputGroupSettings": { - "Type": "FILE_GROUP_SETTINGS", - "FileGroupSettings": {} - }, - "Outputs": [ - { - "Preset": "_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr", - "Extension": "mp4", - "NameModifier": "_Mp4_Avc_Aac_16x9_1280x720p_24Hz_4.5Mbps_qvbr" - } - ] - }, { "Name": "Apple HLS", "Outputs": [ { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_0.6Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_0.6Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.2Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.2Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_3.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_3.5Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_5.0Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_5.0Mbps_qvbr" }, { - "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr", - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.5Mbps_qvbr" + "Preset": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr", + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.5Mbps_qvbr" } ], "OutputGroupSettings": { @@ -71,52 +57,6 @@ "StreamInfResolution": "INCLUDE" } } - }, - { - "Name": "DASH ISO", - "Outputs": [ - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_0.6Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_0.6Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.2Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.2Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3.5Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_3.5Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5.0Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_5.0Mbps_qvbr" - }, - { - "Preset": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.5Mbps_qvbr", - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.5Mbps_qvbr" - }, - { - "Preset": "System-Ott_Dash_Mp4_Aac_He_96Kbps", - "NameModifier": "_Ott_Dash_Mp4_Aac_He_96Kbps" - } - ], - "OutputGroupSettings": { - "Type": "DASH_ISO_GROUP_SETTINGS", - "DashIsoGroupSettings": { - "SegmentLength": 30, - "FragmentLength": 3, - "SegmentControl": "SEGMENTED_FILES", - "HbbtvCompliance": "NONE" - } - } } ] } diff --git a/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9_qvbr_no_preset.json b/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9_qvbr_no_preset.json index 340af5fb..f7acdebf 100644 --- a/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9_qvbr_no_preset.json +++ b/source/custom-resource/lib/mediaconvert/templates/720p_avc_aac_16x9_qvbr_no_preset.json @@ -5,113 +5,6 @@ "Queue": "Default", "Settings": { "OutputGroups": [ - { - "Name": "File Group", - "Outputs": [ - { - "ContainerSettings": { - "Container": "MP4", - "Mp4Settings": { - "CslgAtom": "INCLUDE", - "FreeSpaceBox": "EXCLUDE", - "MoovPlacement": "PROGRESSIVE_DOWNLOAD" - } - }, - "VideoDescription": { - "Width": 1280, - "ScalingBehavior": "DEFAULT", - "Height": 720, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "Softness": 0, - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 15000000, - "MaxBitrate": 6000000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 8 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 24, - "MinIInterval": 0, - "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "AudioDescriptions": [ - { - "AudioTypeControl": "FOLLOW_INPUT", - "AudioSourceName": "Audio Selector 1", - "CodecSettings": { - "Codec": "AAC", - "AacSettings": { - "AudioDescriptionBroadcasterMix": "NORMAL", - "Bitrate": 160000, - "RateControlMode": "CBR", - "CodecProfile": "LC", - "CodingMode": "CODING_MODE_2_0", - "RawFormat": "NONE", - "SampleRate": 48000, - "Specification": "MPEG4" - } - }, - "LanguageCodeControl": "FOLLOW_INPUT", - "AudioType": 0 - } - ], - "Extension": "mp4", - "NameModifier": "_Mp4_Avc_Aac_16x9_1280x720p_24Hz_8.5Mbps_qvbr" - } - ], - "OutputGroupSettings": { - "Type": "FILE_GROUP_SETTINGS", - "FileGroupSettings": { - } - } - }, { "Name": "Apple HLS", "Outputs": [ @@ -152,13 +45,6 @@ "Width": 480, "ScalingBehavior": "DEFAULT", "Height": 270, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -169,7 +55,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -183,17 +68,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 7 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 15, "MinIInterval": 0, "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -232,7 +115,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_15Hz_0.4Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_480x270p_0.4Mbps_qvbr" }, { "ContainerSettings": { @@ -271,13 +154,6 @@ "Width": 640, "ScalingBehavior": "DEFAULT", "Height": 360, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -288,7 +164,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -302,17 +177,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 7 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -351,7 +224,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_30Hz_1.5Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_640x360p_1.5Mbps_qvbr" }, { "ContainerSettings": { @@ -390,13 +263,6 @@ "Width": 960, "ScalingBehavior": "DEFAULT", "Height": 540, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -407,7 +273,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -421,17 +286,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 8 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -470,7 +333,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_30Hz_3.5Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_960x540p_3.5Mbps_qvbr" }, { "ContainerSettings": { @@ -509,13 +372,6 @@ "Width": 1280, "ScalingBehavior": "DEFAULT", "Height": 720, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, "TimecodeInsertion": "DISABLED", "AntiAlias": "ENABLED", "Sharpness": 100, @@ -526,7 +382,6 @@ "ParNumerator": 1, "NumberReferenceFrames": 3, "Syntax": "DEFAULT", - "FramerateDenominator": 1, "GopClosedCadence": 1, "HrdBufferInitialFillPercentage": 90, "GopSize": 3, @@ -540,17 +395,15 @@ "TemporalAdaptiveQuantization": "ENABLED", "FlickerAdaptiveQuantization": "ENABLED", "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", + "FramerateControl": "INITIALIZE_FROM_SOURCE", "RateControlMode": "QVBR", "QvbrSettings": { "QvbrQualityLevel": 8 }, "CodecProfile": "HIGH", "Telecine": "NONE", - "FramerateNumerator": 30, "MinIInterval": 0, "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", "FieldEncoding": "PAFF", "SceneChangeDetect": "ENABLED", "QualityTuningLevel": "SINGLE_PASS_HQ", @@ -589,7 +442,7 @@ "AudioType": 0 } ], - "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_30Hz_6.0Mbps_qvbr" + "NameModifier": "_Ott_Hls_Ts_Avc_Aac_16x9_1280x720p_6.0Mbps_qvbr" } ], "OutputGroupSettings": { @@ -612,323 +465,6 @@ "StreamInfResolution": "INCLUDE" } } - }, - { - "Name": "DASH ISO", - "Outputs": [ - { - "ContainerSettings": { - "Container": "MPD" - }, - "VideoDescription": { - "Width": 480, - "ScalingBehavior": "DEFAULT", - "Height": 270, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 1000000, - "MaxBitrate": 400000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 7 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 15, - "MinIInterval": 0, - "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_480x270p_15Hz_0.4Mbps_qvbr" - }, - { - "ContainerSettings": { - "Container": "MPD" - }, - "VideoDescription": { - "Width": 640, - "ScalingBehavior": "DEFAULT", - "Height": 360, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 3750000, - "MaxBitrate": 1500000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 7 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 30, - "MinIInterval": 0, - "AdaptiveQuantization": "MEDIUM", - "CodecLevel": "LEVEL_3_1", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_640x360p_30Hz_1.5Mbps_qvbr" - }, - { - "ContainerSettings": { - "Container": "MPD" - }, - "VideoDescription": { - "Width": 960, - "ScalingBehavior": "DEFAULT", - "Height": 540, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 8750000, - "MaxBitrate": 3500000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 8 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 30, - "MinIInterval": 0, - "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_960x540p_30Hz_3.5Mbps_qvbr" - }, - { - "ContainerSettings": { - "Container": "MPD" - }, - "VideoDescription": { - "Width": 1280, - "ScalingBehavior": "DEFAULT", - "Height": 720, - "VideoPreprocessors": { - "Deinterlacer": { - "Algorithm": "INTERPOLATE", - "Mode": "DEINTERLACE", - "Control": "NORMAL" - } - }, - "TimecodeInsertion": "DISABLED", - "AntiAlias": "ENABLED", - "Sharpness": 100, - "CodecSettings": { - "Codec": "H_264", - "H264Settings": { - "InterlaceMode": "PROGRESSIVE", - "ParNumerator": 1, - "NumberReferenceFrames": 3, - "Syntax": "DEFAULT", - "FramerateDenominator": 1, - "GopClosedCadence": 1, - "HrdBufferInitialFillPercentage": 90, - "GopSize": 3, - "Slices": 1, - "GopBReference": "ENABLED", - "HrdBufferSize": 15000000, - "MaxBitrate": 6000000, - "SlowPal": "DISABLED", - "ParDenominator": 1, - "SpatialAdaptiveQuantization": "ENABLED", - "TemporalAdaptiveQuantization": "ENABLED", - "FlickerAdaptiveQuantization": "ENABLED", - "EntropyEncoding": "CABAC", - "FramerateControl": "SPECIFIED", - "RateControlMode": "QVBR", - "QvbrSettings": { - "QvbrQualityLevel": 8 - }, - "CodecProfile": "HIGH", - "Telecine": "NONE", - "FramerateNumerator": 30, - "MinIInterval": 0, - "AdaptiveQuantization": "HIGH", - "CodecLevel": "LEVEL_4", - "FieldEncoding": "PAFF", - "SceneChangeDetect": "ENABLED", - "QualityTuningLevel": "SINGLE_PASS_HQ", - "FramerateConversionAlgorithm": "DUPLICATE_DROP", - "UnregisteredSeiTimecode": "DISABLED", - "GopSizeUnits": "SECONDS", - "ParControl": "SPECIFIED", - "NumberBFramesBetweenReferenceFrames": 5, - "RepeatPps": "DISABLED", - "DynamicSubGop": "ADAPTIVE" - } - }, - "AfdSignaling": "NONE", - "DropFrameTimecode": "ENABLED", - "RespondToAfd": "NONE", - "ColorMetadata": "INSERT" - }, - "NameModifier": "_Ott_Dash_Mp4_Avc_16x9_1280x720p_30Hz_6.0Mbps_qvbr" - }, - { - "ContainerSettings": { - "Container": "MPD" - }, - "AudioDescriptions": [ - { - "AudioTypeControl": "FOLLOW_INPUT", - "AudioSourceName": "Audio Selector 1", - "CodecSettings": { - "Codec": "AAC", - "AacSettings": { - "AudioDescriptionBroadcasterMix": "NORMAL", - "Bitrate": 96000, - "RateControlMode": "CBR", - "CodecProfile": "HEV1", - "CodingMode": "CODING_MODE_2_0", - "RawFormat": "NONE", - "SampleRate": 48000, - "Specification": "MPEG4" - } - }, - "LanguageCodeControl": "FOLLOW_INPUT", - "AudioType": 0 - } - ], - "NameModifier": "_Ott_Dash_Mp4_Aac_He_96Kbps" - } - ], - "OutputGroupSettings": { - "Type": "DASH_ISO_GROUP_SETTINGS", - "DashIsoGroupSettings": { - "SegmentLength": 30, - "FragmentLength": 3, - "SegmentControl": "SEGMENTED_FILES", - "HbbtvCompliance": "NONE" - } - } } ], "AdAvailOffset": 0 diff --git a/source/custom-resource/lib/mediapackage/cloudfront.js b/source/custom-resource/lib/mediapackage/cloudfront.js index 13e93a92..02e7a0ef 100644 --- a/source/custom-resource/lib/mediapackage/cloudfront.js +++ b/source/custom-resource/lib/mediapackage/cloudfront.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * @@ -23,7 +23,7 @@ module.exports.addCustomOrigin = async (distributionId, domainName) => { throw new Error('domainName must be informed'); } - const cloudFront = new AWS.CloudFront(); + const cloudFront = new AWS.CloudFront({customUserAgent: process.env.SOLUTION_IDENTIFIER}); const response = await cloudFront.getDistributionConfig({ Id: distributionId }).promise(); const config = response.DistributionConfig; @@ -59,7 +59,15 @@ module.exports.addCustomOrigin = async (distributionId, domainName) => { ForwardedValues: { QueryString: true, Cookies: { Forward: 'none' }, - Headers: { Quantity: 0 }, + Headers: { + Quantity: 4, + Items: [ + 'Access-Control-Request-Headers', + 'Access-Control-Request-Method', + 'Origin', + 'Access-Control-Allow-Origin' + ] + }, QueryStringCacheKeys: { Quantity: 1, Items: ['aws.manifestfilter'] } }, TrustedSigners: { Enabled: false, Quantity: 0 }, diff --git a/source/custom-resource/lib/mediapackage/cloudfront.spec.js b/source/custom-resource/lib/mediapackage/cloudfront.spec.js index 62c3fb4d..faae44bc 100644 --- a/source/custom-resource/lib/mediapackage/cloudfront.spec.js +++ b/source/custom-resource/lib/mediapackage/cloudfront.spec.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/custom-resource/lib/mediapackage/index.js b/source/custom-resource/lib/mediapackage/index.js index 92946b9f..df13c4f0 100644 --- a/source/custom-resource/lib/mediapackage/index.js +++ b/source/custom-resource/lib/mediapackage/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * @@ -75,7 +75,7 @@ const getCmafParameters = (groupId, configId) => ({ }); const create = async (properties) => { - const mediaPackageVod = new AWS.MediaPackageVod(); + const mediaPackageVod = new AWS.MediaPackageVod({customUserAgent: process.env.SOLUTION_IDENTIFIER}); const randomId = crypto.randomBytes(8).toString('hex'); const packagingGroup = await mediaPackageVod.createPackagingGroup({ Id: properties.GroupId }).promise(); @@ -128,7 +128,7 @@ const create = async (properties) => { }; const update = async (properties) => { - const mediaPackageVod = new AWS.MediaPackageVod(); + const mediaPackageVod = new AWS.MediaPackageVod({customUserAgent: process.env.SOLUTION_IDENTIFIER}); const packagingGroup = await mediaPackageVod.describePackagingGroup({ Id: properties.GroupId }).promise(); if (properties.EnableMediaPackage == 'true') { @@ -142,7 +142,7 @@ const update = async (properties) => { }; const purge = async (properties) => { - const mediaPackageVod = new AWS.MediaPackageVod(); + const mediaPackageVod = new AWS.MediaPackageVod({customUserAgent: process.env.SOLUTION_IDENTIFIER}); const groupId = properties.GroupId; let token; diff --git a/source/custom-resource/lib/mediapackage/index.spec.js b/source/custom-resource/lib/mediapackage/index.spec.js index 52e05f26..90884d9f 100644 --- a/source/custom-resource/lib/mediapackage/index.spec.js +++ b/source/custom-resource/lib/mediapackage/index.spec.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/custom-resource/lib/metrics/index.js b/source/custom-resource/lib/metrics/index.js index ce8e2741..dd753443 100644 --- a/source/custom-resource/lib/metrics/index.js +++ b/source/custom-resource/lib/metrics/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/custom-resource/lib/metrics/index.spec.js b/source/custom-resource/lib/metrics/index.spec.js index e8e0e26a..c956c079 100644 --- a/source/custom-resource/lib/metrics/index.spec.js +++ b/source/custom-resource/lib/metrics/index.spec.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/custom-resource/lib/s3/index.js b/source/custom-resource/lib/s3/index.js index 438a39d9..92acefb9 100644 --- a/source/custom-resource/lib/s3/index.js +++ b/source/custom-resource/lib/s3/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * @@ -14,7 +14,7 @@ const AWS = require('aws-sdk'); let PutNotification = async (config) => { - const s3 = new AWS.S3(); + const s3 = new AWS.S3({customUserAgent: process.env.SOLUTION_IDENTIFIER}); let params; @@ -83,6 +83,234 @@ let PutNotification = async (config) => { }] } } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.wmv' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.mxf' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.mkv' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.m3u8' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.mpeg' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.webm' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.h264' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.MPG' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.MP4' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.M4V' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.MOV' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.M2TS' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.WMV' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.MXF' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.MKV' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.M3U8' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.MPEG' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.WEBM' + }] + } + } + }, + { + Events: ['s3:ObjectCreated:*'], + LambdaFunctionArn: config.IngestArn, + Filter: { + Key: { + FilterRules: [{ + Name: 'suffix', + Value: '.H264' + }] + } + } } ] } diff --git a/source/custom-resource/lib/s3/index.spec.js b/source/custom-resource/lib/s3/index.spec.js index c3b4c8dc..cf495551 100644 --- a/source/custom-resource/lib/s3/index.spec.js +++ b/source/custom-resource/lib/s3/index.spec.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/custom-resource/package-lock.json b/source/custom-resource/package-lock.json deleted file mode 100644 index 6bb1b1ee..00000000 --- a/source/custom-resource/package-lock.json +++ /dev/null @@ -1,3133 +0,0 @@ -{ - "name": "vod-custom-resource", - "version": "1.0.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "vod-custom-resource", - "version": "1.0.0", - "license": "Apache-2.0", - "dependencies": { - "axios": "^0.21.1", - "moment": "^2.24.0", - "uuid": "^3.4.0" - }, - "devDependencies": { - "aws-sdk": "^2.609.0", - "aws-sdk-mock": "^5.0.0", - "axios-mock-adapter": "^1.17.0", - "chai": "^4.2.0", - "lodash": "^4.17.15", - "mocha": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@sinonjs/commons": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz", - "integrity": "sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==", - "dev": true, - "dependencies": { - "type-detect": "4.0.8" - } - }, - "node_modules/@sinonjs/fake-timers": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz", - "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^1.7.0" - } - }, - "node_modules/@sinonjs/samsam": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.1.tgz", - "integrity": "sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^1.6.0", - "lodash.get": "^4.4.2", - "type-detect": "^4.0.8" - } - }, - "node_modules/@sinonjs/text-encoding": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz", - "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", - "dev": true - }, - "node_modules/ansi-colors": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", - "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", - "dev": true, - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/aws-sdk": { - "version": "2.867.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.867.0.tgz", - "integrity": "sha512-6iXRTW6dlCU4UwMivDGHoRyMCvX9Ch1G2gIZZl5yKwzVNaBNpJiAyByWFuxrcBqQsSIFKBEbxeRjePE6QiBbkw==", - "dev": true, - "dependencies": { - "buffer": "4.9.2", - "events": "1.1.1", - "ieee754": "1.1.13", - "jmespath": "0.15.0", - "querystring": "0.2.0", - "sax": "1.2.1", - "url": "0.10.3", - "uuid": "3.3.2", - "xml2js": "0.4.19" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/aws-sdk-mock": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/aws-sdk-mock/-/aws-sdk-mock-5.1.0.tgz", - "integrity": "sha512-Wa5eCSo8HX0Snqb7FdBylaXMmfrAWoWZ+d7MFhiYsgHPvNvMEGjV945FF2qqE1U0Tolr1ALzik1fcwgaOhqUWQ==", - "dev": true, - "dependencies": { - "aws-sdk": "^2.637.0", - "sinon": "^9.0.1", - "traverse": "^0.6.6" - } - }, - "node_modules/aws-sdk/node_modules/uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", - "dev": true, - "bin": { - "uuid": "bin/uuid" - } - }, - "node_modules/axios": { - "version": "0.21.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", - "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", - "dependencies": { - "follow-redirects": "^1.10.0" - } - }, - "node_modules/axios-mock-adapter": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/axios-mock-adapter/-/axios-mock-adapter-1.19.0.tgz", - "integrity": "sha512-D+0U4LNPr7WroiBDvWilzTMYPYTuZlbo6BI8YHZtj7wYQS8NkARlP9KBt8IWWHTQJ0q/8oZ0ClPBtKCCkx8cQg==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.3", - "is-buffer": "^2.0.3" - }, - "peerDependencies": { - "axios": ">= 0.9.0" - } - }, - "node_modules/balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "dependencies": { - "fill-range": "^7.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true - }, - "node_modules/buffer": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", - "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", - "dev": true, - "dependencies": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" - } - }, - "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/chai": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz", - "integrity": "sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==", - "dev": true, - "dependencies": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^3.0.1", - "get-func-name": "^2.0.0", - "pathval": "^1.1.1", - "type-detect": "^4.0.5" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/chalk/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/chokidar": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz", - "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==", - "dev": true, - "dependencies": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.2.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "optionalDependencies": { - "fsevents": "~2.1.1" - } - }, - "node_modules/cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, - "dependencies": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } - }, - "node_modules/cliui/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/cliui/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/cliui/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "node_modules/decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", - "dev": true, - "dependencies": { - "type-detect": "^4.0.0" - }, - "engines": { - "node": ">=0.12" - } - }, - "node_modules/define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true, - "dependencies": { - "object-keys": "^1.0.12" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "node_modules/es-abstract": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz", - "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "get-intrinsic": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.2", - "is-callable": "^1.2.3", - "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.2", - "is-string": "^1.0.5", - "object-inspect": "^1.9.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.2", - "string.prototype.trimend": "^1.0.4", - "string.prototype.trimstart": "^1.0.4", - "unbox-primitive": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/es-abstract/node_modules/object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/events": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", - "dev": true, - "engines": { - "node": ">=0.4.x" - } - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "dependencies": { - "locate-path": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/flat": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz", - "integrity": "sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==", - "dev": true, - "dependencies": { - "is-buffer": "~2.0.3" - }, - "bin": { - "flat": "cli.js" - } - }, - "node_modules/follow-redirects": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz", - "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==", - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "node_modules/fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", - "deprecated": "\"Please update to latest v2.3 or v2.2\"", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - } - }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", - "dev": true, - "engines": { - "node": ">=4.x" - } - }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/has-bigints": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", - "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true, - "bin": { - "he": "bin/he" - } - }, - "node_modules/ieee754": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==", - "dev": true - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "node_modules/is-bigint": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz", - "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-boolean-object": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz", - "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-buffer": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", - "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "engines": { - "node": ">=4" - } - }, - "node_modules/is-callable": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz", - "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-date-object": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", - "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-negative-zero": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz", - "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/is-number-object": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz", - "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-regex": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz", - "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-symbols": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-string": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", - "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-symbol": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", - "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", - "dev": true, - "dependencies": { - "has-symbols": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "node_modules/jmespath": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz", - "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=", - "dev": true, - "engines": { - "node": ">= 0.6.0" - } - }, - "node_modules/js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", - "dev": true, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/just-extend": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz", - "integrity": "sha512-aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==", - "dev": true - }, - "node_modules/locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "node_modules/lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", - "dev": true - }, - "node_modules/log-symbols": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", - "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", - "dev": true, - "dependencies": { - "chalk": "^2.4.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "node_modules/mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/mocha": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz", - "integrity": "sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==", - "dev": true, - "dependencies": { - "ansi-colors": "3.2.3", - "browser-stdout": "1.3.1", - "chokidar": "3.3.0", - "debug": "3.2.6", - "diff": "3.5.0", - "escape-string-regexp": "1.0.5", - "find-up": "3.0.0", - "glob": "7.1.3", - "growl": "1.10.5", - "he": "1.2.0", - "js-yaml": "3.13.1", - "log-symbols": "3.0.0", - "minimatch": "3.0.4", - "mkdirp": "0.5.5", - "ms": "2.1.1", - "node-environment-flags": "1.0.6", - "object.assign": "4.1.0", - "strip-json-comments": "2.0.1", - "supports-color": "6.0.0", - "which": "1.3.1", - "wide-align": "1.1.3", - "yargs": "13.3.2", - "yargs-parser": "13.1.2", - "yargs-unparser": "1.6.0" - }, - "bin": { - "_mocha": "bin/_mocha", - "mocha": "bin/mocha" - }, - "engines": { - "node": ">= 8.10.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mochajs" - } - }, - "node_modules/mocha/node_modules/debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/mocha/node_modules/ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - }, - "node_modules/moment": { - "version": "2.29.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", - "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==", - "engines": { - "node": "*" - } - }, - "node_modules/nise": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/nise/-/nise-4.1.0.tgz", - "integrity": "sha512-eQMEmGN/8arp0xsvGoQ+B1qvSkR73B1nWSCh7nOt5neMCtwcQVYQGdzQMhcNscktTsWB54xnlSQFzOAPJD8nXA==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^1.7.0", - "@sinonjs/fake-timers": "^6.0.0", - "@sinonjs/text-encoding": "^0.7.1", - "just-extend": "^4.0.2", - "path-to-regexp": "^1.7.0" - } - }, - "node_modules/node-environment-flags": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz", - "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==", - "dev": true, - "dependencies": { - "object.getownpropertydescriptors": "^2.0.3", - "semver": "^5.7.0" - } - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-inspect": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz", - "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", - "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.2", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "object-keys": "^1.0.11" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.getownpropertydescriptors": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz", - "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2" - }, - "engines": { - "node": ">= 0.8" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "dependencies": { - "p-limit": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-to-regexp": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", - "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", - "dev": true, - "dependencies": { - "isarray": "0.0.1" - } - }, - "node_modules/path-to-regexp/node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "node_modules/pathval": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", - "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", - "dev": true, - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", - "dev": true - }, - "node_modules/querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "dev": true, - "engines": { - "node": ">=0.4.x" - } - }, - "node_modules/readdirp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz", - "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==", - "dev": true, - "dependencies": { - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "node_modules/sax": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", - "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o=", - "dev": true - }, - "node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "node_modules/sinon": { - "version": "9.2.4", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz", - "integrity": "sha512-zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^1.8.1", - "@sinonjs/fake-timers": "^6.0.1", - "@sinonjs/samsam": "^5.3.1", - "diff": "^4.0.2", - "nise": "^4.0.4", - "supports-color": "^7.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/sinon" - } - }, - "node_modules/sinon/node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/sinon/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/sinon/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "node_modules/string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "dependencies": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/string.prototype.trimend": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", - "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/string.prototype.trimstart": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", - "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "dependencies": { - "ansi-regex": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/supports-color": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz", - "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/traverse": { - "version": "0.6.6", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", - "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=", - "dev": true - }, - "node_modules/type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/unbox-primitive": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.0.tgz", - "integrity": "sha512-P/51NX+JXyxK/aigg1/ZgyccdAxm5K1+n8+tvqSntjOivPt19gvm1VC49RWYetsiub8WViUchdxl/KWHHB0kzA==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1", - "has-bigints": "^1.0.0", - "has-symbols": "^1.0.0", - "which-boxed-primitive": "^1.0.1" - } - }, - "node_modules/url": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz", - "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=", - "dev": true, - "dependencies": { - "punycode": "1.3.2", - "querystring": "0.2.0" - } - }, - "node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "bin": { - "uuid": "bin/uuid" - } - }, - "node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, - "node_modules/which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, - "dependencies": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "node_modules/wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "dev": true, - "dependencies": { - "string-width": "^1.0.2 || 2" - } - }, - "node_modules/wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "node_modules/xml2js": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", - "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", - "dev": true, - "dependencies": { - "sax": ">=0.6.0", - "xmlbuilder": "~9.0.1" - } - }, - "node_modules/xmlbuilder": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", - "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/y18n": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", - "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==", - "dev": true - }, - "node_modules/yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", - "dev": true, - "dependencies": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" - } - }, - "node_modules/yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", - "dev": true, - "dependencies": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - }, - "node_modules/yargs-unparser": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz", - "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==", - "dev": true, - "dependencies": { - "flat": "^4.1.0", - "lodash": "^4.17.15", - "yargs": "^13.3.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - } - }, - "dependencies": { - "@sinonjs/commons": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz", - "integrity": "sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==", - "dev": true, - "requires": { - "type-detect": "4.0.8" - } - }, - "@sinonjs/fake-timers": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz", - "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==", - "dev": true, - "requires": { - "@sinonjs/commons": "^1.7.0" - } - }, - "@sinonjs/samsam": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.1.tgz", - "integrity": "sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg==", - "dev": true, - "requires": { - "@sinonjs/commons": "^1.6.0", - "lodash.get": "^4.4.2", - "type-detect": "^4.0.8" - } - }, - "@sinonjs/text-encoding": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz", - "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", - "dev": true - }, - "ansi-colors": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", - "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==", - "dev": true - }, - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", - "dev": true - }, - "aws-sdk": { - "version": "2.867.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.867.0.tgz", - "integrity": "sha512-6iXRTW6dlCU4UwMivDGHoRyMCvX9Ch1G2gIZZl5yKwzVNaBNpJiAyByWFuxrcBqQsSIFKBEbxeRjePE6QiBbkw==", - "dev": true, - "requires": { - "buffer": "4.9.2", - "events": "1.1.1", - "ieee754": "1.1.13", - "jmespath": "0.15.0", - "querystring": "0.2.0", - "sax": "1.2.1", - "url": "0.10.3", - "uuid": "3.3.2", - "xml2js": "0.4.19" - }, - "dependencies": { - "uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", - "dev": true - } - } - }, - "aws-sdk-mock": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/aws-sdk-mock/-/aws-sdk-mock-5.1.0.tgz", - "integrity": "sha512-Wa5eCSo8HX0Snqb7FdBylaXMmfrAWoWZ+d7MFhiYsgHPvNvMEGjV945FF2qqE1U0Tolr1ALzik1fcwgaOhqUWQ==", - "dev": true, - "requires": { - "aws-sdk": "^2.637.0", - "sinon": "^9.0.1", - "traverse": "^0.6.6" - } - }, - "axios": { - "version": "0.21.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", - "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", - "requires": { - "follow-redirects": "^1.10.0" - } - }, - "axios-mock-adapter": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/axios-mock-adapter/-/axios-mock-adapter-1.19.0.tgz", - "integrity": "sha512-D+0U4LNPr7WroiBDvWilzTMYPYTuZlbo6BI8YHZtj7wYQS8NkARlP9KBt8IWWHTQJ0q/8oZ0ClPBtKCCkx8cQg==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.3", - "is-buffer": "^2.0.3" - } - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true - }, - "binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true - }, - "buffer": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", - "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", - "dev": true, - "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" - } - }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "chai": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz", - "integrity": "sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==", - "dev": true, - "requires": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^3.0.1", - "get-func-name": "^2.0.0", - "pathval": "^1.1.1", - "type-detect": "^4.0.5" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", - "dev": true - }, - "chokidar": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz", - "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==", - "dev": true, - "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.1.1", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.2.0" - } - }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, - "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true - }, - "deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", - "dev": true, - "requires": { - "type-detect": "^4.0.0" - } - }, - "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true, - "requires": { - "object-keys": "^1.0.12" - } - }, - "diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", - "dev": true - }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "es-abstract": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz", - "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "get-intrinsic": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.2", - "is-callable": "^1.2.3", - "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.2", - "is-string": "^1.0.5", - "object-inspect": "^1.9.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.2", - "string.prototype.trimend": "^1.0.4", - "string.prototype.trimstart": "^1.0.4", - "unbox-primitive": "^1.0.0" - }, - "dependencies": { - "object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - } - } - } - }, - "es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "events": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", - "dev": true - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "flat": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz", - "integrity": "sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==", - "dev": true, - "requires": { - "is-buffer": "~2.0.3" - } - }, - "follow-redirects": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz", - "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==" - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", - "dev": true, - "optional": true - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, - "get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", - "dev": true - }, - "get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1" - } - }, - "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", - "dev": true - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-bigints": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", - "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", - "dev": true - }, - "he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true - }, - "ieee754": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "is-bigint": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz", - "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==", - "dev": true - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-boolean-object": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz", - "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==", - "dev": true, - "requires": { - "call-bind": "^1.0.0" - } - }, - "is-buffer": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", - "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", - "dev": true - }, - "is-callable": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz", - "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==", - "dev": true - }, - "is-date-object": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", - "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", - "dev": true - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-negative-zero": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz", - "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==", - "dev": true - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "is-number-object": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz", - "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==", - "dev": true - }, - "is-regex": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz", - "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-symbols": "^1.0.1" - } - }, - "is-string": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", - "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", - "dev": true - }, - "is-symbol": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", - "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", - "dev": true, - "requires": { - "has-symbols": "^1.0.1" - } - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "jmespath": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz", - "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=", - "dev": true - }, - "js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "just-extend": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz", - "integrity": "sha512-aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==", - "dev": true - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", - "dev": true - }, - "log-symbols": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", - "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", - "dev": true, - "requires": { - "chalk": "^2.4.2" - } - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "mocha": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz", - "integrity": "sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==", - "dev": true, - "requires": { - "ansi-colors": "3.2.3", - "browser-stdout": "1.3.1", - "chokidar": "3.3.0", - "debug": "3.2.6", - "diff": "3.5.0", - "escape-string-regexp": "1.0.5", - "find-up": "3.0.0", - "glob": "7.1.3", - "growl": "1.10.5", - "he": "1.2.0", - "js-yaml": "3.13.1", - "log-symbols": "3.0.0", - "minimatch": "3.0.4", - "mkdirp": "0.5.5", - "ms": "2.1.1", - "node-environment-flags": "1.0.6", - "object.assign": "4.1.0", - "strip-json-comments": "2.0.1", - "supports-color": "6.0.0", - "which": "1.3.1", - "wide-align": "1.1.3", - "yargs": "13.3.2", - "yargs-parser": "13.1.2", - "yargs-unparser": "1.6.0" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - } - } - }, - "moment": { - "version": "2.29.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", - "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==" - }, - "nise": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/nise/-/nise-4.1.0.tgz", - "integrity": "sha512-eQMEmGN/8arp0xsvGoQ+B1qvSkR73B1nWSCh7nOt5neMCtwcQVYQGdzQMhcNscktTsWB54xnlSQFzOAPJD8nXA==", - "dev": true, - "requires": { - "@sinonjs/commons": "^1.7.0", - "@sinonjs/fake-timers": "^6.0.0", - "@sinonjs/text-encoding": "^0.7.1", - "just-extend": "^4.0.2", - "path-to-regexp": "^1.7.0" - } - }, - "node-environment-flags": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz", - "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==", - "dev": true, - "requires": { - "object.getownpropertydescriptors": "^2.0.3", - "semver": "^5.7.0" - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true - }, - "object-inspect": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz", - "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==", - "dev": true - }, - "object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true - }, - "object.assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", - "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "object-keys": "^1.0.11" - } - }, - "object.getownpropertydescriptors": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz", - "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.2" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - }, - "path-to-regexp": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", - "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", - "dev": true, - "requires": { - "isarray": "0.0.1" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - } - } - }, - "pathval": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", - "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", - "dev": true - }, - "picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", - "dev": true - }, - "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", - "dev": true - }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "dev": true - }, - "readdirp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz", - "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==", - "dev": true, - "requires": { - "picomatch": "^2.0.4" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "sax": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", - "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o=", - "dev": true - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "sinon": { - "version": "9.2.4", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz", - "integrity": "sha512-zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg==", - "dev": true, - "requires": { - "@sinonjs/commons": "^1.8.1", - "@sinonjs/fake-timers": "^6.0.1", - "@sinonjs/samsam": "^5.3.1", - "diff": "^4.0.2", - "nise": "^4.0.4", - "supports-color": "^7.1.0" - }, - "dependencies": { - "diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "string.prototype.trimend": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", - "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3" - } - }, - "string.prototype.trimstart": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", - "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true - }, - "supports-color": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz", - "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - }, - "traverse": { - "version": "0.6.6", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", - "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=", - "dev": true - }, - "type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true - }, - "unbox-primitive": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.0.tgz", - "integrity": "sha512-P/51NX+JXyxK/aigg1/ZgyccdAxm5K1+n8+tvqSntjOivPt19gvm1VC49RWYetsiub8WViUchdxl/KWHHB0kzA==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "has-bigints": "^1.0.0", - "has-symbols": "^1.0.0", - "which-boxed-primitive": "^1.0.1" - } - }, - "url": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz", - "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=", - "dev": true, - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - } - }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" - }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "dev": true, - "requires": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "dev": true, - "requires": { - "string-width": "^1.0.2 || 2" - } - }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "xml2js": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", - "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", - "dev": true, - "requires": { - "sax": ">=0.6.0", - "xmlbuilder": "~9.0.1" - } - }, - "xmlbuilder": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", - "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", - "dev": true - }, - "y18n": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", - "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==", - "dev": true - }, - "yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", - "dev": true, - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, - "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - }, - "yargs-unparser": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz", - "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==", - "dev": true, - "requires": { - "flat": "^4.1.0", - "lodash": "^4.17.15", - "yargs": "^13.3.0" - } - } - } -} diff --git a/source/custom-resource/package.json b/source/custom-resource/package.json index f14686e6..e248a705 100644 --- a/source/custom-resource/package.json +++ b/source/custom-resource/package.json @@ -18,10 +18,10 @@ "devDependencies": { "aws-sdk": "^2.609.0", "aws-sdk-mock": "^5.0.0", - "axios-mock-adapter": "^1.17.0", + "mocha": "^7.0.0", "chai": "^4.2.0", - "lodash": "^4.17.15", - "mocha": "^7.0.0" + "axios-mock-adapter": "^1.17.0", + "lodash": "^4.17.15" }, "private": true, "author": { diff --git a/source/dynamo/index.js b/source/dynamo/index.js index 4bceb296..c002014c 100644 --- a/source/dynamo/index.js +++ b/source/dynamo/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * @@ -18,7 +18,8 @@ exports.handler = async (event) => { console.log(`REQUEST:: ${JSON.stringify(event, null, 2)}`); const dynamo = new AWS.DynamoDB.DocumentClient({ - region: process.env.AWS_REGION + region: process.env.AWS_REGION, + customUserAgent: process.env.SOLUTION_IDENTIFIER }); try { diff --git a/source/dynamo/lib/error.js b/source/dynamo/lib/error.js index 53b6be3f..91da391b 100644 --- a/source/dynamo/lib/error.js +++ b/source/dynamo/lib/error.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/dynamo/lib/index.spec.js b/source/dynamo/lib/index.spec.js index f156cb77..55bf673f 100644 --- a/source/dynamo/lib/index.spec.js +++ b/source/dynamo/lib/index.spec.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/encode/index.js b/source/encode/index.js index 05c559ca..2cf17d58 100644 --- a/source/encode/index.js +++ b/source/encode/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * @@ -124,7 +124,8 @@ exports.handler = async (event) => { console.log(`REQUEST:: ${JSON.stringify(event, null, 2)}`); const mediaconvert = new AWS.MediaConvert({ - endpoint: process.env.EndPoint + endpoint: process.env.EndPoint, + customUserAgent: process.env.SOLUTION_IDENTIFIER }); try { @@ -145,11 +146,7 @@ exports.handler = async (event) => { 'Audio Selector 1': { Offset: 0, DefaultSelection: 'NOT_DEFAULT', - ProgramSelection: 1, - SelectorType: 'TRACK', - Tracks: [ - 1 - ] + ProgramSelection: 1 } }, VideoSelector: { diff --git a/source/encode/lib/error.js b/source/encode/lib/error.js index 53b6be3f..91da391b 100644 --- a/source/encode/lib/error.js +++ b/source/encode/lib/error.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/encode/lib/index.spec.js b/source/encode/lib/index.spec.js index fa89df82..5ba53172 100644 --- a/source/encode/lib/index.spec.js +++ b/source/encode/lib/index.spec.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/error-handler/index.js b/source/error-handler/index.js index 2a79b452..510d0626 100644 --- a/source/error-handler/index.js +++ b/source/error-handler/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * @@ -17,11 +17,13 @@ exports.handler = async (event) => { console.log(`REQUEST:: ${JSON.stringify(event, null, 2)}`); const dynamo = new AWS.DynamoDB.DocumentClient({ - region: process.env.AWS_REGION + region: process.env.AWS_REGION, + customUserAgent: process.env.SOLUTION_IDENTIFIER }); const sns = new AWS.SNS({ - region: process.env.AWS_REGION + region: process.env.AWS_REGION, + customUserAgent: process.env.SOLUTION_IDENTIFIER }); let guid, diff --git a/source/error-handler/lib/index.spec.js b/source/error-handler/lib/index.spec.js index 0790b3e9..6eedb327 100644 --- a/source/error-handler/lib/index.spec.js +++ b/source/error-handler/lib/index.spec.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/input-validate/index.js b/source/input-validate/index.js index e384721b..34fadca2 100644 --- a/source/input-validate/index.js +++ b/source/input-validate/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * @@ -18,7 +18,7 @@ const error = require('./lib/error'); exports.handler = async (event) => { console.log(`REQUEST:: ${JSON.stringify(event, null, 2)}`); - const s3 = new AWS.S3(); + const s3 = new AWS.S3({customUserAgent: process.env.SOLUTION_IDENTIFIER}); let data; try { diff --git a/source/input-validate/lib/error.js b/source/input-validate/lib/error.js index 53b6be3f..91da391b 100644 --- a/source/input-validate/lib/error.js +++ b/source/input-validate/lib/error.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/input-validate/lib/index.spec.js b/source/input-validate/lib/index.spec.js index e8ac1dcd..4d4b0389 100644 --- a/source/input-validate/lib/index.spec.js +++ b/source/input-validate/lib/index.spec.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/media-package-assets/index.js b/source/media-package-assets/index.js index 997947cc..d03e29e5 100644 --- a/source/media-package-assets/index.js +++ b/source/media-package-assets/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * @@ -49,7 +49,7 @@ const convertEndpoints = (egressEndpoints, cloudFrontEndpoint) => { const handler = async (event) => { console.log(`REQUEST:: ${JSON.stringify(event, null, 2)}`); - const mediaPackageVod = new AWS.MediaPackageVod(); + const mediaPackageVod = new AWS.MediaPackageVod({customUserAgent: process.env.SOLUTION_IDENTIFIER}); const randomId = crypto.randomBytes(16).toString('hex').toLowerCase(); try { diff --git a/source/media-package-assets/lib/error.js b/source/media-package-assets/lib/error.js index 53b6be3f..91da391b 100644 --- a/source/media-package-assets/lib/error.js +++ b/source/media-package-assets/lib/error.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/media-package-assets/lib/index.spec.js b/source/media-package-assets/lib/index.spec.js index c4ec3da1..cbc82f03 100644 --- a/source/media-package-assets/lib/index.spec.js +++ b/source/media-package-assets/lib/index.spec.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/output-validate/index.js b/source/output-validate/index.js index ad01f56f..f304ac9b 100644 --- a/source/output-validate/index.js +++ b/source/output-validate/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * @@ -21,10 +21,11 @@ exports.handler = async (event) => { console.log(`REQUEST:: ${JSON.stringify(event, null, 2)}`); const dynamo = new AWS.DynamoDB.DocumentClient({ - region: process.env.AWS_REGION + region: process.env.AWS_REGION, + customUserAgent: process.env.SOLUTION_IDENTIFIER }); - const s3 = new AWS.S3(); + const s3 = new AWS.S3({customUserAgent: process.env.SOLUTION_IDENTIFIER}); let data = {}; diff --git a/source/output-validate/lib/error.js b/source/output-validate/lib/error.js index 53b6be3f..91da391b 100644 --- a/source/output-validate/lib/error.js +++ b/source/output-validate/lib/error.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/output-validate/lib/index.spec.js b/source/output-validate/lib/index.spec.js index c4fc1537..3a48945e 100644 --- a/source/output-validate/lib/index.spec.js +++ b/source/output-validate/lib/index.spec.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/profiler/index.js b/source/profiler/index.js index 9b15b3ce..913d8c07 100644 --- a/source/profiler/index.js +++ b/source/profiler/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * @@ -18,7 +18,8 @@ exports.handler = async (event) => { console.log(`REQUEST:: ${JSON.stringify(event, null, 2)}`); const dynamo = new AWS.DynamoDB.DocumentClient({ - region: process.env.AWS_REGION + region: process.env.AWS_REGION, + customUserAgent: process.env.SOLUTION_IDENTIFIER }); try { diff --git a/source/profiler/lib/error.js b/source/profiler/lib/error.js index 53b6be3f..91da391b 100644 --- a/source/profiler/lib/error.js +++ b/source/profiler/lib/error.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/profiler/lib/index.spec.js b/source/profiler/lib/index.spec.js index c07d0c73..cee42a3e 100644 --- a/source/profiler/lib/index.spec.js +++ b/source/profiler/lib/index.spec.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/sns-notification/index.js b/source/sns-notification/index.js index c46e548a..bbdc4afe 100644 --- a/source/sns-notification/index.js +++ b/source/sns-notification/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * @@ -33,7 +33,8 @@ exports.handler = async (event) => { console.log(`REQUEST:: ${JSON.stringify(event, null, 2)}`); const sns = new AWS.SNS({ - region: process.env.AWS_REGION + region: process.env.AWS_REGION, + customUserAgent: process.env.SOLUTION_IDENTIFIER }); let msg = {}; diff --git a/source/sns-notification/lib/error.js b/source/sns-notification/lib/error.js index 53b6be3f..91da391b 100644 --- a/source/sns-notification/lib/error.js +++ b/source/sns-notification/lib/error.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/sns-notification/lib/index.spec.js b/source/sns-notification/lib/index.spec.js index 8a9bd06c..36c92411 100644 --- a/source/sns-notification/lib/index.spec.js +++ b/source/sns-notification/lib/index.spec.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/sqs-publish/index.js b/source/sqs-publish/index.js index 54fb75de..1f2ba4ec 100644 --- a/source/sqs-publish/index.js +++ b/source/sqs-publish/index.js @@ -19,7 +19,8 @@ exports.handler = async (event) => { console.log(`REQUEST:: ${JSON.stringify(event, null, 2)}`); const sqs = new AWS.SQS({ - region: process.env.AWS_REGION + region: process.env.AWS_REGION, + customUserAgent: process.env.SOLUTION_IDENTIFIER }); try { diff --git a/source/step-functions/index.js b/source/step-functions/index.js index bc85e5b9..447ab136 100644 --- a/source/step-functions/index.js +++ b/source/step-functions/index.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * @@ -19,7 +19,8 @@ exports.handler = async (event) => { console.log(`REQUEST:: ${JSON.stringify(event, null, 2)}`); const stepfunctions = new AWS.StepFunctions({ - region: process.env.AWS_REGION + region: process.env.AWS_REGION, + customUserAgent: process.env.SOLUTION_IDENTIFIER }); let response; diff --git a/source/step-functions/lib/error.js b/source/step-functions/lib/error.js index 53b6be3f..91da391b 100644 --- a/source/step-functions/lib/error.js +++ b/source/step-functions/lib/error.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at * diff --git a/source/step-functions/lib/index.spec.js b/source/step-functions/lib/index.spec.js index 3b6b40bc..352fd297 100644 --- a/source/step-functions/lib/index.spec.js +++ b/source/step-functions/lib/index.spec.js @@ -1,5 +1,5 @@ /********************************************************************************************************************* - * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * * * * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance * * with the License. A copy of the License is located at *