- Alsa-devel - mailman.alsa-project.org

[PATCH] ASoC: amd: Replacing component->name with codec_dai->name
by Ravulapati Vishnu vardhan rao 10 Aug '20

10 Aug '20

Replacing string compare with codec_dai->name instead of comparing with codec_dai->component->name in hw_params. Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/acp3x-rt5682-max9836.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c index 55815fdaa1aa..406526e79af3 100644 --- a/sound/soc/amd/acp3x-rt5682-max9836.c +++ b/sound/soc/amd/acp3x-rt5682-max9836.c @@ -138,7 +138,7 @@ static int acp3x_1015_hw_params(struct snd_pcm_substream *substream, srate = params_rate(params); for_each_rtd_codec_dais(rtd, i, codec_dai) { - if (strcmp(codec_dai->component->name, "rt1015-aif")) + if (strcmp(codec_dai->name, "rt1015-aif")) continue; ret = snd_soc_dai_set_bclk_ratio(codec_dai, 64); if (ret < 0) -- 2.17.1

3 5

[PATCH] ASoC: amd: Replacing component->name with codec_dai->name.
by Ravulapati Vishnu vardhan rao 10 Aug '20

10 Aug '20

Replacing string compare with "codec_dai->name" instead of comparing with "codec_dai->component->name" in hw_params because, Here the component name for codec RT1015 is "i2c-10EC5682:00" and will never be "rt1015-aif1" as it is codec-dai->name. So, strcmp() always compares and fails to set the sysclk,pll,bratio for expected codec-dai="rt1015-aif1". Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/acp3x-rt5682-max9836.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c index 55815fdaa1aa..406526e79af3 100644 --- a/sound/soc/amd/acp3x-rt5682-max9836.c +++ b/sound/soc/amd/acp3x-rt5682-max9836.c @@ -138,7 +138,7 @@ static int acp3x_1015_hw_params(struct snd_pcm_substream *substream, srate = params_rate(params); for_each_rtd_codec_dais(rtd, i, codec_dai) { - if (strcmp(codec_dai->component->name, "rt1015-aif")) + if (strcmp(codec_dai->name, "rt1015-aif")) continue; ret = snd_soc_dai_set_bclk_ratio(codec_dai, 64); if (ret < 0) -- 2.17.1

2 1

[PATCH] alsaseq: fix constant objects in Python 3
by Hector Martin 10 Aug '20

10 Aug '20

In Py3 everything is a long, so we can't get away with duplicating the integer object layout any more. Properly subclass PyLong_Type instead, with a bit of a hack to add an extra name field after the variable-sized data section. Also get rid of the enum type stuff, which seems to be unused cruft, and the numprotocol stuff, because the base type can take care of that (and we can't map arbitrary arithmetic results back to constants anyway). Signed-off-by: Hector Martin <marcan(a)marcan.st> --- pyalsa/alsaseq.c | 149 +++++++++++++++++------------------------------ 1 file changed, 52 insertions(+), 97 deletions(-) diff --git a/pyalsa/alsaseq.c b/pyalsa/alsaseq.c index 0e7cc35..9d9b1a9 100644 --- a/pyalsa/alsaseq.c +++ b/pyalsa/alsaseq.c @@ -51,9 +51,6 @@ /* the C variable of a constant dict */ #define TDICT(subtype) _dictPYALSASEQ_CONST_##subtype -/* the C enumeration of a constant dict */ -#define TTYPE(subtype) PYALSASEQ_CONST_##subtype - /* defines constant dict by type */ #define TCONSTDICT(subtype) \ static PyObject * TDICT(subtype); @@ -71,7 +68,7 @@ /* creates a typed constant and add it to the module and dictionary */ #define TCONSTADD(module, subtype, name) { \ PyObject *tmp = \ - Constant_create(#name, SND_##name, TTYPE(subtype)); \ + Constant_create(#name, SND_##name); \ if (tmp == NULL) { \ return MOD_ERROR_VAL; \ } \ @@ -109,46 +106,6 @@ } \ } - -/* num protocol support for binary Constant operations */ -#define NUMPROTOCOL2(name, oper) \ - static PyObject * \ - Constant_##name (PyObject *v, PyObject *w) { \ - int type = 0; \ - long val1, val2, val; \ - if (get_long1(v, &val1) || get_long1(w, &val2)) { \ - Py_INCREF(Py_NotImplemented); \ - return Py_NotImplemented; \ - } \ - val = val1 oper val2; \ - /* always asume left will be the type */ \ - if (PyObject_TypeCheck(v, &ConstantType)) { \ - type = ((ConstantObject *) v)->type; \ - } else if (PyObject_TypeCheck(w, &ConstantType)) { \ - type = ((ConstantObject *) w)->type; \ - } \ - PyObject *self = Constant_create(#oper, val, type); \ - return self; \ - } - -/* num protocol support for unary Constant operations */ -#define NUMPROTOCOL1(name, oper) \ - static PyObject * \ - Constant_##name (PyObject *v) { \ - int type = 0; \ - long val1, val; \ - if (get_long1(v, &val1)) { \ - Py_INCREF(Py_NotImplemented); \ - return Py_NotImplemented; \ - } \ - val = oper val1; \ - if (PyObject_TypeCheck(v, &ConstantType)) { \ - type = ((ConstantObject *) v)->type; \ - } \ - PyObject *self = Constant_create(#oper, val, type); \ - return self; \ - } - /* sets the object into the dict */ #define SETDICTOBJ(name, object) \ PyDict_SetItemString(dict, name, object) @@ -328,21 +285,6 @@ // alsaseq.Constant implementation ////////////////////////////////////////////////////////////////////////////// -/* alsaseq.Constant->type enumeration */ -enum { - PYALSASEQ_CONST_STREAMS, - PYALSASEQ_CONST_MODE, - PYALSASEQ_CONST_QUEUE, - PYALSASEQ_CONST_CLIENT_TYPE, - PYALSASEQ_CONST_PORT_CAP, - PYALSASEQ_CONST_PORT_TYPE, - PYALSASEQ_CONST_EVENT_TYPE, - PYALSASEQ_CONST_EVENT_TIMESTAMP, - PYALSASEQ_CONST_EVENT_TIMEMODE, - PYALSASEQ_CONST_ADDR_CLIENT, - PYALSASEQ_CONST_ADDR_PORT, -}; - // constants dictionaries TCONSTDICT(STREAMS); @@ -390,34 +332,66 @@ PyDoc_STRVAR(Constant__doc__, "Python number protocol." ); -/** alsaseq.Constant object structure type */ +/** alsaseq.Constant additional fields */ +/* This follows the variable length portion of the Long type */ typedef struct { - PyObject_HEAD - ; - - /* value of constant */ - unsigned long int value; /* name of constant */ const char *name; - /* type of constant */ - int type; +} ConstantExtraFields; + +/** alsaseq.Constant object structure type */ +typedef struct { +#if PY_MAJOR_VERSION < 3 + PyIntObject base; +#else + /* NOTE: this only works if the value fits in one digit */ + PyLongObject base; +#endif + /* This field is actually offset by the base type's variable size portion */ + ConstantExtraFields extra; } ConstantObject; +#if PY_MAJOR_VERSION < 3 +/* PyInt is fixed size in Python 2 */ +# define CONST_VALUE(x) PyInt_AsLong((PyObject *)x) +# define CONST_EXTRA(x) (&(x->extra)) +#else +/* PyLong is variable size in Python 3 */ +# define CONST_VALUE(x) PyLong_AsLong((PyObject *)x) +# define CONST_EXTRA(x) \ + ((ConstantExtraFields *)( \ + ((intptr_t)(&x->extra)) \ + + abs(Py_SIZE(&x->base)) * Py_TYPE(x)->tp_itemsize \ + )) +#endif + /** alsaseq.Constant type (initialized later...) */ static PyTypeObject ConstantType; /** alsaseq.Constant internal create */ static PyObject * -Constant_create(const char *name, long value, int type) { - ConstantObject *self = PyObject_New(ConstantObject, &ConstantType); +Constant_create(const char *name, long value) { +#if PY_MAJOR_VERSION < 3 + PyObject *val = PyInt_FromLong(value); +#else + PyObject *val = PyLong_FromLong(value); +#endif + + PyObject *args = PyTuple_Pack(1, val); + Py_DECREF(val); + +#if PY_MAJOR_VERSION < 3 + ConstantObject *self = (ConstantObject *)PyInt_Type.tp_new(&ConstantType, args, NULL); +#else + ConstantObject *self = (ConstantObject *)PyLong_Type.tp_new(&ConstantType, args, NULL); +#endif + Py_DECREF(args); if (self == NULL) { return NULL; } - self->value = value; - self->name = name; - self->type = type; + CONST_EXTRA(self)->name = name; return (PyObject *)self; } @@ -426,34 +400,16 @@ Constant_create(const char *name, long value, int type) { static PyObject * Constant_repr(ConstantObject *self) { return PyUnicode_FromFormat("%s(0x%x)", - self->name, - (unsigned int)self->value); + CONST_EXTRA(self)->name, + (unsigned int)CONST_VALUE(self)); } /** alsaseq.Constant tp_str */ static PyObject * Constant_str(ConstantObject *self) { return PyUnicode_FromFormat("%s", - self->name); -} - -/** alsaseq.Constant Number protocol support (note: not all ops supported) */ -NUMPROTOCOL2(Add, +) -NUMPROTOCOL2(Subtract, -) -NUMPROTOCOL2(Xor, ^) -NUMPROTOCOL2(Or, |) -NUMPROTOCOL2(And, &) -NUMPROTOCOL1(Invert, ~) - -/** alsaseq.Constant number protocol methods */ -static PyNumberMethods Constant_as_number = { - nb_add: (binaryfunc)Constant_Add, - nb_subtract: (binaryfunc)Constant_Subtract, - nb_xor: (binaryfunc)Constant_Xor, - nb_or: (binaryfunc)Constant_Or, - nb_and: (binaryfunc)Constant_And, - nb_invert: (unaryfunc)Constant_Invert -}; + CONST_EXTRA(self)->name); +} /** alsaseq.Constant type */ static PyTypeObject ConstantType = { @@ -464,7 +420,7 @@ static PyTypeObject ConstantType = { #else tp_base: &PyLong_Type, #endif - tp_basicsize: sizeof(ConstantObject), + tp_basicsize: sizeof(ConstantObject) + sizeof(ConstantExtraFields), tp_flags: #if PY_MAJOR_VERSION < 3 Py_TPFLAGS_HAVE_GETCHARBUFFER @@ -474,7 +430,6 @@ static PyTypeObject ConstantType = { 0, #endif tp_doc: Constant__doc__, - tp_as_number: &Constant_as_number, tp_free: PyObject_Del, tp_str: (reprfunc)Constant_str, tp_repr: (reprfunc)Constant_repr @@ -1730,7 +1685,7 @@ SeqEvent_repr(SeqEventObject *self) { unsigned int ntime = 0; Py_DECREF(key); if (constObject != NULL) { - typestr = constObject->name; + typestr = constObject->extra.name; } if (snd_seq_ev_is_real(self->event)) { -- 2.27.0

2 1

[PATCH] ALSA: usb-audio: Disable Lenovo P620 Rear line-in volume control
by Kai-Heng Feng 10 Aug '20

10 Aug '20

The USB device (0x17aa:0x1046) that support Lenovo P620 rear panel line-in claim to support volume control, but it doens't seem to have an AMP, so when line-in volume lowers below 80, nothing gets recorded anymore. Disable the volume control to workaround the issue. Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> --- sound/usb/mixer_maps.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c index c369c81e74c4..5b43e9e40e49 100644 --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c @@ -371,6 +371,7 @@ static const struct usbmix_name_map asus_rog_map[] = { }; static const struct usbmix_name_map lenovo_p620_rear_map[] = { + { 19, NULL, 2 }, /* FU, Volume */ { 19, NULL, 12 }, /* FU, Input Gain Pad */ {} }; -- 2.17.1

2 1

[PATCH 0/4] ASoC: Intel: KMB: TDM Enablement patches
by Michael Sit Wei Hong 10 Aug '20

10 Aug '20

This patch series is to enable multiple features on the Keembay Platform Michael Sit Wei Hong (4): ASoC: Intel: KMB: Add 8kHz audio support ASoC: Intel: KMB: Rework disable channel function ASoC: Intel: KMB: Enable TDM audio capture dt-bindings: sound: intel,keembay-i2s: Add channel-max property .../bindings/sound/intel,keembay-i2s.yaml | 8 + sound/soc/intel/keembay/kmb_platform.c | 137 +++++++++++++----- sound/soc/intel/keembay/kmb_platform.h | 1 + 3 files changed, 112 insertions(+), 34 deletions(-) -- 2.17.1

3 14

[PATCH] ALSA: usb-audio: work around streaming quirk for MacroSilicon MS2109
by Hector Martin 10 Aug '20

10 Aug '20

Further investigation of the L-R swap problem on the MS2109 reveals that the problem isn't that the channels are swapped, but rather that they are swapped and also out of phase by one sample. In other words, the issue is actually that the very first frame that comes from the hardware is a half-frame containing only the right channel, and after that everything becomes offset. So introduce a new quirk field to drop the very first 2 bytes that come in after the format is configured and a capture stream starts. This puts the channels in phase and in the correct order. Cc: stable(a)vger.kernel.org Signed-off-by: Hector Martin <marcan(a)marcan.st> --- sound/usb/card.h | 1 + sound/usb/pcm.c | 6 ++++++ sound/usb/quirks.c | 3 +++ sound/usb/stream.c | 1 + 4 files changed, 11 insertions(+) diff --git a/sound/usb/card.h b/sound/usb/card.h index de43267b9c8a..5351d7183b1b 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -137,6 +137,7 @@ struct snd_usb_substream { unsigned int tx_length_quirk:1; /* add length specifier to transfers */ unsigned int fmt_type; /* USB audio format type (1-3) */ unsigned int pkt_offset_adj; /* Bytes to drop from beginning of packets (for non-compliant devices) */ + unsigned int stream_offset_adj; /* Bytes to drop from beginning of stream (for non-compliant devices) */ unsigned int running: 1; /* running status */ diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 415bfec49a01..5600751803cf 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -1420,6 +1420,12 @@ static void retire_capture_urb(struct snd_usb_substream *subs, // continue; } bytes = urb->iso_frame_desc[i].actual_length; + if (subs->stream_offset_adj > 0) { + unsigned int adj = min(subs->stream_offset_adj, bytes); + cp += adj; + bytes -= adj; + subs->stream_offset_adj -= adj; + } frames = bytes / stride; if (!subs->txfr_quirk) bytes = frames * stride; diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index c551141f337e..abf99b814a0f 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1495,6 +1495,9 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs, case USB_ID(0x2b73, 0x000a): /* Pioneer DJ DJM-900NXS2 */ pioneer_djm_set_format_quirk(subs); break; + case USB_ID(0x534d, 0x2109): /* MacroSilicon MS2109 */ + subs->stream_offset_adj = 2; + break; } } diff --git a/sound/usb/stream.c b/sound/usb/stream.c index 4d1e6579e54d..ca76ba5b5c0b 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -94,6 +94,7 @@ static void snd_usb_init_substream(struct snd_usb_stream *as, subs->tx_length_quirk = as->chip->tx_length_quirk; subs->speed = snd_usb_get_speed(subs->dev); subs->pkt_offset_adj = 0; + subs->stream_offset_adj = 0; snd_usb_set_pcm_ops(as->pcm, stream); -- 2.27.0

3 2

[PATCH] ALSA: usb-audio: add quirk for Pioneer DDJ-RB
by Hector Martin 10 Aug '20

10 Aug '20

This is just another Pioneer device with fixed endpoints. Input is dummy but used as feedback (it always returns silence). Cc: stable(a)vger.kernel.org Signed-off-by: Hector Martin <marcan(a)marcan.st> --- sound/usb/quirks-table.h | 56 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 9c3c03dc96d3..d79e3ddc5690 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -3558,6 +3558,62 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), } } }, +{ + /* + * PIONEER DJ DDJ-RB + * PCM is 4 channels out, 2 dummy channels in @ 44.1 fixed + * The feedback for the output is the dummy input. + */ + USB_DEVICE_VENDOR_SPEC(0x2b73, 0x000e), + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 0, + .type = QUIRK_AUDIO_FIXED_ENDPOINT, + .data = &(const struct audioformat) { + .formats = SNDRV_PCM_FMTBIT_S24_3LE, + .channels = 4, + .iface = 0, + .altsetting = 1, + .altset_idx = 1, + .endpoint = 0x01, + .ep_attr = USB_ENDPOINT_XFER_ISOC| + USB_ENDPOINT_SYNC_ASYNC, + .rates = SNDRV_PCM_RATE_44100, + .rate_min = 44100, + .rate_max = 44100, + .nr_rates = 1, + .rate_table = (unsigned int[]) { 44100 } + } + }, + { + .ifnum = 0, + .type = QUIRK_AUDIO_FIXED_ENDPOINT, + .data = &(const struct audioformat) { + .formats = SNDRV_PCM_FMTBIT_S24_3LE, + .channels = 2, + .iface = 0, + .altsetting = 1, + .altset_idx = 1, + .endpoint = 0x82, + .ep_attr = USB_ENDPOINT_XFER_ISOC| + USB_ENDPOINT_SYNC_ASYNC| + USB_ENDPOINT_USAGE_IMPLICIT_FB, + .rates = SNDRV_PCM_RATE_44100, + .rate_min = 44100, + .rate_max = 44100, + .nr_rates = 1, + .rate_table = (unsigned int[]) { 44100 } + } + }, + { + .ifnum = -1 + } + } + } +}, #define ALC1220_VB_DESKTOP(vend, prod) { \ USB_DEVICE(vend, prod), \ -- 2.27.0

2 1

Accidently deleted alsa folder
by GitHub issues - opened 10 Aug '20

10 Aug '20

alsa-project/alsa-lib issue #77 was opened from themagicalmammal: I deleted alsa folder accidently and not mic doesnt work. Even after using alsa command. I searched and tried to apply many stack-overflow solutions but nothing helped when I try to use mic on pycharm it doesnt work it yields this error ``` ALSA lib conf.c:3916:(snd_config_update_r) Cannot access file /usr/share/alsa/alsa.conf ALSA lib control.c:1373:(snd_ctl_open_noupdate) Invalid CTL hw:0 python3.6: src/hostapi/alsa/pa_linux_alsa.c:1454: BuildDeviceList: Assertion `devIdx < numDeviceNames' failed. ``` While External recorder works Issue URL : https://github.com/alsa-project/alsa-lib/issues/77 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH v2] ALSA: usb-audio: fix overeager device match for MacroSilicon MS2109
by Hector Martin 10 Aug '20

10 Aug '20

Matching by device matches all interfaces, which breaks the video/HID portions of the device depending on module load order. Cc: stable(a)vger.kernel.org Signed-off-by: Hector Martin <marcan(a)marcan.st> --- sound/usb/quirks-table.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 9092cc0aa807..7cbb3d591a7f 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -3645,7 +3645,13 @@ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* Asrock TRX40 Creator */ * with. */ { - USB_DEVICE(0x534d, 0x2109), + .match_flags = USB_DEVICE_ID_MATCH_DEVICE | + USB_DEVICE_ID_MATCH_INT_CLASS | + USB_DEVICE_ID_MATCH_INT_SUBCLASS, + .idVendor = 0x534d, + .idProduct = 0x2109, + .bInterfaceClass = USB_CLASS_AUDIO, + .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { .vendor_name = "MacroSilicon", .product_name = "MS2109", -- 2.27.0

2 1

[PATCH] ALSA: usb-audio: fix overeager device match for MacroSilicon MS2109
by Hector Martin 10 Aug '20

10 Aug '20

Matching by device matches all interfaces, which breaks the video/HID portions of the device depending on module load order. Signed-off-by: Hector Martin <marcan(a)marcan.st> --- sound/usb/quirks-table.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 9092cc0aa807..7cbb3d591a7f 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -3645,7 +3645,13 @@ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* Asrock TRX40 Creator */ * with. */ { - USB_DEVICE(0x534d, 0x2109), + .match_flags = USB_DEVICE_ID_MATCH_DEVICE | + USB_DEVICE_ID_MATCH_INT_CLASS | + USB_DEVICE_ID_MATCH_INT_SUBCLASS, + .idVendor = 0x534d, + .idProduct = 0x2109, + .bInterfaceClass = USB_CLASS_AUDIO, + .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { .vendor_name = "MacroSilicon", .product_name = "MS2109", -- 2.27.0

1 0