Compare commits
No commits in common. 'c9' and 'i9' have entirely different histories.
@ -1 +1 @@
|
||||
SOURCES/gst-plugins-bad-free-1.22.1.tar.xz
|
||||
SOURCES/gst-plugins-bad-free-1.18.4.tar.xz
|
||||
|
||||
@ -1 +1 @@
|
||||
fb0172c16d7e8ab7c7c6497f302d64a6e0ff974b SOURCES/gst-plugins-bad-free-1.22.1.tar.xz
|
||||
c8b36955ec53ee69e60c0e25d5340104f41e369b SOURCES/gst-plugins-bad-free-1.18.4.tar.xz
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
From 3e57512bea64ae9d231441caae96037a96aef2bf Mon Sep 17 00:00:00 2001
|
||||
From: Troy Dawson <tdawson@redhat.com>
|
||||
Date: Mon, 19 Oct 2020 14:09:32 -0700
|
||||
Subject: [PATCH] No va test when va disabled
|
||||
|
||||
---
|
||||
tests/examples/meson.build | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/examples/meson.build b/tests/examples/meson.build
|
||||
index a41fc16..a73c81d 100644
|
||||
--- a/tests/examples/meson.build
|
||||
+++ b/tests/examples/meson.build
|
||||
@@ -13,7 +13,9 @@ if not get_option('opencv').disabled()
|
||||
subdir('opencv', if_found: opencv_dep)
|
||||
endif
|
||||
subdir('uvch264')
|
||||
-subdir('va')
|
||||
+if not get_option('va').disabled()
|
||||
+ subdir('va')
|
||||
+endif
|
||||
subdir('waylandsink')
|
||||
subdir('webrtc')
|
||||
|
||||
--
|
||||
2.18.4
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
From 9815fd1e2ab13f765b75b39e3764fe1e860cb251 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Williamson <awilliam@redhat.com>
|
||||
Date: Thu, 10 Sep 2020 10:35:11 -0700
|
||||
Subject: [PATCH] examples: only check opencv_dep if option is not disabled
|
||||
(#1406)
|
||||
|
||||
We can't check opencv_dep if the option is disabled because it's
|
||||
never initialized in that case, since 833a65cc .
|
||||
|
||||
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
||||
---
|
||||
tests/examples/meson.build | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/examples/meson.build b/tests/examples/meson.build
|
||||
index 2eba1d47e..a41fc1679 100644
|
||||
--- a/tests/examples/meson.build
|
||||
+++ b/tests/examples/meson.build
|
||||
@@ -9,7 +9,9 @@ subdir('mpegts')
|
||||
subdir('msdk')
|
||||
subdir('mxf')
|
||||
subdir('nvcodec')
|
||||
-subdir('opencv', if_found: opencv_dep)
|
||||
+if not get_option('opencv').disabled()
|
||||
+ subdir('opencv', if_found: opencv_dep)
|
||||
+endif
|
||||
subdir('uvch264')
|
||||
subdir('va')
|
||||
subdir('waylandsink')
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -1,323 +0,0 @@
|
||||
From db2e5ccfcf4db7fc3d199d885b07e5eb34770c19 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
|
||||
Date: Fri, 20 Oct 2023 00:09:57 +0300
|
||||
Subject: [PATCH 1/2] mxfdemux: Store GstMXFDemuxEssenceTrack in their own
|
||||
fixed allocation
|
||||
|
||||
Previously they were stored inline inside a GArray, but as references to
|
||||
the tracks were stored in various other places although the array could
|
||||
still be updated (and reallocated!), this could lead to dangling
|
||||
references in various places.
|
||||
|
||||
Instead now store them in a GPtrArray in their own allocation so each
|
||||
track's memory position stays fixed.
|
||||
|
||||
Fixes ZDI-CAN-22299
|
||||
|
||||
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3055
|
||||
|
||||
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5638>
|
||||
---
|
||||
.../gst-plugins-bad/gst/mxf/mxfdemux.c | 116 ++++++++----------
|
||||
.../gst-plugins-bad/gst/mxf/mxfdemux.h | 2 +-
|
||||
2 files changed, 50 insertions(+), 68 deletions(-)
|
||||
|
||||
diff --git a/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.c b/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.c
|
||||
index d9eb9a5844..1b58989631 100644
|
||||
--- a/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.c
|
||||
+++ b/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.c
|
||||
@@ -170,10 +170,25 @@ gst_mxf_demux_partition_free (GstMXFDemuxPartition * partition)
|
||||
}
|
||||
|
||||
static void
|
||||
-gst_mxf_demux_reset_mxf_state (GstMXFDemux * demux)
|
||||
+gst_mxf_demux_essence_track_free (GstMXFDemuxEssenceTrack * t)
|
||||
{
|
||||
- guint i;
|
||||
+ if (t->offsets)
|
||||
+ g_array_free (t->offsets, TRUE);
|
||||
+
|
||||
+ g_free (t->mapping_data);
|
||||
+
|
||||
+ if (t->tags)
|
||||
+ gst_tag_list_unref (t->tags);
|
||||
+
|
||||
+ if (t->caps)
|
||||
+ gst_caps_unref (t->caps);
|
||||
+
|
||||
+ g_free (t);
|
||||
+}
|
||||
|
||||
+static void
|
||||
+gst_mxf_demux_reset_mxf_state (GstMXFDemux * demux)
|
||||
+{
|
||||
GST_DEBUG_OBJECT (demux, "Resetting MXF state");
|
||||
|
||||
g_list_foreach (demux->partitions, (GFunc) gst_mxf_demux_partition_free,
|
||||
@@ -182,23 +197,7 @@ gst_mxf_demux_reset_mxf_state (GstMXFDemux * demux)
|
||||
demux->partitions = NULL;
|
||||
|
||||
demux->current_partition = NULL;
|
||||
-
|
||||
- for (i = 0; i < demux->essence_tracks->len; i++) {
|
||||
- GstMXFDemuxEssenceTrack *t =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
|
||||
-
|
||||
- if (t->offsets)
|
||||
- g_array_free (t->offsets, TRUE);
|
||||
-
|
||||
- g_free (t->mapping_data);
|
||||
-
|
||||
- if (t->tags)
|
||||
- gst_tag_list_unref (t->tags);
|
||||
-
|
||||
- if (t->caps)
|
||||
- gst_caps_unref (t->caps);
|
||||
- }
|
||||
- g_array_set_size (demux->essence_tracks, 0);
|
||||
+ g_ptr_array_set_size (demux->essence_tracks, 0);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -216,7 +215,7 @@ gst_mxf_demux_reset_linked_metadata (GstMXFDemux * demux)
|
||||
|
||||
for (i = 0; i < demux->essence_tracks->len; i++) {
|
||||
GstMXFDemuxEssenceTrack *track =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
|
||||
+ g_ptr_array_index (demux->essence_tracks, i);
|
||||
|
||||
track->source_package = NULL;
|
||||
track->delta_id = -1;
|
||||
@@ -419,7 +418,7 @@ gst_mxf_demux_partition_postcheck (GstMXFDemux * demux,
|
||||
|
||||
for (i = 0; i < demux->essence_tracks->len; i++) {
|
||||
GstMXFDemuxEssenceTrack *cand =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
|
||||
+ g_ptr_array_index (demux->essence_tracks, i);
|
||||
|
||||
if (cand->body_sid != partition->partition.body_sid)
|
||||
continue;
|
||||
@@ -866,8 +865,7 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
|
||||
|
||||
for (k = 0; k < demux->essence_tracks->len; k++) {
|
||||
GstMXFDemuxEssenceTrack *tmp =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack,
|
||||
- k);
|
||||
+ g_ptr_array_index (demux->essence_tracks, k);
|
||||
|
||||
if (tmp->track_number == track->parent.track_number &&
|
||||
tmp->body_sid == edata->body_sid) {
|
||||
@@ -885,24 +883,23 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
|
||||
}
|
||||
|
||||
if (!etrack) {
|
||||
- GstMXFDemuxEssenceTrack tmp;
|
||||
+ GstMXFDemuxEssenceTrack *tmp = g_new0 (GstMXFDemuxEssenceTrack, 1);
|
||||
|
||||
- memset (&tmp, 0, sizeof (tmp));
|
||||
- tmp.body_sid = edata->body_sid;
|
||||
- tmp.index_sid = edata->index_sid;
|
||||
- tmp.track_number = track->parent.track_number;
|
||||
- tmp.track_id = track->parent.track_id;
|
||||
- memcpy (&tmp.source_package_uid, &package->parent.package_uid, 32);
|
||||
+ tmp->body_sid = edata->body_sid;
|
||||
+ tmp->index_sid = edata->index_sid;
|
||||
+ tmp->track_number = track->parent.track_number;
|
||||
+ tmp->track_id = track->parent.track_id;
|
||||
+ memcpy (&tmp->source_package_uid, &package->parent.package_uid, 32);
|
||||
|
||||
if (demux->current_partition->partition.body_sid == edata->body_sid &&
|
||||
demux->current_partition->partition.body_offset == 0)
|
||||
- tmp.position = 0;
|
||||
+ tmp->position = 0;
|
||||
else
|
||||
- tmp.position = -1;
|
||||
+ tmp->position = -1;
|
||||
|
||||
- g_array_append_val (demux->essence_tracks, tmp);
|
||||
+ g_ptr_array_add (demux->essence_tracks, tmp);
|
||||
etrack =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack,
|
||||
+ g_ptr_array_index (demux->essence_tracks,
|
||||
demux->essence_tracks->len - 1);
|
||||
new = TRUE;
|
||||
}
|
||||
@@ -1050,13 +1047,7 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
|
||||
|
||||
next:
|
||||
if (new) {
|
||||
- g_free (etrack->mapping_data);
|
||||
- if (etrack->tags)
|
||||
- gst_tag_list_unref (etrack->tags);
|
||||
- if (etrack->caps)
|
||||
- gst_caps_unref (etrack->caps);
|
||||
-
|
||||
- g_array_remove_index (demux->essence_tracks,
|
||||
+ g_ptr_array_remove_index (demux->essence_tracks,
|
||||
demux->essence_tracks->len - 1);
|
||||
}
|
||||
}
|
||||
@@ -1069,7 +1060,7 @@ gst_mxf_demux_update_essence_tracks (GstMXFDemux * demux)
|
||||
|
||||
for (i = 0; i < demux->essence_tracks->len; i++) {
|
||||
GstMXFDemuxEssenceTrack *etrack =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
|
||||
+ g_ptr_array_index (demux->essence_tracks, i);
|
||||
|
||||
if (!etrack->source_package || !etrack->source_track || !etrack->caps) {
|
||||
GST_ERROR_OBJECT (demux, "Failed to update essence track %u", i);
|
||||
@@ -1438,7 +1429,7 @@ gst_mxf_demux_update_tracks (GstMXFDemux * demux)
|
||||
|
||||
for (k = 0; k < demux->essence_tracks->len; k++) {
|
||||
GstMXFDemuxEssenceTrack *tmp =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, k);
|
||||
+ g_ptr_array_index (demux->essence_tracks, k);
|
||||
|
||||
if (tmp->source_package == source_package &&
|
||||
tmp->source_track == source_track) {
|
||||
@@ -1927,8 +1918,7 @@ gst_mxf_demux_pad_set_component (GstMXFDemux * demux, GstMXFDemuxPad * pad,
|
||||
pad->current_essence_track = NULL;
|
||||
|
||||
for (k = 0; k < demux->essence_tracks->len; k++) {
|
||||
- GstMXFDemuxEssenceTrack *tmp =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, k);
|
||||
+ GstMXFDemuxEssenceTrack *tmp = g_ptr_array_index (demux->essence_tracks, k);
|
||||
|
||||
if (tmp->source_package == source_package &&
|
||||
tmp->source_track == source_track) {
|
||||
@@ -2712,7 +2702,7 @@ gst_mxf_demux_handle_generic_container_essence_element (GstMXFDemux * demux,
|
||||
if (!etrack) {
|
||||
for (i = 0; i < demux->essence_tracks->len; i++) {
|
||||
GstMXFDemuxEssenceTrack *tmp =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
|
||||
+ g_ptr_array_index (demux->essence_tracks, i);
|
||||
|
||||
if (tmp->body_sid == demux->current_partition->partition.body_sid &&
|
||||
(tmp->track_number == track_number || tmp->track_number == 0)) {
|
||||
@@ -3916,8 +3906,7 @@ from_track_offset:
|
||||
gst_mxf_demux_set_partition_for_offset (demux, demux->offset);
|
||||
|
||||
for (i = 0; i < demux->essence_tracks->len; i++) {
|
||||
- GstMXFDemuxEssenceTrack *t =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
|
||||
+ GstMXFDemuxEssenceTrack *t = g_ptr_array_index (demux->essence_tracks, i);
|
||||
|
||||
if (index_start_position != -1 && t == etrack)
|
||||
t->position = index_start_position;
|
||||
@@ -3941,8 +3930,7 @@ from_track_offset:
|
||||
/* Handle EOS */
|
||||
for (i = 0; i < demux->essence_tracks->len; i++) {
|
||||
GstMXFDemuxEssenceTrack *t =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack,
|
||||
- i);
|
||||
+ g_ptr_array_index (demux->essence_tracks, i);
|
||||
|
||||
if (t->position > 0)
|
||||
t->duration = t->position;
|
||||
@@ -4180,8 +4168,7 @@ gst_mxf_demux_pull_and_handle_klv_packet (GstMXFDemux * demux)
|
||||
guint i;
|
||||
for (i = 0; i < demux->essence_tracks->len; i++) {
|
||||
GstMXFDemuxEssenceTrack *etrack =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack,
|
||||
- i);
|
||||
+ g_ptr_array_index (demux->essence_tracks, i);
|
||||
|
||||
if (etrack->body_sid != partition->partition.body_sid)
|
||||
continue;
|
||||
@@ -4652,9 +4639,8 @@ gst_mxf_demux_pad_to_track_and_position (GstMXFDemux * demux,
|
||||
/* Get the corresponding essence track for the given source package and stream id */
|
||||
for (i = 0; i < demux->essence_tracks->len; i++) {
|
||||
GstMXFDemuxEssenceTrack *track =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
|
||||
- GST_LOG_OBJECT (pad,
|
||||
- "Looking at essence track body_sid:%d index_sid:%d",
|
||||
+ g_ptr_array_index (demux->essence_tracks, i);
|
||||
+ GST_LOG_OBJECT (pad, "Looking at essence track body_sid:%d index_sid:%d",
|
||||
track->body_sid, track->index_sid);
|
||||
if (clip->source_track_id == 0 || (track->track_id == clip->source_track_id
|
||||
&& mxf_umid_is_equal (&clip->source_package_id,
|
||||
@@ -4903,8 +4889,7 @@ gst_mxf_demux_seek_push (GstMXFDemux * demux, GstEvent * event)
|
||||
}
|
||||
|
||||
for (i = 0; i < demux->essence_tracks->len; i++) {
|
||||
- GstMXFDemuxEssenceTrack *t =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
|
||||
+ GstMXFDemuxEssenceTrack *t = g_ptr_array_index (demux->essence_tracks, i);
|
||||
t->position = -1;
|
||||
}
|
||||
|
||||
@@ -5342,8 +5327,7 @@ gst_mxf_demux_seek_pull (GstMXFDemux * demux, GstEvent * event)
|
||||
}
|
||||
|
||||
for (i = 0; i < demux->essence_tracks->len; i++) {
|
||||
- GstMXFDemuxEssenceTrack *t =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
|
||||
+ GstMXFDemuxEssenceTrack *t = g_ptr_array_index (demux->essence_tracks, i);
|
||||
t->position = -1;
|
||||
}
|
||||
|
||||
@@ -5642,7 +5626,7 @@ gst_mxf_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
|
||||
|
||||
for (i = 0; i < demux->essence_tracks->len; i++) {
|
||||
GstMXFDemuxEssenceTrack *t =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack, i);
|
||||
+ g_ptr_array_index (demux->essence_tracks, i);
|
||||
|
||||
if (t->position > 0)
|
||||
t->duration = t->position;
|
||||
@@ -5683,8 +5667,7 @@ gst_mxf_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
|
||||
|
||||
for (i = 0; i < demux->essence_tracks->len; i++) {
|
||||
GstMXFDemuxEssenceTrack *etrack =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack,
|
||||
- i);
|
||||
+ g_ptr_array_index (demux->essence_tracks, i);
|
||||
etrack->position = -1;
|
||||
}
|
||||
ret = TRUE;
|
||||
@@ -5708,8 +5691,7 @@ gst_mxf_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
|
||||
|
||||
for (i = 0; i < demux->essence_tracks->len; i++) {
|
||||
GstMXFDemuxEssenceTrack *t =
|
||||
- &g_array_index (demux->essence_tracks, GstMXFDemuxEssenceTrack,
|
||||
- i);
|
||||
+ g_ptr_array_index (demux->essence_tracks, i);
|
||||
t->position = -1;
|
||||
}
|
||||
demux->current_partition = NULL;
|
||||
@@ -5982,7 +5964,7 @@ gst_mxf_demux_finalize (GObject * object)
|
||||
|
||||
g_ptr_array_free (demux->src, TRUE);
|
||||
demux->src = NULL;
|
||||
- g_array_free (demux->essence_tracks, TRUE);
|
||||
+ g_ptr_array_free (demux->essence_tracks, TRUE);
|
||||
demux->essence_tracks = NULL;
|
||||
|
||||
g_hash_table_destroy (demux->metadata);
|
||||
@@ -6059,8 +6041,8 @@ gst_mxf_demux_init (GstMXFDemux * demux)
|
||||
g_rw_lock_init (&demux->metadata_lock);
|
||||
|
||||
demux->src = g_ptr_array_new ();
|
||||
- demux->essence_tracks =
|
||||
- g_array_new (FALSE, FALSE, sizeof (GstMXFDemuxEssenceTrack));
|
||||
+ demux->essence_tracks = g_ptr_array_new_with_free_func ((GDestroyNotify)
|
||||
+ gst_mxf_demux_essence_track_free);
|
||||
|
||||
gst_segment_init (&demux->segment, GST_FORMAT_TIME);
|
||||
|
||||
diff --git a/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.h b/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.h
|
||||
index d079a1de1a..1dc8a4edb5 100644
|
||||
--- a/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.h
|
||||
+++ b/subprojects/gst-plugins-bad/gst/mxf/mxfdemux.h
|
||||
@@ -266,7 +266,7 @@ struct _GstMXFDemux
|
||||
GList *partitions;
|
||||
GstMXFDemuxPartition *current_partition;
|
||||
|
||||
- GArray *essence_tracks;
|
||||
+ GPtrArray *essence_tracks;
|
||||
|
||||
GList *pending_index_table_segments;
|
||||
GList *index_tables; /* one per BodySID / IndexSID */
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -0,0 +1,239 @@
|
||||
From 3abf31c7cf5b38dc4425b79d30c8f582d325010b Mon Sep 17 00:00:00 2001
|
||||
From: Wim Taymans <wtaymans@redhat.com>
|
||||
Date: Wed, 31 Mar 2021 16:18:04 +0200
|
||||
Subject: [PATCH] vulkan: provide a custom VK_DEFINE_NON_DISPATCHABLE_HANDLE
|
||||
|
||||
If the application did not define one yet, define our own
|
||||
VK_DEFINE_NON_DISPATCHABLE_HANDLE that is independent of the
|
||||
architecture.
|
||||
|
||||
Vulkan, by default, provides a define that depends on the architecture,
|
||||
which causes the symbol type to be different. This causes an
|
||||
architecture dependent .gir file, which then causes multilib
|
||||
installation problems because the .gir files can't be shared.
|
||||
|
||||
Make it possible to override the format specifier and provide
|
||||
a default one that is compatible with the default non dispatchable
|
||||
handle.
|
||||
|
||||
Return VK_NULL_HANDLE from functions that return a non-dispatchable
|
||||
handle.
|
||||
|
||||
Fixes #1566
|
||||
|
||||
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2130>
|
||||
---
|
||||
.../gst/vulkan/android/gstvkwindow_android.c | 4 ++--
|
||||
gst-libs/gst/vulkan/cocoa/gstvkwindow_cocoa.m | 4 ++--
|
||||
gst-libs/gst/vulkan/gstvkapi.h | 18 ++++++++++++++++++
|
||||
gst-libs/gst/vulkan/gstvkhandle.h | 7 ++++---
|
||||
gst-libs/gst/vulkan/ios/gstvkwindow_ios.m | 6 +++---
|
||||
.../gst/vulkan/wayland/gstvkwindow_wayland.c | 4 ++--
|
||||
gst-libs/gst/vulkan/win32/gstvkwindow_win32.c | 4 ++--
|
||||
gst-libs/gst/vulkan/xcb/gstvkwindow_xcb.c | 4 ++--
|
||||
sys/applemedia/videotexturecache-vulkan.mm | 4 ++--
|
||||
9 files changed, 37 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/gst-libs/gst/vulkan/android/gstvkwindow_android.c b/gst-libs/gst/vulkan/android/gstvkwindow_android.c
|
||||
index c1bd866ac..20a1c9cbe 100644
|
||||
--- a/gst-libs/gst/vulkan/android/gstvkwindow_android.c
|
||||
+++ b/gst-libs/gst/vulkan/android/gstvkwindow_android.c
|
||||
@@ -163,14 +163,14 @@ gst_vulkan_window_android_get_surface (GstVulkanWindow * window,
|
||||
if (!window_android->CreateAndroidSurface) {
|
||||
g_set_error_literal (error, GST_VULKAN_ERROR, VK_ERROR_FEATURE_NOT_PRESENT,
|
||||
"Could not retrieve \"vkCreateAndroidSurfaceKHR\" function pointer");
|
||||
- return 0;
|
||||
+ return VK_NULL_HANDLE;
|
||||
}
|
||||
|
||||
err =
|
||||
window_android->CreateAndroidSurface (window->display->instance->instance,
|
||||
&info, NULL, &ret);
|
||||
if (gst_vulkan_error_to_g_error (err, error, "vkCreateAndroidSurfaceKHR") < 0)
|
||||
- return 0;
|
||||
+ return VK_NULL_HANDLE;
|
||||
|
||||
return ret;
|
||||
}
|
||||
diff --git a/gst-libs/gst/vulkan/cocoa/gstvkwindow_cocoa.m b/gst-libs/gst/vulkan/cocoa/gstvkwindow_cocoa.m
|
||||
index f00726267..e95da1278 100644
|
||||
--- a/gst-libs/gst/vulkan/cocoa/gstvkwindow_cocoa.m
|
||||
+++ b/gst-libs/gst/vulkan/cocoa/gstvkwindow_cocoa.m
|
||||
@@ -226,14 +226,14 @@ gst_vulkan_window_cocoa_get_surface (GstVulkanWindow * window, GError ** error)
|
||||
if (!window_cocoa->CreateMacOSSurface) {
|
||||
g_set_error_literal (error, GST_VULKAN_ERROR, VK_ERROR_FEATURE_NOT_PRESENT,
|
||||
"Could not retrieve \"vkCreateMacOSSurfaceMVK\" function pointer");
|
||||
- return NULL;
|
||||
+ return VK_NULL_HANDLE;
|
||||
}
|
||||
|
||||
err =
|
||||
window_cocoa->CreateMacOSSurface (window->display->instance->instance, &info,
|
||||
NULL, &ret);
|
||||
if (gst_vulkan_error_to_g_error (err, error, "vkCreateMacOSSurfaceMVK") < 0)
|
||||
- return NULL;
|
||||
+ return VK_NULL_HANDLE;
|
||||
|
||||
return ret;
|
||||
}
|
||||
diff --git a/gst-libs/gst/vulkan/gstvkapi.h b/gst-libs/gst/vulkan/gstvkapi.h
|
||||
index 9d223201f..5889a7d2e 100644
|
||||
--- a/gst-libs/gst/vulkan/gstvkapi.h
|
||||
+++ b/gst-libs/gst/vulkan/gstvkapi.h
|
||||
@@ -31,6 +31,24 @@
|
||||
#include <gst/vulkan/vulkan_fwd.h>
|
||||
#include <gst/vulkan/vulkan-enumtypes.h>
|
||||
|
||||
+/**
|
||||
+ * VK_DEFINE_NON_DISPATCHABLE_HANDLE:
|
||||
+ *
|
||||
+ * Allow applications to override the VK_DEFINE_NON_DISPATCHABLE_HANDLE
|
||||
+ * but provide our own version otherwise. The default vulkan define
|
||||
+ * provides a different symbol type depending on the architecture and
|
||||
+ * this causes multilib problems because the generated .gir files are
|
||||
+ * different.
|
||||
+ *
|
||||
+ * Also make sure to provide a suitable GST_VULKAN_NON_DISPATCHABLE_HANDLE_FORMAT
|
||||
+ * implementation when redefining VK_DEFINE_NON_DISPATCHABLE_HANDLE.
|
||||
+ *
|
||||
+ * Since: 1.20
|
||||
+ */
|
||||
+#if !defined(VK_DEFINE_NON_DISPATCHABLE_HANDLE)
|
||||
+#define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object;
|
||||
+#endif
|
||||
+
|
||||
#include <vulkan/vulkan_core.h>
|
||||
|
||||
#endif /* __GST_VULKAN_API_H__ */
|
||||
diff --git a/gst-libs/gst/vulkan/gstvkhandle.h b/gst-libs/gst/vulkan/gstvkhandle.h
|
||||
index 885b4bc71..2aa6f01f7 100644
|
||||
--- a/gst-libs/gst/vulkan/gstvkhandle.h
|
||||
+++ b/gst-libs/gst/vulkan/gstvkhandle.h
|
||||
@@ -54,11 +54,12 @@ VK_DEFINE_NON_DISPATCHABLE_HANDLE(GstVulkanHandleTypedef)
|
||||
*
|
||||
* The printf format specifier for raw Vulkan non dispatchable handles.
|
||||
*
|
||||
+ * When redefining VK_DEFINE_NON_DISPATCHABLE_HANDLE, also make sure
|
||||
+ * to redefine a suitable printf format specifier.
|
||||
+ *
|
||||
* Since: 1.18
|
||||
*/
|
||||
-#if GLIB_SIZEOF_VOID_P == 8
|
||||
-# define GST_VULKAN_NON_DISPATCHABLE_HANDLE_FORMAT "p"
|
||||
-#else
|
||||
+#if !defined(GST_VULKAN_NON_DISPATCHABLE_HANDLE_FORMAT)
|
||||
# define GST_VULKAN_NON_DISPATCHABLE_HANDLE_FORMAT G_GUINT64_FORMAT
|
||||
#endif
|
||||
|
||||
diff --git a/gst-libs/gst/vulkan/ios/gstvkwindow_ios.m b/gst-libs/gst/vulkan/ios/gstvkwindow_ios.m
|
||||
index 84fc33deb..3bc8e167d 100644
|
||||
--- a/gst-libs/gst/vulkan/ios/gstvkwindow_ios.m
|
||||
+++ b/gst-libs/gst/vulkan/ios/gstvkwindow_ios.m
|
||||
@@ -203,7 +203,7 @@ gst_vulkan_window_ios_get_surface (GstVulkanWindow * window, GError ** error)
|
||||
g_set_error_literal (error, GST_VULKAN_ERROR,
|
||||
VK_ERROR_INITIALIZATION_FAILED,
|
||||
"No layer to retrieve surface for. Has create_window() been called?");
|
||||
- return 0;
|
||||
+ return VK_NULL_HANDLE;
|
||||
}
|
||||
|
||||
info.sType = VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK;
|
||||
@@ -218,14 +218,14 @@ gst_vulkan_window_ios_get_surface (GstVulkanWindow * window, GError ** error)
|
||||
if (!window_ios->CreateIOSSurface) {
|
||||
g_set_error_literal (error, GST_VULKAN_ERROR, VK_ERROR_FEATURE_NOT_PRESENT,
|
||||
"Could not retrieve \"vkCreateIOSSurfaceMVK\" function pointer");
|
||||
- return 0;
|
||||
+ return VK_NULL_HANDLE;
|
||||
}
|
||||
|
||||
err =
|
||||
window_ios->CreateIOSSurface (window->display->instance->instance, &info,
|
||||
NULL, &ret);
|
||||
if (gst_vulkan_error_to_g_error (err, error, "vkCreateIOSSurfaceMVK") < 0)
|
||||
- return 0;
|
||||
+ return VK_NULL_HANDLE;
|
||||
|
||||
return ret;
|
||||
}
|
||||
diff --git a/gst-libs/gst/vulkan/wayland/gstvkwindow_wayland.c b/gst-libs/gst/vulkan/wayland/gstvkwindow_wayland.c
|
||||
index eda063de9..c55bd3f8c 100644
|
||||
--- a/gst-libs/gst/vulkan/wayland/gstvkwindow_wayland.c
|
||||
+++ b/gst-libs/gst/vulkan/wayland/gstvkwindow_wayland.c
|
||||
@@ -268,14 +268,14 @@ gst_vulkan_window_wayland_get_surface (GstVulkanWindow * window,
|
||||
if (!window_wl->CreateWaylandSurface) {
|
||||
g_set_error_literal (error, GST_VULKAN_ERROR, VK_ERROR_FEATURE_NOT_PRESENT,
|
||||
"Could not retrieve \"vkCreateWaylandSurfaceKHR\" function pointer");
|
||||
- return NULL;
|
||||
+ return VK_NULL_HANDLE;
|
||||
}
|
||||
|
||||
err =
|
||||
window_wl->CreateWaylandSurface (window->display->instance->instance,
|
||||
&info, NULL, &ret);
|
||||
if (gst_vulkan_error_to_g_error (err, error, "vkCreateWaylandSurfaceKHR") < 0)
|
||||
- return NULL;
|
||||
+ return VK_NULL_HANDLE;
|
||||
|
||||
return ret;
|
||||
}
|
||||
diff --git a/gst-libs/gst/vulkan/win32/gstvkwindow_win32.c b/gst-libs/gst/vulkan/win32/gstvkwindow_win32.c
|
||||
index 57e2c663f..dd8767155 100644
|
||||
--- a/gst-libs/gst/vulkan/win32/gstvkwindow_win32.c
|
||||
+++ b/gst-libs/gst/vulkan/win32/gstvkwindow_win32.c
|
||||
@@ -393,7 +393,7 @@ gst_vulkan_window_win32_get_surface (GstVulkanWindow * window, GError ** error)
|
||||
if (!window_win32->CreateWin32Surface) {
|
||||
g_set_error_literal (error, GST_VULKAN_ERROR, VK_ERROR_FEATURE_NOT_PRESENT,
|
||||
"Could not retrieve \"vkCreateWin32SurfaceKHR\" function pointer");
|
||||
- return NULL;
|
||||
+ return VK_NULL_HANDLE;
|
||||
}
|
||||
|
||||
err =
|
||||
@@ -401,7 +401,7 @@ gst_vulkan_window_win32_get_surface (GstVulkanWindow * window, GError ** error)
|
||||
&info, NULL, &ret);
|
||||
|
||||
if (gst_vulkan_error_to_g_error (err, error, "vkCreateWin32SurfaceKHR") < 0)
|
||||
- return NULL;
|
||||
+ return VK_NULL_HANDLE;
|
||||
|
||||
return ret;
|
||||
}
|
||||
diff --git a/gst-libs/gst/vulkan/xcb/gstvkwindow_xcb.c b/gst-libs/gst/vulkan/xcb/gstvkwindow_xcb.c
|
||||
index b0f1ab4d0..4021fe718 100644
|
||||
--- a/gst-libs/gst/vulkan/xcb/gstvkwindow_xcb.c
|
||||
+++ b/gst-libs/gst/vulkan/xcb/gstvkwindow_xcb.c
|
||||
@@ -283,14 +283,14 @@ gst_vulkan_window_xcb_get_surface (GstVulkanWindow * window, GError ** error)
|
||||
if (!window_xcb->CreateXcbSurface) {
|
||||
g_set_error_literal (error, GST_VULKAN_ERROR, VK_ERROR_FEATURE_NOT_PRESENT,
|
||||
"Could not retrieve \"vkCreateXcbSurfaceKHR\" function pointer");
|
||||
- return NULL;
|
||||
+ return VK_NULL_HANDLE;
|
||||
}
|
||||
|
||||
err =
|
||||
window_xcb->CreateXcbSurface (window->display->instance->instance, &info,
|
||||
NULL, &ret);
|
||||
if (gst_vulkan_error_to_g_error (err, error, "vkCreateXcbSurfaceKHR") < 0)
|
||||
- return NULL;
|
||||
+ return VK_NULL_HANDLE;
|
||||
|
||||
return ret;
|
||||
}
|
||||
diff --git a/sys/applemedia/videotexturecache-vulkan.mm b/sys/applemedia/videotexturecache-vulkan.mm
|
||||
index ac0c1e712..6ea77d276 100644
|
||||
--- a/sys/applemedia/videotexturecache-vulkan.mm
|
||||
+++ b/sys/applemedia/videotexturecache-vulkan.mm
|
||||
@@ -292,8 +292,8 @@ gst_io_surface_vulkan_memory_set_surface (GstIOSurfaceVulkanMemory * memory,
|
||||
texture_data->texture = (__bridge_retained gpointer) texture;
|
||||
|
||||
VkResult err = vkSetMTLTextureMVK (memory->vulkan_mem.image, texture);
|
||||
- GST_DEBUG ("bound texture %p to image %p: 0x%x", texture, memory->vulkan_mem.image,
|
||||
- err);
|
||||
+ GST_DEBUG ("bound texture %p to image %"GST_VULKAN_NON_DISPATCHABLE_HANDLE_FORMAT": 0x%x",
|
||||
+ texture, memory->vulkan_mem.image, err);
|
||||
|
||||
vk_mem->user_data = texture_data;
|
||||
vk_mem->notify = (GDestroyNotify) free_texture_wrapper;
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
From 73f1409447033b8e3291a51893d5a027e2be15fc Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Gaignard <benjamin.gaignard@collabora.com>
|
||||
Date: Tue, 21 Nov 2023 14:26:54 +0100
|
||||
Subject: [PATCH 2/2] codecparsers: av1: Clip max tile rows and cols values
|
||||
|
||||
Clip tile rows and cols to 64 as describe in AV1 specification
|
||||
to avoid writing outside array range but preserve sb_cols
|
||||
and sb_rows value which are used to futher computation.
|
||||
|
||||
Fixes ZDI-CAN-22226 / CVE-2023-44429
|
||||
|
||||
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5734>
|
||||
---
|
||||
.../gst-libs/gst/codecparsers/gstav1parser.c | 14 ++++++++++----
|
||||
1 file changed, 10 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstav1parser.c b/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstav1parser.c
|
||||
index 22ffefd168..7ef583c7f5 100644
|
||||
--- a/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstav1parser.c
|
||||
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/codecparsers/gstav1parser.c
|
||||
@@ -2243,7 +2243,9 @@ gst_av1_parse_tile_info (GstAV1Parser * parser, GstBitReader * br,
|
||||
tile_width_sb = (sb_cols + (1 << parser->state.tile_cols_log2) -
|
||||
1) >> parser->state.tile_cols_log2;
|
||||
i = 0;
|
||||
- for (start_sb = 0; start_sb < sb_cols; start_sb += tile_width_sb) {
|
||||
+ /* Fill mi_col_starts[] and make sure to not exceed array range */
|
||||
+ for (start_sb = 0; start_sb < sb_cols && i < GST_AV1_MAX_TILE_COLS;
|
||||
+ start_sb += tile_width_sb) {
|
||||
parser->state.mi_col_starts[i] = start_sb << sb_shift;
|
||||
i += 1;
|
||||
}
|
||||
@@ -2272,7 +2274,9 @@ gst_av1_parse_tile_info (GstAV1Parser * parser, GstBitReader * br,
|
||||
tile_height_sb = (sb_rows + (1 << parser->state.tile_rows_log2) -
|
||||
1) >> parser->state.tile_rows_log2;
|
||||
i = 0;
|
||||
- for (start_sb = 0; start_sb < sb_rows; start_sb += tile_height_sb) {
|
||||
+ /* Fill mi_row_starts[] and make sure to not exceed array range */
|
||||
+ for (start_sb = 0; start_sb < sb_rows && i < GST_AV1_MAX_TILE_ROWS;
|
||||
+ start_sb += tile_height_sb) {
|
||||
parser->state.mi_row_starts[i] = start_sb << sb_shift;
|
||||
i += 1;
|
||||
}
|
||||
@@ -2287,7 +2291,8 @@ gst_av1_parse_tile_info (GstAV1Parser * parser, GstBitReader * br,
|
||||
} else {
|
||||
widest_tile_sb = 0;
|
||||
start_sb = 0;
|
||||
- for (i = 0; start_sb < sb_cols; i++) {
|
||||
+ /* Fill mi_col_starts[] and make sure to not exceed array range */
|
||||
+ for (i = 0; start_sb < sb_cols && i < GST_AV1_MAX_TILE_COLS; i++) {
|
||||
parser->state.mi_col_starts[i] = start_sb << sb_shift;
|
||||
max_width = MIN (sb_cols - start_sb, max_tile_width_sb);
|
||||
tile_info->width_in_sbs_minus_1[i] =
|
||||
@@ -2312,7 +2317,8 @@ gst_av1_parse_tile_info (GstAV1Parser * parser, GstBitReader * br,
|
||||
max_tile_height_sb = MAX (max_tile_area_sb / widest_tile_sb, 1);
|
||||
|
||||
start_sb = 0;
|
||||
- for (i = 0; start_sb < sb_rows; i++) {
|
||||
+ /* Fill mi_row_starts[] and make sure to not exceed array range */
|
||||
+ for (i = 0; start_sb < sb_rows && i < GST_AV1_MAX_TILE_ROWS; i++) {
|
||||
parser->state.mi_row_starts[i] = start_sb << sb_shift;
|
||||
max_height = MIN (sb_rows - start_sb, max_tile_height_sb);
|
||||
tile_info->height_in_sbs_minus_1[i] =
|
||||
--
|
||||
2.43.0
|
||||
|
||||
Loading…
Reference in new issue