Port gstreamer patches to v1.28.2 (#1914)

Port gstreamer patches to v1.28.2

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 \
 "

recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend

@@ -6,13 +6,17 @@ Subject: [PATCH] video: Add support for NV12_Q08C (compressed 8-bit) format
 Upstream-Status: Denied [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9712]
 
 Signed-off-by: Pratik Pachange <ppachang@qti.qualcomm.com>
+Signed-off-by: Bala Sai Kosuri <bkosuri@qti.qualcomm.com>
 ---
- gst-libs/gst/video/video-format.c | 23 ++++++++++++++++++++++
- gst-libs/gst/video/video-format.h | 10 +++++++++-
- gst-libs/gst/video/video-info.c   | 32 +++++++++++++++++++++++++++++++
- gst-libs/gst/video/video-scaler.c |  1 +
- tests/check/libs/video.c          |  4 ++++
- 5 files changed, 69 insertions(+), 1 deletion(-)
+ gst-libs/gst/video/video-format.c   | 23 +++++++++++++++++++++
+ gst-libs/gst/video/video-format.h   | 10 ++++++++-
+ gst-libs/gst/video/video-info-dma.c |  1 +
+ gst-libs/gst/video/video-info.c     | 32 +++++++++++++++++++++++++++++
+ gst-libs/gst/video/video-scaler.c   |  1 +
+ tests/check/elements/videoconvert.c |  3 +++
+ tests/check/elements/videoscale.c   |  1 +
+ tests/check/libs/video.c            |  8 ++++++--
+ 8 files changed, 76 insertions(+), 3 deletions(-)
 
 diff --git a/gst-libs/gst/video/video-format.c b/gst-libs/gst/video/video-format.c
 index 9bd9c69..b28abc3 100644
@@ -44,9 +48,9 @@ index 9bd9c69..b28abc3 100644
  static void
  unpack_AV12 (const GstVideoFormatInfo * info, GstVideoPackFlags flags,
 @@ -8108,6 +8126,9 @@ static const VideoFormat formats[] = {
-       PSTR8888, PLANE0, OFFS0, SUB4444, PACK_Y416_BE),
-   MAKE_GRAY_LE_FORMAT (GRAY10_LE16, "raw video", DPTH10, PSTR2, PLANE0, OFFS0,
-       SUB4, PACK_GRAY10_LE16),
+       PLANE0, OFFS0, SUB4444, PACK_BGR10A2_LE),
+   MAKE_RGB_LE_FORMAT (RGB10x2_LE, "raw video", DPTH10_10_10, PSTR444,
+       PLANE0, OFFS0, SUB4444, PACK_RGB10A2_LE),
 +  MAKE_YUV_FORMAT (NV12_Q08C, "raw video",
 +      GST_MAKE_FOURCC ('Q', '0', '8', 'C'), DPTH888, PSTR122, PLANE011,
 +      OFFS001, SUB420, PACK_NV12_Q08C),
@@ -67,16 +71,16 @@ index b59ec38..6593f8a 100644
 --- a/gst-libs/gst/video/video-format.h
 +++ b/gst-libs/gst/video/video-format.h
 @@ -174,6 +174,7 @@ G_BEGIN_DECLS
-  * @GST_VIDEO_FORMAT_Y416_LE: packed 4:4:4:4 YUV, 16 bits per channel(U-Y-V-A) (Since: 1.26)
-  * @GST_VIDEO_FORMAT_Y416_BE: packed 4:4:4:4 YUV, 16 bits per channel(U-Y-V-A) (Since: 1.26)
-  * @GST_VIDEO_FORMAT_GRAY10_LE16: 10-bit grayscale, packed into 16bit words (6 bits padding) (Since: 1.26)
+  * @GST_VIDEO_FORMAT_NV16_10LE40: Fully packed variant of NV16_10LE32 (Since: 1.28)
+  * @GST_VIDEO_FORMAT_BGR10x2_LE: packed 4:4:4 RGB (B-G-R-x), 10 bits for R/G/B channel and MSB 2 bits for padding (Since: 1.28)
+  * @GST_VIDEO_FORMAT_RGB10x2_LE: packed 4:4:4 RGB (R-G-B-x), 10 bits for R/G/B channel and MSB 2 bits for padding (Since: 1.28)
 + * @GST_VIDEO_FORMAT_NV12_Q08C: Qualcomm NV12 8bit compressed format
   *
   * Enum value describing the most common video formats.
   *
 @@ -670,6 +671,13 @@ typedef enum {
     */
-   GST_VIDEO_FORMAT_GRAY10_LE16,
+   GST_VIDEO_FORMAT_RGB10x2_LE,
 
 +  /**
 +   * GST_VIDEO_FORMAT_NV12_Q08C:
@@ -92,11 +96,23 @@ index b59ec38..6593f8a 100644
   *
   * Since: 1.26
   */
--#define GST_VIDEO_FORMAT_LAST (GST_VIDEO_FORMAT_GRAY10_LE16 + 1)
+-#define GST_VIDEO_FORMAT_LAST (GST_VIDEO_FORMAT_RGB10x2_LE + 1)
 +#define GST_VIDEO_FORMAT_LAST (GST_VIDEO_FORMAT_NV12_Q08C + 1)
 
  #define GST_VIDEO_MAX_PLANES 4
  #define GST_VIDEO_MAX_COMPONENTS 4
+diff --git a/gst-libs/gst/video/video-info-dma.c b/gst-libs/gst/video/video-info-dma.c
+index 16c1cff..4a2c486 100644
+--- a/gst-libs/gst/video/video-info-dma.c
++++ b/gst-libs/gst/video/video-info-dma.c
+@@ -596,6 +596,7 @@ static const struct FormatMap
+   {GST_VIDEO_FORMAT_GRAY16_BE, DRM_FORMAT_R16 | DRM_FORMAT_BIG_ENDIAN, DRM_FORMAT_MOD_LINEAR},
+   {GST_VIDEO_FORMAT_NV16_10LE40, DRM_FORMAT_NV20, DRM_FORMAT_MOD_LINEAR},
+   {GST_VIDEO_FORMAT_P016_LE, DRM_FORMAT_P016, DRM_FORMAT_MOD_LINEAR},
++  {GST_VIDEO_FORMAT_NV12_Q08C, DRM_FORMAT_NV12, DRM_FORMAT_MOD_QCOM_COMPRESSED},
+ };
+ /* *INDENT-ON* */
+ 
 diff --git a/gst-libs/gst/video/video-info.c b/gst-libs/gst/video/video-info.c
 index 04d52b0..f86b9b3 100644
 --- a/gst-libs/gst/video/video-info.c
@@ -152,10 +168,47 @@ index d645087..0fa9e3d 100644
        *bits = 8;
        *n_elems = 2;
        break;
+diff --git a/tests/check/elements/videoconvert.c b/tests/check/elements/videoconvert.c
+index 420564a..4668a9b 100644
+--- a/tests/check/elements/videoconvert.c
++++ b/tests/check/elements/videoconvert.c
+@@ -76,6 +76,9 @@ check_pad_template (GstPadTemplate * tmpl)
+     if (i == GST_VIDEO_FORMAT_DMA_DRM)
+       continue;
+ 
++    if (i == GST_VIDEO_FORMAT_NV12_Q08C)
++      continue;
++
+     if (!formats_supported[i]) {
+       g_error ("videoconvert doesn't support format '%s'",
+           gst_video_format_to_string ((GstVideoFormat) i));
+diff --git a/tests/check/elements/videoscale.c b/tests/check/elements/videoscale.c
+index b2297cb..5edca5a 100644
+--- a/tests/check/elements/videoscale.c
++++ b/tests/check/elements/videoscale.c
+@@ -122,6 +122,7 @@ check_pad_template (GstPadTemplate * tmpl)
+         case GST_VIDEO_FORMAT_DMA_DRM:
+         case GST_VIDEO_FORMAT_MT2110T:
+         case GST_VIDEO_FORMAT_MT2110R:
++        case GST_VIDEO_FORMAT_NV12_Q08C:
+           GST_LOG ("Ignoring lack of support for format %s", fmt_str);
+           break;
+         default:
 diff --git a/tests/check/libs/video.c b/tests/check/libs/video.c
 index 78a1786..5f8af9d 100644
 --- a/tests/check/libs/video.c
 +++ b/tests/check/libs/video.c
+@@ -389,8 +389,8 @@ GST_START_TEST (test_video_formats_all)
+     fail_if (gst_video_format_from_string (fmt_str) ==
+         GST_VIDEO_FORMAT_UNKNOWN);
+   }
+-  /* Take into account GST_VIDEO_FORMAT_ENCODED, UNKNOWN and DMA_DRM. */
+-  fail_unless_equals_int (num, GST_VIDEO_FORMAT_LAST - 3);
++  /* Take into account GST_VIDEO_FORMAT_ENCODED, UNKNOWN, DMA_DRM and NV12_Q08C */
++  fail_unless_equals_int (num, GST_VIDEO_FORMAT_LAST - 4);
+ 
+   gst_caps_unref (caps);
+ }
 @@ -2185,6 +2185,9 @@ GST_START_TEST (test_video_pack_unpack2)
      if (format == GST_VIDEO_FORMAT_DMA_DRM)
        continue;

recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-video-Add-support-for-NV12_Q08C-compressed-8-bit-for.patch

@@ -7,12 +7,15 @@ Subject: [PATCH] video: Add support for NV12_Q10LE32C (compressed 10-bit)
 Upstream-Status: Denied [Same reason as 8-bit compressed format, https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9712]
 
 Signed-off-by: Hui Liu <huliu@qti.qualcomm.com>
+Signed-off-by: Bala Sai Kosuri <bkosuri@qti.qualcomm.com>
 ---
- gst-libs/gst/video/video-format.c | 23 +++++++++++++++++++++
- gst-libs/gst/video/video-format.h | 10 ++++++++-
- gst-libs/gst/video/video-info.c   | 34 +++++++++++++++++++++++++++++++
- tests/check/libs/video.c          |  4 ++++
- 4 files changed, 70 insertions(+), 1 deletion(-)
+ gst-libs/gst/video/video-format.c   | 23 +++++++++++++++++++
+ gst-libs/gst/video/video-format.h   | 10 ++++++++-
+ gst-libs/gst/video/video-info.c     | 34 +++++++++++++++++++++++++++++
+ tests/check/elements/videoconvert.c |  3 +++
+ tests/check/elements/videoscale.c   |  1 +
+ tests/check/libs/video.c            |  9 ++++++--
+ 6 files changed, 77 insertions(+), 3 deletions(-)
 
 diff --git a/gst-libs/gst/video/video-format.c b/gst-libs/gst/video/video-format.c
 index b28abc3..61a9912 100644
@@ -67,10 +70,10 @@ index 6593f8a..6c4d61d 100644
 --- a/gst-libs/gst/video/video-format.h
 +++ b/gst-libs/gst/video/video-format.h
 @@ -175,6 +175,7 @@ G_BEGIN_DECLS
-  * @GST_VIDEO_FORMAT_Y416_BE: packed 4:4:4:4 YUV, 16 bits per channel(U-Y-V-A) (Since: 1.26)
-  * @GST_VIDEO_FORMAT_GRAY10_LE16: 10-bit grayscale, packed into 16bit words (6 bits padding) (Since: 1.26)
+  * @GST_VIDEO_FORMAT_BGR10x2_LE: packed 4:4:4 RGB (B-G-R-x), 10 bits for R/G/B channel and MSB 2 bits for padding (Since: 1.28)
+  * @GST_VIDEO_FORMAT_RGB10x2_LE: packed 4:4:4 RGB (R-G-B-x), 10 bits for R/G/B channel and MSB 2 bits for padding (Since: 1.28)
   * @GST_VIDEO_FORMAT_NV12_Q08C: Qualcomm NV12 8bit compressed format
-+ * @GST_VIDEO_FORMAT_NV12_Q10LE32C: Qualcomm NV12 10-bit compressed format.
++ * @GST_VIDEO_FORMAT_NV12_Q10LE32C: Qualcomm NV12 10bit compressed format
   *
   * Enum value describing the most common video formats.
   *
@@ -142,10 +145,48 @@ index f86b9b3..0e31528 100644
      case GST_VIDEO_FORMAT_ENCODED:
      case GST_VIDEO_FORMAT_DMA_DRM:
        break;
+diff --git a/tests/check/elements/videoconvert.c b/tests/check/elements/videoconvert.c
+index 4668a9b..a600e8b 100644
+--- a/tests/check/elements/videoconvert.c
++++ b/tests/check/elements/videoconvert.c
+@@ -79,6 +79,9 @@ check_pad_template (GstPadTemplate * tmpl)
+     if (i == GST_VIDEO_FORMAT_NV12_Q08C)
+       continue;
+ 
++    if (i == GST_VIDEO_FORMAT_NV12_Q10LE32C)
++      continue;
++
+     if (!formats_supported[i]) {
+       g_error ("videoconvert doesn't support format '%s'",
+           gst_video_format_to_string ((GstVideoFormat) i));
+diff --git a/tests/check/elements/videoscale.c b/tests/check/elements/videoscale.c
+index 5edca5a..4d6bbbb 100644
+--- a/tests/check/elements/videoscale.c
++++ b/tests/check/elements/videoscale.c
+@@ -123,6 +123,7 @@ check_pad_template (GstPadTemplate * tmpl)
+         case GST_VIDEO_FORMAT_MT2110T:
+         case GST_VIDEO_FORMAT_MT2110R:
+         case GST_VIDEO_FORMAT_NV12_Q08C:
++        case GST_VIDEO_FORMAT_NV12_Q10LE32C:
+           GST_LOG ("Ignoring lack of support for format %s", fmt_str);
+           break;
+         default:
 diff --git a/tests/check/libs/video.c b/tests/check/libs/video.c
 index 5f8af9d..dd3d696 100644
 --- a/tests/check/libs/video.c
 +++ b/tests/check/libs/video.c
+@@ -389,8 +389,9 @@ GST_START_TEST (test_video_formats_all)
+     fail_if (gst_video_format_from_string (fmt_str) ==
+         GST_VIDEO_FORMAT_UNKNOWN);
+   }
+-  /* Take into account GST_VIDEO_FORMAT_ENCODED, UNKNOWN, DMA_DRM and NV12_Q08C */
+-  fail_unless_equals_int (num, GST_VIDEO_FORMAT_LAST - 4);
++  /* Take into account GST_VIDEO_FORMAT_ENCODED, UNKNOWN, DMA_DRM, NV12_Q08C
++   * and NV12_Q10LE32C. */
++  fail_unless_equals_int (num, GST_VIDEO_FORMAT_LAST - 5);
+ 
+   gst_caps_unref (caps);
+ }
 @@ -2188,6 +2188,9 @@ GST_START_TEST (test_video_pack_unpack2)
      if (format == GST_VIDEO_FORMAT_NV12_Q08C)
        continue;