.clang-format

+---
+# to be used on clang-format version 14 or later
+Language:        Cpp
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: AcrossComments
+AlignConsecutiveBitFields: AcrossComments
+AlignConsecutiveDeclarations: AcrossComments
+AlignConsecutiveMacros: AcrossComments
+AlignEscapedNewlines: Left
+AlignOperands:   Align
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Always
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: No
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+  AfterCaseLabel:  true
+  AfterClass:      true
+  AfterControlStatement: Always
+  AfterEnum:       true
+  AfterFunction:   true
+  AfterNamespace:  true
+  AfterObjCDeclaration: true
+  AfterStruct:     true
+  AfterUnion:      true
+  AfterExternBlock: true
+  BeforeCatch:     true
+  BeforeElse:      true
+  BeforeLambdaBody: true
+  BeforeWhile:     false
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
+BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeComma
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     120
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 2
+ContinuationIndentWidth: 2
+Cpp11BracedListStyle: false
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
+IncludeIsMainRegex: '(Test)?$'
+IndentCaseLabels: false
+IndentCaseBlocks: true
+IndentGotoLabels: false
+IndentPPDirectives: None
+IndentExternBlock: NoIndent
+IndentWidth:     2
+IndentWrappedFunctionNames: true
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Left
+ReflowComments:  true
+SortIncludes:    false
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeRangeBasedForLoopColon: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 3
+SpacesInAngles: false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        c++17
+TabWidth:        8
+UseTab:          Never
+...
+

.editorconfig

+# EditorConfig: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Matches multiple files with brace expansion notation
+# Set default indent style and size
+[*.{c,cpp,cxx,h,hpp,py}]
+indent_style = space
+indent_size = 2

.gitattributes

+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.c text
+*.cpp text
+*.h text
+

.gitignore

+dec.yuv
+rec.yuv
+str.bin
+/build/
+/bin/
+/lib/
+core
+deploy
+*.sdf
+*.suo
+.vs/
+.vscode/
+*.blg
+*.bbl
+*.pyc
+/out/
+/doc/_minted-software-manual/
+/.idea/
+/cmake-build-*/

.gitlab-ci.yml

+stages:
+   - build
+
+.build_template:
+   stage: build
+   script:
+      - make realclean
+      - make all
+   only:
+      refs:
+         - master
+         - merge_requests
+      variables:
+         - $CI_PROJECT_URL == 'https://vcgit.hhi.fraunhofer.de/jvet/VVCSoftware_VTM'
+         - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'master'
+
+.build_template_linux:
+   extends: .build_template
+   script:
+      - make realclean
+      - make all
+      - make realclean
+      - make release high-bitdepth=true
+      - make realclean
+      - make linuxbuild enable-tracing=true
+
+build_macos:
+   extends: .build_template
+   tags:
+      - macos
+
+build_macos_arm:
+   extends: .build_template
+   tags:
+      - macos-arm
+
+build_ubuntu2004:
+   extends: .build_template_linux
+   tags:
+      - ubuntu2004
+
+build_ubuntu2204:
+   extends: .build_template_linux
+   tags:
+      - ubuntu2204
+
+build_ubuntu2204-gcc12:
+   extends: .build_template
+   script:
+      - make realclean
+      - make all toolset=gcc-12
+      - make realclean
+      - make release high-bitdepth=true toolset=gcc-12
+      - make realclean
+      - make linuxbuild enable-tracing=true toolset=gcc-12
+   tags:
+      - ubuntu2204-gcc12
+
+build_vc191x:
+   extends: .build_template
+   tags:
+      - vc191x
+
+build_vc192x:
+   extends: .build_template
+   tags:
+      - vc192x
+
+build_software-manual:
+   extends: .build_template
+   script:
+      - cd doc
+      - make clean
+      - make
+   artifacts:
+    paths:
+      - doc/software-manual.pdf
+   tags:
+      - pdflatex

.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>NextSoftware</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>?name?</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.append_environment</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
+					<value>all</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildArguments</key>
+					<value>variant=debug link=static -j</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildCommand</key>
+					<value>bjam.py</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+					<value>install --clean-all</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.contents</key>
+					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+					<value>false</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
+					<value>-q install</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.stopOnError</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+					<value>false</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>

.pydevproject

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+</pydev_project>

CMakeLists.txt

@@ -28,17 +28,23 @@ if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
 endif()
 
 set( EXTENSION_360_VIDEO OFF CACHE BOOL "If EXTENSION_360_VIDEO is on, 360Lib will be added" )
-set( SKIP_SVN_REVISION OFF CACHE BOOL "Don't add SVN path and revision info to the encoder and decoder output" )
-set( SET_ENABLE_TRACING OFF CACHE BOOL "Set ENABLE_TRACING as a compiler flag" )
-set( ENABLE_TRACING OFF CACHE BOOL "If SET_ENABLE_TRACING is on, it will be set to this value" )
-set( ENABLE_VTM OFF CACHE BOOL "If ENABLE_VTM is on, the software will be compiled as VTM" )
+set( EXTENSION_HDRTOOLS OFF CACHE BOOL "If EXTENSION_HDRTOOLS is on, HDRLib will be added" )
+
+if (DEFINED ENABLE_TRACING)
+  set( ENABLE_TRACING OFF CACHE BOOL "ENABLE_TRACING will be set to this value" )
+endif()
+if (DEFINED ENABLE_HIGH_BITDEPTH)
+  set( ENABLE_HIGH_BITDEPTH OFF CACHE BOOL "ENABLE_HIGH_BITDEPTH will be set to this value" )
+endif()
+
+set( ENABLE_SEARCH_OPENSSL ON CACHE BOOL "ENABLE_SEARCH_OPENSSL will be set to this value" )
 
 if( CMAKE_COMPILER_IS_GNUCC )
   set( BUILD_STATIC OFF CACHE BOOL "Build static executables" )
 endif()
 
-# set c++11
-set( CMAKE_CXX_STANDARD 11 )
+# set c++17
+set( CMAKE_CXX_STANDARD 17 )
 set( CMAKE_CXX_STANDARD_REQUIRED ON )
 
 # compile everything position independent (even static libraries)
@@ -53,39 +59,24 @@ set_property( GLOBAL PROPERTY USE_FOLDERS ON )
 # Include a utility module providing functions, macros, and settings
 include( ${CMAKE_SOURCE_DIR}/cmake/CMakeBuild/cmake/modules/BBuildEnv.cmake )
 
-# Enable multithreading
-bb_multithreading()
-
-find_package(OpenMP)
-
-if( OpenMP_FOUND )
-  set( CMAKE_C_FLAGS          "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}" )
-  set( CMAKE_CXX_FLAGS        "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}" )
-  set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}" )
-  
-  set( SET_ENABLE_SPLIT_PARALLELISM OFF CACHE BOOL "Set ENABLE_SPLIT_PARALLELISM as a compiler flag" )
-  set( ENABLE_SPLIT_PARALLELISM     OFF CACHE BOOL "If SET_ENABLE_SPLIT_PARALLELISM is on, it will be set to this value" )
-  set( SET_ENABLE_WPP_PARALLELISM   OFF CACHE BOOL "Set ENABLE_WPP_PARALLELISM as a compiler flag" )
-  set( ENABLE_WPP_PARALLELISM       OFF CACHE BOOL "If SET_ENABLE_WPP_PARALLELISM is on, it will be set to this value" )
-endif()
-
 # Enable warnings for some generators and toolsets.
-bb_enable_warnings( gcc warnings-as-errors -Wno-sign-compare )
+# bb_enable_warnings( gcc warnings-as-errors -Wno-sign-compare )
 # bb_enable_warnings( gcc -Wno-unused-variable )
 # bb_enable_warnings( gcc-4.8 warnings-as-errors -Wno-unused-variable )
+# for gcc 8.2:
+bb_enable_warnings( gcc warnings-as-errors -Wno-sign-compare)
 
 if( XCODE )
   bb_enable_warnings( clang warnings-as-errors
                             -Wno-deprecated-declarations
                             -Wno-unknown-attributes
-                            -Wno-deprecated-register
                             -Wno-pessimizing-move
                             -Wno-absolute-value
-                            -Wno-unused-const-variable )
+                            -Wno-unused-const-variable
+                            -Wno-unused-command-line-argument )
 else()
   bb_enable_warnings( clang warnings-as-errors
                             -Wno-unknown-attributes
-                            -Wno-deprecated-register
                             -Wno-pessimizing-move
                             -Wno-absolute-value
                             -Wno-unused-const-variable )
@@ -96,7 +87,7 @@ endif()
 bb_enable_warnings( msvc warnings-as-errors "/wd4996" )
 
 # enable sse4.1 build for all source files for gcc and clang
-if( UNIX )
+if( (UNIX OR MINGW) AND NOT (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") )
   add_compile_options( "-msse4.1" )
 endif()
 
@@ -112,6 +103,7 @@ if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
     if( USE_ADDRESS_SANITIZER )
       # add compile options
       add_compile_options( "-fsanitize=address" )
+      add_link_options( "-fsanitize=address" )
     endif()
   endif()
 
@@ -136,6 +128,9 @@ if( EXTENSION_360_VIDEO )
   add_subdirectory( "source/Lib/Lib360" )
   add_subdirectory( "source/Lib/AppEncHelper360" )
 endif()
+if ( EXTENSION_HDRTOOLS )
+  add_subdirectory( "source/Lib/HDRLib")
+endif()
 add_subdirectory( "source/Lib/DecoderAnalyserLib" )
 add_subdirectory( "source/Lib/DecoderLib" )
 add_subdirectory( "source/Lib/EncoderLib" )
@@ -145,7 +140,11 @@ add_subdirectory( "source/App/DecoderAnalyserApp" )
 add_subdirectory( "source/App/DecoderApp" )
 add_subdirectory( "source/App/EncoderApp" )
 add_subdirectory( "source/App/SEIRemovalApp" )
+add_subdirectory( "source/App/SEIFilmGrainApp" )
 add_subdirectory( "source/App/Parcat" )
+add_subdirectory( "source/App/StreamMergeApp" )
+add_subdirectory( "source/App/BitstreamExtractorApp" )
+add_subdirectory( "source/App/SubpicMergeApp" )
 if( EXTENSION_360_VIDEO )
   add_subdirectory( "source/App/utils/360ConvertApp" )
 endif()

COPYING

@@ -3,7 +3,7 @@ License, included below. This software may be subject to other third party
 and contributor rights, including patent rights, and no such rights are
 granted under this license.   
 
-Copyright (c) 2010-2017, ITU/ISO/IEC
+Copyright (c) 2010-2025, ITU/ISO/IEC
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -17,20 +17,34 @@ BUILD_SCRIPT := $(CURDIR)/cmake/CMakeBuild/bin/cmake.py
 #
 
 TARGETS := CommonLib DecoderAnalyserApp DecoderAnalyserLib DecoderApp DecoderLib 
-TARGETS += EncoderApp EncoderLib Utilities SEIRemovalApp
+TARGETS += EncoderApp EncoderLib Utilities SEIRemovalApp StreamMergeApp
 
 ifeq ($(OS),Windows_NT)
-  PY := $(wildcard c:/windows/py.*)
-  ifeq ($(PY),)
-    PYTHON_LAUNCHER := python
+  ifneq ($(MSYSTEM),)
+    # MSYS runtime environment
+    UNAME_S := $(shell uname -s)
+    PYTHON_LAUNCHER := python3
+    BUILD_CMD := $(PYTHON_LAUNCHER) $(BUILD_SCRIPT)
   else
-    PYTHON_LAUNCHER := $(notdir $(PY))
+    UNAME_S := Windows
+    PY := $(wildcard c:/windows/py.*)
+    ifeq ($(PY),)
+      PYTHON_LAUNCHER := python
+    else
+      PYTHON_LAUNCHER := $(notdir $(PY))
+    endif
+    # If a plain cmake.py is used, the exit codes won't arrive in make; i.e. build failures are reported as success by make.
+    BUILD_CMD := $(PYTHON_LAUNCHER) $(BUILD_SCRIPT)
+    ifeq ($(toolset),gcc)
+      g := mgwmake
+    endif
   endif
-	# If a plain cmake.py is used, the exit codes won't arrive in make; i.e. build failures are reported as success by make.
-	BUILD_SCRIPT := $(PYTHON_LAUNCHER) $(CURDIR)/cmake/CMakeBuild/bin/cmake.py
 else
   UNAME_S := $(shell uname -s)
+  BUILD_CMD := $(BUILD_SCRIPT)
   ifeq ($(UNAME_S),Linux)
+    # for Jenkins: run trace build only on Linux
+    LINUXBUILD := TRUE
   endif
   ifeq ($(UNAME_S),Darwin)
     # MAC
@@ -48,7 +62,12 @@ CONFIG_OPTIONS += -g $(g)
 endif
 
 ifneq ($(toolset),)
-CONFIG_OPTIONS += toolset=$(toolset)
+  # aarch64 and mingw are two shortcuts to simplify toolset specification.
+  ifeq ($(toolset),mingw)
+    CONFIG_OPTIONS += toolset=x86_64-w64-mingw32-gcc-posix
+  else
+    CONFIG_OPTIONS += toolset=$(toolset)
+  endif
 endif
 
 ifneq ($(address-model),)
@@ -63,24 +82,12 @@ ifneq ($(verbose),)
 CMAKE_OPTIONS += -DCMAKE_VERBOSE_MAKEFILE=ON
 endif
 
-ifneq ($(enable-vtm),)
-CMAKE_OPTIONS += -DENABLE_VTM=ON
-endif
-
 ifneq ($(enable-tracing),)
-CONFIG_OPTIONS += -DSET_ENABLE_TRACING=ON -DENABLE_TRACING=$(enable-tracing)
-endif
-
-ifneq ($(skip-svn-info),)
-CONFIG_OPTIONS += -DSKIP_SVN_REVISION=$(skip-svn-info)
-endif
-
-ifneq ($(parallel-split),)
-CONFIG_OPTIONS += -DSET_ENABLE_SPLIT_PARALLELISM=ON -DENABLE_SPLIT_PARALLELISM=$(parallel-split)
+CONFIG_OPTIONS += -DENABLE_TRACING=$(enable-tracing)
 endif
 
-ifneq ($(parallel-wpp),)
-CONFIG_OPTIONS += -DSET_ENABLE_WPP_PARALLELISM=ON -DENABLE_WPP_PARALLELISM=$(parallel-wpp)
+ifneq ($(high-bitdepth),)
+CONFIG_OPTIONS += -DENABLE_HIGH_BITDEPTH=$(high-bitdepth)
 endif
 
 ifneq ($(static),)
@@ -90,33 +97,39 @@ endif
 BUILD_OPTIONS := $(CONFIG_OPTIONS) -b
 
 debug:
-	$(BUILD_SCRIPT) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug
+	$(BUILD_CMD) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug
 
 all:
-	$(BUILD_SCRIPT) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug,release,relwithdebinfo
+	$(BUILD_CMD) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug,release,relwithdebinfo
 
 release:
-	$(BUILD_SCRIPT) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=release
+	$(BUILD_CMD) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=release
 
 relwithdebinfo:
-	$(BUILD_SCRIPT) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=relwithdebinfo
+	$(BUILD_CMD) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=relwithdebinfo
 
 clean:
 	#  clean is equal to realclean to ensure that CMake options are reset
 	$(RM) -rf bin build lib
-#	$(BUILD_SCRIPT) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug,release,relwithdebinfo --target clean
+#	$(BUILD_CMD) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug,release,relwithdebinfo --target clean
 
 clean-r:
-	$(BUILD_SCRIPT) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=release --target clean
+	$(BUILD_CMD) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=release --target clean
 
 clean-d:
-	$(BUILD_SCRIPT) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug --target clean
+	$(BUILD_CMD) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug --target clean
 
 clean-p:
-	$(BUILD_SCRIPT) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=relwithdebinfo --target clean
+	$(BUILD_CMD) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=relwithdebinfo --target clean
 
 configure:
-	$(BUILD_SCRIPT) $(CONFIG_OPTIONS) $(CMAKE_OPTIONS) variant=debug,release,relwithdebinfo
+	$(BUILD_CMD) $(CONFIG_OPTIONS) $(CMAKE_OPTIONS) variant=debug,release,relwithdebinfo
+
+linuxbuild:
+ifeq ($(LINUXBUILD),TRUE)
+	# option for automated jenkins build
+	$(BUILD_CMD) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug
+endif
 
 #
 # project specific targets
@@ -134,28 +147,28 @@ TARGETS_DEBUG_CLEAN_FIRST := $(foreach t,$(TARGETS),$(t)-cd)
 TARGETS_RELWITHDEBINFO_CLEAN_FIRST := $(foreach t,$(TARGETS),$(t)-cp)
 
 $(TARGETS_ALL):
-	$(BUILD_SCRIPT) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug,release,relwithdebinfo --target $(patsubst %-a,%,$@)
+	$(BUILD_CMD) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug,release,relwithdebinfo --target $(patsubst %-a,%,$@)
 
 $(TARGETS_ALL_CLEAN_FIRST):
-	$(BUILD_SCRIPT) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug,release,relwithdebinfo --clean-first --target $(patsubst %-ca,%,$@)
+	$(BUILD_CMD) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug,release,relwithdebinfo --clean-first --target $(patsubst %-ca,%,$@)
 
 $(TARGETS_RELEASE):
-	$(BUILD_SCRIPT) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=release --target $(patsubst %-r,%,$@)
+	$(BUILD_CMD) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=release --target $(patsubst %-r,%,$@)
 
 $(TARGETS_RELEASE_CLEAN_FIRST):
-	$(BUILD_SCRIPT) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=release --clean-first --target $(patsubst %-cr,%,$@)
+	$(BUILD_CMD) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=release --clean-first --target $(patsubst %-cr,%,$@)
 
 $(TARGETS_DEBUG):
-	$(BUILD_SCRIPT) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug --target $(patsubst %-d,%,$@)
+	$(BUILD_CMD) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug --target $(patsubst %-d,%,$@)
 
 $(TARGETS_DEBUG_CLEAN_FIRST):
-	$(BUILD_SCRIPT) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug --target $(patsubst %-cd,%,$@) --clean-first
+	$(BUILD_CMD) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=debug --target $(patsubst %-cd,%,$@) --clean-first
 
 $(TARGETS_RELWITHDEBINFO):
-	$(BUILD_SCRIPT) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=relwithdebinfo --target $(patsubst %-p,%,$@)
+	$(BUILD_CMD) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=relwithdebinfo --target $(patsubst %-p,%,$@)
 
 $(TARGETS_RELWITHDEBINFO_CLEAN_FIRST):
-	$(BUILD_SCRIPT) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=relwithdebinfo --target $(patsubst %-cp,%,$@) --clean-first
+	$(BUILD_CMD) $(BUILD_JOBS) $(BUILD_OPTIONS) $(CMAKE_OPTIONS) variant=relwithdebinfo --target $(patsubst %-cp,%,$@) --clean-first
 
 realclean:
 	$(RM) -rf bin build lib

README.md

+VTM reference software for VVC
+==============================
+
+This software package is the reference software for Rec. ITU-T H.266 | ISO/IEC 23090-3 Versatile Video Coding (VVC). The reference software includes both encoder and decoder functionality.
+
+Reference software is useful in aiding users of a video coding standard to establish and test conformance and interoperability, and to educate users and demonstrate the capabilities of the standard. For these purposes, this software is provided as an aid for the study and implementation of Versatile Video Coding.
+
+The software has been jointly developed by the ITU-T Video Coding Experts Group (VCEG, Question 6 of ITU-T Study Group 16) and the ISO/IEC Moving Picture Experts Group (MPEG Joint Video Coding Team(s) with ITU-T SG 16, Working Group 5 of Subcommittee 29 of ISO/IEC Joint Technical Committee 1).
+
+A software manual, which contains usage instructions, can be found in the "doc" subdirectory of this software package.
+
+The source code is stored in a Git repository. The most recent version can be retrieved using the following commands:
+```bash
+git clone https://vcgit.hhi.fraunhofer.de/jvet/VVCSoftware_VTM.git
+cd VVCSoftware_VTM
+```
+
+Build instructions
+==================
+
+The CMake tool is used to create platform-specific build files. 
+
+Although CMake may be able to generate 32-bit binaries, **it is generally suggested to build 64-bit binaries**. 32-bit binaries are not able to access more than 2GB of RAM, which will not be sufficient for coding larger image formats. Building in 32-bit environments is not tested and will not be supported.
+
+Dependencies
+------------
+
+For generating and verifying cryptographic signatures using digitally signed content SEI messages, OpenSSL is required in version 1.1.1 or greater. Testing is performed on OpenSSL 3.
+If OpenSSL is not found or the version is too low, only parsing of digitally signed content SEI messages will be available.
+
+Detection of OpenSSL can be disabled using the cmake option "-DENABLE_SEARCH_OPENSSL=off"
+
+Build instructions for plain CMake (suggested)
+----------------------------------------------
+
+**Note:** A working CMake installation is required for building the software.
+
+CMake generates configuration files for the compiler environment/development environment on each platform. 
+The following is a list of examples for Windows (MS Visual Studio), macOS (Xcode) and Linux (make).
+
+Open a command prompt on your system and change into the root directory of this project.
+
+Create a build directory in the root directory:
+```bash
+mkdir build 
+```
+
+Use one of the following CMake commands, based on your platform. Feel free to change the commands to satisfy
+your needs.
+
+**Windows Visual Studio 2015/17/19 64 Bit:**
+
+Use the proper generator string for generating Visual Studio files, e.g. for VS 2015:
+
+```bash
+cd build
+cmake .. -G "Visual Studio 14 2015 Win64"
+```
+
+Then open the generated solution file in MS Visual Studio.
+
+For VS 2017 use "Visual Studio 15 2017 Win64", for VS 2019 use "Visual Studio 16 2019".
+
+Visual Studio 2019 also allows you to open the CMake directory directly. Choose "File->Open->CMake" for this option.
+
+**macOS Xcode:**
+
+For generating an Xcode workspace type:
+```bash
+cd build
+cmake .. -G "Xcode"
+```
+Then open the generated work space in Xcode.
+
+For generating Makefiles with optional non-default compilers, use the following commands:
+
+```bash
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=gcc-9 -DCMAKE_CXX_COMPILER=g++-9
+```
+In this example the brew installed GCC 9 is used for a release build.
+
+**Linux**
+
+For generating Linux Release Makefile:
+```bash
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release
+```
+For generating Linux Debug Makefile:
+```bash
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=Debug
+```
+
+Then type
+```bash
+make -j
+```
+
+For more details, refer to the CMake documentation: https://cmake.org/cmake/help/latest/
+
+Build instructions for make
+---------------------------
+
+**Note:** The build instructions in this section require the make tool and Python to be installed, which are
+part of usual Linux and macOS environments. See below for installation instruction for Python and GnuWin32 
+on Windows.
+
+Open a command prompt on your system and change into the root directory of this project.
+
+To use the default system compiler simply call:
+```bash
+make all
+```
+
+
+**MSYS2 and MinGW (Windows)**
+
+**Note:** Build files for MSYS MinGW were added on request. The build platform is not regularily tested and can't be supported. 
+
+Open an MSYS MinGW 64-Bit terminal and change into the root directory of this project.
+
+Call:
+```bash
+make all toolset=gcc
+```
+
+The following tools need to be installed for MSYS2 and MinGW:
+
+Download CMake: http://www.cmake.org/ and install it.
+
+Python and GnuWin32 are not mandatory, but they simplify the build process for the user.
+
+python:    https://www.python.org/downloads/release/python-371/
+
+gnuwin32:  https://sourceforge.net/projects/getgnuwin32/files/getgnuwin32/0.6.30/GetGnuWin32-0.6.3.exe/download
+
+To use MinGW, install MSYS2: http://repo.msys2.org/distrib/msys2-x86_64-latest.exe
+
+Installation instructions: https://www.msys2.org/
+
+Install the needed toolchains:
+```bash
+pacman -S --needed base-devel mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain git subversion mingw-w64-i686-cmake mingw-w64-x86_64-cmake
+```
+

README.txt

-NextSoftware build howto:
-
-The software uses cmake to create the needed build files. 
-Download cmake: http://www.cmake.org/ and install it.
-
-Usage:
-
-Open a command prompt on your system and change into the root directory
-of this project (location of README.txt).
-
-Create a build directory in the root directory:
-mkdir build 
-
-After that use one of the following cmake commands. Feel free to change the 
-commands to satisfy your needs.
-
-Windows sample for Visual Studio 2015 64 Bit:
-cd build
-cmake .. -G "Visual Studio 14 2015 Win64"
-
-Linux Release Makefile sample:
-cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release
-
-Linux Debug Makefile sample:
-cd build
-cmake .. -DCMAKE_BUILD_TYPE=Debug
-
-MACOSX Xcode sample:
-cd build
-cmake .. -G "Xcode"

cfg/444/yuv444.cfg

+BDPCM: 1

cfg/CacheCfg/cache_1d.cfg

+CacheEnable   :   1
+CacheLineSize : 256
+NumCacheLine  :  64
+NumWay        :   4
+CacheAddrMode :   0
+FrameReport   :   

cfg/CacheCfg/cache_2d.cfg

+CacheEnable   :   1
+CacheLineSize : 256
+NumCacheLine  :  64
+NumWay        :   4
+CacheAddrMode :   1
+BlkWidth      :  16
+BlkHeight     :  16
+FrameReport   :   0

cfg/alternative-addon/README.md

+# Alternative config add-ons
+
+The configuration files in this directory can be used as add-ons to the CTC configuration files.
+
+## Adaptive resolution for random access
+
+`random_access_adaptive_resolution.cfg` may be used as an add-on to a random access CTC configuration file.
+It enables adaptive resolution switching to achieve better visual quality.
+
+
+

cfg/alternative-addon/random_access_adaptive_resolution.cfg

+# DMVR encoder control (Enable method for avoiding select MVs that are more likely to give subjective artifacts)
+DMVREncMvSelect                     : 1
+
+# GOP based RPR (Enables decision to encode pictures in GOP in full resolution or one of three downscaled resolutions
+# (default is 1/2, 2/3 and 4/5 in both dimensions)
+GOPBasedRPR                         : 1
+UpscaledOutput                      : 2

cfg/alternative_high_perf/README.md

+# "High Performance" alternative config
+
+The configuration files in this directory can be used as alternatives to the CTC configuration files.
+
+They provide higher coding performance in comparison to the corresponding CTC configurations at the cost of longer encoder run times.
+

cfg/alternative_high_perf/encoder_lowdelay_P_vtm_perf.cfg

+#======== File I/O =====================
+BitstreamFile                 : str.bin
+ReconFile                     : rec.yuv
+
+#======== Profile ================
+Profile                       : auto
+
+#======== Unit definition ================
+MaxCUWidth                    : 64          # Maximum coding unit width in pixel
+MaxCUHeight                   : 64          # Maximum coding unit height in pixel
+
+#======== Coding Structure =============
+IntraPeriod                   : -1          # Period of I-Frame ( -1 = only first)
+DecodingRefreshType           : 0           # Random Accesss 0:none, 1:CRA, 2:IDR, 3:Recovery Point SEI
+GOPSize                       : 8           # GOP Size (number of B slice = GOPSize-1)
+
+IntraQPOffset                 : -1
+LambdaFromQpEnable            : 1           # see JCTVC-X0038 for suitable parameters for IntraQPOffset, QPoffset, QPOffsetModelOff, QPOffsetModelScale when enabled
+#        Type POC QPoffset QPOffsetModelOff QPOffsetModelScale CbQPoffset CrQPoffset QPfactor tcOffsetDiv2 betaOffsetDiv2 CbTcOffsetDiv2 CbBetaOffsetDiv2 CrTcOffsetDiv2 CrBetaOffsetDiv2 temporal_id #ref_pics_active_L0 #ref_pics_L0   reference_pictures_L0 #ref_pics_active_L1 #ref_pics_L1   reference_pictures_L1
+Frame1:    P   1   5       -6.5                      0.2590         0          0          1.0      0            0               0             0                 0               0               0             4                4         1 9 17 25                      0                   0
+Frame2:    P   2   4       -6.5                      0.2590         0          0          1.0      0            0               0             0                 0               0               0             4                4         1 2 10 18                      0                   0
+Frame3:    P   3   5       -6.5                      0.2590         0          0          1.0      0            0               0             0                 0               0               0             4                4         1 3 11 19                      0                   0
+Frame4:    P   4   4       -6.5                      0.2590         0          0          1.0      0            0               0             0                 0               0               0             4                4         1 4 12 20                      0                   0
+Frame5:    P   5   5       -6.5                      0.2590         0          0          1.0      0            0               0             0                 0               0               0             4                4         1 5 13 21                      0                   0
+Frame6:    P   6   4       -6.5                      0.2590         0          0          1.0      0            0               0             0                 0               0               0             4                4         1 6 14 22                      0                   0
+Frame7:    P   7   5       -6.5                      0.2590         0          0          1.0      0            0               0             0                 0               0               0             4                4         1 7 15 23                      0                   0
+Frame8:    P   8   1        0.0                      0.0            0          0          1.0      0            0               0             0                 0               0               0             4                4         1 8 16 24                      0                   0
+
+#=========== Motion Search =============
+FastSearch                    : 1           # 0:Full search  1:TZ search
+SearchRange                   : 64          # (0: Search range is a Full frame)
+BipredSearchRange             : 4           # Search range for bi-prediction refinement
+HadamardME                    : 1           # Use of hadamard measure for fractional ME
+FEN                           : 0           # Fast encoder decision
+FDM                           : 0           # Fast Decision for Merge RD cost
+
+#======== Quantization =============
+QP                            : 32          # Quantization parameter(0-51)
+MaxDeltaQP                    : 0           # CU-based multi-QP optimization
+MaxCuDQPSubdiv                : 0           # Maximum subdiv for CU luma Qp adjustment
+DeltaQpRD                     : 0           # Slice-based multi-QP optimization
+RDOQ                          : 1           # RDOQ
+RDOQTS                        : 1           # RDOQ for transform skip
+
+#=========== Deblock Filter ============
+DeblockingFilterOffsetInPPS         : 1           # Dbl params: 0=varying params in SliceHeader, param = base_param + GOP_offset_param; 1 (default) =constant params in PPS, param = base_param)
+DeblockingFilterDisable             : 0           # Disable deblocking filter (0=Filter, 1=No Filter)
+DeblockingFilterBetaOffset_div2     : -2           # base_param: -12 ~ 12
+DeblockingFilterTcOffset_div2       : 0           # base_param: -12 ~ 12
+DeblockingFilterCbBetaOffset_div2   : -2           # base_param: -12 ~ 12
+DeblockingFilterCbTcOffset_div2     : 0           # base_param: -12 ~ 12
+DeblockingFilterCrBetaOffset_div2   : -2           # base_param: -12 ~ 12
+DeblockingFilterCrTcOffset_div2     : 0           # base_param: -12 ~ 12
+DeblockingFilterMetric        : 0           # blockiness metric (automatically configures deblocking parameters in bitstream). Applies slice-level loop filter offsets (DeblockingFilterOffsetInPPS and DeblockingFilterDisable must be 0)
+
+#=========== Misc. ============
+InternalBitDepth              : 10          # codec operating bit-depth
+
+#=========== Coding Tools =================
+SAO                           : 1           # Sample adaptive offset  (0: OFF, 1: ON)
+TransformSkip                 : 1           # Transform skipping (0: OFF, 1: ON)
+TransformSkipFast             : 1           # Fast Transform skipping (0: OFF, 1: ON)
+TransformSkipLog2MaxSize      : 5
+SAOLcuBoundary                : 0           # SAOLcuBoundary using non-deblocked pixels (0: OFF, 1: ON)
+
+#=========== TemporalFilter =================
+TemporalFilter                : 1
+TemporalFilterPastRefs        : 4           # Number of past references for temporal prefilter
+TemporalFilterFutureRefs      : 0           # Number of future references for temporal prefilter
+TemporalFilterStrengthFrame8  : 0.2         # Enable filter at every 8th frame with strength
+
+#============ Rate Control ======================
+RateControl                         : 0                # Rate control: enable rate control
+TargetBitrate                       : 1000000          # Rate control: target bitrate, in bps
+KeepHierarchicalBit                 : 2                # Rate control: 0: equal bit allocation; 1: fixed ratio bit allocation; 2: adaptive ratio bit allocation
+LCULevelRateControl                 : 1                # Rate control: 1: LCU level RC; 0: picture level RC
+RCLCUSeparateModel                  : 1                # Rate control: use LCU level separate R-lambda model
+InitialQP                           : 0                # Rate control: initial QP
+RCForceIntraQP                      : 0                # Rate control: force intra QP to be equal to initial QP
+
+#============ VTM settings ======================
+SEIDecodedPictureHash               : 0
+CbQpOffset                          : 0
+CrQpOffset                          : 0
+SameCQPTablesForAllChroma           : 1
+QpInValCb                           : 17 22 34 42
+QpOutValCb                          : 17 23 35 39
+ReWriteParamSets                    : 1
+#============ NEXT ====================
+
+# General
+CTUSize                      : 128
+LCTUFast                     : 1
+
+DualITree                    : 1      # separate partitioning of luma and chroma channels for I-slices
+MinQTLumaISlice              : 8
+MinQTChromaISliceInChromaSamples: 4      # minimum QT size in chroma samples for chroma separate tree
+MinQTNonISlice               : 8
+MaxMTTHierarchyDepth         : 3
+MaxMTTHierarchyDepthISliceL  : 4
+MaxMTTHierarchyDepthISliceC  : 4
+
+MTS                          : 3
+MTSIntraMaxCand              : 3
+MTSInterMaxCand              : 4
+SBT                          : 1
+ISP                          : 1
+Affine                       : 1
+SbTMVP                       : 1
+MaxNumMergeCand              : 6
+LMChroma                     : 1      # use CCLM only
+DepQuant                     : 1
+IMV                          : 1
+ALF                          : 1
+CIIP                         : 1
+IBC                          : 0      # turned off in CTC
+AllowDisFracMMVD             : 1
+AffineAmvr                   : 0
+LMCSEnable                   : 1      # LMCS: 0: disable, 1:enable
+LMCSSignalType               : 0      # Input signal type: 0:SDR, 1:HDR-PQ, 2:HDR-HLG
+LMCSUpdateCtrl               : 2      # LMCS model update control: 0:RA, 1:AI, 2:LDB/LDP
+LMCSOffset                   : 1      # chroma residual scaling offset
+MRL                          : 1
+MIP                          : 0
+JointCbCr                    : 1      # joint coding of chroma residuals (if available): 0: disable, 1: enable
+PROF                         : 1
+ChromaTS                     : 1
+
+# Fast tools
+PBIntraFast                  : 1
+ISPFast                      : 0
+FastMrg                      : 1
+AMaxBT                       : 1
+FastMIP                      : 0
+FastLocalDualTreeMode        : 2
+
+# Encoder optimization tools
+AffineAmvrEncOpt             : 0
+MmvdDisNum                   : 6
+ALFAllowPredefinedFilters    : 1
+ALFStrengthTargetLuma        : 1.0
+ALFStrengthTargetChroma      : 1.0
+CCALFStrengthTarget          : 1.0
+EncDbOpt                     : 1
+SplitPredictAdaptMode        : 1
+DisableFastTTfromBT          : 1
+
+### DO NOT ADD ANYTHING BELOW THIS LINE ###
+### DO NOT DELETE THE EMPTY LINE BELOW ###
+
+
+