Skip to content

[RFC]topology: hda: add a volume component to convert 24bit format #866

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

Merged
lgirdwood merged 2 commits into from
Jan 29, 2019
Merged

[RFC]topology: hda: add a volume component to convert 24bit format #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56e440e
topology: hda: delete sof-whl-hda.m4
RanderWang Jan 23, 2019
6619d31
topology: hda: fix a hda bug when pipeline is in 24bit
RanderWang Jan 25, 2019
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
6 changes: 2 additions & 4 deletions tools/topology/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ DEPS = \
MACHINES = \
sof-cht-nocodec.tplg \
sof-cht-max98090.tplg \
sof-whl-hda.tplg \
sof-hda-generic.tplg \
sof-hda-intel-common.tplg \
sof-apl-nocodec.tplg \
sof-byt-nocodec.tplg \
sof-bdw-rt286.tplg \
Expand Down Expand Up @@ -67,8 +66,7 @@ EXTRA_DIST = \
sof-cht-nocodec.m4 \
sof-cht-max98090.m4 \
sof-apl-hdmi.m4 \
sof-whl-hda.m4 \
sof-hda-generic.m4 \
sof-hda-intel-common.m4 \
sof-apl-nocodec.m4 \
sof-byt-nocodec.m4 \
sof-bdw-rt286.m4 \
Expand Down
28 changes: 14 additions & 14 deletions tools/topology/sof-hda-generic.m4 → tools/topology/sof-hda-intel-common.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,52 +73,52 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
#

# playback DAI is HDA Analog using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
# Dai buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-playback.m4,
1, HDA, 0, Analog Playback and Capture,
PIPELINE_SOURCE_1, 2, s24le,
PIPELINE_SOURCE_1, 2, s32le,
48, 1000, 0, 0)

# capture DAI is HDA Analog using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
# Dai buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
2, HDA, 1, Analog Playback and Capture,
PIPELINE_SINK_2, 2, s24le,
PIPELINE_SINK_2, 2, s32le,
48, 1000, 0, 0)

# playback DAI is HDA Digital using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
# Dai buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-playback.m4,
3, HDA, 2, Digital Playback and Capture,
PIPELINE_SOURCE_3, 2, s24le,
PIPELINE_SOURCE_3, 2, s32le,
48, 1000, 0, 0)

# capture DAI is HDA Digital using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
# Dai buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-capture.m4,
4, HDA, 3, Digital Playback and Capture,
PIPELINE_SINK_4, 2, s24le,
PIPELINE_SINK_4, 2, s32le,
48, 1000, 0, 0)

# playback DAI is iDisp1 using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
# Dai buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-playback.m4,
7, HDA, 4, iDisp1,
PIPELINE_SOURCE_7, 2, s24le,
PIPELINE_SOURCE_7, 2, s32le,
48, 1000, 0, 0)

# playback DAI is iDisp2 using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
# Dai buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-playback.m4,
8, HDA, 5, iDisp2,
PIPELINE_SOURCE_8, 2, s24le,
PIPELINE_SOURCE_8, 2, s32le,
48, 1000, 0, 0)

# playback DAI is iDisp3 using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
# Dai buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD(sof/pipe-dai-playback.m4,
9, HDA, 6, iDisp3,
PIPELINE_SOURCE_9, 2, s24le,
PIPELINE_SOURCE_9, 2, s32le,
48, 1000, 0, 0)

PCM_DUPLEX_ADD(HDA Analog, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
Expand Down
155 changes: 0 additions & 155 deletions tools/topology/sof-whl-hda.m4
View file
Open in desktop

This file was deleted.