Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
9a532f05
Commit
9a532f05
authored
Jul 03, 2017
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
parents
10e5b9c2
8a70b454
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
42 additions
and
1 deletion
+42
-1
Documentation/sound/soc/dapm.rst
Documentation/sound/soc/dapm.rst
+18
-0
include/sound/soc-dapm.h
include/sound/soc-dapm.h
+7
-0
include/uapi/sound/asoc.h
include/uapi/sound/asoc.h
+9
-1
sound/soc/soc-topology.c
sound/soc/soc-topology.c
+8
-0
No files found.
Documentation/sound/soc/dapm.rst
View file @
9a532f05
...
@@ -105,6 +105,24 @@ Pre
...
@@ -105,6 +105,24 @@ Pre
Special PRE widget (exec before all others)
Special PRE widget (exec before all others)
Post
Post
Special POST widget (exec after all others)
Special POST widget (exec after all others)
Buffer
Inter widget audio data buffer within a DSP.
Scheduler
DSP internal scheduler that schedules component/pipeline processing
work.
Effect
Widget that performs an audio processing effect.
SRC
Sample Rate Converter within DSP or CODEC
ASRC
Asynchronous Sample Rate Converter within DSP or CODEC
Encoder
Widget that encodes audio data from one format (usually PCM) to another
usually more compressed format.
Decoder
Widget that decodes audio data from a compressed format to an
uncompressed format like PCM.
(Widgets are defined in include/sound/soc-dapm.h)
(Widgets are defined in include/sound/soc-dapm.h)
...
...
include/sound/soc-dapm.h
View file @
9a532f05
...
@@ -510,6 +510,13 @@ enum snd_soc_dapm_type {
...
@@ -510,6 +510,13 @@ enum snd_soc_dapm_type {
snd_soc_dapm_dai_out
,
snd_soc_dapm_dai_out
,
snd_soc_dapm_dai_link
,
/* link between two DAI structures */
snd_soc_dapm_dai_link
,
/* link between two DAI structures */
snd_soc_dapm_kcontrol
,
/* Auto-disabled kcontrol */
snd_soc_dapm_kcontrol
,
/* Auto-disabled kcontrol */
snd_soc_dapm_buffer
,
/* DSP/CODEC internal buffer */
snd_soc_dapm_scheduler
,
/* DSP/CODEC internal scheduler */
snd_soc_dapm_effect
,
/* DSP/CODEC effect component */
snd_soc_dapm_src
,
/* DSP/CODEC SRC component */
snd_soc_dapm_asrc
,
/* DSP/CODEC ASRC component */
snd_soc_dapm_encoder
,
/* FW/SW audio encoder component */
snd_soc_dapm_decoder
,
/* FW/SW audio decoder component */
};
};
enum
snd_soc_dapm_subclass
{
enum
snd_soc_dapm_subclass
{
...
...
include/uapi/sound/asoc.h
View file @
9a532f05
...
@@ -73,7 +73,15 @@
...
@@ -73,7 +73,15 @@
#define SND_SOC_TPLG_DAPM_DAI_IN 13
#define SND_SOC_TPLG_DAPM_DAI_IN 13
#define SND_SOC_TPLG_DAPM_DAI_OUT 14
#define SND_SOC_TPLG_DAPM_DAI_OUT 14
#define SND_SOC_TPLG_DAPM_DAI_LINK 15
#define SND_SOC_TPLG_DAPM_DAI_LINK 15
#define SND_SOC_TPLG_DAPM_LAST SND_SOC_TPLG_DAPM_DAI_LINK
#define SND_SOC_TPLG_DAPM_BUFFER 16
#define SND_SOC_TPLG_DAPM_SCHEDULER 17
#define SND_SOC_TPLG_DAPM_EFFECT 18
#define SND_SOC_TPLG_DAPM_SIGGEN 19
#define SND_SOC_TPLG_DAPM_SRC 20
#define SND_SOC_TPLG_DAPM_ASRC 21
#define SND_SOC_TPLG_DAPM_ENCODER 22
#define SND_SOC_TPLG_DAPM_DECODER 23
#define SND_SOC_TPLG_DAPM_LAST SND_SOC_TPLG_DAPM_DECODER
/* Header magic number and string sizes */
/* Header magic number and string sizes */
#define SND_SOC_TPLG_MAGIC 0x41536F43
/* ASoC */
#define SND_SOC_TPLG_MAGIC 0x41536F43
/* ASoC */
...
...
sound/soc/soc-topology.c
View file @
9a532f05
...
@@ -242,6 +242,14 @@ static const struct soc_tplg_map dapm_map[] = {
...
@@ -242,6 +242,14 @@ static const struct soc_tplg_map dapm_map[] = {
{
SND_SOC_TPLG_DAPM_DAI_IN
,
snd_soc_dapm_dai_in
},
{
SND_SOC_TPLG_DAPM_DAI_IN
,
snd_soc_dapm_dai_in
},
{
SND_SOC_TPLG_DAPM_DAI_OUT
,
snd_soc_dapm_dai_out
},
{
SND_SOC_TPLG_DAPM_DAI_OUT
,
snd_soc_dapm_dai_out
},
{
SND_SOC_TPLG_DAPM_DAI_LINK
,
snd_soc_dapm_dai_link
},
{
SND_SOC_TPLG_DAPM_DAI_LINK
,
snd_soc_dapm_dai_link
},
{
SND_SOC_TPLG_DAPM_BUFFER
,
snd_soc_dapm_buffer
},
{
SND_SOC_TPLG_DAPM_SCHEDULER
,
snd_soc_dapm_scheduler
},
{
SND_SOC_TPLG_DAPM_EFFECT
,
snd_soc_dapm_effect
},
{
SND_SOC_TPLG_DAPM_SIGGEN
,
snd_soc_dapm_siggen
},
{
SND_SOC_TPLG_DAPM_SRC
,
snd_soc_dapm_src
},
{
SND_SOC_TPLG_DAPM_ASRC
,
snd_soc_dapm_asrc
},
{
SND_SOC_TPLG_DAPM_ENCODER
,
snd_soc_dapm_encoder
},
{
SND_SOC_TPLG_DAPM_DECODER
,
snd_soc_dapm_decoder
},
};
};
static
int
tplc_chan_get_reg
(
struct
soc_tplg
*
tplg
,
static
int
tplc_chan_get_reg
(
struct
soc_tplg
*
tplg
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment