Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • jvet-tuc/VVCSoftware_VTM
  • tlu/vvc-software-vtm-tuc
  • hendry197/vvc-software-vtm-tuc
  • jeeva.raj/vvc-software-vtm-tu-c-2
  • ksuehring/vvc-software-vtm-tuc
  • jiechen/vvc-software-vtm-tuc
  • sw.xie/adaptive-film-grain-models
  • Kaifa/vvc-software-vtm-tuc
  • hallapur/vvc-software-vtm-tuc
  • biatekt/vvc-software-vtm-tmuc
  • pbcowan/vvc-software-vtm-tuc
11 results
Show changes
Commits on Source (1226)
1,126 additional commits have been omitted to prevent performance issues.
Hide whitespace changes
Inline Side-by-side
Showing
with 197 additions and 58 deletions
.clang-format
View file @ c79f5017
---
# to be used on clang-format version 14 or later
Language: Cpp
# BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: true
AlignConsecutiveDeclarations: true
AlignEscapedNewlines: Right
AlignOperands: true
AlignConsecutiveAssignments: AcrossComments
AlignConsecutiveBitFields: AcrossComments
AlignConsecutiveDeclarations: AcrossComments
AlignConsecutiveMacros: AcrossComments
AlignEscapedNewlines: Left
AlignOperands: Align
AlignTrailingComments: true
AllowAllArgumentsOnNextLine: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: true
AllowShortCaseLabelsOnASingleLine: true
AllowShortFunctionsOnASingleLine: Inline
AllowShortIfStatementsOnASingleLine: false
AllowShortBlocksOnASingleLine: Always
AllowShortCaseLabelsOnASingleLine: false
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: All
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: false
AlwaysBreakTemplateDeclarations: No
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
BraceWrapping:
AfterCaseLabel: true
AfterClass: true
AfterControlStatement: true
AfterControlStatement: Always
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterObjCDeclaration: false
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: Allman
BreakBeforeBraces: Custom
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: true
BreakConstructorInitializers: BeforeComma
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
......@@ -55,21 +62,30 @@ DerivePointerAlignment: false
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: true
ForEachMacros:
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
IncludeBlocks: Preserve
IncludeCategories:
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
......@@ -78,7 +94,7 @@ KeepEmptyLinesAtTheStartOfBlocks: false
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: All
NamespaceIndentation: None
ObjCBinPackProtocolList: Auto
ObjCBlockIndentWidth: 2
ObjCSpaceAfterProperty: false
......@@ -90,25 +106,30 @@ PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PointerAlignment: Right
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
SpacesInAngles: false
SpacesInConditionalStatement: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
Standard: c++17
TabWidth: 8
UseTab: Never
...
......
.gitignore
View file @ c79f5017
......@@ -15,3 +15,5 @@ deploy
*.pyc
/out/
/doc/_minted-software-manual/
/.idea/
/cmake-build-*/
.gitlab-ci.yml
View file @ c79f5017
......@@ -9,10 +9,11 @@ stages:
only:
refs:
- master
- jvet-tuc
- merge_requests
variables:
- $CI_PROJECT_URL == 'https://vcgit.hhi.fraunhofer.de/jvet/VVCSoftware_VTM'
- $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'master'
- $CI_PROJECT_URL == 'https://vcgit.hhi.fraunhofer.de/jvet-tuc/VVCSoftware_VTM'
- $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'jvet-tuc'
.build_template_linux:
extends: .build_template
......@@ -20,6 +21,8 @@ stages:
- make realclean
- make all
- make realclean
- make release high-bitdepth=true
- make realclean
- make linuxbuild enable-tracing=true
build_macos:
......@@ -27,25 +30,32 @@ build_macos:
tags:
- macos
build_ubuntu1804:
build_macos_arm:
extends: .build_template
tags:
- macos-arm
build_ubuntu2004:
extends: .build_template_linux
tags:
- ubuntu1804
- ubuntu2004
build_ubuntu1804-gcc8:
build_ubuntu2204:
extends: .build_template_linux
tags:
- ubuntu2204
build_ubuntu2204-gcc12:
extends: .build_template
script:
- make realclean
- make all toolset=gcc-8
- make all toolset=gcc-12
- make realclean
- make linuxbuild enable-tracing=true toolset=gcc-8
- make release high-bitdepth=true toolset=gcc-12
- make realclean
- make linuxbuild enable-tracing=true toolset=gcc-12
tags:
- ubuntu1804-gcc8
build_ubuntu2004:
extends: .build_template_linux
tags:
- ubuntu2004
- ubuntu2204-gcc12
build_vc191x:
extends: .build_template
......@@ -57,3 +67,14 @@ build_vc192x:
tags:
- vc192x
build_software-manual:
extends: .build_template
script:
- cd doc
- make clean
- make
artifacts:
paths:
- doc/software-manual.pdf
tags:
- pdflatex
CMakeLists.txt
View file @ c79f5017
......@@ -29,15 +29,20 @@ endif()
set( EXTENSION_360_VIDEO OFF CACHE BOOL "If EXTENSION_360_VIDEO is on, 360Lib will be added" )
set( EXTENSION_HDRTOOLS OFF CACHE BOOL "If EXTENSION_HDRTOOLS is on, HDRLib will be added" )
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" )
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()
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)
......@@ -57,13 +62,12 @@ include( ${CMAKE_SOURCE_DIR}/cmake/CMakeBuild/cmake/modules/BBuildEnv.cmake )
# 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 -Wno-class-memaccess)
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
......@@ -71,7 +75,6 @@ if( XCODE )
else()
bb_enable_warnings( clang warnings-as-errors
-Wno-unknown-attributes
-Wno-deprecated-register
-Wno-pessimizing-move
-Wno-absolute-value
-Wno-unused-const-variable )
......
Makefile
View file @ c79f5017
......@@ -83,15 +83,11 @@ CMAKE_OPTIONS += -DCMAKE_VERBOSE_MAKEFILE=ON
endif
ifneq ($(enable-tracing),)
CONFIG_OPTIONS += -DSET_ENABLE_TRACING=ON -DENABLE_TRACING=$(enable-tracing)
CONFIG_OPTIONS += -DENABLE_TRACING=$(enable-tracing)
endif
ifneq ($(parallel-split),)
CONFIG_OPTIONS += -DSET_ENABLE_SPLIT_PARALLELISM=ON -DENABLE_SPLIT_PARALLELISM=$(parallel-split)
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),)
......
cfg/alternative/encoder_lowdelay_vtm_perf.cfg
View file @ c79f5017
......@@ -17,14 +17,14 @@ GOPSize : 8 # GOP Size (number of B slice = GOPS
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: B 1 5 -6.5 0.2590 0 0 1.0 0 0 0 0 0 0 0 4 4 1 9 17 25 4 4 1 9 17 25
Frame2: B 2 4 -6.5 0.2590 0 0 1.0 0 0 0 0 0 0 0 4 4 1 2 10 18 4 4 1 2 10 18
Frame3: B 3 5 -6.5 0.2590 0 0 1.0 0 0 0 0 0 0 0 4 4 1 3 11 19 4 4 1 3 11 19
Frame4: B 4 4 -6.5 0.2590 0 0 1.0 0 0 0 0 0 0 0 4 4 1 4 12 20 4 4 1 4 12 20
Frame5: B 5 5 -6.5 0.2590 0 0 1.0 0 0 0 0 0 0 0 4 4 1 5 13 21 4 4 1 5 13 21
Frame6: B 6 4 -6.5 0.2590 0 0 1.0 0 0 0 0 0 0 0 4 4 1 6 14 22 4 4 1 6 14 22
Frame7: B 7 5 -6.5 0.2590 0 0 1.0 0 0 0 0 0 0 0 4 4 1 7 15 23 4 4 1 7 15 23
Frame8: B 8 1 0.0 0.0 0 0 1.0 0 0 0 0 0 0 0 4 4 1 8 16 24 4 4 1 8 16 24
Frame1: B 1 6 -6.5 0.2450 0 0 1.0 0 0 0 0 0 0 0 4 4 1 9 17 25 4 4 1 3 5 33
Frame2: B 2 4 -6.5 0.2590 0 0 1.0 0 0 0 0 0 0 0 4 4 1 2 10 18 4 4 1 2 4 26
Frame3: B 3 6 -6.5 0.2450 0 0 1.0 0 0 0 0 0 0 0 4 4 1 3 11 19 4 4 1 3 5 27
Frame4: B 4 4 -6.5 0.2590 0 0 1.0 0 0 0 0 0 0 0 4 4 1 4 12 20 4 4 1 2 4 28
Frame5: B 5 6 -6.5 0.2450 0 0 1.0 0 0 0 0 0 0 0 4 4 1 5 13 21 4 4 1 3 5 29
Frame6: B 6 4 -6.5 0.2590 0 0 1.0 0 0 0 0 0 0 0 4 4 1 6 14 22 4 4 1 2 6 30
Frame7: B 7 6 -6.5 0.2450 0 0 1.0 0 0 0 0 0 0 0 4 4 1 7 15 23 4 4 1 3 7 31
Frame8: B 8 1 0.0 0.0 0 0 1.0 0 0 0 0 0 0 0 4 4 1 8 16 24 4 4 1 2 4 32
#=========== Motion Search =============
FastSearch : 1 # 0:Full search 1:TZ search
SearchRange : 64 # (0: Search range is a Full frame)
......
cfg/encoder_lowdelay_P_vtm.cfg
View file @ c79f5017
......@@ -133,6 +133,7 @@ FastMrg : 1
AMaxBT : 1
FastMIP : 0
FastLocalDualTreeMode : 2
MaxMergeRdCandNumTotal : 5
# Encoder optimization tools
AffineAmvrEncOpt : 0
......
cfg/encoder_lowdelay_vtm.cfg
View file @ c79f5017
......@@ -137,6 +137,7 @@ FastMrg : 1
AMaxBT : 1
FastMIP : 0
FastLocalDualTreeMode : 2
MaxMergeRdCandNumTotal : 11
# Encoder optimization tools
AffineAmvrEncOpt : 0
......
cfg/encoder_randomaccess_vtm.cfg
View file @ c79f5017
......@@ -162,6 +162,7 @@ FastMIP : 0
FastLFNST : 0
FastLocalDualTreeMode : 1
ChromaTS : 1
MaxMergeRdCandNumTotal : 7
# Encoder optimization tools
AffineAmvrEncOpt : 1
......
cfg/encoder_randomaccess_vtm_gop16.cfg
View file @ c79f5017
......@@ -146,6 +146,7 @@ FastMIP : 0
FastLFNST : 0
FastLocalDualTreeMode : 1
ChromaTS : 1
MaxMergeRdCandNumTotal : 7
# Encoder optimization tools
AffineAmvrEncOpt : 1
......@@ -155,6 +156,8 @@ ALFStrengthTargetLuma : 1.0
ALFStrengthTargetChroma : 1.0
CCALFStrengthTarget : 1.0
EncDbOpt : 1 # apply deblocking in RDO
TemporalFilter : 1
TemporalFilterPastRefs : 4 # Number of past references for temporal prefilter
TemporalFilterFutureRefs : 4 # Number of future references for temporal prefilter
TemporalFilterStrengthFrame8 : 0.95 # Enable filter at every 8th frame with given strength
......
cfg/multi-layer/two_layers.cfg
View file @ c79f5017
#======== Layers ===============
MultiLayerEnabledFlag : 1
MaxLayers : 2
MaxSublayers : 7
DefaultPtlDpbHrdMaxTidFlag : 0
......
cfg/multi-layer/two_layers_ELonlyILP.cfg
View file @ c79f5017
#======== Layers ===============
MultiLayerEnabledFlag : 1
MaxLayers : 2
MaxSublayers : 1
DefaultPtlDpbHrdMaxTidFlag : 0
......
cfg/multi-layer/two_layers_independent.cfg 0 → 100644
View file @ c79f5017
#======== Layers ===============
MaxLayers : 2
MaxSublayers : 7
DefaultPtlDpbHrdMaxTidFlag : 0
AllIndependentLayersFlag : 1
#======== OLSs ===============
EachLayerIsAnOlsFlag : 1
NumOutputLayerSets : 2
OlsOutputLayer1 : 1
NumPTLsInVPS : 2
#======== Layer-0 ===============
LayerId0 : 0
#======== Layer-1 ===============
LayerId1 : 1
#======== OLS-0 ===============
OlsPTLIdx0 : 0
#======== OLS-1 ===============
OlsPTLIdx1 : 0
cfg/multi-layer/two_layers_max_tid_ref_pic.cfg
View file @ c79f5017
......@@ -2,6 +2,7 @@
# combines with random-access GOP config file
#======== Layers ===============
MultiLayerEnabledFlag : 1
MaxLayers : 2
MaxSublayers : 7 # allow up to 7 temporal layers
DefaultPtlDpbHrdMaxTidFlag : 0
......
cfg/multi-layer/two_layers_multi_profiles.cfg 0 → 100644
View file @ c79f5017
#======== Layers ===============
MaxLayers : 2
MaxSublayers : 7
DefaultPtlDpbHrdMaxTidFlag : 0
AllIndependentLayersFlag : 0
#======== OLSs ===============
EachLayerIsAnOlsFlag : 0
OlsModeIdc : 2
NumOutputLayerSets : 2
OlsOutputLayer1 : 1 0
NumPTLsInVPS : 2
PtPresentInPTL1 : 1
#======== Layer-0 ===============
LayerId0 : 0
#======== Layer-1 ===============
LayerId1 : 1
NumRefLayers1 : 1
RefLayerIdx1 : 0
#======== OLS-0 ===============
OlsPTLIdx0 : 0
#======== OLS-1 ===============
OlsPTLIdx1 : 1
LevelPTL1 : 6.2
cfg/per-class/formatGBR.cfg 0 → 100644
View file @ c79f5017
ColorTransform : 1
Log2MaxTbSize : 5
DualITree: 0
LMCSEnable : 0
cfg/per-class/formatRGB.cfg
View file @ c79f5017
InputColourSpaceConvert : RGBtoGBR # Non-normative colour space conversion to apply to input video
SNRInternalColourSpace : 1 # Evaluate SNRs in GBR order
OutputInternalColourSpace : 0 # Convert recon output back to RGB order. Use --OutputColourSpaceConvert GBRtoRGB on decoder to produce a matching output file.
ColorTransform : 1
Log2MaxTbSize : 5
DualITree: 0
LMCSEnable : 0
\ No newline at end of file
LMCSEnable : 0
cfg/per-sequence/ChineseEditing_420.cfg 0 → 100644
View file @ c79f5017
#======== File I/O ===============
InputFile : ChineseEditing_1920x1080_60_8bit_420.yuv
InputBitDepth : 8 # Input bitdepth
InputChromaFormat : 420 # Ratio of luminance to chrominance samples
FrameRate : 60 # Frame Rate per second
FrameSkip : 0 # Number of frames to be skipped in input
SourceWidth : 1920 # Input frame width
SourceHeight : 1080 # Input frame height
FramesToBeEncoded : 600 # Number of frames to be coded
Level : 6.2
cfg/per-sequence/Console_420.cfg 0 → 100644
View file @ c79f5017
#======== File I/O ===============
InputFile : sc_console_1920x1080_60_8bit_420.yuv
InputBitDepth : 8 # Input bitdepth
InputChromaFormat : 420 # Ratio of luminance to chrominance samples
FrameRate : 60 # Frame Rate per second
FrameSkip : 0 # Number of frames to be skipped in input
SourceWidth : 1920 # Input frame width
SourceHeight : 1080 # Input frame height
FramesToBeEncoded : 600 # Number of frames to be coded
Level : 6.2
cfg/per-sequence/Desktop_420.cfg 0 → 100644
View file @ c79f5017
#======== File I/O ===============
InputFile : sc_desktop_1920x1080_60_8bit_420.yuv
InputBitDepth : 8 # Input bitdepth
InputChromaFormat : 420 # Ratio of luminance to chrominance samples
FrameRate : 60 # Frame Rate per second
FrameSkip : 0 # Number of frames to be skipped in input
SourceWidth : 1920 # Input frame width
SourceHeight : 1080 # Input frame height
FramesToBeEncoded : 600 # Number of frames to be coded
Level : 6.2