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

1.24.8-2: x265 rebuild

parent e7284085
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.SRCINFO
+ 62
− 60
View file @ dbf306e7
pkgbase = gstreamer pkgbase = gstreamer
pkgdesc = Multimedia graph framework pkgdesc = Multimedia graph framework
pkgver = 1.24.8 pkgver = 1.24.8
pkgrel = 1 pkgrel = 2
url = https://gstreamer.freedesktop.org/ url = https://gstreamer.freedesktop.org/
arch = x86_64 arch = x86_64
license = LGPL-2.1-or-later license = LGPL-2.1-or-later
...@@ -54,7 +54,7 @@ pkgbase = gstreamer ...@@ -54,7 +54,7 @@ pkgbase = gstreamer
makedepends = libgme makedepends = libgme
makedepends = libgudev makedepends = libgudev
makedepends = libiec61883 makedepends = libiec61883
makedepends = libjpeg makedepends = libjpeg-turbo
makedepends = liblc3 makedepends = liblc3
makedepends = libldac makedepends = libldac
makedepends = liblrdf makedepends = liblrdf
...@@ -157,12 +157,14 @@ pkgbase = gstreamer ...@@ -157,12 +157,14 @@ pkgbase = gstreamer
source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.8.tar.xz.asc source = https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-1.24.8.tar.xz.asc
source = 0001-HACK-meson-Disable-broken-tests.patch source = 0001-HACK-meson-Disable-broken-tests.patch
source = 0002-ges-Fix-name-of-GESFrameCompositionMeta-API-type.patch source = 0002-ges-Fix-name-of-GESFrameCompositionMeta-API-type.patch
source = 0003-x265enc-Unbreak-build-with-x265-4.0.patch
validpgpkeys = D637032E45B8C6585B9456565D2EEE6F6F349D7C validpgpkeys = D637032E45B8C6585B9456565D2EEE6F6F349D7C
b2sums = ecdcf29ad346dc4aff966b34b4c68ac9e742b29bac86a33b289f06f213d563ac3c9264768a409c70c032694ccbfd246f772b67097456647c96c869aecd56ff96 b2sums = ecdcf29ad346dc4aff966b34b4c68ac9e742b29bac86a33b289f06f213d563ac3c9264768a409c70c032694ccbfd246f772b67097456647c96c869aecd56ff96
b2sums = 5330ad9313cfcfbdd0514f8f8164440c4eb3605a1e17dda8b7a024f3c986a97042575fedd3e54d4c1b0a1476918cdbb1d1d1ee46b173d235f5e3ed34d40bf39a b2sums = 5330ad9313cfcfbdd0514f8f8164440c4eb3605a1e17dda8b7a024f3c986a97042575fedd3e54d4c1b0a1476918cdbb1d1d1ee46b173d235f5e3ed34d40bf39a
b2sums = SKIP b2sums = SKIP
b2sums = 9e277b0373c024d9ec0175e7a036f85152ce145b40d62105e660ca4f466ee0a2d70c68c11c4e6929e46117380482c70957e08e3bf6b5aca1ea0e2c7d4360f317 b2sums = 9e277b0373c024d9ec0175e7a036f85152ce145b40d62105e660ca4f466ee0a2d70c68c11c4e6929e46117380482c70957e08e3bf6b5aca1ea0e2c7d4360f317
b2sums = ac31a75ad3086e26045d02d917fd1c0f155b9e1a6ea82aa8aaf9687500a129b80be82947f6a07928399570920bdbc829d6ff1b79d0b30538606d056a76aaab05 b2sums = ac31a75ad3086e26045d02d917fd1c0f155b9e1a6ea82aa8aaf9687500a129b80be82947f6a07928399570920bdbc829d6ff1b79d0b30538606d056a76aaab05
b2sums = 23596f6e5ba9628629f9fca36e3518427ffacdc54505224b4a6e6f039bb3fc168e20093c645b1c093ceb8280fe549a2f6d2af857afad55c28fcc5f9f26917e44
pkgname = gstreamer pkgname = gstreamer
pkgdesc = Multimedia graph framework - core pkgdesc = Multimedia graph framework - core
...@@ -177,8 +179,8 @@ pkgname = gstreamer ...@@ -177,8 +179,8 @@ pkgname = gstreamer
pkgname = gst-plugins-bad-libs pkgname = gst-plugins-bad-libs
pkgdesc = Multimedia graph framework - bad pkgdesc = Multimedia graph framework - bad
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = gcc-libs depends = gcc-libs
depends = glib2 depends = glib2
depends = glibc depends = glibc
...@@ -200,7 +202,7 @@ pkgname = gst-plugins-bad-libs ...@@ -200,7 +202,7 @@ pkgname = gst-plugins-bad-libs
pkgname = gst-plugins-base-libs pkgname = gst-plugins-base-libs
pkgdesc = Multimedia graph framework - base pkgdesc = Multimedia graph framework - base
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = glib2 depends = glib2
depends = glibc depends = glibc
depends = iso-codes depends = iso-codes
...@@ -219,15 +221,15 @@ pkgname = gst-plugins-base-libs ...@@ -219,15 +221,15 @@ pkgname = gst-plugins-base-libs
pkgname = gst-plugins-base pkgname = gst-plugins-base
pkgdesc = Multimedia graph framework - base plugins pkgdesc = Multimedia graph framework - base plugins
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = alsa-lib depends = alsa-lib
depends = cairo depends = cairo
depends = cdparanoia depends = cdparanoia
depends = glib2 depends = glib2
depends = glibc depends = glibc
depends = graphene depends = graphene
depends = libjpeg depends = libjpeg-turbo
depends = libogg depends = libogg
depends = libpng depends = libpng
depends = libtheora depends = libtheora
...@@ -238,8 +240,8 @@ pkgname = gst-plugins-base ...@@ -238,8 +240,8 @@ pkgname = gst-plugins-base
pkgname = gst-plugins-good pkgname = gst-plugins-good
pkgdesc = Multimedia graph framework - good plugins pkgdesc = Multimedia graph framework - good plugins
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = aalib depends = aalib
depends = bzip2 depends = bzip2
depends = cairo depends = cairo
...@@ -254,7 +256,7 @@ pkgname = gst-plugins-good ...@@ -254,7 +256,7 @@ pkgname = gst-plugins-good
depends = libdv depends = libdv
depends = libgudev depends = libgudev
depends = libiec61883 depends = libiec61883
depends = libjpeg depends = libjpeg-turbo
depends = libpng depends = libpng
depends = libpulse depends = libpulse
depends = libraw1394 depends = libraw1394
...@@ -281,9 +283,9 @@ pkgname = gst-plugins-good ...@@ -281,9 +283,9 @@ pkgname = gst-plugins-good
pkgname = gst-plugins-bad pkgname = gst-plugins-bad
pkgdesc = Multimedia graph framework - bad plugins pkgdesc = Multimedia graph framework - bad plugins
depends = gst-plugins-bad-libs=1.24.8-1 depends = gst-plugins-bad-libs=1.24.8-2
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = aom depends = aom
depends = bzip2 depends = bzip2
depends = cairo depends = cairo
...@@ -351,8 +353,8 @@ pkgname = gst-plugins-bad ...@@ -351,8 +353,8 @@ pkgname = gst-plugins-bad
pkgname = gst-plugins-ugly pkgname = gst-plugins-ugly
pkgdesc = Multimedia graph framework - ugly plugins pkgdesc = Multimedia graph framework - ugly plugins
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = a52dec depends = a52dec
depends = glib2 depends = glib2
depends = glibc depends = glibc
...@@ -364,18 +366,18 @@ pkgname = gst-plugins-ugly ...@@ -364,18 +366,18 @@ pkgname = gst-plugins-ugly
pkgname = gst-libav pkgname = gst-libav
pkgdesc = Multimedia graph framework - libav plugin pkgdesc = Multimedia graph framework - libav plugin
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = ffmpeg depends = ffmpeg
depends = glib2 depends = glib2
depends = glibc depends = glibc
provides = gst-ffmpeg=1.24.8-1 provides = gst-ffmpeg=1.24.8-2
pkgname = gst-plugin-gtk pkgname = gst-plugin-gtk
pkgdesc = Multimedia graph framework - gtk plugin pkgdesc = Multimedia graph framework - gtk plugin
depends = gst-plugins-bad-libs=1.24.8-1 depends = gst-plugins-bad-libs=1.24.8-2
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = cairo depends = cairo
depends = glib2 depends = glib2
depends = glibc depends = glibc
...@@ -384,9 +386,9 @@ pkgname = gst-plugin-gtk ...@@ -384,9 +386,9 @@ pkgname = gst-plugin-gtk
pkgname = gst-plugin-msdk pkgname = gst-plugin-msdk
pkgdesc = Multimedia graph framework - msdk plugin pkgdesc = Multimedia graph framework - msdk plugin
depends = gst-plugins-bad-libs=1.24.8-1 depends = gst-plugins-bad-libs=1.24.8-2
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = glib2 depends = glib2
depends = glibc depends = glibc
depends = libdrm depends = libdrm
...@@ -396,9 +398,9 @@ pkgname = gst-plugin-msdk ...@@ -396,9 +398,9 @@ pkgname = gst-plugin-msdk
pkgname = gst-plugin-onnx pkgname = gst-plugin-onnx
pkgdesc = Multimedia graph framework - onnx plugin pkgdesc = Multimedia graph framework - onnx plugin
depends = gst-plugins-bad-libs=1.24.8-1 depends = gst-plugins-bad-libs=1.24.8-2
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = gcc-libs depends = gcc-libs
depends = glib2 depends = glib2
depends = glibc depends = glibc
...@@ -406,8 +408,8 @@ pkgname = gst-plugin-onnx ...@@ -406,8 +408,8 @@ pkgname = gst-plugin-onnx
pkgname = gst-plugin-opencv pkgname = gst-plugin-opencv
pkgdesc = Multimedia graph framework - opencv plugin pkgdesc = Multimedia graph framework - opencv plugin
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = gcc-libs depends = gcc-libs
depends = glib2 depends = glib2
depends = glibc depends = glibc
...@@ -415,8 +417,8 @@ pkgname = gst-plugin-opencv ...@@ -415,8 +417,8 @@ pkgname = gst-plugin-opencv
pkgname = gst-plugin-qml6 pkgname = gst-plugin-qml6
pkgdesc = Multimedia graph framework - qml6 plugin pkgdesc = Multimedia graph framework - qml6 plugin
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = gcc-libs depends = gcc-libs
depends = glib2 depends = glib2
depends = glibc depends = glibc
...@@ -427,8 +429,8 @@ pkgname = gst-plugin-qml6 ...@@ -427,8 +429,8 @@ pkgname = gst-plugin-qml6
pkgname = gst-plugin-qmlgl pkgname = gst-plugin-qmlgl
pkgdesc = Multimedia graph framework - qmlgl plugin pkgdesc = Multimedia graph framework - qmlgl plugin
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = gcc-libs depends = gcc-libs
depends = glib2 depends = glib2
depends = glibc depends = glibc
...@@ -440,9 +442,9 @@ pkgname = gst-plugin-qmlgl ...@@ -440,9 +442,9 @@ pkgname = gst-plugin-qmlgl
pkgname = gst-plugin-qsv pkgname = gst-plugin-qsv
pkgdesc = Multimedia graph framework - qsv plugin pkgdesc = Multimedia graph framework - qsv plugin
depends = gst-plugins-bad-libs=1.24.8-1 depends = gst-plugins-bad-libs=1.24.8-2
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = gcc-libs depends = gcc-libs
depends = glib2 depends = glib2
depends = glibc depends = glibc
...@@ -451,9 +453,9 @@ pkgname = gst-plugin-qsv ...@@ -451,9 +453,9 @@ pkgname = gst-plugin-qsv
pkgname = gst-plugin-va pkgname = gst-plugin-va
pkgdesc = Multimedia graph framework - va plugin pkgdesc = Multimedia graph framework - va plugin
depends = gst-plugins-bad-libs=1.24.8-1 depends = gst-plugins-bad-libs=1.24.8-2
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = glib2 depends = glib2
depends = glibc depends = glibc
depends = libgudev depends = libgudev
...@@ -461,8 +463,8 @@ pkgname = gst-plugin-va ...@@ -461,8 +463,8 @@ pkgname = gst-plugin-va
pkgname = gst-plugin-wpe pkgname = gst-plugin-wpe
pkgdesc = Multimedia graph framework - wpe plugin pkgdesc = Multimedia graph framework - wpe plugin
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = gcc-libs depends = gcc-libs
depends = glib2 depends = glib2
depends = glibc depends = glibc
...@@ -474,8 +476,8 @@ pkgname = gst-plugin-wpe ...@@ -474,8 +476,8 @@ pkgname = gst-plugin-wpe
pkgname = gst-devtools-libs pkgname = gst-devtools-libs
pkgdesc = Multimedia graph framework - development and debugging libraries pkgdesc = Multimedia graph framework - development and debugging libraries
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = glib2 depends = glib2
depends = glibc depends = glibc
depends = json-glib depends = json-glib
...@@ -484,11 +486,11 @@ pkgname = gst-devtools-libs ...@@ -484,11 +486,11 @@ pkgname = gst-devtools-libs
pkgname = gst-devtools pkgname = gst-devtools
pkgdesc = Multimedia graph framework - development and debugging tools pkgdesc = Multimedia graph framework - development and debugging tools
depends = gst-devtools-libs=1.24.8-1 depends = gst-devtools-libs=1.24.8-2
depends = gst-plugins-bad-libs=1.24.8-1 depends = gst-plugins-bad-libs=1.24.8-2
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gst-rtsp-server=1.24.8-1 depends = gst-rtsp-server=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = cairo depends = cairo
depends = glib2 depends = glib2
depends = glibc depends = glibc
...@@ -502,8 +504,8 @@ pkgname = gst-devtools ...@@ -502,8 +504,8 @@ pkgname = gst-devtools
pkgname = gst-rtsp-server pkgname = gst-rtsp-server
pkgdesc = Multimedia graph framework - rtsp server pkgdesc = Multimedia graph framework - rtsp server
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = glib2 depends = glib2
depends = glibc depends = glibc
depends = orc depends = orc
...@@ -511,10 +513,10 @@ pkgname = gst-rtsp-server ...@@ -511,10 +513,10 @@ pkgname = gst-rtsp-server
pkgname = gst-editing-services pkgname = gst-editing-services
pkgdesc = Multimedia graph framework - editing services pkgdesc = Multimedia graph framework - editing services
depends = gst-devtools-libs=1.24.8-1 depends = gst-devtools-libs=1.24.8-2
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gst-python=1.24.8-1 depends = gst-python=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = glib2 depends = glib2
depends = glibc depends = glibc
depends = json-glib depends = json-glib
...@@ -527,9 +529,9 @@ pkgname = gst-editing-services ...@@ -527,9 +529,9 @@ pkgname = gst-editing-services
pkgname = gstreamer-vaapi pkgname = gstreamer-vaapi
pkgdesc = Multimedia graph framework - vaapi plugin pkgdesc = Multimedia graph framework - vaapi plugin
depends = gst-plugins-bad-libs=1.24.8-1 depends = gst-plugins-bad-libs=1.24.8-2
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = glib2 depends = glib2
depends = glibc depends = glibc
depends = libglvnd depends = libglvnd
...@@ -541,8 +543,8 @@ pkgname = gstreamer-vaapi ...@@ -541,8 +543,8 @@ pkgname = gstreamer-vaapi
pkgname = gst-python pkgname = gst-python
pkgdesc = Multimedia graph framework - python plugin pkgdesc = Multimedia graph framework - python plugin
depends = gst-plugins-base-libs=1.24.8-1 depends = gst-plugins-base-libs=1.24.8-2
depends = gstreamer=1.24.8-1 depends = gstreamer=1.24.8-2
depends = glib2 depends = glib2
depends = glibc depends = glibc
depends = python depends = python
......
0003-x265enc-Unbreak-build-with-x265-4.0.patch 0 → 100644
+ 121
− 0
View file @ dbf306e7
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Sat, 5 Oct 2024 04:21:10 +0200
Subject: [PATCH] x265enc: Unbreak build with x265 4.0
Following a [similar change][1] in FFmpeg.
[1]: https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/1f801dfdb5066aadf0ade9cb5e94d620f33eacdc
---
.../gst-plugins-bad/ext/x265/gstx265enc.c | 29 ++++++++++++++-----
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/subprojects/gst-plugins-bad/ext/x265/gstx265enc.c b/subprojects/gst-plugins-bad/ext/x265/gstx265enc.c
index e6aa973ac7cc..77de727061b1 100644
--- a/subprojects/gst-plugins-bad/ext/x265/gstx265enc.c
+++ b/subprojects/gst-plugins-bad/ext/x265/gstx265enc.c
@@ -1514,7 +1514,12 @@ gst_x265_enc_encode_frame (GstX265Enc * encoder, x265_picture * pic_in,
{
GstVideoCodecFrame *frame = NULL;
GstBuffer *out_buf = NULL;
- x265_picture pic_out;
+#if (X265_BUILD >= 210)
+ x265_picture pics_out[MAX_SCALABLE_LAYERS], *pics_outp[MAX_SCALABLE_LAYERS];
+#else
+ x265_picture pics_out[1];
+#endif
+ x265_picture *pic_out = &pics_out[0];
x265_nal *nal;
int i_size, i, offset;
int encoder_return;
@@ -1549,75 +1554,83 @@ gst_x265_enc_encode_frame (GstX265Enc * encoder, x265_picture * pic_in,
if (G_UNLIKELY (update_latency))
gst_x265_enc_set_latency (encoder);
+#if (X265_BUILD >= 210)
+ for (i = 0; i < MAX_SCALABLE_LAYERS; i++)
+ pics_outp[i] = &pics_out[i];
+
encoder_return = api->encoder_encode (encoder->x265enc,
- &nal, i_nal, pic_in, &pic_out);
+ &nal, i_nal, pic_in, pics_outp);
+#else
+ encoder_return = api->encoder_encode (encoder->x265enc,
+ &nal, i_nal, pic_in, pic_out);
+#endif
GST_DEBUG_OBJECT (encoder, "encoder result (%d) with %u nal units",
encoder_return, *i_nal);
if (encoder_return < 0) {
GST_ELEMENT_ERROR (encoder, STREAM, ENCODE, ("Encode x265 frame failed."),
("x265_encoder_encode return code=%d", encoder_return));
ret = GST_FLOW_ERROR;
/* Make sure we finish this frame */
frame = input_frame;
goto out;
}
/* Input frame is now queued */
if (input_frame)
gst_video_codec_frame_unref (input_frame);
if (!*i_nal) {
ret = GST_FLOW_OK;
GST_LOG_OBJECT (encoder, "no output yet");
goto out;
}
frame = gst_video_encoder_get_frame (GST_VIDEO_ENCODER (encoder),
- GPOINTER_TO_INT (pic_out.userData));
+ GPOINTER_TO_INT (pic_out->userData));
g_assert (frame || !send);
GST_DEBUG_OBJECT (encoder,
- "output picture ready POC=%d system=%d frame found %d", pic_out.poc,
- GPOINTER_TO_INT (pic_out.userData), frame != NULL);
+ "output picture ready POC=%d system=%d frame found %d", pic_out->poc,
+ GPOINTER_TO_INT (pic_out->userData), frame != NULL);
if (!send || !frame) {
GST_LOG_OBJECT (encoder, "not sending (%d) or frame not found (%d)", send,
frame != NULL);
ret = GST_FLOW_OK;
goto out;
}
i_size = 0;
offset = 0;
for (i = 0; i < *i_nal; i++)
i_size += nal[i].sizeBytes;
out_buf = gst_buffer_new_allocate (NULL, i_size, NULL);
for (i = 0; i < *i_nal; i++) {
gst_buffer_fill (out_buf, offset, nal[i].payload, nal[i].sizeBytes);
offset += nal[i].sizeBytes;
}
- if (pic_out.sliceType == X265_TYPE_IDR || pic_out.sliceType == X265_TYPE_I) {
+ if (pic_out->sliceType == X265_TYPE_IDR || pic_out->sliceType == X265_TYPE_I) {
GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (frame);
}
frame->output_buffer = out_buf;
if (encoder->push_header) {
GstBuffer *header;
header = gst_x265_enc_get_header_buffer (encoder);
frame->output_buffer = gst_buffer_append (header, frame->output_buffer);
encoder->push_header = FALSE;
}
GST_LOG_OBJECT (encoder,
"output: dts %" G_GINT64_FORMAT " pts %" G_GINT64_FORMAT,
- (gint64) pic_out.dts, (gint64) pic_out.pts);
+ (gint64) pic_out->dts, (gint64) pic_out->pts);
- frame->dts = pic_out.dts + encoder->dts_offset;
+ frame->dts = pic_out->dts + encoder->dts_offset;
out:
if (frame) {
PKGBUILD
+ 11
− 6
View file @ dbf306e7
...@@ -29,7 +29,7 @@ pkgname=( ...@@ -29,7 +29,7 @@ pkgname=(
gstreamer-docs gstreamer-docs
) )
pkgver=1.24.8 pkgver=1.24.8
pkgrel=1 pkgrel=2
pkgdesc="Multimedia graph framework" pkgdesc="Multimedia graph framework"
url="https://gstreamer.freedesktop.org/" url="https://gstreamer.freedesktop.org/"
arch=(x86_64) arch=(x86_64)
...@@ -83,7 +83,7 @@ makedepends=( ...@@ -83,7 +83,7 @@ makedepends=(
libgme libgme
libgudev libgudev
libiec61883 libiec61883
libjpeg libjpeg-turbo
liblc3 liblc3
libldac libldac
liblrdf liblrdf
...@@ -188,12 +188,14 @@ source=( ...@@ -188,12 +188,14 @@ source=(
"https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-$pkgver.tar.xz"{,.asc} "https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-$pkgver.tar.xz"{,.asc}
0001-HACK-meson-Disable-broken-tests.patch 0001-HACK-meson-Disable-broken-tests.patch
0002-ges-Fix-name-of-GESFrameCompositionMeta-API-type.patch 0002-ges-Fix-name-of-GESFrameCompositionMeta-API-type.patch
0003-x265enc-Unbreak-build-with-x265-4.0.patch
) )
b2sums=('ecdcf29ad346dc4aff966b34b4c68ac9e742b29bac86a33b289f06f213d563ac3c9264768a409c70c032694ccbfd246f772b67097456647c96c869aecd56ff96' b2sums=('ecdcf29ad346dc4aff966b34b4c68ac9e742b29bac86a33b289f06f213d563ac3c9264768a409c70c032694ccbfd246f772b67097456647c96c869aecd56ff96'
'5330ad9313cfcfbdd0514f8f8164440c4eb3605a1e17dda8b7a024f3c986a97042575fedd3e54d4c1b0a1476918cdbb1d1d1ee46b173d235f5e3ed34d40bf39a' '5330ad9313cfcfbdd0514f8f8164440c4eb3605a1e17dda8b7a024f3c986a97042575fedd3e54d4c1b0a1476918cdbb1d1d1ee46b173d235f5e3ed34d40bf39a'
'SKIP' 'SKIP'
'9e277b0373c024d9ec0175e7a036f85152ce145b40d62105e660ca4f466ee0a2d70c68c11c4e6929e46117380482c70957e08e3bf6b5aca1ea0e2c7d4360f317' '9e277b0373c024d9ec0175e7a036f85152ce145b40d62105e660ca4f466ee0a2d70c68c11c4e6929e46117380482c70957e08e3bf6b5aca1ea0e2c7d4360f317'
'ac31a75ad3086e26045d02d917fd1c0f155b9e1a6ea82aa8aaf9687500a129b80be82947f6a07928399570920bdbc829d6ff1b79d0b30538606d056a76aaab05') 'ac31a75ad3086e26045d02d917fd1c0f155b9e1a6ea82aa8aaf9687500a129b80be82947f6a07928399570920bdbc829d6ff1b79d0b30538606d056a76aaab05'
'23596f6e5ba9628629f9fca36e3518427ffacdc54505224b4a6e6f039bb3fc168e20093c645b1c093ceb8280fe549a2f6d2af857afad55c28fcc5f9f26917e44')
validpgpkeys=( validpgpkeys=(
D637032E45B8C6585B9456565D2EEE6F6F349D7C # Tim Müller <tim@gstreamer-foundation.org> D637032E45B8C6585B9456565D2EEE6F6F349D7C # Tim Müller <tim@gstreamer-foundation.org>
) )
...@@ -204,8 +206,11 @@ prepare() { ...@@ -204,8 +206,11 @@ prepare() {
# Disable broken tests # Disable broken tests
git apply -3 ../0001-HACK-meson-Disable-broken-tests.patch git apply -3 ../0001-HACK-meson-Disable-broken-tests.patch
# Fix build # Fix build of GES
git apply -3 ../0002-ges-Fix-name-of-GESFrameCompositionMeta-API-type.patch git apply -3 ../0002-ges-Fix-name-of-GESFrameCompositionMeta-API-type.patch
# Fix build with x265 4.0
git apply -3 ../0003-x265enc-Unbreak-build-with-x265-4.0.patch
} }
build() { build() {
...@@ -524,7 +529,7 @@ package_gst-plugins-base() { ...@@ -524,7 +529,7 @@ package_gst-plugins-base() {
glib2 glib2
glibc glibc
graphene graphene
libjpeg libjpeg-turbo
libogg libogg
libpng libpng
libtheora libtheora
...@@ -565,7 +570,7 @@ package_gst-plugins-good() { ...@@ -565,7 +570,7 @@ package_gst-plugins-good() {
libdv libdv
libgudev libgudev
libiec61883 libiec61883
libjpeg libjpeg-turbo
libpng libpng
libpulse libpulse
libraw1394 libraw1394
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment