mirror of https://github.com/thesofproject/sof.git
Revert "topology2: add ssp multi stream capture"
This reverts commit 0857ed68b9.
The "topology2: add ssp multi stream capture" impacted PR test.
Will resubmit once we fixed the issue.
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
This commit is contained in:
Bard Liao
Liam Girdwood
parent
d9aed376d5
commit
92ad7bd974
|
|
@ -15,8 +15,6 @@
|
|||
<passthrough-be.conf>
|
||||
<host-copier-gain-mixin-playback.conf>
|
||||
<mixout-gain-dai-copier-playback.conf>
|
||||
<dai-copier-gain-module-copier-capture.conf>
|
||||
<gain-capture.conf>
|
||||
<data.conf>
|
||||
<pcm.conf>
|
||||
<pcm_caps.conf>
|
||||
|
|
@ -245,7 +243,7 @@ Object.Pipeline {
|
|||
}
|
||||
|
||||
# capture pipelines
|
||||
gain-capture.1 {
|
||||
passthrough-capture.1 {
|
||||
index 7
|
||||
Object.Widget.pipeline.1 {
|
||||
stream_name 'NoCodec-0'
|
||||
|
|
@ -253,31 +251,15 @@ Object.Pipeline {
|
|||
Object.Widget.copier.1 {
|
||||
stream_name 'SSP0 Capture'
|
||||
}
|
||||
Object.Widget.gain.1 {
|
||||
Object.Control.mixer.1 {
|
||||
name 'Main Capture Volume 1'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
gain-capture.4 {
|
||||
index 17
|
||||
format s32le
|
||||
passthrough-be.4 {
|
||||
index 8
|
||||
direction capture
|
||||
Object.Widget.pipeline.1 {
|
||||
stream_name 'NoCodec-0'
|
||||
}
|
||||
Object.Widget.copier.1 {
|
||||
stream_name 'SSP0-1 Capture'
|
||||
}
|
||||
Object.Widget.gain.1 {
|
||||
Object.Control.mixer.1 {
|
||||
name 'Main Capture Volume 2'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dai-copier-gain-module-copier-capture.4 {
|
||||
index 8
|
||||
Object.Widget.copier."1" {
|
||||
dai_index 0
|
||||
dai_type "SSP"
|
||||
|
|
@ -293,22 +275,6 @@ Object.Pipeline {
|
|||
dma_buffer_size "$[$ibs * 2]"
|
||||
}
|
||||
}
|
||||
|
||||
Object.Widget.copier."2" {
|
||||
stream_name "NoCodec-0"
|
||||
Object.Base.audio_format.1 {
|
||||
in_bit_depth 32
|
||||
in_valid_bit_depth 32
|
||||
out_bit_depth 32
|
||||
out_valid_bit_depth 32
|
||||
dma_buffer_size "$[$ibs * 2]"
|
||||
}
|
||||
}
|
||||
Object.Widget.gain.1 {
|
||||
Object.Control.mixer.1 {
|
||||
name 'Host Capture Volume'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
passthrough-capture.2 {
|
||||
|
|
@ -397,17 +363,6 @@ Object.PCM {
|
|||
formats 'S16_LE,S24_LE,S32_LE'
|
||||
}
|
||||
}
|
||||
pcm."12" {
|
||||
name "ssp-capture"
|
||||
id 12
|
||||
direction "capture"
|
||||
Object.Base.fe_dai."ssp-capture" {}
|
||||
|
||||
Object.PCM.pcm_caps."capture" {
|
||||
name "SSP0-1 Capture"
|
||||
formats 'S16_LE,S24_LE,S32_LE'
|
||||
}
|
||||
}
|
||||
pcm."1" {
|
||||
name "Port1"
|
||||
id 1
|
||||
|
|
@ -473,7 +428,7 @@ Object.Base {
|
|||
|
||||
route."7" {
|
||||
source "copier.SSP.8.1"
|
||||
sink "gain.8.1"
|
||||
sink "copier.host.7.1"
|
||||
}
|
||||
|
||||
route."8" {
|
||||
|
|
@ -485,15 +440,4 @@ Object.Base {
|
|||
source "copier.SSP.12.1"
|
||||
sink "copier.host.11.1"
|
||||
}
|
||||
|
||||
route."10" {
|
||||
source "copier.module.8.2"
|
||||
sink "gain.7.1"
|
||||
}
|
||||
|
||||
route."11" {
|
||||
source "copier.module.8.2"
|
||||
sink "gain.17.1"
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,112 +0,0 @@
|
|||
#
|
||||
# BE capture pipeline: dai-copier-gain-module-copier-capture
|
||||
#
|
||||
# All attributes defined herein are namespaced
|
||||
# by alsatplg to "Object.Pipeline.dai-copier-gain-module-copier-capture.N.attribute_name"
|
||||
#
|
||||
# Usage: dai-copier-gain-module-copier-capture pipeline object can be instantiated as:
|
||||
#
|
||||
# Object.Pipeline.dai-copier-gain-module-copier-capture."N" {
|
||||
# period 1000
|
||||
# time_domain "timer"
|
||||
# channels 2
|
||||
# rate 48000
|
||||
# }
|
||||
#
|
||||
# Where N is the unique pipeline ID within the same alsaconf node.
|
||||
#
|
||||
|
||||
<include/common/audio_format.conf>
|
||||
<include/components/copier.conf>
|
||||
<include/components/gain.conf>
|
||||
<include/components/pipeline.conf>
|
||||
|
||||
Class.Pipeline."dai-copier-gain-module-copier-capture" {
|
||||
|
||||
DefineAttribute."index" {}
|
||||
|
||||
<include/pipelines/pipeline-common.conf>
|
||||
|
||||
attributes {
|
||||
!constructor [
|
||||
"index"
|
||||
]
|
||||
|
||||
!immutable [
|
||||
"direction"
|
||||
]
|
||||
|
||||
#
|
||||
# dai-copier-gain-module-copier-capture objects instantiated
|
||||
# within the same alsaconf node must have unique pipeline_id
|
||||
# attribute
|
||||
#
|
||||
unique "instance"
|
||||
}
|
||||
|
||||
Object.Widget {
|
||||
copier."1" {
|
||||
type dai_out
|
||||
period_sink_count 2
|
||||
period_source_count 0
|
||||
node_type $HDA_LINK_INPUT_CLASS
|
||||
num_audio_formats 2
|
||||
# copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch
|
||||
Object.Base.audio_format.1 {
|
||||
in_bit_depth 32
|
||||
in_valid_bit_depth 32
|
||||
out_bit_depth 32
|
||||
out_valid_bit_depth 32
|
||||
dma_buffer_size "$[$ibs * 2]"
|
||||
}
|
||||
}
|
||||
|
||||
copier."2" {
|
||||
type buffer
|
||||
copier_type "module"
|
||||
period_sink_count 2
|
||||
period_source_count 0
|
||||
num_audio_formats 2
|
||||
Object.Base.audio_format.1 {
|
||||
in_bit_depth 32
|
||||
in_valid_bit_depth 32
|
||||
out_bit_depth 32
|
||||
out_valid_bit_depth 32
|
||||
dma_buffer_size "$[$ibs * 2]"
|
||||
}
|
||||
}
|
||||
gain."1" {
|
||||
num_audio_formats 1
|
||||
|
||||
# 32-bit 48KHz 2ch
|
||||
Object.Base.audio_format.1 {
|
||||
in_bit_depth 32
|
||||
in_valid_bit_depth 32
|
||||
out_bit_depth 32
|
||||
out_valid_bit_depth 32
|
||||
}
|
||||
}
|
||||
|
||||
pipeline."1" {
|
||||
priority 0
|
||||
lp_mode 0
|
||||
}
|
||||
}
|
||||
|
||||
Object.Base {
|
||||
route.1 {
|
||||
source gain..1
|
||||
sink copier.module..2
|
||||
}
|
||||
}
|
||||
|
||||
direction "capture"
|
||||
dynamic_pipeline 1
|
||||
time_domain "timer"
|
||||
channels 2
|
||||
channels_min 2
|
||||
channels_max 2
|
||||
rate 48000
|
||||
rate_min 48000
|
||||
rate_max 48000
|
||||
}
|
||||
Loading…
Reference in New Issue