Skip to content
Snippets Groups Projects
Verified Commit 73201383 authored by Jan Alexander Steffens (heftig)'s avatar Jan Alexander Steffens (heftig)
Browse files

1.26.0-1

parent b36e80fb
No related branches found
No related tags found
No related merge requests found
pkgbase = gstreamer
pkgdesc = Multimedia graph framework
pkgver = 1.24.12
pkgrel = 4
pkgver = 1.26.0
pkgrel = 1
url = https://gstreamer.freedesktop.org/
arch = x86_64
license = LGPL-2.1-or-later
......@@ -172,19 +172,17 @@ pkgbase = gstreamer
makedepends = zlib
makedepends = zvbi
makedepends = zxing-cpp
source = git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=1.24.12
source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.12.tar.xz
source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.12.tar.xz.asc
source = git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=1.26.0
source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.26.0.tar.xz
source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.26.0.tar.xz.asc
source = 0001-HACK-meson-Disable-broken-tests.patch
source = 0002-x265enc-Unbreak-build-with-x265-4.0.patch
source = 0003-svtav1enc-update-to-use-SVT-AV1-3.0.0-API-changes.patch
validpgpkeys = D637032E45B8C6585B9456565D2EEE6F6F349D7C
b2sums = e11c560e33db0292075a8c3043eef959c6b68c2c54e55a62d41acbfce544b198ff0a948682ff2e9d90ec2773674e614378399b1411588eae7757176ce157dd4e
b2sums = 21a0c3fd42af3870efb38fdd595298d0596d8c90801dc27bd693aaa8436e7f2e2cffd2019dba6188f89cafda1ac3e42958f152e945a9102020bd55f1f66ccfb7
b2sums = 8c90fe57ae67c5097cf427bca73cb687bc5087256444ec9227f4a294b2889d2042643ed4230414c151ecbae8490984e2b8c52cfea494e4f10f79866a26326029
b2sums = 5ee163d6f0dd14457740cbc2e131bdc3499517b0c6d57153a6ff3ef5af4ab2f5502e3131c7045f1d0829d0f6d5d1ed599b803d7396155e34a3ad99c0f2f3974a
b2sums = SKIP
b2sums = 693a30c7af517ee8c149ec58214e3ac891ff82c9f1bddcbd34949854deb46207a995ff123848a7121f64b41aed8ae4ffada1329bb5c987a542710466770a2935
b2sums = 6b4e34286318ca591077779e713ec9a94cb2e5b73a9dd6df35afdefcc709c0f9d1ee4cae6c99d2bbf2e075eda03e94cacb57bfc202fdb8c263b4b0d335541b23
b2sums = 94250c1317ce1e3444c2e0effc190ab544eca21c177e43143c3f3a8690c541cbe068604c6ff6401072a6b09f54683eac03128c918a2a16c7013622c24da11348
b2sums = 97189387749cbcbf66bb378c49dea3bedd2bbd9c181c489f466e61e8d3981d99d578e38e7bc8303d941180ed96bbeefeb01782a6068b89d7030a2234cdd1bdb5
pkgname = gstreamer
pkgdesc = Multimedia graph framework - core
......@@ -199,8 +197,8 @@ pkgname = gstreamer
pkgname = gst-plugins-bad-libs
pkgdesc = Multimedia graph framework - bad
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = gcc-libs
depends = glib2
depends = glibc
......@@ -222,7 +220,7 @@ pkgname = gst-plugins-bad-libs
pkgname = gst-plugins-base-libs
pkgdesc = Multimedia graph framework - base
depends = gstreamer=1.24.12-4
depends = gstreamer=1.26.0-1
depends = glib2
depends = glibc
depends = iso-codes
......@@ -241,8 +239,8 @@ pkgname = gst-plugins-base-libs
pkgname = gst-plugins-base
pkgdesc = Multimedia graph framework - base plugins
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = alsa-lib
depends = cairo
depends = cdparanoia
......@@ -260,8 +258,8 @@ pkgname = gst-plugins-base
pkgname = gst-plugins-good
pkgdesc = Multimedia graph framework - good plugins
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = aalib
depends = bzip2
depends = cairo
......@@ -303,9 +301,9 @@ pkgname = gst-plugins-good
pkgname = gst-plugins-bad
pkgdesc = Multimedia graph framework - bad plugins
depends = gst-plugins-bad-libs=1.24.12-4
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-bad-libs=1.26.0-1
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = aom
depends = bzip2
depends = cairo
......@@ -374,8 +372,8 @@ pkgname = gst-plugins-bad
pkgname = gst-plugins-ugly
pkgdesc = Multimedia graph framework - ugly plugins
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = a52dec
depends = glib2
depends = glibc
......@@ -387,18 +385,18 @@ pkgname = gst-plugins-ugly
pkgname = gst-libav
pkgdesc = Multimedia graph framework - libav plugin
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = ffmpeg
depends = glib2
depends = glibc
provides = gst-ffmpeg=1.24.12-4
provides = gst-ffmpeg=1.26.0-1
pkgname = gst-plugin-gtk
pkgdesc = Multimedia graph framework - gtk plugin
depends = gst-plugins-bad-libs=1.24.12-4
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-bad-libs=1.26.0-1
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = cairo
depends = glib2
depends = glibc
......@@ -407,9 +405,9 @@ pkgname = gst-plugin-gtk
pkgname = gst-plugin-msdk
pkgdesc = Multimedia graph framework - msdk plugin
depends = gst-plugins-bad-libs=1.24.12-4
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-bad-libs=1.26.0-1
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = glib2
depends = glibc
depends = libdrm
......@@ -419,9 +417,9 @@ pkgname = gst-plugin-msdk
pkgname = gst-plugin-onnx
pkgdesc = Multimedia graph framework - onnx plugin
depends = gst-plugins-bad-libs=1.24.12-4
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-bad-libs=1.26.0-1
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = gcc-libs
depends = glib2
depends = glibc
......@@ -430,8 +428,8 @@ pkgname = gst-plugin-onnx
pkgname = gst-plugin-opencv
pkgdesc = Multimedia graph framework - opencv plugin
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = gcc-libs
depends = glib2
depends = glibc
......@@ -439,8 +437,8 @@ pkgname = gst-plugin-opencv
pkgname = gst-plugin-qml6
pkgdesc = Multimedia graph framework - qml6 plugin
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = gcc-libs
depends = glib2
depends = glibc
......@@ -451,8 +449,8 @@ pkgname = gst-plugin-qml6
pkgname = gst-plugin-qmlgl
pkgdesc = Multimedia graph framework - qmlgl plugin
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = gcc-libs
depends = glib2
depends = glibc
......@@ -464,9 +462,9 @@ pkgname = gst-plugin-qmlgl
pkgname = gst-plugin-qsv
pkgdesc = Multimedia graph framework - qsv plugin
depends = gst-plugins-bad-libs=1.24.12-4
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-bad-libs=1.26.0-1
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = gcc-libs
depends = glib2
depends = glibc
......@@ -475,9 +473,9 @@ pkgname = gst-plugin-qsv
pkgname = gst-plugin-va
pkgdesc = Multimedia graph framework - va plugin
depends = gst-plugins-bad-libs=1.24.12-4
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-bad-libs=1.26.0-1
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = glib2
depends = glibc
depends = libgudev
......@@ -485,8 +483,8 @@ pkgname = gst-plugin-va
pkgname = gst-plugin-wpe
pkgdesc = Multimedia graph framework - wpe plugin
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = gcc-libs
depends = glib2
depends = glibc
......@@ -498,8 +496,8 @@ pkgname = gst-plugin-wpe
pkgname = gst-devtools-libs
pkgdesc = Multimedia graph framework - development and debugging libraries
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = glib2
depends = glibc
depends = json-glib
......@@ -508,11 +506,11 @@ pkgname = gst-devtools-libs
pkgname = gst-devtools
pkgdesc = Multimedia graph framework - development and debugging tools
depends = gst-devtools-libs=1.24.12-4
depends = gst-plugins-bad-libs=1.24.12-4
depends = gst-plugins-base-libs=1.24.12-4
depends = gst-rtsp-server=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-devtools-libs=1.26.0-1
depends = gst-plugins-bad-libs=1.26.0-1
depends = gst-plugins-base-libs=1.26.0-1
depends = gst-rtsp-server=1.26.0-1
depends = gstreamer=1.26.0-1
depends = cairo
depends = glib2
depends = glibc
......@@ -526,8 +524,8 @@ pkgname = gst-devtools
pkgname = gst-rtsp-server
pkgdesc = Multimedia graph framework - rtsp server
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = glib2
depends = glibc
depends = orc
......@@ -535,10 +533,10 @@ pkgname = gst-rtsp-server
pkgname = gst-editing-services
pkgdesc = Multimedia graph framework - editing services
depends = gst-devtools-libs=1.24.12-4
depends = gst-plugins-base-libs=1.24.12-4
depends = gst-python=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-devtools-libs=1.26.0-1
depends = gst-plugins-base-libs=1.26.0-1
depends = gst-python=1.26.0-1
depends = gstreamer=1.26.0-1
depends = glib2
depends = glibc
depends = json-glib
......@@ -551,9 +549,9 @@ pkgname = gst-editing-services
pkgname = gstreamer-vaapi
pkgdesc = Multimedia graph framework - vaapi plugin
depends = gst-plugins-bad-libs=1.24.12-4
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-bad-libs=1.26.0-1
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = glib2
depends = glibc
depends = libglvnd
......@@ -565,8 +563,8 @@ pkgname = gstreamer-vaapi
pkgname = gst-python
pkgdesc = Multimedia graph framework - python plugin
depends = gst-plugins-base-libs=1.24.12-4
depends = gstreamer=1.24.12-4
depends = gst-plugins-base-libs=1.26.0-1
depends = gstreamer=1.26.0-1
depends = glib2
depends = glibc
depends = python
......
......@@ -4,20 +4,21 @@ Date: Mon, 6 Jun 2022 00:30:08 +0200
Subject: [PATCH] HACK: meson: Disable broken tests
---
subprojects/gst-editing-services/tests/check/meson.build | 2 --
subprojects/gst-plugins-bad/tests/check/elements/curlhttpsrc.c | 1 -
subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c | 1 -
subprojects/gst-plugins-bad/tests/check/elements/lc3.c | 3 ---
subprojects/gst-plugins-bad/tests/check/meson.build | 1 -
subprojects/gst-plugins-bad/tests/validate/meson.build | 3 ---
subprojects/gst-plugins-base/tests/check/meson.build | 1 -
subprojects/gst-plugins-base/tests/validate/meson.build | 1 -
subprojects/gst-plugins-good/tests/check/elements/flvmux.c | 1 -
subprojects/gstreamer-vaapi/meson.build | 1 -
10 files changed, 15 deletions(-)
subprojects/gst-editing-services/tests/check/meson.build | 2 --
.../gst-plugins-bad/tests/check/elements/curlhttpsrc.c | 1 -
subprojects/gst-plugins-bad/tests/check/elements/lc3.c | 3 ---
subprojects/gst-plugins-bad/tests/check/meson.build | 1 -
subprojects/gst-plugins-bad/tests/validate/meson.build | 7 -------
subprojects/gst-plugins-base/tests/check/meson.build | 1 -
subprojects/gst-plugins-base/tests/validate/meson.build | 1 -
subprojects/gst-plugins-good/tests/check/elements/flvmux.c | 1 -
.../gst-plugins-good/tests/check/elements/mpegaudioparse.c | 1 -
subprojects/gst-python/testsuite/meson.build | 1 -
subprojects/gstreamer-vaapi/meson.build | 1 -
11 files changed, 20 deletions(-)
diff --git a/subprojects/gst-editing-services/tests/check/meson.build b/subprojects/gst-editing-services/tests/check/meson.build
index 784c592ba6f1..bbf9a2491a86 100644
index f3e273d9e5d7..b7c344080841 100644
--- a/subprojects/gst-editing-services/tests/check/meson.build
+++ b/subprojects/gst-editing-services/tests/check/meson.build
@@ -144,7 +144,5 @@ if build_gir
......@@ -40,23 +41,11 @@ index d0901d5b23df..62b3bba4b614 100644
return s;
}
diff --git a/subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c b/subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c
index 1d347b0a54ea..1ee4babf36ae 100644
--- a/subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c
+++ b/subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c
@@ -6659,7 +6659,6 @@ dash_suite (void)
tcase_add_test (tc_simpleMPD, dash_mpdparser_default_presentation_delay);
/* tests checking xlink attributes */
- tcase_add_test (tc_simpleMPD, dash_mpdparser_xlink_period);
/* tests checking the MPD management
* (eg. setting active streams, obtaining attributes values)
diff --git a/subprojects/gst-plugins-bad/tests/check/elements/lc3.c b/subprojects/gst-plugins-bad/tests/check/elements/lc3.c
index ebc7f2e389fc..858e9c706c5f 100644
index 07d79d1765c4..85b95fb0ef7e 100644
--- a/subprojects/gst-plugins-bad/tests/check/elements/lc3.c
+++ b/subprojects/gst-plugins-bad/tests/check/elements/lc3.c
@@ -353,9 +353,6 @@ lc3_suite (void)
@@ -354,9 +354,6 @@ lc3_suite (void)
TCase *tc_chain = tcase_create ("general");
suite_add_tcase (s, tc_chain);
......@@ -67,10 +56,10 @@ index ebc7f2e389fc..858e9c706c5f 100644
return s;
diff --git a/subprojects/gst-plugins-bad/tests/check/meson.build b/subprojects/gst-plugins-bad/tests/check/meson.build
index 1e73b73dab02..d7d880d910d5 100644
index f996fb8ed46e..9d7e83945d55 100644
--- a/subprojects/gst-plugins-bad/tests/check/meson.build
+++ b/subprojects/gst-plugins-bad/tests/check/meson.build
@@ -152,7 +152,6 @@ if host_machine.system() != 'windows'
@@ -165,7 +165,6 @@ if host_machine.system() != 'windows'
[['elements/jifmux.c'],
not exif_dep.found() or not cdata.has('HAVE_UNISTD_H'), [exif_dep]],
[['elements/jpegparse.c'], not cdata.has('HAVE_UNISTD_H')],
......@@ -79,10 +68,10 @@ index 1e73b73dab02..d7d880d910d5 100644
[['elements/unixfd.c'], not gio_unix_dep.found()],
[['elements/voaacenc.c'],
diff --git a/subprojects/gst-plugins-bad/tests/validate/meson.build b/subprojects/gst-plugins-bad/tests/validate/meson.build
index c09772a657f4..6dd292ea670a 100644
index 25eedac14829..6dd292ea670a 100644
--- a/subprojects/gst-plugins-bad/tests/validate/meson.build
+++ b/subprojects/gst-plugins-bad/tests/validate/meson.build
@@ -4,15 +4,12 @@ if not gst_tester.found()
@@ -4,19 +4,12 @@ if not gst_tester.found()
endif
tests = [
......@@ -95,6 +84,10 @@ index c09772a657f4..6dd292ea670a 100644
{'path': 'vtenc/vtenc_h265', 'skip': not applemedia_found_deps},
{'path': 'vtenc/vtenc_h265_b_frames', 'skip': not applemedia_found_deps},
- {'path': 'autovideoconvert/renegotiate'},
- {'path': 'pitch/maintain_pitch_with_variable_playback_rates', 'skip': not soundtouch_dep.found()},
- {'path': 'pitch/reverse.maintain_pitch_with_variable_playback_rates', 'skip': not soundtouch_dep.found()},
- {'path': 'pitch/change_pitch_properties', 'skip': not soundtouch_dep.found()},
- {'path': 'pitch/reverse.change_pitch_properties', 'skip': not soundtouch_dep.found()},
]
env = environment()
......@@ -111,10 +104,10 @@ index 0b8ad09afb41..11ca4820e295 100644
[ 'elements/compositor.c', get_option('compositor').disabled()],
[ 'elements/decodebin.c', get_option('playback').disabled()],
diff --git a/subprojects/gst-plugins-base/tests/validate/meson.build b/subprojects/gst-plugins-base/tests/validate/meson.build
index f732daae44c5..bc89d8caa676 100644
index 569b5bfb8c3d..b1097025935c 100644
--- a/subprojects/gst-plugins-base/tests/validate/meson.build
+++ b/subprojects/gst-plugins-base/tests/validate/meson.build
@@ -20,7 +20,6 @@ tests = [
@@ -30,7 +30,6 @@ tests = [
'videorate/duplicate_on_eos',
'videorate/duplicate_on_eos_disbaled',
'videorate/duplicate_on_eos_half_sec',
......@@ -134,8 +127,32 @@ index 6efa928fb09b..1f1950ef323d 100644
tcase_add_test (tc_chain, test_audio_caps_change_streamable);
tcase_add_test (tc_chain, test_video_caps_change_streamable);
tcase_add_test (tc_chain, test_audio_caps_change_streamable_single);
diff --git a/subprojects/gst-plugins-good/tests/check/elements/mpegaudioparse.c b/subprojects/gst-plugins-good/tests/check/elements/mpegaudioparse.c
index db2075a450c7..65692304bfc8 100644
--- a/subprojects/gst-plugins-good/tests/check/elements/mpegaudioparse.c
+++ b/subprojects/gst-plugins-good/tests/check/elements/mpegaudioparse.c
@@ -432,7 +432,6 @@ mpegaudioparse_suite (void)
tcase_add_test (tc_chain, test_parse_split);
tcase_add_test (tc_chain, test_parse_skip_garbage);
tcase_add_test (tc_chain, test_parse_detect_stream);
- tcase_add_test (tc_chain, test_parse_gapless_and_skip_padding_samples);
return s;
}
diff --git a/subprojects/gst-python/testsuite/meson.build b/subprojects/gst-python/testsuite/meson.build
index 731003edcbde..557285182273 100644
--- a/subprojects/gst-python/testsuite/meson.build
+++ b/subprojects/gst-python/testsuite/meson.build
@@ -3,7 +3,6 @@ runtests = files('runtests.py')
tests = [
['Test gst', 'test_gst.py'],
['Test fundamentals', 'test_types.py'],
- ['Test plugins', 'test_plugin.py'],
['Test analytics', 'test_analytics.py', ['gst-plugins-bad/gst-libs/gst/analytics', 'gst-plugins-base/gst-libs/gst/video']],
]
diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build
index 562c2e20bdf1..151e921fb8f5 100644
index 8238b1aa1b57..14b24c3d7cd6 100644
--- a/subprojects/gstreamer-vaapi/meson.build
+++ b/subprojects/gstreamer-vaapi/meson.build
@@ -214,7 +214,6 @@ plugins = []
......@@ -145,4 +162,4 @@ index 562c2e20bdf1..151e921fb8f5 100644
-subdir('tests')
subdir('docs')
# Set release date
warning ('GStreamer VA-API is deprecated in favor of GstVA in gst-plugins-bad')
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Christopher Degawa <ccom@randomderp.com>
Date: Fri, 21 Feb 2025 16:24:58 -0600
Subject: [PATCH] svtav1enc: update to use SVT-AV1 3.0.0 API changes
Squashed in:
- svtav1enc: isolate switch case for only setting/getting value
- svtav1enc: change switch case to match the api change a bit more
---
.../gst-plugins-bad/ext/svtav1/gstsvtav1enc.c | 57 +++++++++++++++++--
1 file changed, 51 insertions(+), 6 deletions(-)
diff --git a/subprojects/gst-plugins-bad/ext/svtav1/gstsvtav1enc.c b/subprojects/gst-plugins-bad/ext/svtav1/gstsvtav1enc.c
index 5e19a0b36398..6ed4a561572b 100644
--- a/subprojects/gst-plugins-bad/ext/svtav1/gstsvtav1enc.c
+++ b/subprojects/gst-plugins-bad/ext/svtav1/gstsvtav1enc.c
@@ -75,7 +75,11 @@ typedef struct _GstSvtAv1Enc
guint maximum_buffer_size;
gint intra_period_length;
gint intra_refresh_type;
+#if SVT_AV1_CHECK_VERSION(3, 0, 0)
+ gint level_of_parallelism;
+#else
gint logical_processors;
+#endif
gint target_socket;
gchar *parameters_string;
@@ -127,22 +131,24 @@ enum
PROP_MAXIMUM_BUFFER_SIZE,
PROP_INTRA_PERIOD_LENGTH,
PROP_INTRA_REFRESH_TYPE,
- PROP_LOGICAL_PROCESSORS,
+ PROP_LOGICAL_PROCESSORS, /// DEPRECATED: should be removed once the minimum version is 3.0.0
PROP_TARGET_SOCKET,
PROP_PARAMETERS_STRING,
+ PROP_LEVEL_OF_PARALLELISM,
};
#define PROP_PRESET_DEFAULT 10
#define PROP_TARGET_BITRATE_DEFAULT 0
#define PROP_MAX_BITRATE_DEFAULT 0
#define PROP_QP_MAX_QP_ALLOWED_DEFAULT 63
#define PROP_QP_MIN_QP_ALLOWED_DEFAULT 1
#define PROP_CQP_DEFAULT -1
#define PROP_CRF_DEFAULT 35
#define PROP_MAXIMUM_BUFFER_SIZE_DEFAULT 1000
#define PROP_INTRA_PERIOD_LENGTH_DEFAULT -2
#define PROP_INTRA_REFRESH_TYPE_DEFAULT SVT_AV1_KF_REFRESH
-#define PROP_LOGICAL_PROCESSORS_DEFAULT 0
+#define PROP_LEVEL_OF_PARALLELISM_DEFAULT 0
+#define PROP_LOGICAL_PROCESSORS_DEFAULT 0 /// DEPRECATED: should be removed once the minimum version is 3.0.0
#define PROP_TARGET_SOCKET_DEFAULT -1
#define PROP_PARAMETERS_STRING_DEFAULT NULL
@@ -307,15 +313,31 @@ gst_svtav1enc_class_init (GstSvtAv1EncClass * klass)
PROP_INTRA_REFRESH_TYPE_DEFAULT,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+#if SVT_AV1_CHECK_VERSION(3, 0, 0)
+ g_object_class_install_property (gobject_class,
+ PROP_LEVEL_OF_PARALLELISM,
+ g_param_spec_uint ("level-of-parallelism",
+ "Level of Parallelism",
+ "Controls the number of threads and buffers to allocate. 0: auto",
+ 0,
+ 6,
+ PROP_LEVEL_OF_PARALLELISM_DEFAULT,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+#endif
+
g_object_class_install_property (gobject_class,
PROP_LOGICAL_PROCESSORS,
g_param_spec_uint ("logical-processors",
"Logical Processors",
- "Number of logical CPU cores to be used. 0: auto",
+#if SVT_AV1_CHECK_VERSION(3, 0, 0)
+ "Deprecated. Use level-of-parallelism instead. 0: auto",
+#else
+ "Number of logical CPU cores to be used. Deprecated and replaced with level-of-parallelism in SVT-AV1 3.0.0. 0: auto",
+#endif
0,
G_MAXUINT,
PROP_LOGICAL_PROCESSORS_DEFAULT,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_DEPRECATED));
g_object_class_install_property (gobject_class,
PROP_TARGET_SOCKET,
@@ -350,7 +372,11 @@ gst_svtav1enc_init (GstSvtAv1Enc * svtav1enc)
svtav1enc->maximum_buffer_size = PROP_MAXIMUM_BUFFER_SIZE_DEFAULT;
svtav1enc->intra_period_length = PROP_INTRA_PERIOD_LENGTH_DEFAULT;
svtav1enc->intra_refresh_type = PROP_INTRA_REFRESH_TYPE_DEFAULT;
+#if SVT_AV1_CHECK_VERSION(3, 0, 0)
+ svtav1enc->level_of_parallelism = PROP_LEVEL_OF_PARALLELISM_DEFAULT;
+#else
svtav1enc->logical_processors = PROP_LOGICAL_PROCESSORS_DEFAULT;
+#endif
svtav1enc->target_socket = PROP_TARGET_SOCKET_DEFAULT;
svtav1enc->parameters_string = PROP_PARAMETERS_STRING_DEFAULT;
}
@@ -401,8 +427,15 @@ gst_svtav1enc_set_property (GObject * object, guint property_id,
case PROP_INTRA_REFRESH_TYPE:
svtav1enc->intra_refresh_type = g_value_get_enum (value);
break;
+ case PROP_LEVEL_OF_PARALLELISM:
+#if SVT_AV1_CHECK_VERSION(3, 0, 0)
+ svtav1enc->level_of_parallelism = g_value_get_int (value);
+#endif
+ break;
case PROP_LOGICAL_PROCESSORS:
+#if !SVT_AV1_CHECK_VERSION(3, 0, 0)
svtav1enc->logical_processors = g_value_get_uint (value);
+#endif
break;
case PROP_TARGET_SOCKET:
svtav1enc->target_socket = g_value_get_int (value);
@@ -457,8 +490,13 @@ gst_svtav1enc_get_property (GObject * object, guint property_id, GValue * value,
case PROP_INTRA_REFRESH_TYPE:
g_value_set_enum (value, svtav1enc->intra_refresh_type);
break;
+ case PROP_LEVEL_OF_PARALLELISM:
case PROP_LOGICAL_PROCESSORS:
+#if SVT_AV1_CHECK_VERSION(3, 0, 0)
+ g_value_set_int (value, svtav1enc->level_of_parallelism);
+#else
g_value_set_uint (value, svtav1enc->logical_processors);
+#endif
break;
case PROP_TARGET_SOCKET:
g_value_set_int (value, svtav1enc->target_socket);
@@ -554,7 +592,11 @@ gst_svtav1enc_configure_svt (GstSvtAv1Enc * svtav1enc)
}
svtav1enc->svt_config->intra_period_length = svtav1enc->intra_period_length;
svtav1enc->svt_config->intra_refresh_type = svtav1enc->intra_refresh_type;
+#if SVT_AV1_CHECK_VERSION(3, 0, 0)
+ svtav1enc->svt_config->level_of_parallelism = svtav1enc->level_of_parallelism;
+#else
svtav1enc->svt_config->logical_processors = svtav1enc->logical_processors;
+#endif
svtav1enc->svt_config->target_socket = svtav1enc->target_socket;
gst_svtav1enc_parse_parameters_string (svtav1enc);
@@ -723,11 +765,9 @@ gst_svtav1enc_configure_svt (GstSvtAv1Enc * svtav1enc)
master_display_info.max_display_mastering_luminance;
svtav1enc->svt_config->mastering_display.min_luma =
master_display_info.min_display_mastering_luminance;
- svtav1enc->svt_config->high_dynamic_range_input = TRUE;
} else {
memset (&svtav1enc->svt_config->mastering_display,
0, sizeof (svtav1enc->svt_config->mastering_display));
- svtav1enc->svt_config->high_dynamic_range_input = FALSE;
}
GstVideoContentLightLevel content_light_level;
@@ -936,8 +976,13 @@ gst_svtav1enc_open (GstVideoEncoder * encoder)
GST_DEBUG_OBJECT (svtav1enc, "open");
+#if SVT_AV1_CHECK_VERSION(3, 0, 0)
+ EbErrorType res = svt_av1_enc_init_handle (&svtav1enc->svt_encoder,
+ svtav1enc->svt_config);
+#else
EbErrorType res = svt_av1_enc_init_handle (&svtav1enc->svt_encoder, NULL,
svtav1enc->svt_config);
+#endif
if (res != EB_ErrorNone) {
GST_ELEMENT_ERROR (svtav1enc,
LIBRARY,
......@@ -28,8 +28,8 @@ pkgname=(
gst-python
gstreamer-docs
)
pkgver=1.24.12
pkgrel=4
pkgver=1.26.0
pkgrel=1
pkgdesc="Multimedia graph framework"
url="https://gstreamer.freedesktop.org/"
arch=(x86_64)
......@@ -208,14 +208,12 @@ source=(
"https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-$pkgver.tar.xz"{,.asc}
0001-HACK-meson-Disable-broken-tests.patch
0002-x265enc-Unbreak-build-with-x265-4.0.patch
0003-svtav1enc-update-to-use-SVT-AV1-3.0.0-API-changes.patch
)
b2sums=('e11c560e33db0292075a8c3043eef959c6b68c2c54e55a62d41acbfce544b198ff0a948682ff2e9d90ec2773674e614378399b1411588eae7757176ce157dd4e'
'21a0c3fd42af3870efb38fdd595298d0596d8c90801dc27bd693aaa8436e7f2e2cffd2019dba6188f89cafda1ac3e42958f152e945a9102020bd55f1f66ccfb7'
b2sums=('8c90fe57ae67c5097cf427bca73cb687bc5087256444ec9227f4a294b2889d2042643ed4230414c151ecbae8490984e2b8c52cfea494e4f10f79866a26326029'
'5ee163d6f0dd14457740cbc2e131bdc3499517b0c6d57153a6ff3ef5af4ab2f5502e3131c7045f1d0829d0f6d5d1ed599b803d7396155e34a3ad99c0f2f3974a'
'SKIP'
'693a30c7af517ee8c149ec58214e3ac891ff82c9f1bddcbd34949854deb46207a995ff123848a7121f64b41aed8ae4ffada1329bb5c987a542710466770a2935'
'94250c1317ce1e3444c2e0effc190ab544eca21c177e43143c3f3a8690c541cbe068604c6ff6401072a6b09f54683eac03128c918a2a16c7013622c24da11348'
'97189387749cbcbf66bb378c49dea3bedd2bbd9c181c489f466e61e8d3981d99d578e38e7bc8303d941180ed96bbeefeb01782a6068b89d7030a2234cdd1bdb5')
'6b4e34286318ca591077779e713ec9a94cb2e5b73a9dd6df35afdefcc709c0f9d1ee4cae6c99d2bbf2e075eda03e94cacb57bfc202fdb8c263b4b0d335541b23'
'94250c1317ce1e3444c2e0effc190ab544eca21c177e43143c3f3a8690c541cbe068604c6ff6401072a6b09f54683eac03128c918a2a16c7013622c24da11348')
validpgpkeys=(
D637032E45B8C6585B9456565D2EEE6F6F349D7C # Tim Müller <tim@gstreamer-foundation.org>
)
......@@ -228,39 +226,41 @@ prepare() {
# Fix build with x265 4.0
git apply -3 ../0002-x265enc-Unbreak-build-with-x265-4.0.patch
# Fix build with svt-av1 3.0.0
git apply -3 ../0003-svtav1enc-update-to-use-SVT-AV1-3.0.0-API-changes.patch
}
build() {
local meson_options=(
-D benchmarks=disabled
-D examples=disabled
-D gobject-cast-checks=disabled
-D glib_debug=disabled
-D gpl=enabled
-D gst-devtools:debug_viewer=enabled
-D gst-examples=disabled
-D gst-plugins-bad:aja=disabled
-D gst-plugins-bad:amfcodec=disabled
-D gst-plugins-bad:androidmedia=disabled
-D gst-plugins-bad:cuda-nvmm=disabled
-D gst-plugins-bad:directfb=disabled
-D gst-plugins-bad:directshow=disabled
-D gst-plugins-bad:directsound=disabled
-D gst-plugins-bad:flite=disabled
-D gst-plugins-bad:gs=disabled
-D gst-plugins-bad:iqa=disabled
-D gst-plugins-bad:isac=disabled
-D gst-plugins-bad:lcevcdecoder=disabled
-D gst-plugins-bad:lcevcencoder=disabled
-D gst-plugins-bad:magicleap=disabled
-D gst-plugins-bad:mfx_api=oneVPL
-D gst-plugins-bad:nvcomp=disabled
-D gst-plugins-bad:nvdswrapper=disabled
-D gst-plugins-bad:openni2=disabled
-D gst-plugins-bad:opensles=disabled
-D gst-plugins-bad:qt6d3d11=disabled
-D gst-plugins-bad:svtjpegxs=disabled
-D gst-plugins-bad:tinyalsa=disabled
-D gst-plugins-bad:voaacenc=disabled
-D gst-plugins-bad:voamrwbenc=disabled
-D gst-plugins-bad:wasapi2=disabled
-D gst-plugins-bad:wasapi=disabled
-D gst-plugins-bad:wic=disabled
-D gst-plugins-bad:win32ipc=disabled
-D gst-plugins-base:libvisual=disabled
-D gst-plugins-base:tremor=disabled
-D gst-plugins-good:rpicamsrc=disabled
......@@ -277,6 +277,10 @@ build() {
# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3197
export GI_SCANNER_DISABLE_CACHE=1
# Cargo sub-build: Use debug and LTO
export CARGO_PROFILE_RELEASE_DEBUG=2
export CARGO_PROFILE_RELEASE_LTO=true CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
arch-meson gstreamer build "${meson_options[@]}"
meson compile -C build
}
......@@ -342,6 +346,7 @@ package_gstreamer() {
usr/share/gstreamer-1.0/gdb/gst_gdb.py
usr/share/aclocal/gst-element-check-1.0.m4
usr/share/cmake/FindGStreamer.cmake
); _install
}
......@@ -449,6 +454,7 @@ package_gst-plugins-bad-libs() {
usr/lib/gstreamer-1.0/libgstspeed.so
usr/lib/gstreamer-1.0/libgstsubenc.so
usr/lib/gstreamer-1.0/libgstswitchbin.so
usr/lib/gstreamer-1.0/libgsttensordecoders.so
usr/lib/gstreamer-1.0/libgsttranscode.so
usr/lib/gstreamer-1.0/libgstunixfd.so
usr/lib/gstreamer-1.0/libgstuvcgadget.so
......@@ -1116,6 +1122,8 @@ package_gst-devtools() {
usr/share/gst-debug-viewer
usr/share/icons/hicolor/*/apps/gst-debug-viewer.*
usr/share/metainfo/org.freedesktop.GstDebugViewer.appdata.xml
usr/bin/gst-dots-viewer
); _install
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment