mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-05 13:14:45 +02:00
raspidistro-ffmpeg: add support for building raspidistro ffmpeg
Pulls the raspidistro version of ffmpeg down and applies the necessary patches that are located in the debian/patches folder. Signed-off-by: Vincent Davis Jr <vince@underview.tech>
This commit is contained in:
Vincent Davis Jr
Andrei Gherzan
parent
c57b464b88
commit
ba965e3b67
|
|
@ -0,0 +1,288 @@
|
||||||
|
From: James Cowgill <jcowgill@debian.org>
|
||||||
|
Date: Sun, 11 Aug 2019 16:50:56 +0100
|
||||||
|
Subject: avcodec/arm/sbcenc: avoid callee preserved vfp registers
|
||||||
|
|
||||||
|
When compiling FFmpeg with GCC-9, some very random segfaults were
|
||||||
|
observed in code which had previously called down into the SBC encoder
|
||||||
|
NEON assembly routines. This was caused by these functions clobbering
|
||||||
|
some of the vfp callee saved registers (d8 - d15 aka q4 - q7). GCC was
|
||||||
|
using these registers to save local variables, but after these
|
||||||
|
functions returned, they would contain garbage.
|
||||||
|
|
||||||
|
Fix by reallocating the registers in the two affected functions in
|
||||||
|
the following way:
|
||||||
|
ff_sbc_analyze_4_neon: q2-q5 => q8-q11, then q1-q4 => q8-q11
|
||||||
|
ff_sbc_analyze_8_neon: q2-q9 => q8-q15
|
||||||
|
|
||||||
|
The reason for using these replacements is to keep closely related
|
||||||
|
sets of registers consecutively numbered which hopefully makes the
|
||||||
|
code more easy to follow. Since this commit only reallocates
|
||||||
|
registers, it should have no performance impact.
|
||||||
|
|
||||||
|
Upstream-status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: James Cowgill <jcowgill@debian.org>
|
||||||
|
---
|
||||||
|
libavcodec/arm/sbcdsp_neon.S | 220 +++++++++++++++++++++----------------------
|
||||||
|
1 file changed, 110 insertions(+), 110 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libavcodec/arm/sbcdsp_neon.S b/libavcodec/arm/sbcdsp_neon.S
|
||||||
|
index d83d21d..914abfb 100644
|
||||||
|
--- a/libavcodec/arm/sbcdsp_neon.S
|
||||||
|
+++ b/libavcodec/arm/sbcdsp_neon.S
|
||||||
|
@@ -38,49 +38,49 @@ function ff_sbc_analyze_4_neon, export=1
|
||||||
|
/* TODO: merge even and odd cases (or even merge all four calls to this
|
||||||
|
* function) in order to have only aligned reads from 'in' array
|
||||||
|
* and reduce number of load instructions */
|
||||||
|
- vld1.16 {d4, d5}, [r0, :64]!
|
||||||
|
- vld1.16 {d8, d9}, [r2, :128]!
|
||||||
|
+ vld1.16 {d16, d17}, [r0, :64]!
|
||||||
|
+ vld1.16 {d20, d21}, [r2, :128]!
|
||||||
|
|
||||||
|
- vmull.s16 q0, d4, d8
|
||||||
|
- vld1.16 {d6, d7}, [r0, :64]!
|
||||||
|
- vmull.s16 q1, d5, d9
|
||||||
|
- vld1.16 {d10, d11}, [r2, :128]!
|
||||||
|
+ vmull.s16 q0, d16, d20
|
||||||
|
+ vld1.16 {d18, d19}, [r0, :64]!
|
||||||
|
+ vmull.s16 q1, d17, d21
|
||||||
|
+ vld1.16 {d22, d23}, [r2, :128]!
|
||||||
|
|
||||||
|
- vmlal.s16 q0, d6, d10
|
||||||
|
- vld1.16 {d4, d5}, [r0, :64]!
|
||||||
|
- vmlal.s16 q1, d7, d11
|
||||||
|
- vld1.16 {d8, d9}, [r2, :128]!
|
||||||
|
+ vmlal.s16 q0, d18, d22
|
||||||
|
+ vld1.16 {d16, d17}, [r0, :64]!
|
||||||
|
+ vmlal.s16 q1, d19, d23
|
||||||
|
+ vld1.16 {d20, d21}, [r2, :128]!
|
||||||
|
|
||||||
|
- vmlal.s16 q0, d4, d8
|
||||||
|
- vld1.16 {d6, d7}, [r0, :64]!
|
||||||
|
- vmlal.s16 q1, d5, d9
|
||||||
|
- vld1.16 {d10, d11}, [r2, :128]!
|
||||||
|
+ vmlal.s16 q0, d16, d20
|
||||||
|
+ vld1.16 {d18, d19}, [r0, :64]!
|
||||||
|
+ vmlal.s16 q1, d17, d21
|
||||||
|
+ vld1.16 {d22, d23}, [r2, :128]!
|
||||||
|
|
||||||
|
- vmlal.s16 q0, d6, d10
|
||||||
|
- vld1.16 {d4, d5}, [r0, :64]!
|
||||||
|
- vmlal.s16 q1, d7, d11
|
||||||
|
- vld1.16 {d8, d9}, [r2, :128]!
|
||||||
|
+ vmlal.s16 q0, d18, d22
|
||||||
|
+ vld1.16 {d16, d17}, [r0, :64]!
|
||||||
|
+ vmlal.s16 q1, d19, d23
|
||||||
|
+ vld1.16 {d20, d21}, [r2, :128]!
|
||||||
|
|
||||||
|
- vmlal.s16 q0, d4, d8
|
||||||
|
- vmlal.s16 q1, d5, d9
|
||||||
|
+ vmlal.s16 q0, d16, d20
|
||||||
|
+ vmlal.s16 q1, d17, d21
|
||||||
|
|
||||||
|
vpadd.s32 d0, d0, d1
|
||||||
|
vpadd.s32 d1, d2, d3
|
||||||
|
|
||||||
|
vrshrn.s32 d0, q0, SBC_PROTO_FIXED_SCALE
|
||||||
|
|
||||||
|
- vld1.16 {d2, d3, d4, d5}, [r2, :128]!
|
||||||
|
+ vld1.16 {d16, d17, d18, d19}, [r2, :128]!
|
||||||
|
|
||||||
|
vdup.i32 d1, d0[1] /* TODO: can be eliminated */
|
||||||
|
vdup.i32 d0, d0[0] /* TODO: can be eliminated */
|
||||||
|
|
||||||
|
- vmull.s16 q3, d2, d0
|
||||||
|
- vmull.s16 q4, d3, d0
|
||||||
|
- vmlal.s16 q3, d4, d1
|
||||||
|
- vmlal.s16 q4, d5, d1
|
||||||
|
+ vmull.s16 q10, d16, d0
|
||||||
|
+ vmull.s16 q11, d17, d0
|
||||||
|
+ vmlal.s16 q10, d18, d1
|
||||||
|
+ vmlal.s16 q11, d19, d1
|
||||||
|
|
||||||
|
- vpadd.s32 d0, d6, d7 /* TODO: can be eliminated */
|
||||||
|
- vpadd.s32 d1, d8, d9 /* TODO: can be eliminated */
|
||||||
|
+ vpadd.s32 d0, d20, d21 /* TODO: can be eliminated */
|
||||||
|
+ vpadd.s32 d1, d22, d23 /* TODO: can be eliminated */
|
||||||
|
|
||||||
|
vst1.32 {d0, d1}, [r1, :128]
|
||||||
|
|
||||||
|
@@ -91,57 +91,57 @@ function ff_sbc_analyze_8_neon, export=1
|
||||||
|
/* TODO: merge even and odd cases (or even merge all four calls to this
|
||||||
|
* function) in order to have only aligned reads from 'in' array
|
||||||
|
* and reduce number of load instructions */
|
||||||
|
- vld1.16 {d4, d5}, [r0, :64]!
|
||||||
|
- vld1.16 {d8, d9}, [r2, :128]!
|
||||||
|
-
|
||||||
|
- vmull.s16 q6, d4, d8
|
||||||
|
- vld1.16 {d6, d7}, [r0, :64]!
|
||||||
|
- vmull.s16 q7, d5, d9
|
||||||
|
- vld1.16 {d10, d11}, [r2, :128]!
|
||||||
|
- vmull.s16 q8, d6, d10
|
||||||
|
- vld1.16 {d4, d5}, [r0, :64]!
|
||||||
|
- vmull.s16 q9, d7, d11
|
||||||
|
- vld1.16 {d8, d9}, [r2, :128]!
|
||||||
|
-
|
||||||
|
- vmlal.s16 q6, d4, d8
|
||||||
|
- vld1.16 {d6, d7}, [r0, :64]!
|
||||||
|
- vmlal.s16 q7, d5, d9
|
||||||
|
- vld1.16 {d10, d11}, [r2, :128]!
|
||||||
|
- vmlal.s16 q8, d6, d10
|
||||||
|
- vld1.16 {d4, d5}, [r0, :64]!
|
||||||
|
- vmlal.s16 q9, d7, d11
|
||||||
|
- vld1.16 {d8, d9}, [r2, :128]!
|
||||||
|
-
|
||||||
|
- vmlal.s16 q6, d4, d8
|
||||||
|
- vld1.16 {d6, d7}, [r0, :64]!
|
||||||
|
- vmlal.s16 q7, d5, d9
|
||||||
|
- vld1.16 {d10, d11}, [r2, :128]!
|
||||||
|
- vmlal.s16 q8, d6, d10
|
||||||
|
- vld1.16 {d4, d5}, [r0, :64]!
|
||||||
|
- vmlal.s16 q9, d7, d11
|
||||||
|
- vld1.16 {d8, d9}, [r2, :128]!
|
||||||
|
-
|
||||||
|
- vmlal.s16 q6, d4, d8
|
||||||
|
- vld1.16 {d6, d7}, [r0, :64]!
|
||||||
|
- vmlal.s16 q7, d5, d9
|
||||||
|
- vld1.16 {d10, d11}, [r2, :128]!
|
||||||
|
- vmlal.s16 q8, d6, d10
|
||||||
|
- vld1.16 {d4, d5}, [r0, :64]!
|
||||||
|
- vmlal.s16 q9, d7, d11
|
||||||
|
- vld1.16 {d8, d9}, [r2, :128]!
|
||||||
|
-
|
||||||
|
- vmlal.s16 q6, d4, d8
|
||||||
|
- vld1.16 {d6, d7}, [r0, :64]!
|
||||||
|
- vmlal.s16 q7, d5, d9
|
||||||
|
- vld1.16 {d10, d11}, [r2, :128]!
|
||||||
|
-
|
||||||
|
- vmlal.s16 q8, d6, d10
|
||||||
|
- vmlal.s16 q9, d7, d11
|
||||||
|
-
|
||||||
|
- vpadd.s32 d0, d12, d13
|
||||||
|
- vpadd.s32 d1, d14, d15
|
||||||
|
- vpadd.s32 d2, d16, d17
|
||||||
|
- vpadd.s32 d3, d18, d19
|
||||||
|
+ vld1.16 {d16, d17}, [r0, :64]!
|
||||||
|
+ vld1.16 {d20, d21}, [r2, :128]!
|
||||||
|
+
|
||||||
|
+ vmull.s16 q12, d16, d20
|
||||||
|
+ vld1.16 {d18, d19}, [r0, :64]!
|
||||||
|
+ vmull.s16 q13, d17, d21
|
||||||
|
+ vld1.16 {d22, d23}, [r2, :128]!
|
||||||
|
+ vmull.s16 q14, d18, d22
|
||||||
|
+ vld1.16 {d16, d17}, [r0, :64]!
|
||||||
|
+ vmull.s16 q15, d19, d23
|
||||||
|
+ vld1.16 {d20, d21}, [r2, :128]!
|
||||||
|
+
|
||||||
|
+ vmlal.s16 q12, d16, d20
|
||||||
|
+ vld1.16 {d18, d19}, [r0, :64]!
|
||||||
|
+ vmlal.s16 q13, d17, d21
|
||||||
|
+ vld1.16 {d22, d23}, [r2, :128]!
|
||||||
|
+ vmlal.s16 q14, d18, d22
|
||||||
|
+ vld1.16 {d16, d17}, [r0, :64]!
|
||||||
|
+ vmlal.s16 q15, d19, d23
|
||||||
|
+ vld1.16 {d20, d21}, [r2, :128]!
|
||||||
|
+
|
||||||
|
+ vmlal.s16 q12, d16, d20
|
||||||
|
+ vld1.16 {d18, d19}, [r0, :64]!
|
||||||
|
+ vmlal.s16 q13, d17, d21
|
||||||
|
+ vld1.16 {d22, d23}, [r2, :128]!
|
||||||
|
+ vmlal.s16 q14, d18, d22
|
||||||
|
+ vld1.16 {d16, d17}, [r0, :64]!
|
||||||
|
+ vmlal.s16 q15, d19, d23
|
||||||
|
+ vld1.16 {d20, d21}, [r2, :128]!
|
||||||
|
+
|
||||||
|
+ vmlal.s16 q12, d16, d20
|
||||||
|
+ vld1.16 {d18, d19}, [r0, :64]!
|
||||||
|
+ vmlal.s16 q13, d17, d21
|
||||||
|
+ vld1.16 {d22, d23}, [r2, :128]!
|
||||||
|
+ vmlal.s16 q14, d18, d22
|
||||||
|
+ vld1.16 {d16, d17}, [r0, :64]!
|
||||||
|
+ vmlal.s16 q15, d19, d23
|
||||||
|
+ vld1.16 {d20, d21}, [r2, :128]!
|
||||||
|
+
|
||||||
|
+ vmlal.s16 q12, d16, d20
|
||||||
|
+ vld1.16 {d18, d19}, [r0, :64]!
|
||||||
|
+ vmlal.s16 q13, d17, d21
|
||||||
|
+ vld1.16 {d22, d23}, [r2, :128]!
|
||||||
|
+
|
||||||
|
+ vmlal.s16 q14, d18, d22
|
||||||
|
+ vmlal.s16 q15, d19, d23
|
||||||
|
+
|
||||||
|
+ vpadd.s32 d0, d24, d25
|
||||||
|
+ vpadd.s32 d1, d26, d27
|
||||||
|
+ vpadd.s32 d2, d28, d29
|
||||||
|
+ vpadd.s32 d3, d30, d31
|
||||||
|
|
||||||
|
vrshr.s32 q0, q0, SBC_PROTO_FIXED_SCALE
|
||||||
|
vrshr.s32 q1, q1, SBC_PROTO_FIXED_SCALE
|
||||||
|
@@ -153,38 +153,38 @@ function ff_sbc_analyze_8_neon, export=1
|
||||||
|
vdup.i32 d1, d0[1] /* TODO: can be eliminated */
|
||||||
|
vdup.i32 d0, d0[0] /* TODO: can be eliminated */
|
||||||
|
|
||||||
|
- vld1.16 {d4, d5}, [r2, :128]!
|
||||||
|
- vmull.s16 q6, d4, d0
|
||||||
|
- vld1.16 {d6, d7}, [r2, :128]!
|
||||||
|
- vmull.s16 q7, d5, d0
|
||||||
|
- vmull.s16 q8, d6, d0
|
||||||
|
- vmull.s16 q9, d7, d0
|
||||||
|
-
|
||||||
|
- vld1.16 {d4, d5}, [r2, :128]!
|
||||||
|
- vmlal.s16 q6, d4, d1
|
||||||
|
- vld1.16 {d6, d7}, [r2, :128]!
|
||||||
|
- vmlal.s16 q7, d5, d1
|
||||||
|
- vmlal.s16 q8, d6, d1
|
||||||
|
- vmlal.s16 q9, d7, d1
|
||||||
|
-
|
||||||
|
- vld1.16 {d4, d5}, [r2, :128]!
|
||||||
|
- vmlal.s16 q6, d4, d2
|
||||||
|
- vld1.16 {d6, d7}, [r2, :128]!
|
||||||
|
- vmlal.s16 q7, d5, d2
|
||||||
|
- vmlal.s16 q8, d6, d2
|
||||||
|
- vmlal.s16 q9, d7, d2
|
||||||
|
-
|
||||||
|
- vld1.16 {d4, d5}, [r2, :128]!
|
||||||
|
- vmlal.s16 q6, d4, d3
|
||||||
|
- vld1.16 {d6, d7}, [r2, :128]!
|
||||||
|
- vmlal.s16 q7, d5, d3
|
||||||
|
- vmlal.s16 q8, d6, d3
|
||||||
|
- vmlal.s16 q9, d7, d3
|
||||||
|
-
|
||||||
|
- vpadd.s32 d0, d12, d13 /* TODO: can be eliminated */
|
||||||
|
- vpadd.s32 d1, d14, d15 /* TODO: can be eliminated */
|
||||||
|
- vpadd.s32 d2, d16, d17 /* TODO: can be eliminated */
|
||||||
|
- vpadd.s32 d3, d18, d19 /* TODO: can be eliminated */
|
||||||
|
+ vld1.16 {d16, d17}, [r2, :128]!
|
||||||
|
+ vmull.s16 q12, d16, d0
|
||||||
|
+ vld1.16 {d18, d19}, [r2, :128]!
|
||||||
|
+ vmull.s16 q13, d17, d0
|
||||||
|
+ vmull.s16 q14, d18, d0
|
||||||
|
+ vmull.s16 q15, d19, d0
|
||||||
|
+
|
||||||
|
+ vld1.16 {d16, d17}, [r2, :128]!
|
||||||
|
+ vmlal.s16 q12, d16, d1
|
||||||
|
+ vld1.16 {d18, d19}, [r2, :128]!
|
||||||
|
+ vmlal.s16 q13, d17, d1
|
||||||
|
+ vmlal.s16 q14, d18, d1
|
||||||
|
+ vmlal.s16 q15, d19, d1
|
||||||
|
+
|
||||||
|
+ vld1.16 {d16, d17}, [r2, :128]!
|
||||||
|
+ vmlal.s16 q12, d16, d2
|
||||||
|
+ vld1.16 {d18, d19}, [r2, :128]!
|
||||||
|
+ vmlal.s16 q13, d17, d2
|
||||||
|
+ vmlal.s16 q14, d18, d2
|
||||||
|
+ vmlal.s16 q15, d19, d2
|
||||||
|
+
|
||||||
|
+ vld1.16 {d16, d17}, [r2, :128]!
|
||||||
|
+ vmlal.s16 q12, d16, d3
|
||||||
|
+ vld1.16 {d18, d19}, [r2, :128]!
|
||||||
|
+ vmlal.s16 q13, d17, d3
|
||||||
|
+ vmlal.s16 q14, d18, d3
|
||||||
|
+ vmlal.s16 q15, d19, d3
|
||||||
|
+
|
||||||
|
+ vpadd.s32 d0, d24, d25 /* TODO: can be eliminated */
|
||||||
|
+ vpadd.s32 d1, d26, d27 /* TODO: can be eliminated */
|
||||||
|
+ vpadd.s32 d2, d28, d29 /* TODO: can be eliminated */
|
||||||
|
+ vpadd.s32 d3, d30, d31 /* TODO: can be eliminated */
|
||||||
|
|
||||||
|
vst1.32 {d0, d1, d2, d3}, [r1, :128]
|
||||||
|
|
@ -0,0 +1,31 @@
|
||||||
|
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
|
||||||
|
Date: Tue, 19 Jan 2021 20:35:29 +0100
|
||||||
|
Subject: Fix build on powerpc and ppc64
|
||||||
|
|
||||||
|
Upstream-status: Pending
|
||||||
|
|
||||||
|
---
|
||||||
|
libswscale/ppc/yuv2rgb_altivec.c | 10 ++++++++++
|
||||||
|
1 file changed, 10 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c
|
||||||
|
index 5365452..930ef6b 100644
|
||||||
|
--- a/libswscale/ppc/yuv2rgb_altivec.c
|
||||||
|
+++ b/libswscale/ppc/yuv2rgb_altivec.c
|
||||||
|
@@ -283,6 +283,16 @@ static inline void cvtyuvtoRGB(SwsContext *c, vector signed short Y,
|
||||||
|
* ------------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
|
||||||
|
+#if !HAVE_VSX
|
||||||
|
+static inline vector unsigned char vec_xl(signed long long offset, const ubyte *addr)
|
||||||
|
+{
|
||||||
|
+ const vector unsigned char *v_addr = (const vector unsigned char *) (addr + offset);
|
||||||
|
+ vector unsigned char align_perm = vec_lvsl(offset, addr);
|
||||||
|
+
|
||||||
|
+ return (vector unsigned char) vec_perm(v_addr[0], v_addr[1], align_perm);
|
||||||
|
+}
|
||||||
|
+#endif /* !HAVE_VSX */
|
||||||
|
+
|
||||||
|
#define DEFCSP420_CVT(name, out_pixels) \
|
||||||
|
static int altivec_ ## name(SwsContext *c, const unsigned char **in, \
|
||||||
|
int *instrides, int srcSliceY, int srcSliceH, \
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
From: Paul B Mahol <onemda@gmail.com>
|
||||||
|
Date: Sun, 14 Feb 2021 17:20:03 +0100
|
||||||
|
Subject: avcodec/pngenc: remove monowhite from apng formats
|
||||||
|
|
||||||
|
Monowhite pixel format is not supported, and it does not make sense
|
||||||
|
to add support for it.
|
||||||
|
|
||||||
|
Fixes #7989
|
||||||
|
|
||||||
|
Upstream-status: Pending
|
||||||
|
|
||||||
|
---
|
||||||
|
libavcodec/pngenc.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c
|
||||||
|
index efcae8c..eebb164 100644
|
||||||
|
--- a/libavcodec/pngenc.c
|
||||||
|
+++ b/libavcodec/pngenc.c
|
||||||
|
@@ -1174,7 +1174,7 @@ AVCodec ff_apng_encoder = {
|
||||||
|
AV_PIX_FMT_PAL8,
|
||||||
|
AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8A,
|
||||||
|
AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_YA16BE,
|
||||||
|
- AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE
|
||||||
|
+ AV_PIX_FMT_NONE
|
||||||
|
},
|
||||||
|
.priv_class = &apngenc_class,
|
||||||
|
};
|
||||||
60569
recipes-multimedia/rpidistro-ffmpeg/files/0004-ffmpeg-4.3.2-rpi_10.patch
Normal file
60569
recipes-multimedia/rpidistro-ffmpeg/files/0004-ffmpeg-4.3.2-rpi_10.patch
Normal file
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,19 @@
|
||||||
|
Upstream-status: Pending
|
||||||
|
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -6467,11 +6467,9 @@ enabled mbedtls && { check_pkg
|
||||||
|
die "ERROR: mbedTLS not found"; }
|
||||||
|
enabled mediacodec && { enabled jni || die "ERROR: mediacodec requires --enable-jni"; }
|
||||||
|
( enabled rpi ||
|
||||||
|
- enabled mmal ) && { check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host ||
|
||||||
|
- { ! enabled cross_compile &&
|
||||||
|
- add_cflags -isystem/opt/vc/include/ -isystem/opt/vc/include/interface/vmcs_host/linux -isystem/opt/vc/include/interface/vcos/pthreads -fgnu89-inline &&
|
||||||
|
- add_ldflags -L/opt/vc/lib/ &&
|
||||||
|
- check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host -lvcos -lvcsm -lvchostif -lvchiq_arm; } ||
|
||||||
|
+ enabled mmal ) && { { add_cflags -isystem/opt/vc/include/ -isystem/opt/vc/include/interface/vmcs_host/linux -isystem/opt/vc/include/interface/vcos/pthreads -fgnu89-inline &&
|
||||||
|
+ add_ldflags -L/opt/vc/lib/ &&
|
||||||
|
+ check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host -lvcsm -lvchostif -lvchiq_arm -lvcos; } ||
|
||||||
|
die "ERROR: mmal not found" &&
|
||||||
|
check_func_headers interface/mmal/mmal.h "MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"; }
|
||||||
|
enabled openal && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal" "-lOpenAL32"; do
|
||||||
188
recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_4.3.2.bb
Normal file
188
recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_4.3.2.bb
Normal file
|
|
@ -0,0 +1,188 @@
|
||||||
|
SUMMARY = "A complete, cross-platform solution to record, convert and stream audio and video."
|
||||||
|
DESCRIPTION = "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, \
|
||||||
|
mux, demux, stream, filter and play pretty much anything that humans and machines \
|
||||||
|
have created. It supports the most obscure ancient formats up to the cutting edge."
|
||||||
|
HOMEPAGE = "https://www.ffmpeg.org/"
|
||||||
|
SECTION = "libs"
|
||||||
|
|
||||||
|
LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & ISC & MIT & BSD-2-Clause & BSD-3-Clause & IJG"
|
||||||
|
LICENSE:${PN} = "GPL-2.0-or-later"
|
||||||
|
LICENSE:libavcodec = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
||||||
|
LICENSE:libavdevice = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
||||||
|
LICENSE:libavfilter = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
||||||
|
LICENSE:libavformat = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
||||||
|
LICENSE:libavutil = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
||||||
|
LICENSE:libpostproc = "GPL-2.0-or-later"
|
||||||
|
LICENSE:libswresample = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
||||||
|
LICENSE:libswscale = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"
|
||||||
|
LICENSE_FLAGS = "commercial"
|
||||||
|
|
||||||
|
LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||||
|
file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
|
||||||
|
file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
|
||||||
|
file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
|
||||||
|
|
||||||
|
# Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
|
||||||
|
ARM_INSTRUCTION_SET_armv4 = "arm"
|
||||||
|
ARM_INSTRUCTION_SET_armv5 = "arm"
|
||||||
|
ARM_INSTRUCTION_SET_armv6 = "arm"
|
||||||
|
# Should be API compatible with libav (which was a fork of ffmpeg)
|
||||||
|
# libpostproc was previously packaged from a separate recipe
|
||||||
|
PROVIDES = "ffmpeg libav libpostproc"
|
||||||
|
RPROVIDES:${PN} = "${PROVIDES}"
|
||||||
|
DEPENDS = "nasm-native"
|
||||||
|
|
||||||
|
inherit autotools pkgconfig
|
||||||
|
PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample \
|
||||||
|
opengl udev sdl2 ffplay alsa bzlib lzma pic pthreads shared theora zlib \
|
||||||
|
libvorbis x264 gpl mmal sand rpi vout-drm vout-egl \
|
||||||
|
${@bb.utils.contains('AVAILTUNES', 'mips32r2', 'mips32r2', '', d)} \
|
||||||
|
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)}"
|
||||||
|
|
||||||
|
SRC_URI = "\
|
||||||
|
git://git@github.com/RPi-Distro/ffmpeg;protocol=https;branch=pios/bullseye \
|
||||||
|
file://0001-avcodec-arm-sbcenc-avoid-callee-preserved-vfp-regist.patch \
|
||||||
|
file://0002-Fix-build-on-powerpc-and-ppc64.patch \
|
||||||
|
file://0003-avcodec-pngenc-remove-monowhite-from-apng-formats.patch \
|
||||||
|
file://0004-ffmpeg-4.3.2-rpi_10.patch \
|
||||||
|
file://0005-fix_flags.diff \
|
||||||
|
"
|
||||||
|
|
||||||
|
SRCREV = "ea72093f350f38edcd39c480b331c3219c377642"
|
||||||
|
|
||||||
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
# libraries to build in addition to avutil
|
||||||
|
PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice"
|
||||||
|
PACKAGECONFIG[avfilter] = "--enable-avfilter,--disable-avfilter"
|
||||||
|
PACKAGECONFIG[avcodec] = "--enable-avcodec,--disable-avcodec"
|
||||||
|
PACKAGECONFIG[avformat] = "--enable-avformat,--disable-avformat"
|
||||||
|
PACKAGECONFIG[swresample] = "--enable-swresample,--disable-swresample"
|
||||||
|
PACKAGECONFIG[swscale] = "--enable-swscale,--disable-swscale"
|
||||||
|
PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc"
|
||||||
|
PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample"
|
||||||
|
|
||||||
|
# features to support
|
||||||
|
PACKAGECONFIG[ffplay] = "--enable-ffplay,--disable-ffplay"
|
||||||
|
PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
|
||||||
|
PACKAGECONFIG[altivec] = "--enable-altivec,--disable-altivec,"
|
||||||
|
PACKAGECONFIG[bzlib] = "--enable-bzlib,--disable-bzlib,bzip2"
|
||||||
|
PACKAGECONFIG[fdk-aac] = "--enable-libfdk-aac --enable-nonfree,--disable-libfdk-aac,fdk-aac"
|
||||||
|
PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl"
|
||||||
|
PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl"
|
||||||
|
PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm"
|
||||||
|
PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack"
|
||||||
|
PACKAGECONFIG[libvorbis] = "--enable-libvorbis,--disable-libvorbis,libvorbis"
|
||||||
|
PACKAGECONFIG[libopus] = "--enable-libopus,--disable-libopus,libopus"
|
||||||
|
PACKAGECONFIG[lzma] = "--enable-lzma,--disable-lzma,xz"
|
||||||
|
PACKAGECONFIG[mfx] = "--enable-libmfx,--disable-libmfx,intel-mediasdk"
|
||||||
|
PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame"
|
||||||
|
PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
|
||||||
|
PACKAGECONFIG[sdl2] = "--enable-sdl2,--disable-sdl2,virtual/libsdl2"
|
||||||
|
PACKAGECONFIG[speex] = "--enable-libspeex,--disable-libspeex,speex"
|
||||||
|
PACKAGECONFIG[srt] = "--enable-libsrt,--disable-libsrt,srt"
|
||||||
|
PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora libogg"
|
||||||
|
PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva"
|
||||||
|
PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
|
||||||
|
PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx"
|
||||||
|
PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264"
|
||||||
|
PACKAGECONFIG[xcb] = "--enable-libxcb,--disable-libxcb,libxcb"
|
||||||
|
PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv"
|
||||||
|
PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
|
||||||
|
#PACKAGECONFIG[snappy] = "--enable-libsnappy,--enable-libsnappy,snappy"
|
||||||
|
PACKAGECONFIG[udev] = "--enable-libudev,--disable-libudev,udev"
|
||||||
|
PACKAGECONFIG[v4l2] = "--enable-libv4l2 --enable-v4l2-request --enable-libdrm,,v4l-utils"
|
||||||
|
PACKAGECONFIG[mmal] = "--enable-omx --enable-omx-rpi --enable-mmal,,userland"
|
||||||
|
PACKAGECONFIG[sand] = "--enable-sand,,"
|
||||||
|
PACKAGECONFIG[rpi] = "--enable-rpi,,"
|
||||||
|
PACKAGECONFIG[vout-drm] = "--enable-vout-drm,,libdrm"
|
||||||
|
PACKAGECONFIG[vout-egl] = "--enable-vout-egl,,virtual/egl"
|
||||||
|
|
||||||
|
# other configuration options
|
||||||
|
PACKAGECONFIG[mips32r2] = ",--disable-mipsdsp --disable-mipsdspr2"
|
||||||
|
PACKAGECONFIG[pic] = "--enable-pic"
|
||||||
|
PACKAGECONFIG[pthreads] = "--enable-pthreads,--disable-pthreads"
|
||||||
|
PACKAGECONFIG[shared] = "--enable-shared"
|
||||||
|
PACKAGECONFIG[strip] = ",--disable-stripping"
|
||||||
|
|
||||||
|
# Check codecs that require --enable-nonfree
|
||||||
|
USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'openssl' ], 'yes', '', d)}"
|
||||||
|
|
||||||
|
def cpu(d):
|
||||||
|
for arg in (d.getVar('TUNE_CCARGS') or '').split():
|
||||||
|
if arg.startswith('-mcpu='):
|
||||||
|
return arg[6:]
|
||||||
|
return 'generic'
|
||||||
|
|
||||||
|
EXTRA_OECONF = " \
|
||||||
|
${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \
|
||||||
|
\
|
||||||
|
--cross-prefix=${TARGET_PREFIX} \
|
||||||
|
\
|
||||||
|
--ld="${CCLD}" \
|
||||||
|
--cc="${CC}" \
|
||||||
|
--cxx="${CXX}" \
|
||||||
|
--arch=${TARGET_ARCH} \
|
||||||
|
--target-os="linux" \
|
||||||
|
--enable-cross-compile \
|
||||||
|
--extra-cflags="${CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
|
||||||
|
--extra-ldflags="${LDFLAGS}" \
|
||||||
|
--sysroot="${STAGING_DIR_TARGET}" \
|
||||||
|
${EXTRA_FFCONF} \
|
||||||
|
--libdir=${libdir} \
|
||||||
|
--shlibdir=${libdir} \
|
||||||
|
--datadir=${datadir}/ffmpeg \
|
||||||
|
--cpu=${@cpu(d)} \
|
||||||
|
--pkg-config=pkg-config \
|
||||||
|
"
|
||||||
|
EXTRA_OECONF:append:linux-gnux32 = " --disable-asm"
|
||||||
|
|
||||||
|
# Directly specify the include directories the contain headers for
|
||||||
|
# libdrm
|
||||||
|
# openmaxil
|
||||||
|
TARGET_CFLAGS:append = " -I${STAGING_INCDIR}/IL -I${STAGING_INCDIR}/drm"
|
||||||
|
|
||||||
|
# gold crashes on x86, another solution is to --disable-asm but thats more hacky
|
||||||
|
# ld.gold: internal error in relocate_section, at ../../gold/i386.cc:3684
|
||||||
|
LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
|
||||||
|
EXTRA_OEMAKE = "V=1"
|
||||||
|
|
||||||
|
do_configure() {
|
||||||
|
${S}/configure ${EXTRA_OECONF}
|
||||||
|
}
|
||||||
|
|
||||||
|
# patch out build host paths for reproducibility
|
||||||
|
do_compile:prepend:class-target() {
|
||||||
|
sed -i -e "s,${WORKDIR},,g" ${B}/config.h
|
||||||
|
}
|
||||||
|
|
||||||
|
PACKAGES =+ "libavcodec \
|
||||||
|
libavdevice \
|
||||||
|
libavfilter \
|
||||||
|
libavformat \
|
||||||
|
libavresample \
|
||||||
|
libavutil \
|
||||||
|
libpostproc \
|
||||||
|
libswresample \
|
||||||
|
libswscale"
|
||||||
|
|
||||||
|
FILES:${PN}:append = " /usr/share/ffmpeg"
|
||||||
|
FILES:libavcodec = "${libdir}/libavcodec${SOLIBS}"
|
||||||
|
FILES:libavdevice = "${libdir}/libavdevice${SOLIBS}"
|
||||||
|
FILES:libavfilter = "${libdir}/libavfilter${SOLIBS}"
|
||||||
|
FILES:libavformat = "${libdir}/libavformat${SOLIBS}"
|
||||||
|
FILES:libavresample = "${libdir}/libavresample${SOLIBS}"
|
||||||
|
FILES:libavutil = "${libdir}/libavutil${SOLIBS}"
|
||||||
|
FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}"
|
||||||
|
FILES:libswresample = "${libdir}/libswresample${SOLIBS}"
|
||||||
|
FILES:libswscale = "${libdir}/libswscale${SOLIBS}"
|
||||||
|
# ffmpeg disables PIC on some platforms (e.g. x86-32)
|
||||||
|
INSANE_SKIP:${MLPREFIX}libavcodec = "textrel"
|
||||||
|
INSANE_SKIP:${MLPREFIX}libavdevice = "textrel"
|
||||||
|
INSANE_SKIP:${MLPREFIX}libavfilter = "textrel"
|
||||||
|
INSANE_SKIP:${MLPREFIX}libavformat = "textrel"
|
||||||
|
INSANE_SKIP:${MLPREFIX}libavutil = "textrel"
|
||||||
|
INSANE_SKIP:${MLPREFIX}libavresample = "textrel"
|
||||||
|
INSANE_SKIP:${MLPREFIX}libswscale = "textrel"
|
||||||
|
INSANE_SKIP:${MLPREFIX}libswresample = "textrel"
|
||||||
|
INSANE_SKIP:${MLPREFIX}libpostproc = "textrel"
|
||||||
Loading…
Reference in New Issue
Block a user