gstreamer1.0-plugins-bad: refresh patches based on v1.28.2

Refresh local changes on top of the v1.28.2 release, which is now
available in oe-core. Also drop patches which were merged upstream.

Co-developed-by: Bala Sai Kosuri <bkosuri@qti.qualcomm.com>
Signed-off-by: Bala Sai Kosuri <bkosuri@qti.qualcomm.com>
Signed-off-by: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com>

Author: ricardosalveti

recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-wayland-Add-support-for-NV12_Q08C-compressed-8-bit-f.patch

@@ -11,11 +11,12 @@ Subject: [PATCH] wayland: Add support for NV12_Q08C (compressed 8-bit)
 Upstream-Status: Denied [Adding NV12_Q08C format is denied by upstream, for compatibility, need to maintain this patch. https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9712 ]
 
 Signed-off-by: Raja Ganapathi Busam <rbusam@qti.qualcomm.com>
+Signed-off-by: Bala Sai Kosuri <bkosuri@qti.qualcomm.com>
 ---
  ext/wayland/gstwaylandsink.c            | 34 +++++++++++++++++++++++++
- gst-libs/gst/wayland/gstwlvideoformat.c |  1 +
- gst-libs/gst/wayland/gstwlvideoformat.h |  6 +++--
- 3 files changed, 39 insertions(+), 2 deletions(-)
+ gst-libs/gst/wayland/gstwlvideoformat.c |  5 ++++
+ gst-libs/gst/wayland/gstwlvideoformat.h |  4 +--
+ 3 files changed, 41 insertions(+), 2 deletions(-)
 
 diff --git a/ext/wayland/gstwaylandsink.c b/ext/wayland/gstwaylandsink.c
 index 19a3e8c..030fe1b 100644
@@ -65,11 +66,11 @@ index 19a3e8c..030fe1b 100644
 
 @@ -706,6 +729,17 @@ gst_wayland_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
      if (!gst_video_info_dma_drm_from_video_info (&self->drm_info,
-             &self->video_info, DRM_FORMAT_MOD_LINEAR))
+             &self->render_info, DRM_FORMAT_MOD_LINEAR))
        gst_video_info_dma_drm_init (&self->drm_info);
 +
 +    if (GST_VIDEO_INFO_FORMAT (&self->video_info) == GST_VIDEO_FORMAT_NV12_Q08C) {
-+      self->drm_info.vinfo = self->video_info;
++      self->drm_info.vinfo = self->render_info;
 +      self->drm_info.drm_fourcc = gst_video_dma_drm_fourcc_from_format (
 +          GST_VIDEO_FORMAT_NV12);
 +      self->drm_info.drm_modifier = DRM_FORMAT_MOD_QCOM_COMPRESSED;
@@ -80,36 +81,39 @@ index 19a3e8c..030fe1b 100644
 +    }
    }
 
-   self->video_info_changed = TRUE;
+   self->have_mastering_info =
 diff --git a/gst-libs/gst/wayland/gstwlvideoformat.c b/gst-libs/gst/wayland/gstwlvideoformat.c
 index 1c0ea59..1800243 100644
 --- a/gst-libs/gst/wayland/gstwlvideoformat.c
 +++ b/gst-libs/gst/wayland/gstwlvideoformat.c
-@@ -94,6 +94,7 @@ static const wl_VideoFormat wl_formats[] = {
-   {WL_SHM_FORMAT_YVU420, DRM_FORMAT_YVU420, GST_VIDEO_FORMAT_YV12},
-   {WL_SHM_FORMAT_YUV422, DRM_FORMAT_YUV422, GST_VIDEO_FORMAT_Y42B},
-   {WL_SHM_FORMAT_YUV444, DRM_FORMAT_YUV444, GST_VIDEO_FORMAT_v308},
-+  {WL_SHM_FORMAT_NV12, DRM_FORMAT_NV12, GST_VIDEO_FORMAT_NV12_Q08C},
- };
+@@ -53,6 +53,11 @@ static const wl_VideoFormat wl_formats[] = {
 
- enum wl_shm_format
+   drm_format = gst_video_dma_drm_format_from_gst_format (format, &modifier);
+ 
++  // Since modifier for NV12_Q08C is not linear, this is required to bypass shm format check.
++  // caps negotiation passes only when a format is supported in shm interface.
++  if (format == GST_VIDEO_FORMAT_NV12_Q08C)
++    return drm_format;
++
+   if (drm_format == DRM_FORMAT_INVALID || modifier != DRM_FORMAT_MOD_LINEAR) {
+     GST_WARNING ("wayland shm video format not found");
+     return -1;
 diff --git a/gst-libs/gst/wayland/gstwlvideoformat.h b/gst-libs/gst/wayland/gstwlvideoformat.h
 index 5d7eb7c..a07e110 100644
 --- a/gst-libs/gst/wayland/gstwlvideoformat.h
 +++ b/gst-libs/gst/wayland/gstwlvideoformat.h
-@@ -39,11 +39,13 @@ G_BEGIN_DECLS
- #if G_BYTE_ORDER == G_BIG_ENDIAN
- #define GST_WL_VIDEO_FORMATS "{ AYUV, RGBA, ARGB, BGRA, ABGR, P010_10LE, " \
-     "NV12_10LE40, v308, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, " \
--    "YUY2, YVYU, UYVY, I420, YV12, NV12, NV21, Y41B, YUV9, YVU9, BGR16, RGB16 }"
-+    "YUY2, YVYU, UYVY, I420, YV12, NV12, NV21, Y41B, YUV9, YVU9, BGR16, RGB16, " \
-+    "NV12_Q08C }"
+@@ -40,12 +40,12 @@ G_BEGIN_DECLS
+ #define GST_WL_VIDEO_FORMATS "{ BGR10A2_LE, RGB10A2_LE, AYUV, RGBA, ARGB, " \
+     "BGRA, ABGR, BGR10x2_LE, RGB10x2_LE, P010_10LE, NV12_10LE40, Y444, v308, " \
+     "RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, " \
+-    "I420, YV12, NV12, NV21, Y41B, YUV9, YVU9, BGR16, RGB16 }"
++    "I420, YV12, NV12, NV21, Y41B, YUV9, YVU9, BGR16, RGB16, NV12_Q08C }"
  #elif G_BYTE_ORDER == G_LITTLE_ENDIAN
- #define GST_WL_VIDEO_FORMATS "{ AYUV, RGBA, ARGB, BGRA, ABGR, P010_10LE, " \
-     "NV12_10LE40, v308, RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, " \
--    "YUY2, YVYU, UYVY, I420, YV12, NV12, NV21, Y41B, YUV9, YVU9, BGR16, RGB16 }"
-+    "YUY2, YVYU, UYVY, I420, YV12, NV12, NV21, Y41B, YUV9, YVU9, BGR16, RGB16, " \
-+    "NV12_Q08C }"
+ #define GST_WL_VIDEO_FORMATS "{ BGR10A2_LE, RGB10A2_LE, AYUV, RGBA, ARGB, " \
+     "BGRA, ABGR, BGR10x2_LE, RGB10x2_LE, P010_10LE, NV12_10LE40, Y444, v308, " \
+     "RGBx, xRGB, BGRx, xBGR, RGB, BGR, Y42B, NV16, NV61, YUY2, YVYU, UYVY, " \
+-    "I420, YV12, NV12, NV21, Y41B, YUV9, YVU9, BGR16, RGB16 }"
++    "I420, YV12, NV12, NV21, Y41B, YUV9, YVU9, BGR16, RGB16, NV12_Q08C }"
  #endif
 
  GST_WL_API

recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-waylandsink-Release-pending-buffers-during-PAUSED-to.patch

@@ -36,7 +36,7 @@ index c580565..2542efb 100644
 +++ b/gst-libs/gst/wayland/gstwldisplay.c
 @@ -767,3 +767,19 @@ gst_wl_display_has_own_display (GstWlDisplay * self)
 
-   return priv->own_display;
+   return output;
  }
 +
 +void
@@ -60,7 +60,7 @@ index b2f0ca3..a4b3803 100644
 +++ b/gst-libs/gst/wayland/gstwldisplay.h
 @@ -121,4 +121,7 @@ struct wp_single_pixel_buffer_manager_v1 * gst_wl_display_get_single_pixel_buffe
  GST_WL_API
- gboolean gst_wl_display_has_own_display (GstWlDisplay * self);
+ GstWlOutput * gst_wl_display_get_output_by_name (GstWlDisplay * self, const gchar * output_name);
 
 +GST_WL_API
 +void gst_wl_display_force_release_buffers (GstWlDisplay * self);

recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-waylandsink-make-sure-self-window-is-not-NULL-before.patch

@@ -6,5 +6,4 @@ SRC_URI:append:qcom = " \
     file://0001-wayland-Add-support-for-NV12_Q08C-compressed-8-bit-f.patch \
     file://0002-waylandsink-Release-pending-buffers-during-PAUSED-to.patch \
     file://0003-waylandsink-support-gap-buffers.patch \
-    file://0004-waylandsink-make-sure-self-window-is-not-NULL-before.patch \
 "