diff options
Diffstat (limited to 'media-sound/pulseaudio-daemon/files')
4 files changed, 0 insertions, 183 deletions
diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-combine-sink-underrun-crash.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-combine-sink-underrun-crash.patch deleted file mode 100644 index d66d75afdfda..000000000000 --- a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-combine-sink-underrun-crash.patch +++ /dev/null @@ -1,72 +0,0 @@ -https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/ee8bfb49adddd271d8a8cafa796c6f9fa84de48a - -From ee8bfb49adddd271d8a8cafa796c6f9fa84de48a Mon Sep 17 00:00:00 2001 -From: Georg Chini <georg@chini.tk> -Date: Fri, 17 Jun 2022 13:11:11 +0200 -Subject: [PATCH] combine-sink: Fix threading issue during underrun - -A recent commit added i->origin sink for the sink inputs of the combine sinks. -Therefore pa_sink_process_input_underruns() treated the combine sink like -filter sinks. pa_sink_process_input_underruns() calls itself with the -origin sink, which is only correct for filter sinks because they run in the -thread context of the origin sink. The combine sink however has its own -thread context, so pa_sink_process_input_underruns() was executed in the -wrong context. -This patch fixes the issue by skipping the section for module-combine-sink. - -Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/722> ---- - src/pulsecore/sink.c | 37 +++++++++++++++++++++++-------------- - 1 file changed, 23 insertions(+), 14 deletions(-) - -diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c -index 3108ae765..0f0dc56fc 100644 ---- a/src/pulsecore/sink.c -+++ b/src/pulsecore/sink.c -@@ -1016,20 +1016,29 @@ size_t pa_sink_process_input_underruns(pa_sink *s, size_t left_to_play) { - if (i->origin_sink) { - size_t filter_result, left_to_play_origin; - -- /* The recursive call works in the origin sink domain ... */ -- left_to_play_origin = pa_convert_size(left_to_play, &i->sink->sample_spec, &i->origin_sink->sample_spec); -- -- /* .. and returns the time to sleep before waking up. We need the -- * underrun duration for comparisons, so we undo the subtraction on -- * the return value... */ -- filter_result = left_to_play_origin - pa_sink_process_input_underruns(i->origin_sink, left_to_play_origin); -- -- /* ... and convert it back to the master sink domain */ -- filter_result = pa_convert_size(filter_result, &i->origin_sink->sample_spec, &i->sink->sample_spec); -- -- /* Remember the longest underrun so far */ -- if (filter_result > result) -- result = filter_result; -+ /* The combine sink sets i->origin sink but has a different threading model -+ * than the filter sinks. Therefore the recursion below may not be executed -+ * because pa_sink_process_input_underruns() was not called in the thread -+ * context of the origin sink. -+ * FIXME: It is unclear if some other kind of recursion would be necessary -+ * for the combine sink. */ -+ if (!i->module || !pa_safe_streq(i->module->name, "module-combine-sink")) { -+ -+ /* The recursive call works in the origin sink domain ... */ -+ left_to_play_origin = pa_convert_size(left_to_play, &i->sink->sample_spec, &i->origin_sink->sample_spec); -+ -+ /* .. and returns the time to sleep before waking up. We need the -+ * underrun duration for comparisons, so we undo the subtraction on -+ * the return value... */ -+ filter_result = left_to_play_origin - pa_sink_process_input_underruns(i->origin_sink, left_to_play_origin); -+ -+ /* ... and convert it back to the master sink domain */ -+ filter_result = pa_convert_size(filter_result, &i->origin_sink->sample_spec, &i->sink->sample_spec); -+ -+ /* Remember the longest underrun so far */ -+ if (filter_result > result) -+ result = filter_result; -+ } - } - - if (uf == 0) { --- -GitLab - diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch deleted file mode 100644 index a2efaf37b381..000000000000 --- a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-gstreamer-bluetooth-arm-crash.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/dd4dc5e8bce2c03631c3613dbddee1a691bdd17d - -From dd4dc5e8bce2c03631c3613dbddee1a691bdd17d Mon Sep 17 00:00:00 2001 -From: Jan Palus <jpalus@fastmail.com> -Date: Fri, 17 Jun 2022 14:36:36 +0200 -Subject: [PATCH] bluetooth/gst: Correct var type for GST_TYPE_BITMASK - -GST_TYPE_BITMASK is 64-bit bit mask while corresponding channel_mask in -pulseaudio is int therefore usually 32-bit. Switch to uint64_t instead -to match internal representation in gstreamer. - -Fixes pulseaudio crash on ARM 32-bit when pulseaudio is compiled with -gstreamer and either LDAC or aptX support is available. - -Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/723> ---- - src/modules/bluetooth/a2dp-codec-gst.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/modules/bluetooth/a2dp-codec-gst.c b/src/modules/bluetooth/a2dp-codec-gst.c -index 8ef74be9c..11839c580 100644 ---- a/src/modules/bluetooth/a2dp-codec-gst.c -+++ b/src/modules/bluetooth/a2dp-codec-gst.c -@@ -22,6 +22,7 @@ - #endif - - #include <arpa/inet.h> -+#include <stdint.h> - - #include <pulsecore/log.h> - #include <pulsecore/macro.h> -@@ -82,7 +83,7 @@ fail: - static GstCaps *gst_create_caps_from_sample_spec(const pa_sample_spec *ss) { - gchar *sample_format; - GstCaps *caps; -- int channel_mask; -+ uint64_t channel_mask; - - switch (ss->format) { - case PA_SAMPLE_S16LE: --- -GitLab - diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-pacmd-play-file-crash.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-pacmd-play-file-crash.patch deleted file mode 100644 index f9c044dbb2be..000000000000 --- a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-pacmd-play-file-crash.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/a8a2a31408c4acf54530d65922d235d3e590ce05 - -From a8a2a31408c4acf54530d65922d235d3e590ce05 Mon Sep 17 00:00:00 2001 -From: Jaechul Lee <jcsing.lee@samsung.com> -Date: Thu, 2 Jun 2022 15:07:09 +0900 -Subject: [PATCH] sound-file-stream: Fix crash when playing a file which is not - aligned - -pulseaudio crash occurred when I play a file using pacmd play-file command. -The file is not aligned with its frame size and the last rendering size -is also not aligned. Thus, an assertion was generated at the end of the -file as the following. - -memblockq.c: Assertion 'uchunk->length % bq->base == 0' failed at -../src/pulsecore/memblockq.c:288, function pa_memblockq_push(). Aborting. - -When I play the file using paplay, it works good. So, I changed to -pa_memblockq_push_align instead of pa_memblockq_push to prevent the -assertion. - -Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com> -Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/717> ---- - src/pulsecore/sound-file-stream.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/pulsecore/sound-file-stream.c b/src/pulsecore/sound-file-stream.c -index 147aa2288..255f4b61a 100644 ---- a/src/pulsecore/sound-file-stream.c -+++ b/src/pulsecore/sound-file-stream.c -@@ -185,7 +185,7 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t length, pa_memchunk *chunk - - tchunk.length = (size_t) n * fs; - -- pa_memblockq_push(u->memblockq, &tchunk); -+ pa_memblockq_push_align(u->memblockq, &tchunk); - pa_memblock_unref(tchunk.memblock); - } - --- -GitLab - diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch deleted file mode 100644 index 3d72b9a009c4..000000000000 --- a/media-sound/pulseaudio-daemon/files/pulseaudio-16.0-fix-rtp-receiver-sdp-record.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit d7a633df899dda8738a30df318269e28c902e815 -Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com> -Date: Mon Jun 13 21:38:08 2022 +0300 - - rtp: Initialize SDP info struct field added for OPUS - - Turned out that pa_sdp_info::enable_opus is never initialized, which seldom - makes module-rtp-recv believe it will be playing OPUS-encoded stream even though - discovered SDP record does not indicate OPUS codec in metadata. - - Fix this by adding missing initializer. - - Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/720> - -diff --git a/src/modules/rtp/sdp.c b/src/modules/rtp/sdp.c -index 4e6a442f8..bf131a27e 100644 ---- a/src/modules/rtp/sdp.c -+++ b/src/modules/rtp/sdp.c -@@ -129,6 +129,7 @@ pa_sdp_info *pa_sdp_parse(const char *t, pa_sdp_info *i, int is_goodbye) { - i->origin = i->session_name = NULL; - i->salen = 0; - i->payload = 255; -+ i->enable_opus = false; - - if (pa_startswith(t, PA_SDP_HEADER)) { - t += sizeof(PA_SDP_HEADER) - 1; |