Bluetooth: Update audio Object Transfer Client, move alongside Object Transfer Service #42086
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
asbjornsabo
added
area: Tests
asbjornsabo
requested review from
Thalley,
nordic-krch,
kapi-no and
alwa-nordic
asbjornsabo
requested review from
aescolar,
jhedberg,
Vudentz and
wopu-ot
as code owners
github-actions
bot
added
area: API
|
@ekohandel I was not able to add you as a reviewer to the PR. But since you are one of the users of OTS, I would like you to review this PR anyway. |
@asbjornsabo, I am unable to comment on the |
ekohandel
suggested changes
Jan 25, 2022
There was a problem hiding this comment.
@asbjornsabo, it will probably take me a few days to get through this, I work on this as a side project and not part of my day job so I don't have as much time as I would like to put towards it. I will continue to submit my comments in an incremental fashion. Thanks for including me in this review.
Thalley
requested changes
Jan 25, 2022
asbjornsabo
force-pushed
the
otc
branch
7 times, most recently
from
7fd3349 to
803ab9b
Compare
Move the directory listing size defines to the OTS directory listing internal header file. This removes an implicit dependency upon users of ots_dir_list_internal.h to also include ots_internal.h. Signed-off-by: Asbjørn Sæbø <[email protected]>
Update the Object Transfer Client to use OTS defines and types instead of the ones left over from the previous "le-audio local" object transfer service: DIR_LIST, object ID size, OACP and OLCP Remove the no longer used defines and types from the OTC header file. Exception: The OLCP sort order defines have not been removed, but moved to the olcp internal header file, for expected later use. Signed-off-by: Asbjørn Sæbø <[email protected]>
Minor updates to documentation in OTC header file. Signed-off-by: Asbjørn Sæbø <[email protected]>
Rename functions to follow common pattern (module, action, noun). Signed-off-by: Asbjørn Sæbø <[email protected]>
Mark the OTC implementation as experimental Signed-off-by: Asbjørn Sæbø <[email protected]>
Merge Kconfig file for OTS server and client. Rename the client config from _OTC to _OTS_CLIENT Signed-off-by: Asbjørn Sæbø <[email protected]>
Rename OTS client files from "otc" to "ots_client". Signed-off-by: Asbjørn Sæbø <[email protected]>
Move defines from public API to implementation (only used there). Signed-off-by: Asbjørn Sæbø <[email protected]>
Small clean-ups to client code: Making variables const, adding a value to a debug print. Signed-off-by: Asbjørn Sæbø <[email protected]>
Use Kconfig value for object name size also for client. Signed-off-by: Asbjørn Sæbø <[email protected]>
Move the metadata request bitfields to the common header files. This is part of merging the ots_client and ots header files. Signed-off-by: Asbjørn Sæbø <[email protected]>
Merge the metadata types for client and server. This is part of merging the ots_client and ots header files. Signed-off-by: Asbjørn Sæbø <[email protected]>
- Move content of client header file to common header file. - Rename content from "otc" to "ots_client". - Remove empty client header file. - Update users. Signed-off-by: Asbjørn Sæbø <[email protected]>
Rename client callbacks to be more consistent with common code style. Signed-off-by: Asbjørn Sæbø <[email protected]>
Rename two defines for internal consistency in file. Signed-off-by: Asbjørn Sæbø <[email protected]>
Remove #include of conn_internal.h - cast conn pointers to void for logging instead. Signed-off-by: Asbjørn Sæbø <[email protected]>
Move the instance as the first parameter of the client function calls and callbacks, for consistency with the server implementation. Signed-off-by: Asbjørn Sæbø <[email protected]>
Use a value for "Unknown object ID" that is outside of the range of valid object IDs. Signed-off-by: Asbjørn Sæbø <[email protected]>
Rename the data and metadata callbacks to _read(), for consistency with the corresponding function calls. Signed-off-by: Asbjørn Sæbø <[email protected]>
|
Rebase with no changes again. |
Thalley
approved these changes
Mar 2, 2022
kapi-no
approved these changes
Mar 4, 2022
alwa-nordic
approved these changes
Mar 4, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An Object Transfer Client (OTC) has been developed and maintained along with the le-audio profiles and services, as the le-audio Media Control Client depends upon OTC to be full-featured.
The purpose of this PR is to make this OTC implementation "official" and available.
The PR moves the OTC implementation from the le-audio code to alongside the corresponding Object Transfer Service.
The OTC code is cleaned up a bit, and is also updated to use the existing OTS definitions and L2CAP library to avoid duplication.
UPDATE: Additional commits to unify client and server more, including merging the two header files.
The OTC is used by the media control client, and is covered by BabbleSim tests for that module.
The initial implementation the OTC was done by Leif Aschehoug [email protected]
The code has later been updated and maintained by Emil Gydesen [email protected] and Asbjørn Sæbø [email protected]
Note:
Commits 2 and 3 deal with removing remains of the old OTS implementation that also existed in the le-audio code (and which the starting point for, and was replaced by, the current OTS code).
Commit 4 is the move from the le-audio code to alongside the OTS, in the "bluetooth/services/ots" folder
Fixes #41592