michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Audio: Separate Kconfig for MPL

Browse source 
Separate out the Kconfig for the media player.
Also removes some unused MCS configs.

The media player has been using MCS configs, while it should be the
other way around.

Also, this will make it easier to move the media player elsewhere, as
has been discussed.

Signed-off-by: Asbjørn Sæbø <asbjorn.sabo@nordicsemi.no>
This commit is contained in:
Asbjørn Sæbø 2022-02-17 16:35:07 +01:00 • committed by Carles Cufí
commit e3a7ed4766
10 changed files with 283 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/bluetooth/bsim_bt/bsim_test_audio/prj.conf
View file

@ -55,6 +55,13 @@ CONFIG_BT_CSIS_TEST_SAMPLE_DATA=y
CONFIG_BT_CSIS_CLIENT=y
CONFIG_BT_CSIS_CLIENT_TEST_SAMPLE_DATA=y
# Media player
CONFIG_BT_MPL=y
CONFIG_BT_MPL_OBJECTS=y
CONFIG_BT_MPL_TRACK_TITLE_MAX=40
CONFIG_BT_MPL_ICON_URL_MAX=40
CONFIG_BT_MPL_MAX_OBJ_SIZE=600
# Media control
CONFIG_BT_MCS=y
CONFIG_BT_MCC=y
@ -63,7 +70,6 @@ CONFIG_BT_MCC_SHELL=y
CONFIG_BT_MCS_TRACK_TITLE_MAX=40
CONFIG_BT_MCS_ICON_URL_MAX=40
CONFIG_BT_MCC_TOTAL_OBJ_CONTENT_MEM=4096
CONFIG_BT_MCS_MAX_OBJ_SIZE=600
# Object Transfer
CONFIG_BT_OTS=y
@ -85,6 +91,7 @@ CONFIG_BT_DEBUG_VOCS=y
CONFIG_BT_DEBUG_VOCS_CLIENT=y
CONFIG_BT_DEBUG_MICS=y
CONFIG_BT_DEBUG_MICS_CLIENT=y
CONFIG_BT_DEBUG_MPL=y
CONFIG_BT_DEBUG_MCS=y
CONFIG_BT_DEBUG_MCC=y
CONFIG_BT_OTS_LOG_LEVEL_DBG=y

25
tests/bluetooth/shell/audio.conf
View file

@ -64,24 +64,28 @@ CONFIG_BT_CSIS=y
CONFIG_BT_CSIS_CLIENT=y
CONFIG_BT_CSIS_CLIENT_MAX_CSIS_INSTANCES=2
CONFIG_BT_MPL=y
CONFIG_BT_MPL_MEDIA_PLAYER_NAME_MAX=30
CONFIG_BT_MPL_MEDIA_PLAYER_NAME="My media player"
CONFIG_BT_MPL_ICON_URL_MAX=27
CONFIG_BT_MPL_ICON_URL="http://www.somecompany.com"
CONFIG_BT_MPL_TRACK_TITLE_MAX=40
CONFIG_BT_MPL_SEGMENT_NAME_MAX=35
CONFIG_BT_MPL_OBJECTS=y
# TODO Check which value is sensible in the line below
# Must be larger than any of the object sizes - icon, track, group, segments, ...
CONFIG_BT_MPL_MAX_OBJ_SIZE=600
CONFIG_BT_MPL_ICON_BITMAP_SIZE=321
CONFIG_BT_MPL_TRACK_MAX_SIZE=50
CONFIG_BT_MCS=y
CONFIG_BT_MCS_MEDIA_PLAYER_NAME_MAX=30
CONFIG_BT_MCS_MEDIA_PLAYER_NAME="My media player"
CONFIG_BT_MCS_ICON_URL_MAX=27
CONFIG_BT_MCS_ICON_URL="http://www.somecompany.com"
CONFIG_BT_MCS_TRACK_TITLE_MAX=40
CONFIG_BT_MCS_GROUP_TITLE_MAX=40
CONFIG_BT_MCS_SEGMENT_NAME_MAX=35
CONFIG_BT_MCS_ICON_BITMAP_SIZE=321
CONFIG_BT_MCC=y
CONFIG_BT_MCC_OTS=y
CONFIG_BT_MCC_TOTAL_OBJ_CONTENT_MEM=4096
# TODO Check which value is sensible in the line below
# Must be larger than any of the object sizes - icon, track, group, segments, ...
CONFIG_BT_MCS_MAX_OBJ_SIZE=600
CONFIG_BT_MCS_TRACK_MAX_SIZE=50
CONFIG_BT_MCS_TRACK_SEG_MAX_SIZE=500
CONFIG_BT_MCS_GROUP_MAX_SIZE=552
# Object Transfer
CONFIG_BT_OTS=y
@ -98,6 +102,7 @@ CONFIG_BT_HAS_HEARING_AID_MONAURAL=y
# DEBUGGING
CONFIG_BT_DEBUG_LOG=y
CONFIG_BT_DEBUG_MPL=y
CONFIG_BT_DEBUG_MCS=y
CONFIG_BT_DEBUG_MCC=y
CONFIG_BT_OTS_LOG_LEVEL_DBG=y