Merge pull request #2917 from wardru/fix/pipewire

pipewire: Drop per-plane stride and offset patch for iMX95

2 files changed, 0 insertions, 55 deletions

diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0003-pipewiresrc-update-per-plane-stride-and-offset-accor.patch b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0003-pipewiresrc-update-per-plane-stride-and-offset-accor.patch
deleted file mode 100644
index 45dec1645..000000000
--- a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0003-pipewiresrc-update-per-plane-stride-and-offset-accor.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f01c4d27819fc2897b10f7e2bc0f30bd183c45b8 Mon Sep 17 00:00:00 2001
-From: Elliot Chen <elliot.chen@nxp.com>
-Date: Sat, 28 Feb 2026 14:47:22 +0900
-Subject: [PATCH] pipewiresrc: update per-plane stride and offset according to
- chunk info
-
-Upstream-Status: Pending
-Signed-off-by: Elliot Chen <elliot.chen@nxp.com>
-
----
- meson.build              |  2 +-
- src/gst/gstpipewiresrc.c | 11 +++++++++++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index bca2c7a27..e290217e9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -412,7 +412,7 @@ gst_deps_def = {
-   'gio-unix-2.0': {},
-   'gstreamer-1.0': {'version': '>= 1.10.0'},
-   'gstreamer-base-1.0': {},
--  'gstreamer-video-1.0': {},
-+  'gstreamer-video-1.0': {'version': '>= 1.22.0'},
-   'gstreamer-audio-1.0': {},
-   'gstreamer-allocators-1.0': {},
- }
-diff --git a/src/gst/gstpipewiresrc.c b/src/gst/gstpipewiresrc.c
-index b0de17dfd..044c0d583 100644
---- a/src/gst/gstpipewiresrc.c
-+++ b/src/gst/gstpipewiresrc.c
-@@ -838,6 +838,17 @@ static GstBuffer *dequeue_buffer(GstPipeWireSrc *pwsrc)
- 
-       video_size += d->chunk->size;
-     }
-+
-+    /* If the buffer number is smaller than the plane number,
-+     * update the stride and offset for the remain planes.
-+     */
-+    if (n_datas && n_datas < n_planes) {
-+      for (i = n_datas; i < n_planes; i++) {
-+        meta->stride[i] = gst_video_format_info_extrapolate_stride (info->finfo, i, b->buffer->datas[0].chunk->stride);
-+        meta->offset[i] = meta->offset[i-1] +
-+            meta->stride[i-1] * GST_VIDEO_FORMAT_INFO_SCALE_HEIGHT (info->finfo, i-1, GST_VIDEO_INFO_HEIGHT(info));
-+      }
-+    }
-   }
- 
-   if (b->buffer->n_datas != gst_buffer_n_memory(data->buf)) {
--- 
-2.34.1
-
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
index f9323a2fb..9b15e90b5 100644
--- a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
@@ -14,9 +14,6 @@ SRC_URI:append:imx-nxp-bsp = " \
     file://0001-systemd-allow-pipewire-user-services-for-root.patch \
     file://0001-YOCIMX-9095-pipewiresrc-set-rank-to-secondary.patch \
 "
-SRC_URI:append:mx95-nxp-bsp = " \
-    file://0003-pipewiresrc-update-per-plane-stride-and-offset-accor.patch \
-"
 
 # Dispatch line consumes the machine-specialized helper var below.
 # No-op off-target: the helper it consumes expands empty.