6dbb40955f
Needed for the upcoming Nexus version of kodi-inputstream-adaptive,
the bundled version of bento4 was removed upstream:
70625e7670
Backported upstream commit to fix cmake install as patch 0001.
Added feature- and bugfix-patches from kodi, they were sent upstream:
https://github.com/axiomatic-systems/Bento4/issues/648
Build-tested using this defconfig:
BR2_PACKAGE_BENTO4=y
andes-nds32 [ 1/45]: SKIPPED
arm-aarch64 [ 2/45]: OK
bootlin-aarch64-glibc [ 3/45]: OK
bootlin-arcle-hs38-uclibc [ 4/45]: OK
bootlin-armv5-uclibc [ 5/45]: OK
bootlin-armv7-glibc [ 6/45]: OK
bootlin-armv7m-uclibc [ 7/45]: OK
bootlin-armv7-musl [ 8/45]: OK
bootlin-m68k-5208-uclibc [ 9/45]: OK
bootlin-m68k-68040-uclibc [10/45]: OK
bootlin-microblazeel-uclibc [11/45]: OK
bootlin-mipsel32r6-glibc [12/45]: OK
bootlin-mipsel-uclibc [13/45]: OK
bootlin-nios2-glibc [14/45]: OK
bootlin-openrisc-uclibc [15/45]: OK
bootlin-powerpc64le-power8-glibc [16/45]: OK
bootlin-powerpc-e500mc-uclibc [17/45]: OK
bootlin-riscv32-glibc [18/45]: OK
bootlin-riscv64-glibc [19/45]: OK
bootlin-riscv64-musl [20/45]: OK
bootlin-sh4-uclibc [21/45]: OK
bootlin-sparc64-glibc [22/45]: OK
bootlin-sparc-uclibc [23/45]: OK
bootlin-x86-64-glibc [24/45]: OK
bootlin-x86-64-musl [25/45]: OK
bootlin-x86-64-uclibc [26/45]: OK
bootlin-xtensa-uclibc [27/45]: OK
br-arm-basic [28/45]: SKIPPED
br-arm-full-nothread [29/45]: OK
br-arm-full-static [30/45]: OK
br-i386-pentium4-full [31/45]: OK
br-i386-pentium-mmx-musl [32/45]: OK
br-mips64-n64-full [33/45]: OK
br-mips64r6-el-hf-glibc [34/45]: OK
br-powerpc-603e-basic-cpp [35/45]: OK
br-powerpc64-power7-glibc [36/45]: OK
linaro-aarch64-be [37/45]: OK
linaro-aarch64 [38/45]: OK
linaro-arm [39/45]: OK
sourcery-arm-armv4t [40/45]: OK
sourcery-arm [41/45]: OK
sourcery-arm-thumb2 [42/45]: OK
sourcery-mips64 [43/45]: OK
sourcery-mips [44/45]: OK
sourcery-nios2 [45/45]: OK
45 builds, 2 skipped, 0 build failed, 0 legal-info failed
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
From 91e148a9c53811447d35c36d9f11f767d49477a0 Mon Sep 17 00:00:00 2001
|
|
From: Glenn Guy <glennguy83@gmail.com>
|
|
Date: Thu, 22 Jul 2021 11:04:26 +0200
|
|
Subject: [PATCH] Static ReadGolomb/SignedGolomb
|
|
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
---
|
|
Source/C++/Codecs/Ap4AvcParser.cpp | 8 ++++----
|
|
Source/C++/Codecs/Ap4AvcParser.h | 3 +++
|
|
2 files changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Source/C++/Codecs/Ap4AvcParser.cpp b/Source/C++/Codecs/Ap4AvcParser.cpp
|
|
index cfa841d..a17b698 100644
|
|
--- a/Source/C++/Codecs/Ap4AvcParser.cpp
|
|
+++ b/Source/C++/Codecs/Ap4AvcParser.cpp
|
|
@@ -191,8 +191,8 @@ AP4_AvcFrameParser::~AP4_AvcFrameParser()
|
|
/*----------------------------------------------------------------------
|
|
| ReadGolomb
|
|
+---------------------------------------------------------------------*/
|
|
-static unsigned int
|
|
-ReadGolomb(AP4_BitReader& bits)
|
|
+unsigned int
|
|
+AP4_AvcFrameParser::ReadGolomb(AP4_BitReader& bits)
|
|
{
|
|
unsigned int leading_zeros = 0;
|
|
while (bits.ReadBit() == 0) {
|
|
@@ -209,8 +209,8 @@ ReadGolomb(AP4_BitReader& bits)
|
|
/*----------------------------------------------------------------------
|
|
| SignedGolomb
|
|
+---------------------------------------------------------------------*/
|
|
-static int
|
|
-SignedGolomb(unsigned int code_num)
|
|
+int
|
|
+AP4_AvcFrameParser::SignedGolomb(unsigned int code_num)
|
|
{
|
|
if (code_num % 2) {
|
|
return (code_num+1)/2;
|
|
diff --git a/Source/C++/Codecs/Ap4AvcParser.h b/Source/C++/Codecs/Ap4AvcParser.h
|
|
index 99c5320..0c74c0e 100644
|
|
--- a/Source/C++/Codecs/Ap4AvcParser.h
|
|
+++ b/Source/C++/Codecs/Ap4AvcParser.h
|
|
@@ -321,6 +321,9 @@ public:
|
|
unsigned int nal_ref_idc,
|
|
AP4_AvcSliceHeader& slice_header);
|
|
|
|
+ static unsigned int ReadGolomb(AP4_BitReader& bits);
|
|
+ static int SignedGolomb(unsigned int code_num);
|
|
+
|
|
private:
|
|
// methods
|
|
bool SameFrame(unsigned int nal_unit_type_1, unsigned int nal_ref_idc_1, AP4_AvcSliceHeader& sh1,
|
|
--
|
|
2.30.2
|
|
|