Merge pull request #1968 from CastagnaIT/cleanup_bento

CastagnaIT · web-flow · commit 7a442c929e9f · 2025-12-23T11:56:27.000+01:00
[Depends][Bento4] Cleanups to remove some patches
diff --git a/depends/common/bento4/bento4.sha256 b/depends/common/bento4/bento4.sha256
@@ -1 +1 @@
-a9b231b63159b3a4d9e47c5328b476308852bf092ccb9ce98f7cf46a386465ce
+6ba2f975cd0537f32ea28f9f55251d75083ee1560360ea00e6860073c29774c1
diff --git a/depends/common/bento4/bento4.txt b/depends/common/bento4/bento4.txt
@@ -1 +1 @@
-bento4 https://github.com/xbmc/Bento4/archive/refs/tags/1.6.0-641-3-Omega.tar.gz
+bento4 https://github.com/xbmc/Bento4/archive/refs/tags/1.6.0-641-4-Piers.tar.gz
diff --git a/src/codechandler/AVCCodecHandler.cpp b/src/codechandler/AVCCodecHandler.cpp
@@ -12,6 +12,28 @@
 
 using namespace UTILS;
 
+namespace
+{
+unsigned int ReadGolomb(AP4_BitReader& bits)
+{
+  unsigned int leadingZeros = 0;
+  while (bits.ReadBit() == 0)
+  {
+    leadingZeros++;
+    if (leadingZeros >= 32)
+      return 0; // safeguard
+  }
+  if (leadingZeros)
+  {
+    return (1 << leadingZeros) - 1 + bits.ReadBits(leadingZeros);
+  }
+  else
+  {
+    return 0;
+  }
+}
+} // unnamed namespace
+
 AVCCodecHandler::AVCCodecHandler(AP4_SampleDescription* sd)
   : CodecHandler{sd},
     m_countPictureSetIds{0},
@@ -87,7 +109,8 @@ void AVCCodecHandler::UpdatePPSId(const AP4_DataBuffer& buffer)
   if (!m_needSliceInfo)
     return;
 
-  //Search the Slice header NALU
+  // Iterate data to find all NALU units slice headers of type 5 "Coded slice of an IDR picture"
+  // to get the pic_parameter_set_id value of last NALU
   const AP4_Byte* data(buffer.GetData());
   AP4_Size dataSize(buffer.GetDataSize());
   for (; dataSize;)
@@ -126,25 +149,20 @@ void AVCCodecHandler::UpdatePPSId(const AP4_DataBuffer& buffer)
     if (m_countPictureSetIds < 2)
       m_needSliceInfo = false;
 
-    unsigned int nal_unit_type = *data & 0x1F;
+    unsigned int nalUnitType = *data & 0x1F;
 
-    if (
-        //nal_unit_type == AP4_AVC_NAL_UNIT_TYPE_CODED_SLICE_OF_NON_IDR_PICTURE ||
-        nal_unit_type == AP4_AVC_NAL_UNIT_TYPE_CODED_SLICE_OF_IDR_PICTURE //||
-        //nal_unit_type == AP4_AVC_NAL_UNIT_TYPE_CODED_SLICE_DATA_PARTITION_A ||
-        //nal_unit_type == AP4_AVC_NAL_UNIT_TYPE_CODED_SLICE_DATA_PARTITION_B ||
-        //nal_unit_type == AP4_AVC_NAL_UNIT_TYPE_CODED_SLICE_DATA_PARTITION_C
-    )
+    // Following code is a simplification of AP4_AvcFrameParser::ParseSliceHeader from AP4_AvcFrameParser::Feed
+    if (nalUnitType == AP4_AVC_NAL_UNIT_TYPE_CODED_SLICE_OF_IDR_PICTURE)
     {
       AP4_DataBuffer unescaped(data, dataSize);
       AP4_NalParser::Unescape(unescaped);
       AP4_BitReader bits(unescaped.GetData(), unescaped.GetDataSize());
 
       bits.SkipBits(8); // NAL Unit Type
 
-      AP4_AvcFrameParser::ReadGolomb(bits); // first_mb_in_slice
-      AP4_AvcFrameParser::ReadGolomb(bits); // slice_type
-      m_pictureId = AP4_AvcFrameParser::ReadGolomb(bits); //picture_set_id
+      ReadGolomb(bits); // first_mb_in_slice
+      ReadGolomb(bits); // slice_type
+      m_pictureId = ReadGolomb(bits); // pic_parameter_set_id
     }
     // move to the next NAL unit
     data += naluSize;
diff --git a/src/codechandler/AVCCodecHandler.h b/src/codechandler/AVCCodecHandler.h
@@ -24,4 +24,6 @@ class ATTR_DLL_LOCAL AVCCodecHandler : public CodecHandler
   unsigned int m_countPictureSetIds;
   bool m_needSliceInfo;
   STREAMCODEC_PROFILE m_codecProfile;
+  AP4_UI08 m_pictureId{0};
+  AP4_UI08 m_pictureIdPrev{AP4_AVC_PPS_MAX_ID};
 };
diff --git a/src/codechandler/CodecHandler.cpp b/src/codechandler/CodecHandler.cpp
@@ -8,6 +8,10 @@
 
 #include "CodecHandler.h"
 
+#include "utils/Bento4Utils.h"
+
+using namespace UTILS;
+
 namespace
 {
 constexpr const char* NETFLIX_FRAMERATE_UUID = "NetflixFrameRate";
@@ -19,21 +23,26 @@ bool CodecHandler::GetInformation(kodi::addon::InputstreamInfo& info)
       m_sampleDescription->GetType() != AP4_SampleDescription::Type::TYPE_UNKNOWN)
   {
     // Netflix Framerate
-    AP4_Atom* atom;
-    AP4_UnknownUuidAtom* nxfr;
-    atom = m_sampleDescription->GetDetails().GetChild(
+    AP4_Atom* atom = m_sampleDescription->GetDetails().GetChild(
         reinterpret_cast<const AP4_UI08*>(NETFLIX_FRAMERATE_UUID));
-    if (atom && (nxfr = dynamic_cast<AP4_UnknownUuidAtom*>(atom)) &&
-        nxfr->GetData().GetDataSize() == 10)
+
+    auto* unknownUuidAtom = dynamic_cast<AP4_UnknownUuidAtom*>(atom);
+    if (unknownUuidAtom)
     {
-      unsigned int fpsRate = nxfr->GetData().GetData()[7] | nxfr->GetData().GetData()[6] << 8;
-      unsigned int fpsScale = nxfr->GetData().GetData()[9] | nxfr->GetData().GetData()[8] << 8;
+      auto* accessor = reinterpret_cast<BENTO4::FMP4UnknownUuidAtom*>(unknownUuidAtom);
+      const AP4_DataBuffer& data = accessor->GetData();
 
-      if (info.GetFpsScale() != fpsScale || info.GetFpsRate() != fpsRate)
+      if (data.GetDataSize() == 10)
       {
-        info.SetFpsScale(fpsScale);
-        info.SetFpsRate(fpsRate);
-        return true;
+        unsigned int fpsRate = data.GetData()[7] | data.GetData()[6] << 8;
+        unsigned int fpsScale = data.GetData()[9] | data.GetData()[8] << 8;
+
+        if (info.GetFpsScale() != fpsScale || info.GetFpsRate() != fpsRate)
+        {
+          info.SetFpsScale(fpsScale);
+          info.SetFpsRate(fpsRate);
+          return true;
+        }
       }
     }
   }
diff --git a/src/codechandler/CodecHandler.h b/src/codechandler/CodecHandler.h
@@ -24,8 +24,7 @@ class ATTR_DLL_LOCAL CodecHandler
 {
 public:
   CodecHandler(AP4_SampleDescription* sd, AP4_Track* track = nullptr)
-    : m_sampleDescription(sd), m_naluLengthSize(0), m_pictureId(0), m_pictureIdPrev(0xFF),
-      m_track(track){};
+    : m_sampleDescription(sd), m_track(track){};
   virtual ~CodecHandler(){};
 
   virtual void UpdatePPSId(const AP4_DataBuffer& buffer) {}
@@ -65,9 +64,7 @@ class ATTR_DLL_LOCAL CodecHandler
 
   AP4_SampleDescription* m_sampleDescription;
   std::vector<uint8_t> m_extraData;
-  AP4_UI08 m_naluLengthSize;
-  AP4_UI08 m_pictureId;
-  AP4_UI08 m_pictureIdPrev;
+  AP4_UI08 m_naluLengthSize{0};
   AP4_Track* m_track;
 
   protected:
diff --git a/src/samplereader/FragmentedSampleReader.cpp b/src/samplereader/FragmentedSampleReader.cpp
@@ -18,6 +18,7 @@
 #include "codechandler/VP9CodecHandler.h"
 #include "codechandler/WebVTTCodecHandler.h"
 #include "common/AdaptiveCencSampleDecrypter.h"
+#include "utils/Bento4Utils.h"
 #include "utils/CharArrayParser.h"
 #include "utils/Utils.h"
 #include "utils/log.h"
@@ -30,6 +31,8 @@ namespace
 {
 constexpr uint8_t MP4_TFRFBOX_UUID[] = {0xd4, 0x80, 0x7e, 0xf2, 0xca, 0x39, 0x46, 0x95,
                                         0x8e, 0x54, 0x26, 0xcb, 0x9e, 0x46, 0xa7, 0x9f};
+
+constexpr AP4_UI32 FMP4_SAMPLE_FORMAT_WVTT = AP4_ATOM_TYPE('w', 'v', 't', 't');
 } // unnamed namespace
 
 
@@ -583,7 +586,7 @@ void CFragmentedSampleReader::UpdateSampleDescription()
       case AP4_SAMPLE_FORMAT_STPP:
         m_codecHandler = new TTMLCodecHandler(desc, false);
         break;
-      case AP4_SAMPLE_FORMAT_WVTT:
+      case FMP4_SAMPLE_FORMAT_WVTT:
         m_codecHandler = new WebVTTCodecHandler(desc, false);
         break;
       case AP4_SAMPLE_FORMAT_VP9:
@@ -601,7 +604,15 @@ void CFragmentedSampleReader::UpdateSampleDescription()
 
 void CFragmentedSampleReader::ParseTrafTfrf(AP4_UuidAtom* uuidAtom)
 {
-  const AP4_DataBuffer& buf{AP4_DYNAMIC_CAST(AP4_UnknownUuidAtom, uuidAtom)->GetData()};
+  auto* unknownUuidAtom = dynamic_cast<AP4_UnknownUuidAtom*>(uuidAtom);
+  if (!unknownUuidAtom)
+  {
+    LOG::LogF(LOGERROR, "Invalid atom type passed to ParseTrafTfrf. Expected AP4_UnknownUuidAtom.");
+    return;
+  }
+
+  auto* accessor = reinterpret_cast<BENTO4::FMP4UnknownUuidAtom*>(unknownUuidAtom);
+  const AP4_DataBuffer& buf{accessor->GetData()};
   CCharArrayParser parser;
   parser.Reset(buf.GetData(), buf.GetDataSize());
 
diff --git a/src/utils/Bento4Utils.h b/src/utils/Bento4Utils.h
@@ -0,0 +1,32 @@
+/*
+ *  Copyright (C) 2025 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#ifdef INPUTSTREAM_TEST_BUILD
+#include "test/KodiStubs.h"
+#else
+#include <kodi/AddonBase.h>
+#endif
+
+#include <bento4/Ap4.h>
+
+namespace UTILS
+{
+namespace BENTO4
+{
+
+// \brief Accessory for accessing AP4_UnknownUuidAtom data
+class ATTR_DLL_LOCAL FMP4UnknownUuidAtom : public AP4_UnknownUuidAtom
+{
+public:
+  const AP4_DataBuffer& GetData() { return m_Data; }
+};
+
+} // namespace BASE64
+} // namespace UTILS
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
@@ -16,6 +16,7 @@ set(SOURCES
 
 set(HEADERS
   Base64Utils.h
+  Bento4Utils.h
   CharArrayParser.h
   CryptoUtils.h
   CurlUtils.h

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-a9b231b63159b3a4d9e47c5328b476308852bf092ccb9ce98f7cf46a386465ce`
	`1`	`+6ba2f975cd0537f32ea28f9f55251d75083ee1560360ea00e6860073c29774c1`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-bento4 https://github.com/xbmc/Bento4/archive/refs/tags/1.6.0-641-3-Omega.tar.gz`
	`1`	`+bento4 https://github.com/xbmc/Bento4/archive/refs/tags/1.6.0-641-4-Piers.tar.gz`