A recent version bump in oe-core [1] has moved to a version where these two patches are no longer needed. Drop them.
[1] https://git.openembedded.org/openembedded-core/commit/?id=171b0ae0160d38e423c9447b883a4fd709808be8 Signed-off-by: Ryan Eatmon <[email protected]> --- ...ence-to-contiguous-format-if-support.patch | 52 ------------------- ...pt-non-contiguous-if-contiguous-form.patch | 35 ------------- .../gstreamer1.0-plugins-good_1.28-arago.inc | 2 - 3 files changed, 89 deletions(-) delete mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0004-v4l2-Give-preference-to-contiguous-format-if-support.patch delete mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0007-v4l2object-Attempt-non-contiguous-if-contiguous-form.patch diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0004-v4l2-Give-preference-to-contiguous-format-if-support.patch b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0004-v4l2-Give-preference-to-contiguous-format-if-support.patch deleted file mode 100644 index ff617655..00000000 --- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0004-v4l2-Give-preference-to-contiguous-format-if-support.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0238a430b19e5302dc924321225a3e24778bd2b0 Mon Sep 17 00:00:00 2001 -From: Devarsh Thakkar <[email protected]> -Date: Fri, 9 Mar 2018 10:30:47 -0800 -Subject: [PATCH] v4l2: Give preference to contiguous format if supported - -Currently gstreamer uses single format GST_VIDEO_FORMAT_NV12 for both -NV12 (which uses single contiguous buffer for luma and chroma) -and NV12M (uses two non-contiguous buffers for luma and chroma ) -and if device supports both NV12M and NV12 then it gives preference -to NV12M over NV12. - -The logic to give preference to NV12 before NV12M whenever GST_VIDEO_FORMAT_NV12 -is set. - -Upstream-Status: Pending - -Signed-off-by: Devarsh Thakkar <[email protected]> -Signed-off-by: Prasanth Babu Mantena <[email protected]> ---- - sys/v4l2/gstv4l2object.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c -index e9026da..ad9f630 100644 ---- a/sys/v4l2/gstv4l2object.c -+++ b/sys/v4l2/gstv4l2object.c -@@ -2013,17 +2013,17 @@ gst_v4l2_object_get_caps_info (GstV4l2Object * v4l2object, GstCaps * caps, - } - -- /* Prefer the non-contiguous if supported */ -- v4l2object->prefered_non_contiguous = TRUE; -+ /* Prefer the contiguous if supported */ -+ v4l2object->prefered_non_contiguous = FALSE; - -- if (fourcc_nc) -- fmt = gst_v4l2_object_get_format_from_fourcc (v4l2object, fourcc_nc); -+ if (fourcc) -+ fmt = gst_v4l2_object_get_format_from_fourcc (v4l2object, fourcc); - else if (fourcc == 0) - goto unhandled_format; - - if (fmt == NULL) { -- fmt = gst_v4l2_object_get_format_from_fourcc (v4l2object, fourcc); -- v4l2object->prefered_non_contiguous = FALSE; -+ fmt = gst_v4l2_object_get_format_from_fourcc (v4l2object, fourcc_nc); -+ v4l2object->prefered_non_contiguous = TRUE; - } - - if (fmt == NULL) - goto unsupported_format; --- -2.39.0 diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0007-v4l2object-Attempt-non-contiguous-if-contiguous-form.patch b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0007-v4l2object-Attempt-non-contiguous-if-contiguous-form.patch deleted file mode 100644 index 4878ea49..00000000 --- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0007-v4l2object-Attempt-non-contiguous-if-contiguous-form.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8d29018dd31be2045f6724db0942ae1a7da0a789 Mon Sep 17 00:00:00 2001 -From: Brandon Brnich <[email protected]> -Date: Tue, 10 Mar 2026 19:47:35 -0500 -Subject: [PATCH] v4l2object: Attempt non-contiguous if contiguous format isn't - present - -Gstreamer previously had logic that would set fourcc even if the format -being negotiated didn't have a contiguous option - YUYV for example. A fix -was sent to properly set either forcc/forcc_nc properly. For formats that -don't have contiguous formats, that would mean attempting non-contiguous -options wouldn't happen. Attempt non-contiguous formats before erroring -out if applicable. - -Upstream-Status: Inappropriate [TI-custom] - -Signed-off-by: Brandon Brnich <[email protected]> ---- - sys/v4l2/gstv4l2object.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c -index dbfe4992be..b4a7c32f31 100644 ---- a/sys/v4l2/gstv4l2object.c -+++ b/sys/v4l2/gstv4l2object.c -@@ -2167,7 +2167,7 @@ gst_v4l2_object_get_caps_info (GstV4l2Object * v4l2object, GstCaps * caps, - - if (fourcc) - fmt = gst_v4l2_object_get_format_from_fourcc (v4l2object, fourcc); -- else if (fourcc == 0) -+ else if (fourcc_nc == 0) - goto unhandled_format; - - if (fmt == NULL) { --- -2.43.0 diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.28-arago.inc b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.28-arago.inc index a2204efb..d9e0df88 100644 --- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.28-arago.inc +++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.28-arago.inc @@ -4,10 +4,8 @@ SRC_URI:append = " \ file://0001-v4l2jpegenc-Add-support-for-cropping-in-JPEG-Encoder.patch \ file://0002-Adding-support-for-bayer-formats-with-IR-component.patch \ file://0003-v4l2-Changes-for-DMA-Buf-import-j721s2.patch \ - file://0004-v4l2-Give-preference-to-contiguous-format-if-support.patch \ file://0005-HACK-gstv4l2object-Increase-min-buffers-for-CSI-capt.patch \ file://0006-v4l2object-use-actual-stream-resolution-for-encoded-.patch \ - file://0007-v4l2object-Attempt-non-contiguous-if-contiguous-form.patch \ " PR:append = ".arago0" -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17625): https://lists.yoctoproject.org/g/meta-arago/message/17625 Mute This Topic: https://lists.yoctoproject.org/mt/121021469/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
