source/Lib/CommonLib/AffineGradientSearch.h

@@ -3,7 +3,7 @@
  * and contributor rights, including patent rights, and no such rights are
  * granted under this license.
  *
- * Copyright (c) 2010-2024, ITU/ISO/IEC
+ * Copyright (c) 2010-2025, ITU/ISO/IEC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

source/Lib/CommonLib/AlfParameters.h

@@ -3,7 +3,7 @@
  * and contributor rights, including patent rights, and no such rights are
  * granted under this license.
  *
- * Copyright (c) 2010-2024, ITU/ISO/IEC
+ * Copyright (c) 2010-2025, ITU/ISO/IEC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

source/Lib/CommonLib/BitStream.cpp

@@ -3,7 +3,7 @@
  * and contributor rights, including patent rights, and no such rights are
  * granted under this license.
  *
- * Copyright (c) 2010-2024, ITU/ISO/IEC
+ * Copyright (c) 2010-2025, ITU/ISO/IEC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

source/Lib/CommonLib/BitStream.h

@@ -3,7 +3,7 @@
  * and contributor rights, including patent rights, and no such rights are
  * granted under this license.
  *
- * Copyright (c) 2010-2024, ITU/ISO/IEC
+ * Copyright (c) 2010-2025, ITU/ISO/IEC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -152,6 +152,9 @@ class InputBitstream
 protected:
   std::vector<uint8_t> m_fifo; /// FIFO for storage of complete bytes
   std::vector<uint32_t>    m_emulationPreventionByteLocation;
+#if JVET_AJ0151_DSC_SEI
+  std::vector<uint8_t> m_origFifo; /// for calculation of hash
+#endif
 
   uint32_t m_fifoIdx;   /// Read index into m_fifo
 
@@ -218,6 +221,12 @@ public:
 
   const std::vector<uint8_t> &getFifo() const { return m_fifo; }
         std::vector<uint8_t> &getFifo()       { return m_fifo; }
+
+#if JVET_AJ0151_DSC_SEI
+  const std::vector<uint8_t> &getOrigFifo() const { return m_origFifo; }
+  void clearOrigFifo() { m_origFifo.clear(); }
+  void copyToOrigFifo() { m_origFifo = m_fifo; }
+#endif
 };
 
 //! \}

source/Lib/CommonLib/Buffer.cpp

@@ -3,7 +3,7 @@
 * and contributor rights, including patent rights, and no such rights are
 * granted under this license.
 *
-* Copyright (c) 2010-2024, ITU/ISO/IEC
+* Copyright (c) 2010-2025, ITU/ISO/IEC
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without

source/Lib/CommonLib/Buffer.h

@@ -3,7 +3,7 @@
  * and contributor rights, including patent rights, and no such rights are
  * granted under this license.
  *
- * Copyright (c) 2010-2024, ITU/ISO/IEC
+ * Copyright (c) 2010-2025, ITU/ISO/IEC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

source/Lib/CommonLib/CMakeLists.txt

@@ -73,8 +73,19 @@ if( DEFINED ENABLE_HIGH_BITDEPTH )
   endif()
 endif()
 
-target_include_directories( ${LIB_NAME} PUBLIC . .. ./x86 ../libmd5 )
-target_link_libraries( ${LIB_NAME} )
+if ( ENABLE_SEARCH_OPENSSL )
+  find_package(OpenSSL)
+endif()
+
+if ( (NOT OPENSSL_FOUND) OR (OPENSSL_VERSION VERSION_LESS "1.1.1") )
+  message ("OpenSSL not available or version less than 1.1.1. Compiling with parsing only support for Digitally Signed Content SEIs")
+  target_compile_definitions( ${LIB_NAME} PUBLIC JVET_AJ0151_DSC_SEI=0 )
+  target_include_directories( ${LIB_NAME} PUBLIC . .. ./x86 ../libmd5 )
+  target_link_libraries( ${LIB_NAME} )
+else()
+  target_include_directories( ${LIB_NAME} PUBLIC . .. ./x86 ../libmd5 ${OPENSSL_INCLUDE_DIR} )
+  target_link_libraries( ${LIB_NAME} OpenSSL::SSL OpenSSL::Crypto )
+endif ()
 
 if (NOT (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") )
   # set needed compile definitions

source/Lib/CommonLib/CacheModel.cpp

@@ -3,7 +3,7 @@
  * and contributor rights, including patent rights, and no such rights are
  * granted under this license.
  *
- * Copyright (c) 2010 - 2019, ITU/ISO/IEC
+ * Copyright (c) 2010 - 2025, ITU/ISO/IEC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

source/Lib/CommonLib/CacheModel.h

@@ -3,7 +3,7 @@
  * and contributor rights, including patent rights, and no such rights are
  * granted under this license.
  *
- * Copyright (c) 2010-2024, ITU/ISO/IEC
+ * Copyright (c) 2010-2025, ITU/ISO/IEC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

source/Lib/CommonLib/ChromaFormat.cpp

@@ -3,7 +3,7 @@
  * and contributor rights, including patent rights, and no such rights are
  * granted under this license.
  *
- * Copyright (c) 2010-2024, ITU/ISO/IEC
+ * Copyright (c) 2010-2025, ITU/ISO/IEC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

source/Lib/CommonLib/ChromaFormat.h

@@ -3,7 +3,7 @@
  * and contributor rights, including patent rights, and no such rights are
  * granted under this license.
  *
- * Copyright (c) 2010-2024, ITU/ISO/IEC
+ * Copyright (c) 2010-2025, ITU/ISO/IEC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

source/Lib/CommonLib/CodingStatistics.h

@@ -3,7 +3,7 @@
  * and contributor rights, including patent rights, and no such rights are
  * granted under this license.
  *
- * Copyright (c) 2010-2024, ITU/ISO/IEC
+ * Copyright (c) 2010-2025, ITU/ISO/IEC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

source/Lib/CommonLib/CodingStructure.cpp

@@ -3,7 +3,7 @@
 * and contributor rights, including patent rights, and no such rights are
 * granted under this license.
 *
-* Copyright (c) 2010-2024, ITU/ISO/IEC
+* Copyright (c) 2010-2025, ITU/ISO/IEC
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -1583,6 +1583,7 @@ void CodingStructure::initSubStructure( CodingStructure& subStruct, const Channe
 
   subStruct.useDbCost = false;
   subStruct.costDbOffset = 0;
+  subStruct.useInterlayerRef = false;
 
   for( uint32_t i = 0; i < subStruct.area.blocks.size(); i++ )
   {
@@ -1716,6 +1717,7 @@ void CodingStructure::useSubStructure( const CodingStructure& subStruct, const C
     dist     += subStruct.dist;
     cost     += subStruct.cost;
     costDbOffset += subStruct.costDbOffset;
+    useInterlayerRef |= subStruct.useInterlayerRef;
   }
   if( parent )
   {
@@ -1776,6 +1778,8 @@ void CodingStructure::copyStructure( const CodingStructure& other, const Channel
   dist     = other.dist;
   cost     = other.cost;
   costDbOffset = other.costDbOffset;
+  useInterlayerRef = other.useInterlayerRef;
+
   CHECKD( area != other.area, "Incompatible sizes" );
 
   const UnitArea dualITreeArea = CS::getArea( *this, this->area, chType );
@@ -1894,6 +1898,7 @@ void CodingStructure::initStructData( const int &QP, const bool &skipMotBuf )
   costDbOffset = 0;
   useDbCost = false;
   interHad = std::numeric_limits<Distortion>::max();
+  useInterlayerRef = false;
 }
 
 

source/Lib/CommonLib/CodingStructure.h

@@ -3,7 +3,7 @@
 * and contributor rights, including patent rights, and no such rights are
 * granted under this license.
 *
-* Copyright (c) 2010-2024, ITU/ISO/IEC
+* Copyright (c) 2010-2025, ITU/ISO/IEC
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -192,6 +192,7 @@ public:
   bool        useDbCost;
   double      costDbOffset;
   double      lumaCost;
+  bool        useInterlayerRef;
   uint64_t    fracBits;
   Distortion  dist;
   Distortion  interHad;

source/Lib/CommonLib/Common.h

@@ -3,7 +3,7 @@
  * and contributor rights, including patent rights, and no such rights are
  * granted under this license.
  *
- * Copyright (c) 2010-2024, ITU/ISO/IEC
+ * Copyright (c) 2010-2025, ITU/ISO/IEC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

source/Lib/CommonLib/CommonDef.h

@@ -3,7 +3,7 @@
  * and contributor rights, including patent rights, and no such rights are
  * granted under this license.
  *
- * Copyright (c) 2010-2024, ITU/ISO/IEC
+ * Copyright (c) 2010-2025, ITU/ISO/IEC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -578,6 +578,10 @@ static const uint32_t MAX_NNPFA_ID =                               0xfffffffe; /
 static const uint32_t MAX_NNPFC_ID =                               0xfffffffe; // Maximum supported nnpfc_id
 static constexpr double SII_PF_W2 =                                       0.6; // weight for current picture
 static constexpr double SII_PF_W1 =                                       0.4; // weight for previous picture , it must be equal to 1.0 - SII_PF_W2
+static const uint32_t MAX_GFV_ID =                                 0xfffffffe; // Maximum supported GFV_id
+#if JVET_AK0239_GFVE
+static const uint32_t MAX_GFVE_ID =                                 0xfffffffe; // Maximum supported GFVE_id
+#endif
 // ====================================================================================================================
 // Macro functions
 // ====================================================================================================================

source/Lib/CommonLib/CommonSimdCfg.h

@@ -3,7 +3,7 @@
  * and contributor rights, including patent rights, and no such rights are
  * granted under this license.
  *
- * Copyright (c) 2010-2024, ITU/ISO/IEC
+ * Copyright (c) 2010-2025, ITU/ISO/IEC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

source/Lib/CommonLib/ConstraintInfo.cpp

@@ -3,7 +3,7 @@
  * and contributor rights, including patent rights, and no such rights are
  * granted under this license.
  *
- * Copyright (c) 2010-2024, ITU/ISO/IEC
+ * Copyright (c) 2010-2025, ITU/ISO/IEC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

source/Lib/CommonLib/ConstraintInfo.h

@@ -3,7 +3,7 @@
  * and contributor rights, including patent rights, and no such rights are
  * granted under this license.
  *
- * Copyright (c) 2010-2024, ITU/ISO/IEC
+ * Copyright (c) 2010-2025, ITU/ISO/IEC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

source/Lib/CommonLib/ContextModelling.cpp

@@ -3,7 +3,7 @@
  * and contributor rights, including patent rights, and no such rights are
  * granted under this license.
  *
- * Copyright (c) 2010-2024, ITU/ISO/IEC
+ * Copyright (c) 2010-2025, ITU/ISO/IEC
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without