Skip to content

Commit 36a823d

Browse files
committed
Merge branch 'bugfix/fix_amrnb_amrwb_bitrate_default' into 'main'
fix(gmf_loader): Fix amrnb and amrwb bitrate default value See merge request adf/multimedia/esp-gmf!176
2 parents 08e3b9f + 7f91110 commit 36a823d

File tree

3 files changed

+24
-18
lines changed

3 files changed

+24
-18
lines changed

packages/gmf_loader/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## v0.7.1
4+
5+
### Bug Fixes
6+
7+
- Fixed amrnb and amrwb bitrate default value in `Kconfig.audio_codec.enc`
8+
39
## v0.7.0
410

511
### Features

packages/gmf_loader/Kconfigs/kconfig.audio_codec.enc

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@ config GMF_AUDIO_CODEC_INIT_ENCODER
6767

6868
config GMF_AUDIO_CODEC_ENC_AMRNB_BITRATE_MODE
6969
int
70-
default 0 if GMF_AUDIO_CODEC_ENC_AMRNB_BITRATE_MR475
71-
default 1 if GMF_AUDIO_CODEC_ENC_AMRNB_BITRATE_MR515
72-
default 2 if GMF_AUDIO_CODEC_ENC_AMRNB_BITRATE_MR59
73-
default 3 if GMF_AUDIO_CODEC_ENC_AMRNB_BITRATE_MR67
74-
default 4 if GMF_AUDIO_CODEC_ENC_AMRNB_BITRATE_MR74
75-
default 5 if GMF_AUDIO_CODEC_ENC_AMRNB_BITRATE_MR795
76-
default 6 if GMF_AUDIO_CODEC_ENC_AMRNB_BITRATE_MR102
77-
default 7 if GMF_AUDIO_CODEC_ENC_AMRNB_BITRATE_MR122
70+
default 4750 if GMF_AUDIO_CODEC_ENC_AMRNB_BITRATE_MR475
71+
default 5150 if GMF_AUDIO_CODEC_ENC_AMRNB_BITRATE_MR515
72+
default 5900 if GMF_AUDIO_CODEC_ENC_AMRNB_BITRATE_MR59
73+
default 6700 if GMF_AUDIO_CODEC_ENC_AMRNB_BITRATE_MR67
74+
default 7400 if GMF_AUDIO_CODEC_ENC_AMRNB_BITRATE_MR74
75+
default 7950 if GMF_AUDIO_CODEC_ENC_AMRNB_BITRATE_MR795
76+
default 10200 if GMF_AUDIO_CODEC_ENC_AMRNB_BITRATE_MR102
77+
default 12200 if GMF_AUDIO_CODEC_ENC_AMRNB_BITRATE_MR122
7878

7979
config GMF_AUDIO_CODEC_ENC_AMRNB_NO_FILE_HEADER
8080
bool "AMR-NB Encoder No File Header"
@@ -120,15 +120,15 @@ config GMF_AUDIO_CODEC_INIT_ENCODER
120120

121121
config GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MODE
122122
int
123-
default 0 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD66
124-
default 1 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD885
125-
default 2 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD1265
126-
default 3 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD1425
127-
default 4 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD1585
128-
default 5 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD1825
129-
default 6 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD1985
130-
default 7 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD2305
131-
default 8 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD2385
123+
default 6600 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD66
124+
default 8850 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD885
125+
default 12650 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD1265
126+
default 14250 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD1425
127+
default 15850 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD1585
128+
default 18250 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD1825
129+
default 19850 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD1985
130+
default 23050 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD2305
131+
default 23850 if GMF_AUDIO_CODEC_ENC_AMRWB_BITRATE_MD2385
132132

133133
config GMF_AUDIO_CODEC_ENC_AMRWB_NO_FILE_HEADER
134134
bool "AMR-WB Encoder No File Header"

packages/gmf_loader/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "0.7.0"
1+
version: "0.7.1"
22
description: Espressif GMF Loader is a module that loads elements and I/O components for the GMF pipeline
33
url: https://github.com/espressif/esp-gmf/tree/main/packages/gmf_loader
44
documentation: "https://github.com/espressif/esp-gmf/blob/main/packages/gmf_loader/README.md"

0 commit comments

Comments
 (0)