Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[gst] Update and rebase on 1.16.1. Meson build. MER#2068
Switched to SailfishOS mirror git repo
  • Loading branch information
Andrew Branson authored and abranson committed Nov 14, 2019
1 parent 191fdc2 commit a5c8560
Show file tree
Hide file tree
Showing 6 changed files with 108 additions and 240 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
@@ -1,3 +1,3 @@
[submodule "gst-plugins-base"]
path = gst-plugins-base
url = git://anongit.freedesktop.org/gstreamer/gst-plugins-base
url = https://git.sailfishos.org/mirror/gst-plugins-base.git
2 changes: 1 addition & 1 deletion gst-plugins-base
Submodule gst-plugins-base updated from 384ff7 to a88627
61 changes: 31 additions & 30 deletions rpm/0000-Move-encodebin-sources-to-encodebasebin.patch
@@ -1,11 +1,12 @@
From 8706694de2fcc678cdd9ee0b95e044b0ea70bd80 Wed, 17 Apr 2019 15:11:35 +0200
From 026b7f8328a3cf1c4e05f3f1a9520df151c9187a Fri, 3 May 2019 09:06:44 +0200
From: Andrew Branson <andrew.branson@jollamobile.com>
Date: Wed, 17 Apr 2019 14:35:38 +0200
Date: Fri, 3 May 2019 08:47:51 +0200
Subject: [PATCH] Move encodebin sources to encodebasebin


diff --git a/gst/encoding/gstencodebasebin.c b/gst/encoding/gstencodebasebin.c
new file mode 100644
index 0000000..573ea94
index 0000000..6f8cc5e
--- /dev/null
+++ b/gst/encoding/gstencodebasebin.c
@@ -0,0 +1,2351 @@
Expand Down Expand Up @@ -1089,7 +1090,7 @@ index 0000000..573ea94
+ sinkcaps);
+ g_assert (srctempl != NULL);
+ sinktempl = gst_element_get_compatible_pad_template (ebin->muxer, srctempl);
+ g_object_unref (srctempl);
+ gst_object_unref (srctempl);
+ }
+
+ if (G_UNLIKELY (sinktempl == NULL))
Expand Down Expand Up @@ -1141,7 +1142,7 @@ index 0000000..573ea94
+
+ structure = gst_caps_get_structure (caps, 0);
+ gst_structure_remove_field (structure, "streamheader");
+ GST_DEBUG_OBJECT (pad, "Forcing caps to %" GST_PTR_FORMAT, caps);
+ GST_INFO_OBJECT (pad, "Forcing caps to %" GST_PTR_FORMAT, caps);
+ g_object_set (GST_OBJECT_PARENT (pad), "caps", caps, NULL);
+ g_signal_handler_disconnect (pad, *signal_id);
+ *signal_id = 0;
Expand Down Expand Up @@ -1179,8 +1180,8 @@ index 0000000..573ea94
+ /* missing plugin support */
+ gst_element_post_message (GST_ELEMENT_CAST (ebin),
+ gst_missing_encoder_message_new (GST_ELEMENT_CAST (ebin), format));
+ GST_ELEMENT_ERROR (ebin, CORE, MISSING_PLUGIN, (NULL),
+ ("Couldn't create encoder for format %" GST_PTR_FORMAT, format));
+ GST_ELEMENT_ERROR (ebin, CORE, MISSING_PLUGIN,
+ ("Couldn't create encoder for format %" GST_PTR_FORMAT, format), (NULL));
+
+ gst_caps_unref (format);
+}
Expand Down Expand Up @@ -1394,7 +1395,7 @@ index 0000000..573ea94
+ sinkpad = gst_element_get_static_pad (sgroup->smartencoder, "sink");
+ }
+ gst_caps_unref (tmpcaps);
+ g_object_unref (srcpad);
+ gst_object_unref (srcpad);
+ }
+
+ srcpad =
Expand All @@ -1406,8 +1407,8 @@ index 0000000..573ea94
+ /* Go straight to splitter */
+ if (G_UNLIKELY (fast_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK))
+ goto passthrough_link_failure;
+ g_object_unref (sinkpad);
+ g_object_unref (srcpad);
+ gst_object_unref (sinkpad);
+ gst_object_unref (srcpad);
+ srcpad = NULL;
+
+ /* Path 2 : Conversion / Encoding */
Expand All @@ -1427,8 +1428,8 @@ index 0000000..573ea94
+ srcpad = gst_element_get_static_pad (sgroup->encoder, "src");
+ if (G_UNLIKELY (fast_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK))
+ goto encoder_link_failure;
+ g_object_unref (sinkpad);
+ g_object_unref (srcpad);
+ gst_object_unref (sinkpad);
+ gst_object_unref (srcpad);
+ srcpad = NULL;
+ } else if (gst_encoding_profile_get_preset (sgroup->profile)
+ || gst_encoding_profile_get_preset_name (sgroup->profile)) {
Expand Down Expand Up @@ -1600,8 +1601,8 @@ index 0000000..573ea94
+ goto no_splitter_srcpad;
+ if (G_UNLIKELY (fast_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK))
+ goto splitter_encoding_failure;
+ g_object_unref (sinkpad);
+ g_object_unref (srcpad);
+ gst_object_unref (sinkpad);
+ gst_object_unref (srcpad);
+ srcpad = NULL;
+
+ /* End of Stream 2 setup */
Expand Down Expand Up @@ -1984,8 +1985,8 @@ index 0000000..573ea94
+ /* missing plugin support */
+ gst_element_post_message (GST_ELEMENT_CAST (ebin),
+ gst_missing_encoder_message_new (GST_ELEMENT_CAST (ebin), format));
+ GST_ELEMENT_ERROR (ebin, CORE, MISSING_PLUGIN, (NULL),
+ ("No available muxer for format %" GST_PTR_FORMAT, format));
+ GST_ELEMENT_ERROR (ebin, CORE, MISSING_PLUGIN,
+ ("No available muxer for format %" GST_PTR_FORMAT, format), (NULL));
+ if (format)
+ gst_caps_unref (format);
+ return FALSE;
Expand Down Expand Up @@ -2406,7 +2407,7 @@ index 0000000..021e690
+#endif /* __GST_ENCODEBIN_H__ */
diff --git a/gst/encoding/gstencodebin.c b/gst/encoding/gstencodebin.c
deleted file mode 100644
index 573ea94..0000000
index 6f8cc5e..0000000
--- a/gst/encoding/gstencodebin.c
+++ /dev/null
@@ -1,2351 +0,0 @@
Expand Down Expand Up @@ -3490,7 +3491,7 @@ index 573ea94..0000000
- sinkcaps);
- g_assert (srctempl != NULL);
- sinktempl = gst_element_get_compatible_pad_template (ebin->muxer, srctempl);
- g_object_unref (srctempl);
- gst_object_unref (srctempl);
- }
-
- if (G_UNLIKELY (sinktempl == NULL))
Expand Down Expand Up @@ -3542,7 +3543,7 @@ index 573ea94..0000000
-
- structure = gst_caps_get_structure (caps, 0);
- gst_structure_remove_field (structure, "streamheader");
- GST_DEBUG_OBJECT (pad, "Forcing caps to %" GST_PTR_FORMAT, caps);
- GST_INFO_OBJECT (pad, "Forcing caps to %" GST_PTR_FORMAT, caps);
- g_object_set (GST_OBJECT_PARENT (pad), "caps", caps, NULL);
- g_signal_handler_disconnect (pad, *signal_id);
- *signal_id = 0;
Expand Down Expand Up @@ -3580,8 +3581,8 @@ index 573ea94..0000000
- /* missing plugin support */
- gst_element_post_message (GST_ELEMENT_CAST (ebin),
- gst_missing_encoder_message_new (GST_ELEMENT_CAST (ebin), format));
- GST_ELEMENT_ERROR (ebin, CORE, MISSING_PLUGIN, (NULL),
- ("Couldn't create encoder for format %" GST_PTR_FORMAT, format));
- GST_ELEMENT_ERROR (ebin, CORE, MISSING_PLUGIN,
- ("Couldn't create encoder for format %" GST_PTR_FORMAT, format), (NULL));
-
- gst_caps_unref (format);
-}
Expand Down Expand Up @@ -3795,7 +3796,7 @@ index 573ea94..0000000
- sinkpad = gst_element_get_static_pad (sgroup->smartencoder, "sink");
- }
- gst_caps_unref (tmpcaps);
- g_object_unref (srcpad);
- gst_object_unref (srcpad);
- }
-
- srcpad =
Expand All @@ -3807,8 +3808,8 @@ index 573ea94..0000000
- /* Go straight to splitter */
- if (G_UNLIKELY (fast_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK))
- goto passthrough_link_failure;
- g_object_unref (sinkpad);
- g_object_unref (srcpad);
- gst_object_unref (sinkpad);
- gst_object_unref (srcpad);
- srcpad = NULL;
-
- /* Path 2 : Conversion / Encoding */
Expand All @@ -3828,8 +3829,8 @@ index 573ea94..0000000
- srcpad = gst_element_get_static_pad (sgroup->encoder, "src");
- if (G_UNLIKELY (fast_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK))
- goto encoder_link_failure;
- g_object_unref (sinkpad);
- g_object_unref (srcpad);
- gst_object_unref (sinkpad);
- gst_object_unref (srcpad);
- srcpad = NULL;
- } else if (gst_encoding_profile_get_preset (sgroup->profile)
- || gst_encoding_profile_get_preset_name (sgroup->profile)) {
Expand Down Expand Up @@ -4001,8 +4002,8 @@ index 573ea94..0000000
- goto no_splitter_srcpad;
- if (G_UNLIKELY (fast_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK))
- goto splitter_encoding_failure;
- g_object_unref (sinkpad);
- g_object_unref (srcpad);
- gst_object_unref (sinkpad);
- gst_object_unref (srcpad);
- srcpad = NULL;
-
- /* End of Stream 2 setup */
Expand Down Expand Up @@ -4385,8 +4386,8 @@ index 573ea94..0000000
- /* missing plugin support */
- gst_element_post_message (GST_ELEMENT_CAST (ebin),
- gst_missing_encoder_message_new (GST_ELEMENT_CAST (ebin), format));
- GST_ELEMENT_ERROR (ebin, CORE, MISSING_PLUGIN, (NULL),
- ("No available muxer for format %" GST_PTR_FORMAT, format));
- GST_ELEMENT_ERROR (ebin, CORE, MISSING_PLUGIN,
- ("No available muxer for format %" GST_PTR_FORMAT, format), (NULL));
- if (format)
- gst_caps_unref (format);
- return FALSE;
Expand Down
6 changes: 3 additions & 3 deletions rpm/0002-splitencodebin-Add-new-element.patch
Expand Up @@ -36,7 +36,7 @@ index 7100749..95ff04d 100644
gststreamsplitter.h \
gstsmartencoder.h \
diff --git a/gst/encoding/gstencodebasebin.c b/gst/encoding/gstencodebasebin.c
index 184ebf7..4c6a7be 100644
index 2154d64..60fcbf4 100644
--- a/gst/encoding/gstencodebasebin.c
+++ b/gst/encoding/gstencodebasebin.c
@@ -918,14 +918,71 @@
Expand Down Expand Up @@ -125,7 +125,7 @@ index 184ebf7..4c6a7be 100644
sinkcaps);
g_assert (srctempl != NULL);
- sinktempl = gst_element_get_compatible_pad_template (ebin->muxer, srctempl);
- g_object_unref (srctempl);
- gst_object_unref (srctempl);
}

- if (G_UNLIKELY (sinktempl == NULL))
Expand Down Expand Up @@ -470,7 +470,7 @@ index 0000000..2b35feb
+
+#endif /* __GST_SPLITENCODEBIN_H__ */
diff --git a/gst/encoding/meson.build b/gst/encoding/meson.build
index 3e34018..932e728 100644
index aef4607..9380ef6 100644
--- a/gst/encoding/meson.build
+++ b/gst/encoding/meson.build
@@ -1,5 +1,6 @@
Expand Down
19 changes: 19 additions & 0 deletions rpm/0003-neon-Define-missing-type.patch
@@ -0,0 +1,19 @@
From 62b985a38b6d56d2d57afa2d4056bb8652b6c993 Fri, 4 Oct 2019 17:27:49 +0200
From: Andrew Branson <andrew.branson@jollamobile.com>
Date: Fri, 4 Oct 2019 17:26:12 +0200
Subject: [PATCH] [neon] Define missing type


This is a temporary patch, which should get fixed with a compiler upgrade.
diff --git a/gst-libs/gst/audio/audio-resampler-neon.h b/gst-libs/gst/audio/audio-resampler-neon.h
index 5a77d45..e78a0cb 100644
--- a/gst-libs/gst/audio/audio-resampler-neon.h
+++ b/gst-libs/gst/audio/audio-resampler-neon.h
@@ -16,6 +16,7 @@
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
+typedef unsigned long uint32_t;

static inline void
inner_product_gint16_full_1_neon (gint16 * o, const gint16 * a,

0 comments on commit a5c8560

Please sign in to comment.