From 2581029647a9bfabfe1b335f032131830d56699e Mon Sep 17 00:00:00 2001 From: Lasse Emil Hildebrandt Date: Mon, 6 Mar 2023 12:10:56 +0100 Subject: [PATCH 1/4] Add failing tests for bitrate and sample rate --- internal/service/medialive/channel_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/service/medialive/channel_test.go b/internal/service/medialive/channel_test.go index 5eef1b78cc31..23ff0029b8d3 100644 --- a/internal/service/medialive/channel_test.go +++ b/internal/service/medialive/channel_test.go @@ -184,6 +184,8 @@ func TestAccMediaLiveChannel_audioDescriptions_codecSettings(t *testing.T) { "audio_selector_name": rName, "name": rName, "codec_settings.0.aac_settings.0.rate_control_mode": string(types.AacRateControlModeCbr), + "codec_settings.0.aac_settings.0.bitrate": "192000", + "codec_settings.0.aac_settings.0.sample_rate": "48000", }), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "encoder_settings.0.video_descriptions.*", map[string]string{ "name": "test-video-name", @@ -847,6 +849,8 @@ resource "aws_medialive_channel" "test" { codec_settings { aac_settings { rate_control_mode = "CBR" + bitrate = 192000 + sample_rate = 48000 } } } From 8c83ca8420ffa05c719f5f8e2e38feed65698803 Mon Sep 17 00:00:00 2001 From: Lasse Emil Hildebrandt Date: Mon, 6 Mar 2023 12:14:22 +0100 Subject: [PATCH 2/4] Fixed casting for bitrate for aac_settings --- .../service/medialive/channel_encoder_settings_schema.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/medialive/channel_encoder_settings_schema.go b/internal/service/medialive/channel_encoder_settings_schema.go index 0299c83e5cb4..56571a42db1d 100644 --- a/internal/service/medialive/channel_encoder_settings_schema.go +++ b/internal/service/medialive/channel_encoder_settings_schema.go @@ -2539,8 +2539,8 @@ func expandAudioDescriptionsCodecSettingsAacSettings(tfList []interface{}) *type m := tfList[0].(map[string]interface{}) var out types.AacSettings - if v, ok := m["bitrate"].(float32); ok { - out.Bitrate = float64(v) + if v, ok := m["bitrate"].(float64); ok { + out.Bitrate = v } if v, ok := m["coding_mode"].(string); ok && v != "" { out.CodingMode = types.AacCodingMode(v) @@ -2557,8 +2557,8 @@ func expandAudioDescriptionsCodecSettingsAacSettings(tfList []interface{}) *type if v, ok := m["raw_format"].(string); ok && v != "" { out.RawFormat = types.AacRawFormat(v) } - if v, ok := m["sample_rate"].(float32); ok { - out.SampleRate = float64(v) + if v, ok := m["sample_rate"].(float64); ok { + out.SampleRate = v } if v, ok := m["spec"].(string); ok && v != "" { out.Spec = types.AacSpec(v) From d1700dd76b5041b15a38d18e6b0b04fcc6bda2d3 Mon Sep 17 00:00:00 2001 From: Lasse Emil Hildebrandt Date: Wed, 8 Mar 2023 13:08:53 +0100 Subject: [PATCH 3/4] Added changelog --- .changelog/29807.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/29807.txt diff --git a/.changelog/29807.txt b/.changelog/29807.txt new file mode 100644 index 000000000000..dd0404feb01e --- /dev/null +++ b/.changelog/29807.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_medialive_channel: Fix setting of `bitrate` and `sample_rate` for `aac_settings`. +``` From 7757ffe06faab57aca83d5a1677ae80513892e28 Mon Sep 17 00:00:00 2001 From: Lasse Emil Hildebrandt Date: Wed, 8 Mar 2023 15:07:00 +0100 Subject: [PATCH 4/4] Fixed cast in flatten --- internal/service/medialive/channel_encoder_settings_schema.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/medialive/channel_encoder_settings_schema.go b/internal/service/medialive/channel_encoder_settings_schema.go index 56571a42db1d..2503f50c3a0b 100644 --- a/internal/service/medialive/channel_encoder_settings_schema.go +++ b/internal/service/medialive/channel_encoder_settings_schema.go @@ -5535,13 +5535,13 @@ func flattenCodecSettingsAacSettings(in *types.AacSettings) []interface{} { } m := map[string]interface{}{ - "bitrate": float32(in.Bitrate), + "bitrate": in.Bitrate, "coding_mode": string(in.CodingMode), "input_type": string(in.InputType), "profile": string(in.Profile), "rate_control_mode": string(in.RateControlMode), "raw_format": string(in.RawFormat), - "sample_rate": float32(in.SampleRate), + "sample_rate": in.SampleRate, "spec": string(in.Spec), "vbr_quality": string(in.VbrQuality), }