Changes - SailfishOS Open Build Service

Changes of Revision 2

[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-jb2q.changes
@@ -1,3 +1,10 @@ +* Fri Mar 10 2023 Matti Lehtimäki <matti.lehtimaki@jolla.com> - 14.2.101 +- [common] Fix 24-bit audio format mapping. JB#60307 + +* Tue Dec 20 2022 Juho Hämäläinen <juho.hamalainen@jolla.com> - 14.2.100 +- [common] Add quirk for swapping headphone and router device. JB#59576 +- [sink] Add quirk for remixing stereo to mono. JB#59079 + * 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
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-jb2q.spec ^
@@ -5,7 +5,7 @@ Name: pulseaudio-modules-droid-jb2q Summary: PulseAudio Droid HAL modules -Version: 14.2.99 +Version: 14.2.101 Release: 1 License: LGPLv2+ URL: https://github.com/mer-hybris/pulseaudio-modules-droid-jb2q
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-jb2q-14.2.101.tar.bz2/README.md ^
@@ -26,8 +26,8 @@ Headers for defining devices and strings for different droid versions are in src/common/droid-util-audio.h (legacy headers for Jolla 1 in droid-util-41qc.h). -When new devices with relevant new enums appear, add enum check to configure.ac. -CC_CHECK_DROID_ENUM macro will create macros HAVE_ENUM_FOO, STRING_ENTRY_IF_FOO +When new devices with relevant new enums appear, add enum check to meson.build. +Meson build will create macros HAVE_ENUM_FOO, STRING_ENTRY_IF_FOO and FANCY_ENTRY_IF_FOO if enum FOO exists in HAL audio.h. For example:
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-jb2q-14.2.101.tar.bz2/meson.build ^
@@ -192,6 +192,7 @@ 'AUDIO_CHANNEL_IN_VOICE_DNLINK_MONO', # Formats + 'AUDIO_FORMAT_PCM_24_BIT_PACKED', 'AUDIO_FORMAT_PCM_OFFLOAD', 'AUDIO_FORMAT_FLAC', 'AUDIO_FORMAT_OPUS',
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-jb2q-14.2.101.tar.bz2/src/common/droid-util-audio.h ^
@@ -91,7 +91,9 @@ { 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 } +#if HAVE_ENUM_AUDIO_FORMAT_PCM_24_BIT_PACKED + { PA_SAMPLE_S24LE, AUDIO_FORMAT_PCM_24_BIT_PACKED } +#endif }; uint32_t conversion_table_default_audio_source[][2] = { @@ -139,7 +141,7 @@ STRING_ENTRY( AUDIO_DEVICE_OUT_DEFAULT ), /* Devices which may or may not be defined for all devices, - * update configure.ac CC_CHECK_DROID_ENUM list if you encounter new ones. / + update meson.build check_enums list if you encounter new ones. / STRING_ENTRY_IF_AUDIO_DEVICE_OUT_HDMI STRING_ENTRY_IF_AUDIO_DEVICE_OUT_HDMI_ARC STRING_ENTRY_IF_AUDIO_DEVICE_OUT_TELEPHONY_TX @@ -223,7 +225,7 @@ STRING_ENTRY( AUDIO_DEVICE_IN_DEFAULT ), / Devices which may or may not be defined for all devices, - * update configure.ac CC_CHECK_DROID_ENUM list if you encounter new ones. / + update meson.build check_enums list if you encounter new ones. / STRING_ENTRY_IF_AUDIO_DEVICE_IN_HDMI STRING_ENTRY_IF_AUDIO_DEVICE_IN_TELEPHONY_RX STRING_ENTRY_IF_AUDIO_DEVICE_IN_FM_TUNER @@ -316,7 +318,7 @@ STRING_ENTRY( AUDIO_OUTPUT_FLAG_DEEP_BUFFER ), / Audio output flags which may or may not be defined for all devices, - * update configure.ac CC_CHECK_DROID_ENUM list if you encounter new ones. / + update meson.build check_enums list if you encounter new ones. / STRING_ENTRY_IF_AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD STRING_ENTRY_IF_AUDIO_OUTPUT_FLAG_NON_BLOCKING STRING_ENTRY_IF_AUDIO_OUTPUT_FLAG_HW_AV_SYNC @@ -333,7 +335,7 @@ struct string_conversion string_conversion_table_input_flag[] = { / Audio output flags which may or may not be defined for all devices, - * update configure.ac CC_CHECK_DROID_ENUM list if you encounter new ones. / + update meson.build check_enums list if you encounter new ones. / STRING_ENTRY_IF_AUDIO_INPUT_FLAG_NONE STRING_ENTRY_IF_AUDIO_INPUT_FLAG_FAST STRING_ENTRY_IF_AUDIO_INPUT_FLAG_HW_HOTWORD @@ -425,7 +427,8 @@ STRING_ENTRY( AUDIO_FORMAT_PCM_8_24_BIT ), / Audio formats which may or may not be defined for all devices, - * update configure.ac CC_CHECK_DROID_ENUM list if you encounter new ones. / + update meson.build check_enums list if you encounter new ones. */ + STRING_ENTRY_IF_AUDIO_FORMAT_PCM_24_BIT_PACKED STRING_ENTRY_IF_AUDIO_FORMAT_PCM_OFFLOAD STRING_ENTRY_IF_AUDIO_FORMAT_FLAC STRING_ENTRY_IF_AUDIO_FORMAT_OPUS
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-jb2q-14.2.101.tar.bz2/src/common/droid-util.c ^
@@ -77,19 +77,21 @@ }; struct droid_quirk valid_quirks[] = { - { "input_atoi", QUIRK_INPUT_ATOI }, - { "set_parameters", QUIRK_SET_PARAMETERS }, - { "close_input", QUIRK_CLOSE_INPUT }, - { "unload_no_close", QUIRK_UNLOAD_NO_CLOSE }, - { "no_hw_volume", QUIRK_NO_HW_VOLUME }, - { "output_make_writable", QUIRK_OUTPUT_MAKE_WRITABLE }, - { "realcall", QUIRK_REALCALL }, - { "unload_call_exit", QUIRK_UNLOAD_CALL_EXIT }, - { "output_fast", QUIRK_OUTPUT_FAST }, - { "output_deep_buffer", QUIRK_OUTPUT_DEEP_BUFFER }, - { "audio_cal_wait", QUIRK_AUDIO_CAL_WAIT }, - { "standby_set_route", QUIRK_STANDBY_SET_ROUTE }, - { "speaker_before_voice", QUIRK_SPEAKER_BEFORE_VOICE }, + { "input_atoi", QUIRK_INPUT_ATOI }, + { "set_parameters", QUIRK_SET_PARAMETERS }, + { "close_input", QUIRK_CLOSE_INPUT }, + { "unload_no_close", QUIRK_UNLOAD_NO_CLOSE }, + { "no_hw_volume", QUIRK_NO_HW_VOLUME }, + { "output_make_writable", QUIRK_OUTPUT_MAKE_WRITABLE }, + { "realcall", QUIRK_REALCALL }, + { "unload_call_exit", QUIRK_UNLOAD_CALL_EXIT }, + { "output_fast", QUIRK_OUTPUT_FAST }, + { "output_deep_buffer", QUIRK_OUTPUT_DEEP_BUFFER }, + { "audio_cal_wait", QUIRK_AUDIO_CAL_WAIT }, + { "standby_set_route", QUIRK_STANDBY_SET_ROUTE }, + { "speaker_before_voice", QUIRK_SPEAKER_BEFORE_VOICE }, + { "swap_headphone_speaker", QUIRK_SWAP_HEADPHONE_SPEAKER }, + { "output_remix_to_mono", QUIRK_OUTPUT_REMIX_TO_MONO }, }; #define QUIRK_AUDIO_CAL_WAIT_S (10) @@ -122,6 +124,8 @@ static int droid_set_parameters(pa_droid_hw_module hw, const char parameters); static bool droid_set_audio_source(pa_droid_hw_module hw_module, audio_source_t audio_source); +static pa_droid_hw_module hw_primary = NULL; + static pa_droid_profile profile_new(pa_droid_profile_set ps, const pa_droid_config_hw_module module, const char name, @@ -445,15 +449,23 @@ devices = am->output->devices; - /* IHF combo devices, these devices are combined with IHF / - combo_devices = AUDIO_DEVICE_OUT_SPEAKER \| AUDIO_DEVICE_OUT_WIRED_HEADPHONE; + / IHF combo devices, these devices are combined with IHF, only if swap quirk is disabled. / + if (!pa_droid_quirk(hw_primary, QUIRK_SWAP_HEADPHONE_SPEAKER)) + combo_devices = AUDIO_DEVICE_OUT_SPEAKER \| AUDIO_DEVICE_OUT_WIRED_HEADPHONE; while (devices) { uint32_t cur_device = (1 << i++); if (devices & cur_device) { - pa_assert_se(pa_droid_output_port_name(cur_device, &name)); + if (pa_droid_quirk(hw_primary, QUIRK_SWAP_HEADPHONE_SPEAKER) && + cur_device & (AUDIO_DEVICE_OUT_WIRED_HEADPHONE \| AUDIO_DEVICE_OUT_SPEAKER)) { + if (cur_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE) + pa_assert_se(pa_droid_output_port_name(AUDIO_DEVICE_OUT_SPEAKER, &name)); + else / cur_device & AUDIO_DEVICE_OUT_SPEAKER / + pa_assert_se(pa_droid_output_port_name(AUDIO_DEVICE_OUT_WIRED_HEADPHONE, &name)); + } else + pa_assert_se(pa_droid_output_port_name(cur_device, &name)); if (!(p = pa_hashmap_get(am->profile_set->all_ports, name))) { @@ -1056,9 +1068,10 @@ pa_assert_se(pa_shared_set(core, hw->shared_name, hw) >= 0); - / API for calling HAL functions from other modules. / - if (pa_streq(hw->module_id, PA_DROID_PRIMARY_DEVICE)) { + hw_primary = hw; + + / API for calling HAL functions from other modules. */ pa_shared_set(core, DROID_HW_HANDLE_V1, hw); pa_shared_set(core, DROID_SET_PARAMETERS_V1, droid_set_parameters_v1_cb); pa_shared_set(core, DROID_GET_PARAMETERS_V1, droid_get_parameters_v1_cb); @@ -1188,6 +1201,9 @@ pa_idxset_free(hw->inputs, NULL); } + if (hw_primary == hw) + hw_primary = NULL; + pa_xfree(hw); }
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-jb2q-14.2.101.tar.bz2/src/common/include/droid/droid-util.h ^
@@ -84,6 +84,8 @@ QUIRK_AUDIO_CAL_WAIT, QUIRK_STANDBY_SET_ROUTE, QUIRK_SPEAKER_BEFORE_VOICE, + QUIRK_SWAP_HEADPHONE_SPEAKER, + QUIRK_OUTPUT_REMIX_TO_MONO, QUIRK_COUNT };
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-jb2q-14.2.101.tar.bz2/src/droid/droid-sink.c ^
@@ -86,6 +86,7 @@ pa_hook_slot sink_unlink_hook_slot; pa_hook_slot sink_port_changed_hook_slot; pa_sink primary_stream_sink; + pa_time_event refresh_time_event; audio_devices_t primary_devices; audio_devices_t extra_devices; @@ -127,6 +128,8 @@ #define DEFAULT_VOICE_CONTROL_PROPERTY_KEY "media.role" #define DEFAULT_VOICE_CONTROL_PROPERTY_VALUE "phone" +#define REFRESH_TIME_US ((pa_usec_t) (10 * PA_USEC_PER_SEC)) + static void parameter_free(droid_parameter_mapping m); static void userdata_free(struct userdata u); static void set_voice_volume(struct userdata u, pa_sink_input i); @@ -281,9 +284,35 @@ u->write_time = pa_rtclock_now(); for (;;) { - if (pa_droid_quirk(u->hw_module, QUIRK_OUTPUT_MAKE_WRITABLE)) + if (pa_droid_quirk(u->hw_module, QUIRK_OUTPUT_MAKE_WRITABLE) \|\| + pa_droid_quirk(u->hw_module, QUIRK_OUTPUT_REMIX_TO_MONO)) { pa_memchunk_make_writable(&c, c.length); + /* Naive implementation, only works for little-endian 16 bit samples + * and causes volume to drop by 6dB. + * Do mixing for speaker, headset and headphone only. / + if (pa_droid_quirk(u->hw_module, QUIRK_OUTPUT_REMIX_TO_MONO) && + u->primary_devices & (AUDIO_DEVICE_OUT_SPEAKER \| + AUDIO_DEVICE_OUT_WIRED_HEADSET \| + AUDIO_DEVICE_OUT_WIRED_HEADPHONE)) { + size_t i; + void dst; + + dst = pa_memblock_acquire_chunk(&c); + + for (i = 0; i < c.length; i += 4) { + int16_t left = dst; + int16_t right = dst + 2; + + left = left / 2 + right / 2; + right = left; + dst += 4; + } + + pa_memblock_release(c.memblock); + } + } + p = pa_memblock_acquire_chunk(&c); wrote = pa_droid_stream_write(u->stream, p, c.length); pa_memblock_release(c.memblock); @@ -1043,6 +1072,19 @@ return false; } +static void refresh_time_cb(pa_mainloop_api a, pa_time_event e, const struct timeval t, void userdata) { + struct userdata u = userdata; + + pa_assert(u->refresh_time_event); + pa_assert(u->refresh_time_event == e); + + u->core->mainloop->time_free(u->refresh_time_event); + u->refresh_time_event = NULL; + + /* Re-apply whatever route currently is active to HAL. / + do_routing(u); +} + pa_sink pa_droid_sink_new(pa_module m, pa_modargs ma, const char driver, @@ -1324,6 +1366,9 @@ pa_droid_stream_set_data(u->stream, u->sink); pa_sink_put(u->sink); + if (pa_droid_quirk(u->hw_module, QUIRK_SWAP_HEADPHONE_SPEAKER) && pa_droid_stream_is_primary(u->stream)) + u->refresh_time_event = pa_core_rttime_new(u->core, pa_rtclock_now() + REFRESH_TIME_US, refresh_time_cb, u); + return u->sink; fail: @@ -1354,6 +1399,9 @@ static void userdata_free(struct userdata u) { + if (u->refresh_time_event) + u->core->mainloop->time_free(u->refresh_time_event); + if (u->primary_stream_sink) unset_primary_stream_sink(u);