From e60caa0c0cdfbc37658396fc4d0f22067410643a Mon Sep 17 00:00:00 2001 From: Daniel Baluta Date: Mon, 26 Sep 2022 12:20:09 +0300 Subject: [PATCH] topology1: Update documentation to reflect multicodec support This updates documentation to reflect that now param id is only 2 bytes followed by 2 bytes codec id. Signed-off-by: Daniel Baluta --- tools/topology/topology1/sof/pipe-codec-adapter-capture.m4 | 3 ++- tools/topology/topology1/sof/pipe-codec-adapter-playback.m4 | 3 ++- .../topology1/sof/pipe-eq-iir-codec-adapter-playback.m4 | 3 ++- .../topology/topology1/sof/pipe-host-codec-adapter-playback.m4 | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/topology/topology1/sof/pipe-codec-adapter-capture.m4 b/tools/topology/topology1/sof/pipe-codec-adapter-capture.m4 index 6d947456f..e5e5c4cda 100644 --- a/tools/topology/topology1/sof/pipe-codec-adapter-capture.m4 +++ b/tools/topology/topology1/sof/pipe-codec-adapter-capture.m4 @@ -30,7 +30,8 @@ include(`bytecontrol.m4') # - [16:31]: reserved 0s # - (optional) 12+ bytes codec_param: codec TLV parameters container, for more details please refer # struct codec_param under audio/codec_adapter/codec/generic.h -# - [0:3]: param ID +# - [0:1]: param ID +# - [2:3]: codec ID (when supporting multiple codecs, 0 otherwise) # - [4:7]: size in bytes (ID + size + data) # - [8:n-1]: data[], the param data ifdef(`CA_SETUP_CONTROLBYTES',`', `define(`CA_SETUP_CONTROLBYTES', diff --git a/tools/topology/topology1/sof/pipe-codec-adapter-playback.m4 b/tools/topology/topology1/sof/pipe-codec-adapter-playback.m4 index b30e9d626..dcfe4d75d 100644 --- a/tools/topology/topology1/sof/pipe-codec-adapter-playback.m4 +++ b/tools/topology/topology1/sof/pipe-codec-adapter-playback.m4 @@ -30,7 +30,8 @@ include(`bytecontrol.m4') # - [16:31]: reserved 0s # - (optional) 12+ bytes codec_param: codec TLV parameters container, for more details please refer # struct codec_param under audio/codec_adapter/codec/generic.h -# - [0:3]: param ID +# - [0:1]: param ID +# - [2:3]: codec ID (when supporting multiple codecs, 0 otherwise) # - [4:7]: size in bytes (ID + size + data) # - [8:n-1]: data[], the param data ifdef(`CA_SETUP_CONTROLBYTES',`', `define(`CA_SETUP_CONTROLBYTES', diff --git a/tools/topology/topology1/sof/pipe-eq-iir-codec-adapter-playback.m4 b/tools/topology/topology1/sof/pipe-eq-iir-codec-adapter-playback.m4 index fbc19e808..c93d59981 100644 --- a/tools/topology/topology1/sof/pipe-eq-iir-codec-adapter-playback.m4 +++ b/tools/topology/topology1/sof/pipe-eq-iir-codec-adapter-playback.m4 @@ -31,7 +31,8 @@ include(`eq_iir.m4') # - [16:31]: reserved 0s # - (optional) 12+ bytes codec_param: codec TLV parameters container, for more details please refer # struct codec_param under audio/codec_adapter/codec/generic.h -# - [0:3]: param ID +# - [0:1]: param ID +# - [2:3]: codec ID (when supporting multiple codecs, 0 otherwise) # - [4:7]: size in bytes (ID + size + data) # - [8:n-1]: data[], the param data ifdef(`CA_SETUP_CONTROLBYTES',`', `define(`CA_SETUP_CONTROLBYTES', diff --git a/tools/topology/topology1/sof/pipe-host-codec-adapter-playback.m4 b/tools/topology/topology1/sof/pipe-host-codec-adapter-playback.m4 index 1ecd1abb7..2ee73c6ac 100644 --- a/tools/topology/topology1/sof/pipe-host-codec-adapter-playback.m4 +++ b/tools/topology/topology1/sof/pipe-host-codec-adapter-playback.m4 @@ -30,7 +30,8 @@ include(`bytecontrol.m4') # - [16:31]: reserved 0s # - (optional) 12+ bytes codec_param: codec TLV parameters container, for more details please refer # struct codec_param under audio/codec_adapter/codec/generic.h -# - [0:3]: param ID +# - [0:1]: param ID +# - [2:3]: codec ID, when supporting multiple codecs, 0 otherwise # - [4:7]: size in bytes (ID + size + data) # - [8:n-1]: data[], the param data ifdef(`CA_SETUP_CONTROLBYTES',`', `define(`CA_SETUP_CONTROLBYTES',