~ruther/guix-local

a0e6027e3b2f0c878b92f75e19a8f65ba91375fa — kestrel 5 months ago b0258a2
gnu: Update ffmpeg-jami patches.

* gnu/packages/patches/ffmpeg-jami-pipewiregrab-source-filter.patch: Update
file provided from upstream.
* gnu/packages/video.scm (ffmpeg-jami) [source]: Apply omitted patch.

Change-Id: I73e6850c1c5f8d995b57eb28ff6f109130710307
Signed-off-by: Maxim Cournoyer <maxim@guixotic.coop>
M gnu/packages/patches/ffmpeg-jami-pipewiregrab-source-filter.patch => gnu/packages/patches/ffmpeg-jami-pipewiregrab-source-filter.patch +5 -4
@@ 72,10 72,10 @@ index d7db46c2af..87204fec71 100644
 extern const AVFilter ff_vsrc_smptebars;
diff --git a/libavfilter/vsrc_pipewiregrab.c b/libavfilter/vsrc_pipewiregrab.c
new file mode 100644
index 0000000000..ff9c3468ab
index 0000000000..44d64b1eac
--- /dev/null
+++ b/libavfilter/vsrc_pipewiregrab.c
@@ -0,0 +1,1375 @@
@@ -0,0 +1,1376 @@
+/*
+ * PipeWire input grabber (ScreenCast)
+ * Copyright (C) 2024 Savoir-faire Linux, Inc.


@@ 117,8 117,6 @@ index 0000000000..ff9c3468ab
+#include <sys/mman.h>
+#include <sys/queue.h>
+
+#include "libavfilter/formats.h"
+#include "libavfilter/video.h"
+#include "libavutil/internal.h"
+#include "libavutil/mathematics.h"
+#include "libavutil/opt.h"


@@ 129,7 127,9 @@ index 0000000000..ff9c3468ab
+#include "libavformat/internal.h"
+#include "libavutil/avassert.h"
+#include "avfilter.h"
+#include "formats.h"
+#include "internal.h"
+#include "video.h"
+
+#include <pipewire/pipewire.h>
+#include <pipewire/thread-loop.h>


@@ 671,6 671,7 @@ index 0000000000..ff9c3468ab
+    memcpy(pw_ctx->current_frame->data[0], sdata, spa_buf->datas[0].chunk->size);
+    pw_ctx->current_frame->width = frame_width;
+    pw_ctx->current_frame->height = frame_height;
+    pw_ctx->current_frame->linesize[0] = spa_buf->datas[0].chunk->stride;
+    pthread_mutex_unlock(&pw_ctx->current_frame_mutex);
+
+    // Cleanup

M gnu/packages/video.scm => gnu/packages/video.scm +1 -0
@@ 2004,6 2004,7 @@ audio/video codec library.")
                     "ffmpeg-jami-change-RTCP-ratio.patch"
                     "ffmpeg-jami-rtp_ext_abs_send_time.patch"
                     "ffmpeg-jami-libopusdec-enable-FEC.patch"
                     "ffmpeg-jami-libopusenc-enable-FEC.patch"
                     "ffmpeg-jami-libopusenc-reload-packet-loss-at-encode.patch"
                     "ffmpeg-jami-screen-sharing-x11-fix.patch"
                     "ffmpeg-jami-pipewiregrab-source-filter.patch"))))))