Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

host/audio: move old LE Audio files to new directory #1714

Merged
merged 1 commit into from
Mar 1, 2024

Conversation

KKopyscinski
Copy link
Contributor

LE Audio lives now in nimble/host/audio.

@KKopyscinski
Copy link
Contributor Author

@MariuszSkamra PTAL

@KKopyscinski KKopyscinski force-pushed the move_audio branch 3 times, most recently from 5453517 to 6a63d3c Compare February 29, 2024 13:31
Comment on lines 35 to 37
pkg.deps.BLE_ISO:
- nimble/host/audio

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I understand it correctly, this makes BLE_ISO dependent on nimble/host/audio.
If so, that does not seem right to me as you can have BLE_ISO without audio, but you cannot have audio without BLE_ISO.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe we should have one common config for audio? I can add one here

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sounds good to me

@@ -35,6 +35,7 @@ pkg.deps:
- nimble/host/services/gatt
- nimble/host/store/config
- nimble/host/util
- nimble/host/audio
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this seems to be ordered, thus I'd place nimble/host/audio right after nimble/host

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved to deps of BLE_AUDIO

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dep should be added by package which defines BLE_AUDIO

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@KKopyscinski KKopyscinski force-pushed the move_audio branch 2 times, most recently from 725b726 to 32cb19b Compare February 29, 2024 14:03
@@ -17,5 +17,8 @@
#

syscfg.defs:
BLE_AUDIO:
description: 'Indicates that a BLE Audio is present.'
Copy link
Contributor

@MariuszSkamra MariuszSkamra Feb 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd move this config to host/syscfg.yml, similarly where BLE_MESH is defined.
Plus, I'd suggest to describe this option like:

Suggested change
description: 'Indicates that a BLE Audio is present.'
description: 'This option enables Bluetooth LE Audio support.'

Otherwise LGTM

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fully agree :)

Copy link
Contributor

@MariuszSkamra MariuszSkamra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@sjanc sjanc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

split this to separate commits ( CI, apps, host)

@@ -440,6 +440,11 @@ syscfg.defs:
that have been enabled in the stack, such as GATT support.
value: 0

BLE_AUDIO:
description: 'This option enables Bluetooth LE Audio support'
value: 0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mark this as experimental

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

apps/btshell/src/cmd_leaudio.c Outdated Show resolved Hide resolved
@KKopyscinski KKopyscinski force-pushed the move_audio branch 2 times, most recently from 746168d to 7f1df8a Compare March 1, 2024 09:23
@KKopyscinski
Copy link
Contributor Author

@sjanc as discussed offline, this refactor must be single-commit, because apps won't build otherwise

nimble/host/audio/syscfg.yml Outdated Show resolved Hide resolved
apps/auracast/syscfg.yml Outdated Show resolved Hide resolved
nimble/host/syscfg.yml Outdated Show resolved Hide resolved
@@ -35,6 +35,7 @@ pkg.deps:
- nimble/host/services/gatt
- nimble/host/store/config
- nimble/host/util
- nimble/host/audio
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dep should be added by package which defines BLE_AUDIO

This patch refactors BLE Audio library to conform to new directory tree
introduced in a979570.

LE Audio related files present in host/include, host/src and
host/services were moved to corelated folders in host/audio.

Experimental system config BLE_AUDIO enabling LE Audio feature was introduced.

Naming convention for BLE Audio functions, structures and files was
unified - replaced `bcst` shorthand with `broadcast`. For example,
ble_audio_pub_bcst_announcement_feat was renamed to
ble_audio_pub_broadcast_announcement_feat.

Contents of host/include/ble_audio_common.h was incorporated into
host/audio/include/audio/ble_audio.h.

Apps and Auracast service were adjusted to new config and include paths.

BLE_MAX_BIG and BLE_MAX_BIS renamed to BLE_ISO_MAX_BIGS and
BLE_ISO_MAX_BISES, respectevaly.
@KKopyscinski KKopyscinski merged commit a04a6d2 into apache:master Mar 1, 2024
17 checks passed
@KKopyscinski KKopyscinski deleted the move_audio branch March 1, 2024 12:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants