kodi-addon-inputstream-adaptive: 21.4.4 -> 21.4.5

This commit is contained in:
Tim Biermann 2024-04-14 17:08:35 +02:00
parent 6f50fa3c40
commit 0d8511a723
Signed by: tb
GPG Key ID: 42F8B4E30B673606
4 changed files with 8 additions and 88 deletions

View File

@ -4,8 +4,8 @@ drwxr-xr-x root/root usr/lib/kodi/
drwxr-xr-x root/root usr/lib/kodi/addons/
drwxr-xr-x root/root usr/lib/kodi/addons/inputstream.adaptive/
lrwxrwxrwx root/root usr/lib/kodi/addons/inputstream.adaptive/inputstream.adaptive.so -> inputstream.adaptive.so.21.0
lrwxrwxrwx root/root usr/lib/kodi/addons/inputstream.adaptive/inputstream.adaptive.so.21.0 -> inputstream.adaptive.so.21.4.4
-rwxr-xr-x root/root usr/lib/kodi/addons/inputstream.adaptive/inputstream.adaptive.so.21.4.4
lrwxrwxrwx root/root usr/lib/kodi/addons/inputstream.adaptive/inputstream.adaptive.so.21.0 -> inputstream.adaptive.so.21.4.5
-rwxr-xr-x root/root usr/lib/kodi/addons/inputstream.adaptive/inputstream.adaptive.so.21.4.5
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/kodi/
drwxr-xr-x root/root usr/share/kodi/addons/

View File

@ -1,7 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF34JpN7aLG6EFj66Q1rAv6nGqpCSc2EZctZK49gEbfX3deXzTeMvNWiGiReswB/m8HhBSw0LTry51rYMQ454QMAw=
SHA256 (Pkgfile) = d3141f893a2f932bc0eea6b5acf171c0ebf7fd257833bf9d34532152c7af8c12
SHA256 (.footprint) = e59960abd1c5a0a9030eb18a01ec1463e82efd17018ed69750b742aeec8e9f0b
SHA256 (kodi-addon-inputstream-adaptive-21.4.4.tar.gz) = 0a1074fe04fb7e9500d578490b4cda12ecfcf433495e15e7bf65861527586167
RWSagIOpLGJF31Wwu3aP5kqGtsnGIq9tZoTR33dk1Xo1nz5/IEDy2uO6EZgcr1UFWM7JM3ZdHJpXevlS0k4FCnNyH1olKy6++gA=
SHA256 (Pkgfile) = 27e878885d5d6447660c10ad748366f300e58955a437a87c10fd1ffb90cf91f2
SHA256 (.footprint) = 8701b04ab296efceb5ff96404ccdb1539a901dccd1bf75e51f52daf9c15c073f
SHA256 (kodi-addon-inputstream-adaptive-21.4.5.tar.gz) = 6e7d217b239f7cb935fd4f4024353ba995fcdb47078a35e0ae51ee5dcf8c8de8
SHA256 (bento4-1.6.0-641-Omega.tar.gz) = f1f8cfa4f7cb651b609e587f825607cb4b06fe5b08af876fd0154a434f9a5315
SHA256 (a82e3eb8333187d8bb346bf5eca384524a553e57.patch) = 47933ef5fa624139bc1f0f7cd4e87b113f79d4f26322e28e8192d18683900193

View File

@ -4,19 +4,16 @@
# Depends on: kodi-gbm pugixml
name=kodi-addon-inputstream-adaptive
version=21.4.4
version=21.4.5
release=1
_bento4=1.6.0-641
_codename=Omega
source=(https://github.com/xbmc/inputstream.adaptive/archive/$version-$_codename/$name-$version.tar.gz
https://github.com/xbmc/Bento4/archive/refs/tags/$_bento4-$_codename.tar.gz
a82e3eb8333187d8bb346bf5eca384524a553e57.patch)
https://github.com/xbmc/Bento4/archive/refs/tags/$_bento4-$_codename.tar.gz)
renames=(SKIP bento4-$_bento4-Omega.tar.gz)
build() {
patch -Np1 -d inputstream.adaptive-$version-$_codename -i $SRC/a82e3eb8333187d8bb346bf5eca384524a553e57.patch
cmake -S inputstream.adaptive-$version-$_codename -B build -G Ninja \
-D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_BUILD_TYPE=Release \

View File

@ -1,76 +0,0 @@
From f3ab0a645599171ed2f1fca92bbebdc05bac254d Mon Sep 17 00:00:00 2001
From: CastagnaIT <gottardo.stefano.83@gmail.com>
Date: Sat, 30 Mar 2024 09:22:54 +0100
Subject: [PATCH] [CodecHandler] Set fourcc for h264 codec
---
src/Session.cpp | 11 +++++++++++
src/codechandler/AVCCodecHandler.cpp | 16 ++++++++++++++++
src/utils/Utils.h | 4 ++++
3 files changed, 31 insertions(+)
diff --git a/src/Session.cpp b/src/Session.cpp
index 0e12ec0ab..3dd6cab78 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -792,7 +792,18 @@ void CSession::UpdateStream(CStream& stream)
if (CODEC::Contains(codecs, CODEC::FOURCC_AVC_, codecStr) ||
CODEC::Contains(codecs, CODEC::FOURCC_H264, codecStr))
+ {
stream.m_info.SetCodecName(CODEC::NAME_H264);
+
+ if (STRING::Contains(codecStr, CODEC::FOURCC_AVC1))
+ stream.m_info.SetCodecFourCC(CODEC::MakeFourCC(CODEC::FOURCC_AVC1));
+ else if (STRING::Contains(codecStr, CODEC::FOURCC_AVC2))
+ stream.m_info.SetCodecFourCC(CODEC::MakeFourCC(CODEC::FOURCC_AVC2));
+ else if (STRING::Contains(codecStr, CODEC::FOURCC_AVC3))
+ stream.m_info.SetCodecFourCC(CODEC::MakeFourCC(CODEC::FOURCC_AVC3));
+ else if (STRING::Contains(codecStr, CODEC::FOURCC_AVC4))
+ stream.m_info.SetCodecFourCC(CODEC::MakeFourCC(CODEC::FOURCC_AVC4));
+ }
else if (CODEC::Contains(codecs, CODEC::FOURCC_HEVC, codecStr))
stream.m_info.SetCodecName(CODEC::NAME_HEVC);
else if (CODEC::Contains(codecs, CODEC::FOURCC_HVC1, codecStr))
diff --git a/src/codechandler/AVCCodecHandler.cpp b/src/codechandler/AVCCodecHandler.cpp
index edc15c5cc..7f7ef7398 100644
--- a/src/codechandler/AVCCodecHandler.cpp
+++ b/src/codechandler/AVCCodecHandler.cpp
@@ -179,6 +179,22 @@ bool AVCCodecHandler::GetInformation(kodi::addon::InputstreamInfo& info)
bool isChanged = UpdateInfoCodecName(info, CODEC::NAME_H264);
+ uint32_t fourcc = 0;
+ if (m_sampleDescription->GetFormat() == AP4_SAMPLE_FORMAT_AVC1)
+ fourcc = CODEC::MakeFourCC(CODEC::FOURCC_AVC1);
+ else if (m_sampleDescription->GetFormat() == AP4_SAMPLE_FORMAT_AVC2)
+ fourcc = CODEC::MakeFourCC(CODEC::FOURCC_AVC2);
+ else if (m_sampleDescription->GetFormat() == AP4_SAMPLE_FORMAT_AVC3)
+ fourcc = CODEC::MakeFourCC(CODEC::FOURCC_AVC3);
+ else if (m_sampleDescription->GetFormat() == AP4_SAMPLE_FORMAT_AVC4)
+ fourcc = CODEC::MakeFourCC(CODEC::FOURCC_AVC4);
+
+ if (fourcc != 0 && info.GetCodecFourCC() != fourcc)
+ {
+ info.SetCodecFourCC(fourcc);
+ isChanged = true;
+ }
+
if (AP4_AvcSampleDescription* avcSampleDescription =
AP4_DYNAMIC_CAST(AP4_AvcSampleDescription, m_sampleDescription))
{
diff --git a/src/utils/Utils.h b/src/utils/Utils.h
index f008c3fdf..3b1d5d108 100644
--- a/src/utils/Utils.h
+++ b/src/utils/Utils.h
@@ -98,6 +98,10 @@ constexpr const char* NAME_TTML = "ttml";
constexpr const char* FOURCC_H264 = "h264"; // MPEG-4 AVC
constexpr const char* FOURCC_AVC_ = "avc"; // Generic prefix for all avc* fourcc, e.g. avc1, avcb
+constexpr const char* FOURCC_AVC1 = "avc1";
+constexpr const char* FOURCC_AVC2 = "avc2";
+constexpr const char* FOURCC_AVC3 = "avc3";
+constexpr const char* FOURCC_AVC4 = "avc4";
constexpr const char* FOURCC_VP09 = "vp09"; // VP9
constexpr const char* FOURCC_AV01 = "av01"; // AV1
constexpr const char* FOURCC_HEVC = "hevc";