Merge pull request #6480 from HiassofT/le11-alsa

RPi: update vc4-hdmi ALSA card conf to version sent upstream
This commit is contained in:
CvH 2022-05-11 19:23:53 +02:00 committed by GitHub
commit c12dcf63a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,7 +1,10 @@
#
# Configuration for the VC4-HDMI sound card using software IEC958 # Configuration for the VC4-HDMI sound card using software IEC958
# subframe conversion # subframe conversion
#
<confdir:pcm/hdmi.conf> <confdir:pcm/hdmi.conf>
vc4-hdmi.pcm.hdmi.0 { vc4-hdmi.pcm.hdmi.0 {
@args [ CARD AES0 AES1 AES2 AES3 ] @args [ CARD AES0 AES1 AES2 AES3 ]
@args.CARD { @args.CARD {
@ -18,7 +21,6 @@ vc4-hdmi.pcm.hdmi.0 {
} }
@args.AES3 { @args.AES3 {
type integer type integer
default 0x01 # IEC958_AES3_CON_FS_NOTID
} }
type iec958 type iec958
slave { slave {
@ -49,29 +51,32 @@ vc4-hdmi.pcm.hdmi.0 {
hdmi_mode true hdmi_mode true
} }
# default with plug # default with plug and softvol
vc4-hdmi.pcm.default { vc4-hdmi.pcm.default {
@args [ CARD ] @args [ CARD ]
@args.CARD { @args.CARD {
type string type string
} }
type plug type asym
slave.pcm { playback.pcm {
type softvol type plug
slave.pcm { slave.pcm {
@func concat type softvol
strings [ slave.pcm {
"hdmi:" @func concat
"CARD=" $CARD "," strings [
"AES0=0x00," # IEC958_AES0_CON_EMPHASIS_NONE "cards.vc4-hdmi.pcm.hdmi.0:"
"AES1=0x82," # IEC958_AES1_CON_ORIGINAL | IEC958_AES1_CON_PCM_CODER "CARD=" $CARD ","
"AES2=0x00," # IEC958_AES2_CON_SOURCE_UNSPEC | IEC958_AES2_CON_CHANNEL_UNSPEC "AES0=0x04," # IEC958_AES0_CON_NOT_COPYRIGHT | IEC958_AES0_CON_EMPHASIS_NONE
"AES3=0x01" # IEC958_AES3_CON_FS_NOTID "AES1=0x82," # IEC958_AES1_CON_ORIGINAL | IEC958_AES1_CON_PCM_CODER
] "AES2=0x00," # IEC958_AES2_CON_SOURCE_UNSPEC | IEC958_AES2_CON_CHANNEL_UNSPEC
} "AES3=0x01" # IEC958_AES3_CON_FS_NOTID (iec958 plugin will fill in actual rate)
control { ]
name "PCM Playback Volume" }
card $CARD control {
name "PCM Playback Volume"
card $CARD
}
} }
} }
} }