Changes - SailfishOS Open Build Service

Changes of Revision 40

[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid.changes
@@ -1,3 +1,10 @@ +* Wed Mar 08 2023 Matti Lehtimäki <matti.lehtimaki@jolla.com> - 14.2.100 +- [common] Fix 24-bit audio format mapping. JB#60307 + +* Fri Oct 07 2022 Juho Hämäläinen <juho.hamalainen@jolla.com> - 14.2.99 +- [parser] Better support for includes in xml. Fixes JB#58934 +- [parser] Generate default profile for device ports which have none. + * Mon Sep 19 2022 Juho Hämäläinen <juho.hamalainen@jolla.com> - 14.2.98 - [build] Add meson support. JB#58078
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid.spec ^
@@ -5,7 +5,7 @@ Name: pulseaudio-modules-droid Summary: PulseAudio Droid HAL modules -Version: 14.2.98 +Version: 14.2.100 Release: 1 License: LGPLv2+ URL: https://github.com/mer-hybris/pulseaudio-modules-droid
[-] [+]	Changed	_service ^
@@ -6,7 +6,7 @@ <service name="tar_git"> <param name="url">https://github.com/mer-hybris/pulseaudio-modules-droid.git</param> <param name="branch">master</param> - <param name="revision">60ebe93c3432ed52569dc7e033e5a3405f52eec0</param> + <param name="revision">f749aa95e9df520575661bd45caa8f1893aa4a66</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-14.2.100.tar.bz2/src/common/config-parser-xml.c ^
@@ -215,6 +215,12 @@ &element_parse_item }; +/* Entries like + * <modules> + * <module name="primary"> <xi:include href="other.xml"/> </module> + * </modules> + * Where other.xml contains module elements + / static const struct element_parser element_parse_module_include = { ELEMENT_include, parse_module_include, @@ -223,11 +229,25 @@ NULL }; +/ Entries like + * <modules> + * <xi:include href="other.xml"/> + * </modules> + * Where other.xml contains <module name="primary">... + / +static const struct element_parser element_parse_modules_include = { + ELEMENT_include, + parse_module_include, + NULL, + NULL, + NULL +}; + static const struct element_parser element_parse_module = { ELEMENT_module, parse_module, NULL, - NULL, + &element_parse_modules_include, &element_parse_module_include }; @@ -1007,6 +1027,27 @@ return c_mix_port; } +/ If a devicePort doesn't have any profiles defined let's just make something + * up that could work. / +static struct profile default_profile(const char role) { + struct profile p; + bool output; + + output = pa_safe_streq(role, PORT_TYPE_sink); + + p = pa_xmalloc0(sizeof(p)); + + p->name = pa_sprintf_malloc("generated-default"); + pa_assert(pa_string_convert_str_to_num(CONV_STRING_FORMAT, "AUDIO_FORMAT_PCM_16_BIT", &p->format)); + p->sampling_rates[0] = 48000; + pa_assert(pa_string_convert_str_to_num(output ? CONV_STRING_OUTPUT_CHANNELS : CONV_STRING_INPUT_CHANNELS, + output ? "AUDIO_CHANNEL_OUT_STEREO" : "AUDIO_CHANNEL_IN_STEREO", + &p->channel_masks[0])); + p->next = NULL; + + return p; +} + static void generate_config_for_module(struct module module, dm_config_device config) { dm_config_module c_module; struct mix_port mix_port; @@ -1034,8 +1075,8 @@ dm_config_port c_device_port; if (!device_port->profiles) { - pa_log("No profile defined for devicePort %s", device_port->tag_name); - continue; + pa_log_info("No profile defined for devicePort %s, generating default.", device_port->tag_name); + SLLIST_APPEND(struct profile, device_port->profiles, default_profile(device_port->role)); } c_device_port = config_device_port_new(c_module, device_port); @@ -1181,9 +1222,6 @@ SLLIST_FOREACH(data.current_include, data.conf->includes) { char *fn = NULL; - if (!data.current_include->module) - continue; - if (data.current_include->href[0] != '/') fn = build_path(filename, data.current_include->href);
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-14.2.100.tar.bz2/src/common/droid-util-audio.h ^
@@ -90,7 +90,7 @@ { PA_SAMPLE_U8, AUDIO_FORMAT_PCM_8_BIT }, { PA_SAMPLE_S16LE, AUDIO_FORMAT_PCM_16_BIT }, { PA_SAMPLE_S32LE, AUDIO_FORMAT_PCM_32_BIT }, - { PA_SAMPLE_S24LE, AUDIO_FORMAT_PCM_8_24_BIT } + { PA_SAMPLE_S24LE, AUDIO_FORMAT_PCM_24_BIT_PACKED } }; uint32_t conversion_table_default_audio_source[][2] = { @@ -424,6 +424,7 @@ STRING_ENTRY( AUDIO_FORMAT_PCM_8_BIT ), STRING_ENTRY( AUDIO_FORMAT_PCM_32_BIT ), STRING_ENTRY( AUDIO_FORMAT_PCM_8_24_BIT ), + STRING_ENTRY( AUDIO_FORMAT_PCM_24_BIT_PACKED ), { 0, NULL } };