Updating prebuilts and/or headers

ed8273ff6102bb0b4fa7975a401b12b3e95a7187 - nvbufsurface.h 9a172f748a2b8f4d6d15648ea353989ccc7aeba6 - gst-plugins-nv-video-sinks/Makefile 7ef56486c9e6b3e354473a2959d274517dd709da - gst-plugins-nv-video-sinks/gstnvvideosinks.c 9825d8a113dbf7dd16f791ff1ca66f2de3047b22 - gst-plugins-nv-video-sinks/LICENSE.libgstnvvideosinks f8cd771fc3695e957a02665e9eb1a1c6fb9b0572 - gst-plugins-nv-video-sinks/nv3dsink/gstnv3dsink.c 9b7125a2d7ebe2ea647c43d2eb43e8d04cd16c47 - gst-plugins-nv-video-sinks/nv3dsink/gstnv3dsink.h 5e13200e9cba5f45d74cf6899dd3356d5f5d1c8e - gst-plugins-nv-video-sinks/common/context.h ad360a668f0f494ebd2bb630c3faaf93078c6e0d - gst-plugins-nv-video-sinks/common/window.c 72f9a4b823c4162c9f22cedb7c1cb1764d06fcb6 - gst-plugins-nv-video-sinks/common/renderer.h fcb1b73054a1c8ff8ce614878ee46880273656f4 - gst-plugins-nv-video-sinks/common/renderer.c 4f86ed5c7d6dfa6e6e4df4fd2945993655fc3409 - gst-plugins-nv-video-sinks/common/context.c d48e1dae85e3c6a0ba7623be7ee306b8e1ef6695 - gst-plugins-nv-video-sinks/common/gstnvvideofwd.h a0debde9b0fd5bc6ac9c5fac7f1a14745a2b0617 - gst-plugins-nv-video-sinks/common/display.c 96b0b4d38692a0aecf70944749684ac938ff192f - gst-plugins-nv-video-sinks/common/display.h 6e77d54ffc5d1a49d5bad768cdf5cfadf458f1f7 - gst-plugins-nv-video-sinks/common/window.h 638b0da4ea65d02818289e89bc1d635ddbcdaec5 - gst-plugins-nv-video-sinks/common/x11/window_x11.h d692399c6d94dbc7814770b08baf9271ed97f8e0 - gst-plugins-nv-video-sinks/common/x11/display_x11.h b3f1b67cae0b4643f6a676b362ceaa61abc9c40f - gst-plugins-nv-video-sinks/common/x11/display_x11.c c98945083e215dff26507c1e10b0ebf62a2c6fb7 - gst-plugins-nv-video-sinks/common/x11/window_x11.c f528404a796de5a23dab281588feb72f42343e59 - gst-plugins-nv-video-sinks/common/renderer/renderer_gl.h 707a36267f329bb22afdd19b947be5a99478ec7a - gst-plugins-nv-video-sinks/common/renderer/renderer_gl.c ad6be303e104ee7fbe2845a7697bc39e575a3e52 - gst-plugins-nv-video-sinks/common/egl/context_egl.c 536a072a8ef84b3c91307777f88121fb88df2c4f - gst-plugins-nv-video-sinks/common/egl/context_egl.h Change-Id: Ieeddbd2ca3c5764d569d2ce3165d8019e12ab080
2025-12-22 09:22:49 +03:00 · 2023-08-03 21:10:42 -07:00
4 changed files with 61 additions and 63 deletions
--- a/commitFile.txt
+++ b/commitFile.txt
@@ -2,24 +2,24 @@ Updating prebuilts and/or headers

 ed8273ff6102bb0b4fa7975a401b12b3e95a7187 - nvbufsurface.h
 9a172f748a2b8f4d6d15648ea353989ccc7aeba6 - gst-plugins-nv-video-sinks/Makefile
-9825d8a113dbf7dd16f791ff1ca66f2de3047b22 - gst-plugins-nv-video-sinks/LICENSE.libgstnvvideosinks
 7ef56486c9e6b3e354473a2959d274517dd709da - gst-plugins-nv-video-sinks/gstnvvideosinks.c
-4f86ed5c7d6dfa6e6e4df4fd2945993655fc3409 - gst-plugins-nv-video-sinks/common/context.c
-a0debde9b0fd5bc6ac9c5fac7f1a14745a2b0617 - gst-plugins-nv-video-sinks/common/display.c
-fcb1b73054a1c8ff8ce614878ee46880273656f4 - gst-plugins-nv-video-sinks/common/renderer.c
-96b0b4d38692a0aecf70944749684ac938ff192f - gst-plugins-nv-video-sinks/common/display.h
-6e77d54ffc5d1a49d5bad768cdf5cfadf458f1f7 - gst-plugins-nv-video-sinks/common/window.h
-d48e1dae85e3c6a0ba7623be7ee306b8e1ef6695 - gst-plugins-nv-video-sinks/common/gstnvvideofwd.h
+9825d8a113dbf7dd16f791ff1ca66f2de3047b22 - gst-plugins-nv-video-sinks/LICENSE.libgstnvvideosinks
+f8cd771fc3695e957a02665e9eb1a1c6fb9b0572 - gst-plugins-nv-video-sinks/nv3dsink/gstnv3dsink.c
+9b7125a2d7ebe2ea647c43d2eb43e8d04cd16c47 - gst-plugins-nv-video-sinks/nv3dsink/gstnv3dsink.h
+5e13200e9cba5f45d74cf6899dd3356d5f5d1c8e - gst-plugins-nv-video-sinks/common/context.h
 ad360a668f0f494ebd2bb630c3faaf93078c6e0d - gst-plugins-nv-video-sinks/common/window.c
 72f9a4b823c4162c9f22cedb7c1cb1764d06fcb6 - gst-plugins-nv-video-sinks/common/renderer.h
-5e13200e9cba5f45d74cf6899dd3356d5f5d1c8e - gst-plugins-nv-video-sinks/common/context.h
+fcb1b73054a1c8ff8ce614878ee46880273656f4 - gst-plugins-nv-video-sinks/common/renderer.c
+4f86ed5c7d6dfa6e6e4df4fd2945993655fc3409 - gst-plugins-nv-video-sinks/common/context.c
+d48e1dae85e3c6a0ba7623be7ee306b8e1ef6695 - gst-plugins-nv-video-sinks/common/gstnvvideofwd.h
+a0debde9b0fd5bc6ac9c5fac7f1a14745a2b0617 - gst-plugins-nv-video-sinks/common/display.c
+96b0b4d38692a0aecf70944749684ac938ff192f - gst-plugins-nv-video-sinks/common/display.h
+6e77d54ffc5d1a49d5bad768cdf5cfadf458f1f7 - gst-plugins-nv-video-sinks/common/window.h
 638b0da4ea65d02818289e89bc1d635ddbcdaec5 - gst-plugins-nv-video-sinks/common/x11/window_x11.h
-b3f1b67cae0b4643f6a676b362ceaa61abc9c40f - gst-plugins-nv-video-sinks/common/x11/display_x11.c
 d692399c6d94dbc7814770b08baf9271ed97f8e0 - gst-plugins-nv-video-sinks/common/x11/display_x11.h
+b3f1b67cae0b4643f6a676b362ceaa61abc9c40f - gst-plugins-nv-video-sinks/common/x11/display_x11.c
 c98945083e215dff26507c1e10b0ebf62a2c6fb7 - gst-plugins-nv-video-sinks/common/x11/window_x11.c
-536a072a8ef84b3c91307777f88121fb88df2c4f - gst-plugins-nv-video-sinks/common/egl/context_egl.h
-35b1e9d33b1f8bb8fc7065ab57696696128e042d - gst-plugins-nv-video-sinks/common/egl/context_egl.c
-707a36267f329bb22afdd19b947be5a99478ec7a - gst-plugins-nv-video-sinks/common/renderer/renderer_gl.c
 f528404a796de5a23dab281588feb72f42343e59 - gst-plugins-nv-video-sinks/common/renderer/renderer_gl.h
-9b7125a2d7ebe2ea647c43d2eb43e8d04cd16c47 - gst-plugins-nv-video-sinks/nv3dsink/gstnv3dsink.h
-a02ed68d624ec0fc13349cbf5c4e675dfdfec1b9 - gst-plugins-nv-video-sinks/nv3dsink/gstnv3dsink.c
+707a36267f329bb22afdd19b947be5a99478ec7a - gst-plugins-nv-video-sinks/common/renderer/renderer_gl.c
+ad6be303e104ee7fbe2845a7697bc39e575a3e52 - gst-plugins-nv-video-sinks/common/egl/context_egl.c
+536a072a8ef84b3c91307777f88121fb88df2c4f - gst-plugins-nv-video-sinks/common/egl/context_egl.h
--- a/gst-plugins-nv-video-sinks/common/egl/context_egl.c
+++ b/gst-plugins-nv-video-sinks/common/egl/context_egl.c
@@ -426,55 +426,51 @@ gst_nv_video_context_egl_new (GstNvVideoDisplay * display)

  // TODO: query from egl
  caps = gst_caps_new_empty ();
-  // Software buffer caps
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_RGBA));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_BGRA));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_ARGB));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_ABGR));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_RGBx));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_BGRx));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_xRGB));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_xBGR));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_AYUV));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_Y444));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_RGB));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_BGR));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_I420));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_YV12));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_NV12));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_NV21));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_Y42B));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_Y41B));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_RGB16));
+  // Software & NVMM buffer caps
+  for (i = 0; i < 2; i++) {
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_RGBA));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_BGRA));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_ARGB));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_ABGR));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_RGBx));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_BGRx));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_xRGB));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_xBGR));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_AYUV));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_Y444));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_RGB));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_BGR));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_I420));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_YV12));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_NV12));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_NV21));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_Y42B));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_Y41B));
+    gst_caps_append (caps,
+        gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_RGB16));
+  }

  n = gst_caps_get_size(caps);
-  // NVMM buffer caps
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_NV12));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_I420));
-  gst_caps_append (caps,
-      gst_nv_video_context_egl_new_template_caps (GST_VIDEO_FORMAT_RGBA));
-  for (i = n; i < n + 3; i++) {
+
+  for (i = n/2; i < n; i++) {
    GstCapsFeatures *features = gst_caps_features_new ("memory:NVMM", NULL);
    gst_caps_set_features (caps, i, features);
  }
--- a/gst-plugins-nv-video-sinks/nv3dsink/gstnv3dsink.c
+++ b/gst-plugins-nv-video-sinks/nv3dsink/gstnv3dsink.c
@@ -50,7 +50,9 @@ static GstStaticPadTemplate gst_nv3dsink_sink_template_factory =
            ";"
        GST_VIDEO_CAPS_MAKE_WITH_FEATURES (
            GST_CAPS_FEATURE_MEMORY_NVMM,
-            "{ RGBA, I420, NV12 }")
+            "{ RGBA, BGRA, ARGB, ABGR, RGBx, BGRx, xRGB, xBGR, "
+            "AYUV, Y444, I420, YV12, NV12, NV21, Y42B, Y41B, "
+            "RGB, BGR, RGB16 }")
        ));

 #define parent_class gst_nv3dsink_parent_class
--- a/push_info.txt
+++ b/push_info.txt
@@ -1 +1 @@
-jetson_35.5_APT1
+jetson_35.4.1