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.

Sign up for GitHub

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

Topology: Use pipe-volume-switch-capture in nocodec topologies #3509

Closed
wants to merge 1 commit into from
Closed

Topology: Use pipe-volume-switch-capture in nocodec topologies #3509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions tools/topology/sof-apl-nocodec.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
1000, 0, 0,
48000, 48000, 48000)

# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s16le.
# Volume switch capture pipeline 2 on PCM 0 using max 2 channels of s16le.
# 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
singalsu marked this conversation as resolved.
Show resolved Hide resolved
PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4,
2, 0, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)
Expand All @@ -61,9 +61,9 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
1000, 0, 0,
48000, 48000, 48000)

# Low Latency capture pipeline 4 on PCM 1 using max 2 channels of s16le.
# Volume switch capture pipeline 4 on PCM 1 using max 2 channels of s16le.
# 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4,
4, 1, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)
Expand All @@ -75,9 +75,9 @@ PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
# 1000, 0, 0,
# 48000, 48000, 48000)

# Low Latency capture pipeline 6 on PCM 2 using max 2 channels of s16le.
# Volume switch capture pipeline 6 on PCM 2 using max 2 channels of s16le.
# 1000us deadline on core 0 with priority 0
#PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
#PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4,
# 6, 2, 2, s32le,
# 1000, 0, 0,
# 48000, 48000, 48000)
Expand All @@ -89,9 +89,9 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
1000, 0, 0,
48000, 48000, 48000)

# Low Latency capture pipeline 8 on PCM 3 using max 2 channels of s16le.
# Volume switch capture pipeline 8 on PCM 3 using max 2 channels of s16le.
# 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4,
8, 3, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)
Expand All @@ -103,9 +103,9 @@ PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
# 1000, 0, 0,
# 48000, 48000, 48000)

# Low Latency capture pipeline 10 on PCM 4 using max 2 channels of s16le.
# Volume switch capture pipeline 10 on PCM 4 using max 2 channels of s16le.
# 1000us deadline on core 0 with priority 0
#PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
#PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4,
# 10, 4, 2, s32le,
# 1000, 0, 0,
# 48000, 48000, 48000)
Expand All @@ -117,9 +117,9 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
1000, 0, 0,
48000, 48000, 48000)

# Low Latency capture pipeline 12 on PCM 5 using max 2 channels of s16le.
# Volume switch capture pipeline 12 on PCM 5 using max 2 channels of s16le.
# 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4,
12, 5, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)
Expand Down
4 changes: 2 additions & 2 deletions tools/topology/sof-bdw-nocodec.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ PIPELINE_PCM_ADD(sof/pipe-low-latency-playback.m4,
1000, 0, 0,
48000, 48000, 48000)

# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
# Volume switch capture pipeline 2 on PCM 0 using max 2 channels of s32le.
# 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4,
2, 0, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)
Expand Down
4 changes: 2 additions & 2 deletions tools/topology/sof-cht-nocodec.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ include(`platform/intel/'PLATFORM`.m4')
# PCM0 <---- Volume <---- SSP2
#

# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s32le.
# Volume switch capture pipeline 2 on PCM 0 using max 2 channels of s32le.
# 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-low-latency-capture.m4,
PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4,
2, 0, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)
Expand Down
12 changes: 6 additions & 6 deletions tools/topology/sof-cnl-nocodec.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
1000, 0, 0,
48000, 48000, 48000)

# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s24le.
# Volume switch capture pipeline 2 on PCM 0 using max 2 channels of s24le.
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4,
2, 0, 2, s24le,
1000, 0, 0,
48000, 48000, 48000)
Expand All @@ -54,9 +54,9 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
1000, 0, 0,
48000, 48000, 48000)

# Low Latency capture pipeline 4 on PCM 1 using max 2 channels of s24le.
# Volume switch capture pipeline 4 on PCM 1 using max 2 channels of s24le.
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4,
4, 1, 2, s24le,
1000, 0, 0,
48000, 48000, 48000)
Expand All @@ -68,9 +68,9 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
1000, 0, 0,
48000, 48000, 48000)

# Low Latency capture pipeline 6 on PCM 2 using max 2 channels of s24le.
# Volume switch capture pipeline 6 on PCM 2 using max 2 channels of s24le.
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4,
6, 2, 2, s24le,
1000, 0, 0,
48000, 48000, 48000)
Expand Down
4 changes: 2 additions & 2 deletions tools/topology/sof-icl-nocodec.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
1000, 0, 0,
48000, 48000, 48000)

# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s24le.
# Volume switch capture pipeline 2 on PCM 0 using max 2 channels of s24le.
# 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4,
2, 0, 2, s24le,
1000, 0, 0,
48000, 48000, 48000)
Expand Down
12 changes: 6 additions & 6 deletions tools/topology/sof-tgl-nocodec.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
1000, 0, 0,
48000, 48000, 48000)

# Low Latency capture pipeline 2 on PCM 0 using max 2 channels of s16le.
# Volume switch capture pipeline 2 on PCM 0 using max 2 channels of s16le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4,
2, 0, 2, s16le,
1000, 0, 0,
48000, 48000, 48000)
Expand All @@ -58,9 +58,9 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
1000, 0, 0,
48000, 48000, 48000)

# Low Latency capture pipeline 4 on PCM 1 using max 2 channels of s16le.
# Volume switch capture pipeline 4 on PCM 1 using max 2 channels of s16le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4,
4, 1, 2, s16le,
1000, 0, 0,
48000, 48000, 48000)
Expand All @@ -72,9 +72,9 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
1000, 0, 0,
48000, 48000, 48000)

# Low Latency capture pipeline 6 on PCM 2 using max 2 channels of s16le.
# Volume switch capture pipeline 6 on PCM 2 using max 2 channels of s16le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
PIPELINE_PCM_ADD(sof/pipe-volume-switch-capture.m4,
6, 2, 2, s16le,
1000, 0, 0,
48000, 48000, 48000)
Expand Down