From 6e76663f37a91641bae1bad05512968cdbe53f10 Mon Sep 17 00:00:00 2001 From: Thierry Bultel Date: Thu, 7 Jun 2018 17:44:23 +0200 Subject: Added log for card lookup diagnostic Signed-off-by: Thierry Bultel --- conf.d/project/lua.d/smixer-test-simple.lua | 245 --------------------------- conf.d/project/lua.d/smixer-test-usb_2ch.lua | 245 +++++++++++++++++++++++++++ plugins/alsa/alsa-core-ctl.c | 2 + plugins/alsa/alsa-utils-bypath.c | 7 +- 4 files changed, 252 insertions(+), 247 deletions(-) delete mode 100644 conf.d/project/lua.d/smixer-test-simple.lua create mode 100644 conf.d/project/lua.d/smixer-test-usb_2ch.lua diff --git a/conf.d/project/lua.d/smixer-test-simple.lua b/conf.d/project/lua.d/smixer-test-simple.lua deleted file mode 100644 index 99893c1..0000000 --- a/conf.d/project/lua.d/smixer-test-simple.lua +++ /dev/null @@ -1,245 +0,0 @@ ---[[ - Copyright (C) 2016 "IoT.bzh" - Author Fulup Ar Foll - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - NOTE: strict mode: every global variables should be prefixed by '_' ---]] - --- Static variables should be prefixed with _ -_EventHandle={} - - --- make variable visible from ::OnExitError:: -local error -local result - - -local printf = function(s,...) - io.write(s:format(...)) - io.write("\n") - return -end - --- Display receive arguments and echo them to caller -function _mixer_simple_test_ (source, args) - do - - -- Mixer UID is used as API name - - -- ==================== Default rate =========================== - - local audio_params ={ - defaults = { ["rate"] = 48000 }, - standard = { ["rate"] = 44100 }, - basic= { ["rate"] = 8000 }, - } - - local volume_ramps = { - {["uid"]="ramp-fast", ["delay"]= 050, ["up"]=10,["down"]=3}, - {["uid"]="ramp-slow", ["delay"]= 250, ["up"]=03,["down"]=1}, - {["uid"]="ramp-normal", ["delay"]= 100, ["up"]=06,["down"]=2}, - } - - -- ======================= Loop PCM =========================== - local snd_aloop = { - ["uid"] = "Alsa-Loop", - ["path"]= "/dev/snd/by-path/platform-snd_aloop.0", - ["devices"] = {["playback"]=0,["capture"]=1}, - ["subdevs"] = { - {["subdev"]= 0, ["numid"]= 51, ["uid"]= "loop-legacy"}, - {["subdev"]= 1, ["numid"]= 57, ["uid"]= "loop-multimedia"}, - {["subdev"]= 2, ["numid"]= 63}, - {["subdev"]= 3, ["numid"]= 69}, - {["subdev"]= 4, ["numid"]= 75}, - {["subdev"]= 5, ["numid"]= 81}, - {["subdev"]= 6, ["numid"]= 87}, - {["subdev"]= 7, ["numid"]= 93}, - }, - } - - - -- ============================= Backend (Sound Cards) =================== - - local snd_yamaha = { - ["uid"]= "YAMAHA-APU70", - ["path"]= "/dev/snd/by-id/usb-YAMAHA_Corporation_YAMAHA_AP-U70_USB_Audio_00-00", - ["params"]= audio_params.default, - ["sink"] = { - ["channels"] = { - {["uid"]= "front-right", ["port"]= 0}, - {["uid"]= "front-left", ["port"]= 1}, - }, - } - } - - local snd_usb_8ch= { - ["uid"]= "8CH-USB", - ["path"]= "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00", - ["params"] = audio_params.default, - ["sink"] = { - ["controls"]= { - ["volume"] = {["name"]= "Speaker Playback Volume", ["value"]=80}, - ["mute"] = {["name"]= "Speaker Playback Switch"}, - }, - ["channels"] = { - {["uid"]= "front-right", ["port"]= 0}, - {["uid"]= "front-left" , ["port"]= 1}, - {["uid"]= "middle-right", ["port"]= 2}, - {["uid"]= "middle-left" , ["port"]= 3}, - {["uid"]= "back-right", ["port"]= 4}, - {["uid"]= "back-left" , ["port"]= 5}, - {["uid"]= "centre-left" , ["port"]= 6}, - {["uid"]= "centre-left" , ["port"]= 7}, - }, - }, - ["source"] = { - ["controls"]= { - ["volume"] = {["name"]= "Capture Volume"}, - ["mute"] = {["name"]= "Capture Switch"}, - }, - ["channels"] = { - {["uid"]= "mic-right", ["port"]= 0}, - {["uid"]= "mic-left" , ["port"]= 1}, - }, - } - } - - - -- ============================= Zones =================== - local zone_stereo={ - ["uid"] = "full-stereo", - ["sink"] = { - {["target"]="front-right",["channel"]=0}, - {["target"]="front-left" ,["channel"]=1}, - {["target"]="middle-right",["channel"]=0}, - {["target"]="middle-left" ,["channel"]=1}, - {["target"]="back-right",["channel"]=0}, - {["target"]="back-left" ,["channel"]=1}, - } - } - - local zone_front= { - ["uid"] = "front-seats", - ["sink"] = { - {["target"]="front-right",["channel"]=0}, - {["target"]="front-left" ,["channel"]=1}, - } - } - - local zone_middle= { - ["uid"] = "middle-seats", - ["sink"] = { - {["target"]="middle-right",["channel"]=0}, - {["target"]="middle-left" ,["channel"]=1}, - } - } - - local zone_back= { - ["uid"] = "back-seats", - ["sink"] = { - {["target"]="back-right",["channel"]=0}, - {["target"]="back-left" ,["channel"]=1}, - } - } - - local zone_driver= { - ["uid"] = "driver-seat", - ["source"] = { - {["target"]="mic-right",["channel"]=0}, - }, - ["sink"] = { - {["target"]="front-right",["channel"]=0}, - } - } - - -- =================== Audio Stream ============================ - local stream_music= { - ["uid"] = "multimedia", - ["zone"]= "full-stereo", - ["source"]= "loop-multimedia", - ["volume"]= 80, - ["mute"] = false, - ["params"]= audio_params.standard, - } - - local stream_navigation= { - ["uid"] = "navigation", - ["zone"]= "front-seats", - ["volume"]= 80, - ["mute"] = false, - } - - local stream_emergency= { - ["uid"] = "emergency", - ["zone"] = "driver-seat", - ["volume"]= 80, - ["mute"] = false, - --["params"]= audio_params.basic, - } - - local stream_radio= { - ["uid"] = "radio", - ["zone"] = "full-stereo", - --["source"]= snd_usb_8ch.uid, - ["volume"]= 80, - ["mute"] = false, - } - - local stream_pulse= { - ["uid"] = "pulseaudio", - ["zone"] = "back-seats", - ["source"]= "loop-legacy", - ["volume"]= 80, - ["mute"] = false, - } - - --- ================ Create Mixer ========================= - local MyTestHal= { - ["uid"]= "MyMixer", - ["ramps"]= volume_ramps, - ["playbacks"] = {snd_usb_8ch}, - ["captures"]= {snd_usb_8ch}, - ["loops"] = {snd_aloop}, - ["zones"] = {zone_stereo, zone_front, zone_back, zone_middle, zone_driver}, - ["streams"] = {stream_pulse, stream_music, stream_navigation }, - -- ["streams"] = {stream_pulse, stream_music, stream_navigation, stream_emergency, stream_radio }, - - } - - - - error,result= AFB:servsync(source, "smixer", "attach", MyTestHal) - if (error) then - AFB:error (source, "--InLua-- API MyMixer/attach fail error=%d", error) - goto OnErrorExit - else - AFB:notice (source, "--InLua-- MyMixer/attach done result=%s\n", Dump_Table(result)) - end - - -- ================== Happy End ============================= - AFB:notice (source, "--InLua-- Test success") - return 0 end - - -- ================= Unhappy End ============================ - ::OnErrorExit:: - local response=result["request"] - printf ("--InLua-- ------------STATUS= %s --------------", result["status"]) - printf ("--InLua-- ++ INFO= %s", Dump_Table(response["info"])) - printf ("--InLua-- ----------TEST %s-------------", result["status"]) - - AFB:error (source, "--InLua-- Test Fail") - return 1 -- unhappy end -- -end diff --git a/conf.d/project/lua.d/smixer-test-usb_2ch.lua b/conf.d/project/lua.d/smixer-test-usb_2ch.lua new file mode 100644 index 0000000..99893c1 --- /dev/null +++ b/conf.d/project/lua.d/smixer-test-usb_2ch.lua @@ -0,0 +1,245 @@ +--[[ + Copyright (C) 2016 "IoT.bzh" + Author Fulup Ar Foll + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + NOTE: strict mode: every global variables should be prefixed by '_' +--]] + +-- Static variables should be prefixed with _ +_EventHandle={} + + +-- make variable visible from ::OnExitError:: +local error +local result + + +local printf = function(s,...) + io.write(s:format(...)) + io.write("\n") + return +end + +-- Display receive arguments and echo them to caller +function _mixer_simple_test_ (source, args) + do + + -- Mixer UID is used as API name + + -- ==================== Default rate =========================== + + local audio_params ={ + defaults = { ["rate"] = 48000 }, + standard = { ["rate"] = 44100 }, + basic= { ["rate"] = 8000 }, + } + + local volume_ramps = { + {["uid"]="ramp-fast", ["delay"]= 050, ["up"]=10,["down"]=3}, + {["uid"]="ramp-slow", ["delay"]= 250, ["up"]=03,["down"]=1}, + {["uid"]="ramp-normal", ["delay"]= 100, ["up"]=06,["down"]=2}, + } + + -- ======================= Loop PCM =========================== + local snd_aloop = { + ["uid"] = "Alsa-Loop", + ["path"]= "/dev/snd/by-path/platform-snd_aloop.0", + ["devices"] = {["playback"]=0,["capture"]=1}, + ["subdevs"] = { + {["subdev"]= 0, ["numid"]= 51, ["uid"]= "loop-legacy"}, + {["subdev"]= 1, ["numid"]= 57, ["uid"]= "loop-multimedia"}, + {["subdev"]= 2, ["numid"]= 63}, + {["subdev"]= 3, ["numid"]= 69}, + {["subdev"]= 4, ["numid"]= 75}, + {["subdev"]= 5, ["numid"]= 81}, + {["subdev"]= 6, ["numid"]= 87}, + {["subdev"]= 7, ["numid"]= 93}, + }, + } + + + -- ============================= Backend (Sound Cards) =================== + + local snd_yamaha = { + ["uid"]= "YAMAHA-APU70", + ["path"]= "/dev/snd/by-id/usb-YAMAHA_Corporation_YAMAHA_AP-U70_USB_Audio_00-00", + ["params"]= audio_params.default, + ["sink"] = { + ["channels"] = { + {["uid"]= "front-right", ["port"]= 0}, + {["uid"]= "front-left", ["port"]= 1}, + }, + } + } + + local snd_usb_8ch= { + ["uid"]= "8CH-USB", + ["path"]= "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00", + ["params"] = audio_params.default, + ["sink"] = { + ["controls"]= { + ["volume"] = {["name"]= "Speaker Playback Volume", ["value"]=80}, + ["mute"] = {["name"]= "Speaker Playback Switch"}, + }, + ["channels"] = { + {["uid"]= "front-right", ["port"]= 0}, + {["uid"]= "front-left" , ["port"]= 1}, + {["uid"]= "middle-right", ["port"]= 2}, + {["uid"]= "middle-left" , ["port"]= 3}, + {["uid"]= "back-right", ["port"]= 4}, + {["uid"]= "back-left" , ["port"]= 5}, + {["uid"]= "centre-left" , ["port"]= 6}, + {["uid"]= "centre-left" , ["port"]= 7}, + }, + }, + ["source"] = { + ["controls"]= { + ["volume"] = {["name"]= "Capture Volume"}, + ["mute"] = {["name"]= "Capture Switch"}, + }, + ["channels"] = { + {["uid"]= "mic-right", ["port"]= 0}, + {["uid"]= "mic-left" , ["port"]= 1}, + }, + } + } + + + -- ============================= Zones =================== + local zone_stereo={ + ["uid"] = "full-stereo", + ["sink"] = { + {["target"]="front-right",["channel"]=0}, + {["target"]="front-left" ,["channel"]=1}, + {["target"]="middle-right",["channel"]=0}, + {["target"]="middle-left" ,["channel"]=1}, + {["target"]="back-right",["channel"]=0}, + {["target"]="back-left" ,["channel"]=1}, + } + } + + local zone_front= { + ["uid"] = "front-seats", + ["sink"] = { + {["target"]="front-right",["channel"]=0}, + {["target"]="front-left" ,["channel"]=1}, + } + } + + local zone_middle= { + ["uid"] = "middle-seats", + ["sink"] = { + {["target"]="middle-right",["channel"]=0}, + {["target"]="middle-left" ,["channel"]=1}, + } + } + + local zone_back= { + ["uid"] = "back-seats", + ["sink"] = { + {["target"]="back-right",["channel"]=0}, + {["target"]="back-left" ,["channel"]=1}, + } + } + + local zone_driver= { + ["uid"] = "driver-seat", + ["source"] = { + {["target"]="mic-right",["channel"]=0}, + }, + ["sink"] = { + {["target"]="front-right",["channel"]=0}, + } + } + + -- =================== Audio Stream ============================ + local stream_music= { + ["uid"] = "multimedia", + ["zone"]= "full-stereo", + ["source"]= "loop-multimedia", + ["volume"]= 80, + ["mute"] = false, + ["params"]= audio_params.standard, + } + + local stream_navigation= { + ["uid"] = "navigation", + ["zone"]= "front-seats", + ["volume"]= 80, + ["mute"] = false, + } + + local stream_emergency= { + ["uid"] = "emergency", + ["zone"] = "driver-seat", + ["volume"]= 80, + ["mute"] = false, + --["params"]= audio_params.basic, + } + + local stream_radio= { + ["uid"] = "radio", + ["zone"] = "full-stereo", + --["source"]= snd_usb_8ch.uid, + ["volume"]= 80, + ["mute"] = false, + } + + local stream_pulse= { + ["uid"] = "pulseaudio", + ["zone"] = "back-seats", + ["source"]= "loop-legacy", + ["volume"]= 80, + ["mute"] = false, + } + + --- ================ Create Mixer ========================= + local MyTestHal= { + ["uid"]= "MyMixer", + ["ramps"]= volume_ramps, + ["playbacks"] = {snd_usb_8ch}, + ["captures"]= {snd_usb_8ch}, + ["loops"] = {snd_aloop}, + ["zones"] = {zone_stereo, zone_front, zone_back, zone_middle, zone_driver}, + ["streams"] = {stream_pulse, stream_music, stream_navigation }, + -- ["streams"] = {stream_pulse, stream_music, stream_navigation, stream_emergency, stream_radio }, + + } + + + + error,result= AFB:servsync(source, "smixer", "attach", MyTestHal) + if (error) then + AFB:error (source, "--InLua-- API MyMixer/attach fail error=%d", error) + goto OnErrorExit + else + AFB:notice (source, "--InLua-- MyMixer/attach done result=%s\n", Dump_Table(result)) + end + + -- ================== Happy End ============================= + AFB:notice (source, "--InLua-- Test success") + return 0 end + + -- ================= Unhappy End ============================ + ::OnErrorExit:: + local response=result["request"] + printf ("--InLua-- ------------STATUS= %s --------------", result["status"]) + printf ("--InLua-- ++ INFO= %s", Dump_Table(response["info"])) + printf ("--InLua-- ----------TEST %s-------------", result["status"]) + + AFB:error (source, "--InLua-- Test Fail") + return 1 -- unhappy end -- +end diff --git a/plugins/alsa/alsa-core-ctl.c b/plugins/alsa/alsa-core-ctl.c index 0ef11e1..bdf6bf5 100644 --- a/plugins/alsa/alsa-core-ctl.c +++ b/plugins/alsa/alsa-core-ctl.c @@ -269,6 +269,8 @@ PUBLIC snd_ctl_card_info_t *AlsaCtlGetInfo(SoftMixerT *mixer, const char *cardid int error; snd_ctl_t *ctl; + AFB_ApiNotice(mixer->api, "Looking for card '%s'", cardid); + if ((error = snd_ctl_open(&ctl, cardid, SND_CTL_READONLY)) < 0) { cardid = "Not Defined"; goto OnErrorExit; diff --git a/plugins/alsa/alsa-utils-bypath.c b/plugins/alsa/alsa-utils-bypath.c index 30e528f..f950129 100644 --- a/plugins/alsa/alsa-utils-bypath.c +++ b/plugins/alsa/alsa-utils-bypath.c @@ -97,8 +97,11 @@ PUBLIC snd_ctl_t *AlsaByPathOpenCtl(SoftMixerT *mixer, const char *uid, AlsaSndC // get card info from /dev/snd/xxx if not use hw:x,x,x snd_ctl_card_info_t *cardInfo = NULL; - if (dev->cid.devpath) cardInfo = AlsaByPathInfo(mixer, dev->cid.devpath); - else if (dev->cid.cardid) cardInfo = AlsaCtlGetInfo(mixer, dev->cid.cardid); + + if (dev->cid.devpath) + cardInfo = AlsaByPathInfo(mixer, dev->cid.devpath); + else if (dev->cid.cardid) + cardInfo = AlsaCtlGetInfo(mixer, dev->cid.cardid); if (!cardInfo) { AFB_ApiError(mixer->api, "AlsaByPathOpenCtl: uid=%s fail to find sndcard by path=%s id=%s", uid, dev->cid.devpath, dev->cid.cardid); -- cgit 1.2.3-korg