diff --git a/cfg/multi-layer/encoder_lowdelay_vtm_l1.cfg b/cfg/multi-layer/encoder_lowdelay_vtm_l1.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..cc5b42744ca539263f00d29a914f90be672d5436
--- /dev/null
+++ b/cfg/multi-layer/encoder_lowdelay_vtm_l1.cfg
@@ -0,0 +1,156 @@
+#======== 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: B 1 6 -6.5 0.2450 0 0 1.0 0 0 0 0 0 0 0 5 5 0.0 1 9 17 25 5 5 0.0 1 3 5 33
+Frame2: B 2 4 -6.5 0.2590 0 0 1.0 0 0 0 0 0 0 0 5 5 0.0 1 2 10 18 5 5 0.0 1 2 4 26
+Frame3: B 3 6 -6.5 0.2450 0 0 1.0 0 0 0 0 0 0 0 5 5 0.0 1 3 11 19 5 5 0.0 1 3 5 27
+Frame4: B 4 4 -6.5 0.2590 0 0 1.0 0 0 0 0 0 0 0 5 5 0.0 1 4 12 20 5 5 0.0 1 2 4 28
+Frame5: B 5 6 -6.5 0.2450 0 0 1.0 0 0 0 0 0 0 0 5 5 0.0 1 5 13 21 5 5 0.0 1 3 5 29
+Frame6: B 6 4 -6.5 0.2590 0 0 1.0 0 0 0 0 0 0 0 5 5 0.0 1 6 14 22 5 5 0.0 1 2 6 30
+Frame7: B 7 6 -6.5 0.2450 0 0 1.0 0 0 0 0 0 0 0 5 5 0.0 1 7 15 23 5 5 0.0 1 3 7 31
+Frame8: B 8 1 0.0 0.0 0 0 1.0 0 0 0 0 0 0 0 5 5 0.0 1 8 16 24 5 5 0.0 1 2 4 32
+
+#=========== 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 : 1 # Fast encoder decision
+FDM : 1 # 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 : 3
+MaxMTTHierarchyDepthISliceC : 3
+
+MTS : 1
+MTSIntraMaxCand : 3
+MTSInterMaxCand : 4
+SBT : 1
+ISP : 1
+MMVD : 1
+Affine : 1
+SbTMVP : 1
+MaxNumMergeCand : 6
+LMChroma : 1 # use CCLM only
+DepQuant : 1
+IMV : 1
+ALF : 1
+BCW : 1
+BcwFast : 1
+CIIP : 1
+Geo : 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
+MaxMergeRdCandNumTotal : 11
+
+# Encoder optimization tools
+AffineAmvrEncOpt : 0
+MmvdDisNum : 6
+ALFAllowPredefinedFilters : 1
+ALFStrengthTargetLuma : 1.0
+ALFStrengthTargetChroma : 1.0
+CCALFStrengthTarget : 1.0
+EncDbOpt : 1 # apply deblocking in RDO
+AlfLambdaOpt : 0 # JVET-AF0122: apply ALF APS optimization
+MTTSkipping : 1 # MTTSkipping: 0: disable, 1:enable
+### DO NOT ADD ANYTHING BELOW THIS LINE ###
+### DO NOT DELETE THE EMPTY LINE BELOW ###
+
+
+
diff --git a/cfg/multi-layer/layer1_gop16_randomaccess.cfg b/cfg/multi-layer/layer1_gop16_randomaccess.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..c62d3220b2fa5b5abc53d1ca560c5ccb101ff4fa
--- /dev/null
+++ b/cfg/multi-layer/layer1_gop16_randomaccess.cfg
@@ -0,0 +1,25 @@
+#======== Coding Structure =============
+ExplicitILRP : 1 # Explicit configuration of inter-layer reference pictures (0:disabled, 1:enabled)
+DecodingRefreshType : 1 # Random Accesss 0:none, 1:CRA, 2:IDR, 3:Recovery Point SEI
+GOPSize : 16 # GOP Size (number of B slice = GOPSize-1)
+
+IntraQPOffset : -3
+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 16 1 0.0 0.0 0 0 1.0 0 0 0 0 0 0 0 3 4 0.0 16 32 24 3 3 0.0 16 32
+Frame2: B 8 1 -4.8848 0.2061 0 0 1.0 0 0 0 0 0 0 1 3 3 0.0 8 16 3 3 0.0 -8 8
+Frame3: B 4 4 -5.7476 0.2286 0 0 1.0 0 0 0 0 0 0 2 3 3 0.0 4 12 3 3 0.0 -4 -12
+Frame4: B 2 5 -5.90 0.2333 0 0 1.0 0 0 0 0 0 0 3 3 3 0.0 2 10 3 4 0.0 -2 -6 -14
+Frame5: B 1 6 -7.1444 0.3 0 0 1.0 0 0 0 0 0 0 4 3 3 0.0 1 -1 3 5 0.0 -1 -3 -7 -15
+Frame6: B 3 6 -7.1444 0.3 0 0 1.0 0 0 0 0 0 0 4 3 3 0.0 1 3 3 4 0.0 -1 -5 -13
+Frame7: B 6 5 -5.90 0.2333 0 0 1.0 0 0 0 0 0 0 3 3 3 0.0 2 6 3 3 0.0 -2 -10
+Frame8: B 5 6 -7.1444 0.3 0 0 1.0 0 0 0 0 0 0 4 3 3 0.0 1 5 3 4 0.0 -1 -3 -11
+Frame9: B 7 6 -7.1444 0.3 0 0 1.0 0 0 0 0 0 0 4 3 4 0.0 1 3 7 3 3 0.0 -1 -9
+Frame10: B 12 4 -5.7476 0.2286 0 0 1.0 0 0 0 0 0 0 2 3 3 0.0 4 12 3 3 0.0 -4 4
+Frame11: B 10 5 -5.90 0.2333 0 0 1.0 0 0 0 0 0 0 3 3 3 0.0 2 10 3 3 0.0 -2 -6
+Frame12: B 9 6 -7.1444 0.3 0 0 1.0 0 0 0 0 0 0 4 3 3 0.0 1 9 3 4 0.0 -1 -3 -7
+Frame13: B 11 6 -7.1444 0.3 0 0 1.0 0 0 0 0 0 0 4 3 4 0.0 1 3 11 3 3 0.0 -1 -5
+Frame14: B 14 5 -5.90 0.2333 0 0 1.0 0 0 0 0 0 0 3 3 4 0.0 2 6 14 3 3 0.0 -2 2
+Frame15: B 13 6 -7.1444 0.3 0 0 1.0 0 0 0 0 0 0 4 3 4 0.0 1 5 13 3 3 0.0 -1 -3
+Frame16: B 15 6 -7.1444 0.3 0 0 1.0 0 0 0 0 0 0 4 3 5 0.0 1 3 7 15 3 3 0.0 -1 1
+
diff --git a/cfg/multi-layer/layer1_gop_lowdelay.cfg b/cfg/multi-layer/layer1_gop_lowdelay.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..da2055741a431db9b460b0404bab99e4fc85a8d1
--- /dev/null
+++ b/cfg/multi-layer/layer1_gop_lowdelay.cfg
@@ -0,0 +1,17 @@
+#======== Coding Structure =============
+ExplicitILRP : 1 # Explicit configuration of inter-layer reference pictures (0:disabled, 1:enabled)
+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: B 1 6 -6.5 0.2450 0 0 1.0 0 0 0 0 0 0 0 5 5 0.0 1 9 17 25 5 5 0.0 1 3 5 33
+Frame2: B 2 4 -6.5 0.2590 0 0 1.0 0 0 0 0 0 0 0 5 5 0.0 1 2 10 18 5 5 0.0 1 2 4 26
+Frame3: B 3 6 -6.5 0.2450 0 0 1.0 0 0 0 0 0 0 0 5 5 0.0 1 3 11 19 5 5 0.0 1 3 5 27
+Frame4: B 4 4 -6.5 0.2590 0 0 1.0 0 0 0 0 0 0 0 5 5 0.0 1 4 12 20 5 5 0.0 1 2 4 28
+Frame5: B 5 6 -6.5 0.2450 0 0 1.0 0 0 0 0 0 0 0 5 5 0.0 1 5 13 21 5 5 0.0 1 3 5 29
+Frame6: B 6 4 -6.5 0.2590 0 0 1.0 0 0 0 0 0 0 0 5 5 0.0 1 6 14 22 5 5 0.0 1 2 6 30
+Frame7: B 7 6 -6.5 0.2450 0 0 1.0 0 0 0 0 0 0 0 5 5 0.0 1 7 15 23 5 5 0.0 1 3 7 31
+Frame8: B 8 1 0.0 0.0 0 0 1.0 0 0 0 0 0 0 0 5 5 0.0 1 8 16 24 5 5 0.0 1 2 4 32
+
diff --git a/cfg/multi-layer/layer1_gop_lowdelay_P.cfg b/cfg/multi-layer/layer1_gop_lowdelay_P.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..ac888a6dff168256107a3531a2933d20267fc054
--- /dev/null
+++ b/cfg/multi-layer/layer1_gop_lowdelay_P.cfg
@@ -0,0 +1,17 @@
+#======== Coding Structure =============
+ExplicitILRP : 1 # Explicit configuration of inter-layer reference pictures (0:disabled, 1:enabled)
+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 5 5 0.0 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 5 5 0.0 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 5 5 0.0 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 5 5 0.0 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 5 5 0.0 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 5 5 0.0 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 5 5 0.0 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 5 5 0.0 1 8 16 24 0 0
+
diff --git a/cfg/multi-layer/layer1_gop_randomaccess.cfg b/cfg/multi-layer/layer1_gop_randomaccess.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..8b8753acf2807a8840097c24c527d37e04263b2d
--- /dev/null
+++ b/cfg/multi-layer/layer1_gop_randomaccess.cfg
@@ -0,0 +1,41 @@
+#======== Coding Structure =============
+ExplicitILRP : 1 # Explicit configuration of inter-layer reference pictures (0:disabled, 1:enabled)
+DecodingRefreshType : 1 # Random Accesss 0:none, 1:CRA, 2:IDR, 3:Recovery Point SEI
+GOPSize : 32 # GOP Size (number of B slice = GOPSize-1)
+
+IntraQPOffset : -3
+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 32 -1 0.0 0.0 0 0 1.0 0 0 0 0 0 0 0 3 6 0.0 32 64 48 40 36 2 3 0.0 32 48
+Frame2 : B 16 0 -4.9309 0.2265 0 0 1.0 0 0 0 0 0 0 1 4 6 0.0 16 32 48 24 20 2 2 0.0 -16
+Frame3 : B 8 1 -4.5000 0.1900 0 0 1.0 0 0 0 0 0 0 2 5 6 0.0 8 24 16 40 12 3 3 0.0 -8 -24
+Frame4 : B 4 3 -5.4095 0.2571 0 0 1.0 0 0 0 0 0 0 3 4 4 0.0 4 8 20 4 4 0.0 -4 -12 -28
+Frame5 : B 2 5 -4.4895 0.1947 0 0 1.0 0 0 0 0 0 0 4 4 4 0.0 2 6 18 5 5 0.0 -2 -6 -14 -30
+Frame6 : B 1 6 -5.4429 0.2429 0 0 1.0 0 0 0 0 0 0 5 2 2 0.0 1 3 6 0.0 -1 -3 -7 -15 -31
+Frame7 : B 3 6 -5.4429 0.2429 0 0 1.0 0 0 0 0 0 0 5 3 3 0.0 1 3 3 5 0.0 -1 -5 -13 -29
+Frame8 : B 6 5 -4.4895 0.1947 0 0 1.0 0 0 0 0 0 0 4 4 4 0.0 2 4 6 4 4 0.0 -2 -10 -26
+Frame9 : B 5 6 -5.4429 0.2429 0 0 1.0 0 0 0 0 0 0 5 3 3 0.0 1 5 3 5 0.0 -1 -3 -11 -27
+Frame10 : B 7 6 -5.4429 0.2429 0 0 1.0 0 0 0 0 0 0 5 3 4 0.0 1 3 7 3 4 0.0 -1 -9 -25
+Frame11 : B 12 3 -5.4095 0.2571 0 0 1.0 0 0 0 0 0 0 3 4 5 0.0 4 8 12 6 3 3 0.0 -4 -20
+Frame12 : B 10 5 -4.4895 0.1947 0 0 1.0 0 0 0 0 0 0 4 5 5 0.0 2 4 6 10 4 4 0.0 -2 -6 -22
+Frame13 : B 9 6 -5.4429 0.2429 0 0 1.0 0 0 0 0 0 0 5 3 4 0.0 1 5 9 3 5 0.0 -1 -3 -7 -23
+Frame14 : B 11 6 -5.4429 0.2429 0 0 1.0 0 0 0 0 0 0 5 3 4 0.0 1 3 11 3 4 0.0 -1 -5 -21
+Frame15 : B 14 5 -4.4895 0.1947 0 0 1.0 0 0 0 0 0 0 4 5 5 0.0 2 4 6 14 3 3 0.0 -2 -18
+Frame16 : B 13 6 -5.4429 0.2429 0 0 1.0 0 0 0 0 0 0 5 3 4 0.0 1 5 13 3 4 0.0 -1 -3 -19
+Frame17 : B 15 6 -5.4429 0.2429 0 0 1.0 0 0 0 0 0 0 5 3 5 0.0 1 3 7 15 3 3 0.0 -1 -17
+Frame18 : B 24 1 -4.5000 0.1900 0 0 1.0 0 0 0 0 0 0 2 4 4 0.0 8 16 24 2 2 0.0 -8
+Frame19 : B 20 3 -5.4095 0.2571 0 0 1.0 0 0 0 0 0 0 3 4 4 0.0 4 12 20 3 3 0.0 -4 -12
+Frame20 : B 18 5 -4.4895 0.1947 0 0 1.0 0 0 0 0 0 0 4 4 4 0.0 2 10 18 4 4 0.0 -2 -6 -14
+Frame21 : B 17 6 -5.4429 0.2429 0 0 1.0 0 0 0 0 0 0 5 3 4 0.0 1 9 17 3 5 0.0 -1 -3 -7 -15
+Frame22 : B 19 6 -5.4429 0.2429 0 0 1.0 0 0 0 0 0 0 5 3 4 0.0 1 3 19 3 4 0.0 -1 -5 -13
+Frame23 : B 22 5 -4.4895 0.1947 0 0 1.0 0 0 0 0 0 0 4 4 4 0.0 2 6 22 4 4 0.0 -2 -10 4
+Frame24 : B 21 6 -5.4429 0.2429 0 0 1.0 0 0 0 0 0 0 5 3 4 0.0 1 5 21 3 4 0.0 -1 -3 -11
+Frame25 : B 23 6 -5.4429 0.2429 0 0 1.0 0 0 0 0 0 0 5 3 5 0.0 1 3 7 23 3 3 0.0 -1 -9
+Frame26 : B 28 3 -5.4095 0.2571 0 0 1.0 0 0 0 0 0 0 3 5 5 0.0 4 8 12 28 2 2 0.0 -4
+Frame27 : B 26 5 -4.4895 0.1947 0 0 1.0 0 0 0 0 0 0 4 5 5 0.0 2 6 10 26 3 3 0.0 -2 -6
+Frame28 : B 25 6 -5.4429 0.2429 0 0 1.0 0 0 0 0 0 0 5 3 5 0.0 1 5 9 25 3 4 0.0 -1 -3 -7
+Frame29 : B 27 6 -5.4429 0.2429 0 0 1.0 0 0 0 0 0 0 5 3 5 0.0 1 3 11 27 3 3 0.0 -1 -5
+Frame30 : B 30 5 -4.4895 0.1947 0 0 1.0 0 0 0 0 0 0 4 5 5 0.0 2 6 14 30 2 2 0.0 -2
+Frame31 : B 29 6 -5.4429 0.2429 0 0 1.0 0 0 0 0 0 0 5 3 5 0.0 1 5 13 29 3 3 0.0 -1 -3
+Frame32 : B 31 6 -5.4429 0.2429 0 0 1.0 0 0 0 0 0 0 5 3 6 0.0 1 3 7 15 31 2 2 0.0 -1
+
diff --git a/cfg/multi-layer/two_layers.cfg b/cfg/multi-layer/two_layers.cfg
index 4218c76149a84a706b641a7677a6fa05b484c717..a0fb1e194ee9878a7abf05e07abbc37fab6732b4 100644
--- a/cfg/multi-layer/two_layers.cfg
+++ b/cfg/multi-layer/two_layers.cfg
@@ -4,11 +4,16 @@ MaxLayers : 2
MaxSublayers : 7
DefaultPtlDpbHrdMaxTidFlag : 0
AllIndependentLayersFlag : 0
+AllowablePredDirection : 0 0 0 0 0 # equal to 0 specifies the picture in the i-th temporal layer is allowed to use both inter-layer and intra-layer preditions
+ # equal to 1 specifies the picture in the i-th temporal layer is allowed to use inter-layer predition only
+ # equal to 2 specifies the picture in the i-th temporal layer is allowed to use intra-layer predition only
+
+# When using ExplicitILRP, do not use AllowablePredDirection or specify everything to zero (= default values)
+#ExplicitILRP : 1 # Explicitely specify inter-layer reference picture in the GOP structure / FrameXX (using 0.0 syntax: 0 = POC diff, .0 = reference layer)
+
#======== OLSs ===============
EachLayerIsAnOlsFlag : 0
-OlsModeIdc : 2
-NumOutputLayerSets : 2
-OlsOutputLayer1 : 1 0
+OlsModeIdc : 0
NumPTLsInVPS : 2
#======== Layer-0 ===============
LayerId0 : 0
@@ -19,8 +24,5 @@ RefLayerIdx1 : 0
#======== OLS-0 ===============
OlsPTLIdx0 : 0
#======== OLS-1 ===============
-LevelPTL1 : 6.2
-OlsPTLIdx1 : 1
-
-
-
+LevelPTL1 : 6.1
+OlsPTLIdx1 : 1
\ No newline at end of file
diff --git a/cfg/multi-layer/two_layers_scalable.cfg b/cfg/multi-layer/two_layers_scalable.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..6b101849755871eae6412327cbffb48e7610ca5b
--- /dev/null
+++ b/cfg/multi-layer/two_layers_scalable.cfg
@@ -0,0 +1,25 @@
+#======== Layers ===============
+MultiLayerEnabledFlag : 1
+MaxLayers : 2
+MaxSublayers : 7
+DefaultPtlDpbHrdMaxTidFlag : 0
+AllIndependentLayersFlag : 0
+
+#======== OLSs ===============
+EachLayerIsAnOlsFlag : 0
+OlsModeIdc : 0
+NumPTLsInVPS : 2
+#======== Layer-0 ===============
+LayerId0 : 0
+#======== Layer-1 ===============
+LayerId1 : 1
+NumRefLayers1 : 1
+RefLayerIdx1 : 0
+#======== OLS-0 ===============
+OlsPTLIdx0 : 0
+#======== OLS-1 ===============
+LevelPTL1 : 6.1
+OlsPTLIdx1 : 1
+
+
+
diff --git a/doc/software-manual.tex b/doc/software-manual.tex
index 9991d426e9d8ee3349ea6bff8660d62e82d4bc1e..fc14ba90100ffb3e92e2fd9491433c158aeac10e 100644
--- a/doc/software-manual.tex
+++ b/doc/software-manual.tex
@@ -502,6 +502,10 @@ ordered as their intendend order in the L0.
Note that any pictures not supplied in this list and in the list of L1 will be discarded and
therefore not available as reference pictures later.
+When ExplicitILRP is true, a layer-specific GOP structure configuration can be provided (using the -li encoder
+parameter), in which inter-layer reference pictures are specified using a 0.x syntax, with 0 meaning
+zero POC difference, and x is the layer of the reference picture.
+
\item[]\textbf{num_ref_pics_active_L1}: Number of reference pictures in lists L1
that are used during coding.
@@ -517,6 +521,10 @@ ordered as their intendend order in the L1.
Note that any pictures not supplied in this list and in the list of L0 will be discarded and
therefore not available as reference pictures later.
+When ExplicitILRP is true, the same syntax as the one described for L0 can be used to specify
+inter-layer reference pictures.
+
+
For example, consider the coding structure of Figure~\ref{fig:gop-example}.
This coding structure is of size 4. The pictures are listed in decoding
order. Frame1 shall therefore describe picture with $\textrm{POC}=4$. It
@@ -1714,6 +1722,15 @@ Specifies a list of values of the allowable prediction directions for dependent
\end{tabular}
\\
+\Option{ExplicitILRP} &
+%\ShortOption{\None} &
+\Default{false} &
+Explicit specification of inter-layer reference pictures, using a layer-specific GOP structure (see section 3.1).
+When ExplicitILRP is true, AllowablePredDirection should not be used or left to default values (all zero), and
+inter-layer reference pictures are no longer inserted automatically.
+\par
+\\
+
\Option{LayerId\emph{i}} &
%\ShortOption{\None} &
\Default{0} &
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index 8473d3676ee8cab6859294e5e861fa8038ceb096..4c3d0570b8153e81900c49d58b580b4769218357 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -301,6 +301,7 @@ void EncApp::xInitLibCfg( int layerIdx )
m_cEncLib.setFramesToBeEncoded ( m_framesToBeEncoded );
m_cEncLib.setValidFrames(m_firstValidFrame, m_lastValidFrame);
m_cEncLib.setAvoidIntraInDepLayer ( m_avoidIntraInDepLayer );
+ m_cEncLib.setExplicitILRP ( m_explicitILRP );
m_cEncLib.setRefLayerMetricsEnabled(m_refMetricsEnabled);
m_cEncLib.setRefLayerRescaledAvailable(false);
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 418a915e631a5d490e3bad0a85f546e23d2443fe..72fe8c211722ea3a889ee06655e30b38c9b8a838 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -138,15 +138,42 @@ std::istringstream &operator>>(std::istringstream &in, GOPEntry &entry) //in
in>>entry.m_temporalId;
in >> entry.m_numRefPicsActive0;
in >> entry.m_numRefPics0;
+
+ char c;
for (int i = 0; i < entry.m_numRefPics0; i++)
{
in >> entry.m_deltaRefPics0[i];
+ if (in.rdbuf()->in_avail())
+ {
+ c = in.get();
+ if (c == '.')
+ {
+ in >> entry.m_layerRef0[i];
+ }
+ else
+ {
+ in.unget();
+ }
+ }
}
in >> entry.m_numRefPicsActive1;
in >> entry.m_numRefPics1;
+
for (int i = 0; i < entry.m_numRefPics1; i++)
{
in >> entry.m_deltaRefPics1[i];
+ if (in.rdbuf()->in_avail())
+ {
+ c = in.get();
+ if (c == '.')
+ {
+ in >> entry.m_layerRef1[i];
+ }
+ else
+ {
+ in.unget();
+ }
+ }
}
return in;
@@ -1739,6 +1766,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
( "AvoidIntraInDepLayers", m_avoidIntraInDepLayer, true, "Replaces I pictures in dependent layers with B pictures" )
( "MaxTidILRefPicsPlusOneLayerId%d", m_maxTidILRefPicsPlus1Str, std::string(""), MAX_VPS_LAYERS, "Maximum temporal ID for inter-layer reference pictures plus 1 of i-th layer, 0 for IRAP only")
( "RPLofDepLayerInSH", m_rplOfDepLayerInSh, false, "define Reference picture lists in slice header instead of SPS for dependant layers")
+ ( "ExplicitILRP", m_explicitILRP, false, "Explicitly define Inter-Layer Reference pictures in GOP entry")
;
opts.addOptions()
@@ -2210,6 +2238,11 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
m_RPLList0[i].m_deltaRefPics[j] = m_GOPList[i].m_deltaRefPics0[j];
for (int j = 0; j < m_GOPList[i].m_numRefPics1; j++)
m_RPLList1[i].m_deltaRefPics[j] = m_GOPList[i].m_deltaRefPics1[j];
+ for (int j = 0; j < MAX_NUM_REF_PICS; j++)
+ {
+ m_RPLList0[i].m_layerRef[j] = m_GOPList[i].m_layerRef0[j];
+ m_RPLList1[i].m_layerRef[j] = m_GOPList[i].m_layerRef1[j];
+ }
}
if (m_compositeRefEnabled)
@@ -4410,7 +4443,35 @@ bool EncAppCfg::xCheckParameter()
#endif
xConfirmPara( m_maxSublayers < 1 || m_maxSublayers > 7, "MaxSublayers must be in range [1..7]" );
+ xConfirmPara( m_explicitILRP && m_allIndependentLayersFlag, "AllIndependentLayersFlag cannot be 1 when ExplicitILRP is enabled" );
+ if (m_explicitILRP)
+ {
+ for (int i = 0; i < m_predDirectionArray.size(); i++)
+ {
+ if (m_predDirectionArray[i] != ' ')
+ {
+ xConfirmPara( m_predDirectionArray[i] != '0', "AllowablePredDirection should be 0 for all temporal layers when ExplicitILRP is enabled" );
+ }
+ }
+ }
+
+ bool nonZeroDeltaPOC_ILRP = false;
+ bool usingExplicit_ILRP = false;
+ for (int i = 0; m_GOPList[i].m_POC != -1 && i < MAX_GOP; i++)
+ {
+ for (int j = 0; j < m_GOPList[i].m_numRefPics0; j++)
+ {
+ nonZeroDeltaPOC_ILRP |= m_RPLList0[i].m_layerRef[j] != -1 && m_RPLList0[i].m_deltaRefPics[j] != 0;
+ nonZeroDeltaPOC_ILRP |= m_RPLList1[i].m_layerRef[j] != -1 && m_RPLList1[i].m_deltaRefPics[j] != 0;
+ usingExplicit_ILRP |= m_RPLList0[i].m_layerRef[j] != -1 || m_RPLList1[i].m_layerRef[j] != -1;
+ }
+ }
+ xConfirmPara(nonZeroDeltaPOC_ILRP, "For ExplicitILRP, Inter-Layer Reference pictures can only have same POC as current frame (delta POC=0)");
+ if (!m_explicitILRP)
+ {
+ xConfirmPara(usingExplicit_ILRP, "Cannot specify inter-layer reference pictures in GOP entry when ExplicitILRP is disabled.");
+ }
xConfirmPara( m_fastLocalDualTreeMode < 0 || m_fastLocalDualTreeMode > 2, "FastLocalDualTreeMode must be in range [0..2]" );
@@ -4459,6 +4520,10 @@ bool EncAppCfg::xCheckParameter()
}
}
}
+ if (curPOC == refPoc && m_RPLList0[rplIdx].m_layerRef[i]!=-1)
+ {
+ found = true;
+ }
}
if (!found)
{
@@ -4497,6 +4562,7 @@ bool EncAppCfg::xCheckParameter()
if (refPoc >= 0)
{
m_RPLList0[newRplIdx].m_deltaRefPics[newRefs0] = m_RPLList0[rplIdx].m_deltaRefPics[i];
+ m_RPLList0[newRplIdx].m_layerRef[newRefs0] = m_RPLList0[rplIdx].m_layerRef[i];
newRefs0++;
newActiveRefs0 += i < m_RPLList0[rplIdx].m_numRefPicsActive ? 1 : 0;
}
@@ -4511,6 +4577,7 @@ bool EncAppCfg::xCheckParameter()
if (refPoc >= 0)
{
m_RPLList1[m_gopSize + extraRPLs].m_deltaRefPics[newRefs1] = m_RPLList1[rplIdx].m_deltaRefPics[i];
+ m_RPLList1[m_gopSize + extraRPLs].m_layerRef[newRefs0] = m_RPLList1[rplIdx].m_layerRef[i];
newRefs1++;
newActiveRefs1 += i < m_RPLList1[rplIdx].m_numRefPicsActive ? 1 : 0;
}
@@ -4550,11 +4617,13 @@ bool EncAppCfg::xCheckParameter()
}
}
int prev = newDeltaPoc;
+ int prevLayerRef = -1; // inserted picture should not be an inter-layer
newRefs0++;
newActiveRefs0++;
for (int j = insertPoint; j < newRefs0; j++)
{
std::swap(prev, m_RPLList0[newRplIdx].m_deltaRefPics[j]);
+ std::swap(prevLayerRef, m_RPLList0[newRplIdx].m_layerRef[j]);
}
}
}
@@ -4597,11 +4666,13 @@ bool EncAppCfg::xCheckParameter()
}
}
int prev = newDeltaPoc;
+ int prevLayerRef = -1; // inserted picture should not be an inter-layer
newRefs1++;
newActiveRefs1++;
for (int j = insertPoint; j < newRefs1; j++)
{
std::swap(prev, m_RPLList1[newRplIdx].m_deltaRefPics[j]);
+ std::swap(prevLayerRef, m_RPLList1[newRplIdx].m_layerRef[j]);
}
}
}
@@ -4666,9 +4737,18 @@ bool EncAppCfg::xCheckParameter()
}
for (int i = 0; i < m_gopSize; i++)
{
+
int numRefPic = m_RPLList0[i].m_numRefPics;
+ for (int tmp = 0; tmp < m_RPLList0[i].m_numRefPics; tmp++)
+ {
+ if (m_RPLList0[i].m_deltaRefPics[tmp]==0 && m_RPLList0[i].m_layerRef[tmp]!=-1)
+ {
+ numRefPic--; //Inter-layer ref pic already in DPB for ref layer, do not count it for current layer.
+ }
+ }
for (int tmp = 0; tmp < m_RPLList1[i].m_numRefPics; tmp++)
{
+ if (m_RPLList1[i].m_deltaRefPics[tmp]==0 && m_RPLList1[i].m_layerRef[tmp]!=-1) continue; //Inter-layer ref pic already in DPB for ref layer, do not count it for current layer.
bool notSame = true;
for (int jj = 0; notSame && jj < m_RPLList0[i].m_numRefPics; jj++)
{
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index cba5782fc7e6657f04bb51a772d4a120636dba5b..a40820fe49cb9b85d85854d2d2b9ffe3ddbfac7c 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -1054,6 +1054,7 @@ protected:
bool m_defaultPtlDpbHrdMaxTidFlag;
bool m_allIndependentLayersFlag;
std::string m_predDirectionArray;
+ bool m_explicitILRP;
int m_numRefLayers[MAX_VPS_LAYERS];
std::string m_refLayerIdxStr[MAX_VPS_LAYERS];
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index ff898d5789fdb538e365cc39d2b07052d35dec5f..2768fddc10a2ef5eea329780ca6df87c0ed28f5e 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -82,6 +82,8 @@ struct GOPEntry
int m_deltaRefPics1[MAX_NUM_REF_PICS];
bool m_isEncoded;
bool m_ltrpInSliceHeaderFlag;
+ int m_layerRef0[MAX_VPS_LAYERS];
+ int m_layerRef1[MAX_VPS_LAYERS];
GOPEntry()
: m_POC(-1)
, m_QPOffset(0)
@@ -110,6 +112,8 @@ struct GOPEntry
{
::memset(m_deltaRefPics0, 0, sizeof(m_deltaRefPics0));
::memset(m_deltaRefPics1, 0, sizeof(m_deltaRefPics1));
+ ::memset(m_layerRef0, -1, sizeof(m_layerRef0));
+ ::memset(m_layerRef1, -1, sizeof(m_layerRef1));
}
};
@@ -124,6 +128,7 @@ struct RPLEntry
int m_deltaRefPics[MAX_NUM_REF_PICS];
bool m_isEncoded;
bool m_ltrpInSliceHeaderFlag;
+ int m_layerRef[MAX_NUM_REF_PICS];
RPLEntry()
: m_POC(-1)
, m_temporalId(0)
@@ -135,6 +140,7 @@ struct RPLEntry
, m_ltrpInSliceHeaderFlag(false)
{
::memset(m_deltaRefPics, 0, sizeof(m_deltaRefPics));
+ ::memset(m_layerRef, -1, sizeof(m_layerRef));
}
};
@@ -1094,6 +1100,7 @@ protected:
bool m_craAPSreset;
bool m_rprRASLtoolSwitch;
bool m_refLayerMetricsEnabled;
+ bool m_explicitILRP;
public:
EncCfg()
@@ -3014,6 +3021,8 @@ public:
void setAvoidIntraInDepLayer(bool b) { m_avoidIntraInDepLayer = b; }
bool getAvoidIntraInDepLayer() const { return m_avoidIntraInDepLayer; }
+ void setExplicitILRP(bool b) { m_explicitILRP = b; }
+ bool getExplicitILRP() const { return m_explicitILRP; }
const EncCfgParam::CfgVPSParameters &getVPSParameters() const
{
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index fd479644b8d9e76f22d27f01ccaf966988dbbdb0..1c0e2d071e6634ebb97d29befb716448ffa309f0 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -6950,10 +6950,11 @@ void EncGOP::xCreateExplicitReferencePictureSetFromReference( Slice* slice, PicL
}
else if (num[l] >= rpl->getNumberOfActivePictures() - rpl->getNumberOfInterLayerPictures()
&& layerIdx != 0 && vps != nullptr && !vps->getAllIndependentLayersFlag()
- && isInterLayerPredAllowed)
+ && isInterLayerPredAllowed && !m_pcEncLib->getExplicitILRP())
{
inactiveRefs[l].push_back(ii);
}
+
else
{
localRpl[l].setRefPicIdentifier(num[l], rpl->getRefPicIdentifier(ii), rpl->isRefPicLongterm(ii),
@@ -6967,21 +6968,60 @@ void EncGOP::xCreateExplicitReferencePictureSetFromReference( Slice* slice, PicL
}
}
}
+ else if (m_pcEncLib->getExplicitILRP() && layerIdx != 0 && vps != nullptr && !vps->getAllIndependentLayersFlag() && isInterLayerPredAllowed)
+ {
+ for (const auto &pic: rcListPic)
+ {
+ int refLayerIdx = vps->getGeneralLayerIdx(pic->layerId);
+ if (refLayerIdx == rpl->getInterLayerRefPicIdx(ii) && pic->referenced && pic->getPOC() == curPic->getPOC()
+ && vps->getDirectRefLayerFlag(layerIdx, refLayerIdx) && xCheckMaxTidILRefPics(layerIdx, pic, slice->isIRAP()))
+ {
+ localRpl[l].setRefPicIdentifier(num[l], 0, true, true, vps->getInterLayerRefIdc(layerIdx, refLayerIdx));
+ num[l]++;
+ numIlrp[l]++;
+ }
+ }
+ }
}
}
- // inter-layer reference pictures are added to the end of the reference picture list
- if (layerIdx != 0 && vps != nullptr && !vps->getAllIndependentLayersFlag() && isInterLayerPredAllowed)
+ // AvoidIntraInDepLayer IRAPs in dependent layers are replaced with inter slices but may have empty L0 list (e.g. if no IL ref specified in config)
+ // In this case implicitly add an inter-layer ref to avoid inter slices with no ref
+ if (m_pcEncLib->getExplicitILRP())
{
- for (const auto &pic: rcListPic)
+ if(l==REF_PIC_LIST_0 && num[l]==0 && (slice->isIRAP() && m_pcEncLib->getAvoidIntraInDepLayer())
+ && m_pcEncLib->getNumRefLayers(layerIdx) && !vps->getAllIndependentLayersFlag())
{
- int refLayerIdx = vps->getGeneralLayerIdx(pic->layerId);
- if (pic->referenced && pic->getPOC() == curPic->getPOC() && vps->getDirectRefLayerFlag(layerIdx, refLayerIdx)
- && xCheckMaxTidILRefPics(layerIdx, pic, slice->isIRAP()))
+ for (const auto &pic: rcListPic)
{
- localRpl[l].setRefPicIdentifier(num[l], 0, true, true, vps->getInterLayerRefIdc(layerIdx, refLayerIdx));
- num[l]++;
- numIlrp[l]++;
+ int refLayerIdx = vps->getGeneralLayerIdx(pic->layerId);
+ if (pic->referenced && pic->getPOC() == curPic->getPOC() && vps->getDirectRefLayerFlag(layerIdx, refLayerIdx)
+ && xCheckMaxTidILRefPics(layerIdx, pic, slice->isIRAP()))
+ {
+ localRpl[l].setRefPicIdentifier(num[l], 0, true, true, vps->getInterLayerRefIdc(layerIdx, refLayerIdx));
+ num[l]++;
+ numIlrp[l]++;
+ msg(WARNING, "WARNING: inter slice at POC %d and LId %d has an ampty L0 list => Automatically adding inter-layer reference from LId %d\n", slice->getPOC(), curPic->layerId, pic->layerId);
+ break;//only add 1 Inter-layer ref pic automatically.
+ }
+ }
+ }
+ }
+ else
+ {
+ // inter-layer reference pictures are added to the end of the reference picture list
+ if (layerIdx != 0 && vps != nullptr && !vps->getAllIndependentLayersFlag() && isInterLayerPredAllowed)
+ {
+ for (const auto &pic: rcListPic)
+ {
+ int refLayerIdx = vps->getGeneralLayerIdx(pic->layerId);
+ if (pic->referenced && pic->getPOC() == curPic->getPOC() && vps->getDirectRefLayerFlag(layerIdx, refLayerIdx)
+ && xCheckMaxTidILRefPics(layerIdx, pic, slice->isIRAP()))
+ {
+ localRpl[l].setRefPicIdentifier(num[l], 0, true, true, vps->getInterLayerRefIdc(layerIdx, refLayerIdx));
+ num[l]++;
+ numIlrp[l]++;
+ }
}
}
}
@@ -7005,6 +7045,10 @@ void EncGOP::xCreateExplicitReferencePictureSetFromReference( Slice* slice, PicL
const int identifier = localRpl[k].getRefPicIdentifier(ii);
const bool isLongTerm = localRpl[k].isRefPicLongterm(ii);
const bool isInterLayer = localRpl[k].isInterLayerRefPic(ii);
+ if (m_pcEncLib->getExplicitILRP() && isInterLayer)
+ {
+ continue;//do not implicitly add inter layer refs from other list if explicitILRP is enabled.
+ }
// Make sure this copy is not already present
bool canIncludeThis = true;
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 13146f1cdb2d1e8c592d5d07a2f3cc1d08abee4a..f2d377fc3a17e393712e4b2c4699660d8c6727df 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -2255,41 +2255,89 @@ void EncLib::xInitRPL(SPS &sps)
// inter-layer reference picture is not signaled in SPS RPL, SPS is shared currently
rpl->setNumberOfInterLayerPictures( 0 );
- if (!getRplOfDepLayerInSh())
+ if (getExplicitILRP())
{
- bool isIntraLayerPredAllowed = getVPS() ? ((getVPS()->getIndependentLayerFlag(layerIdx) || (getVPS()->getPredDirection(ge.m_temporalId) != 1)) && ((m_intraPeriod < 0 && ge.m_POC != 0) || (ge.m_POC % m_intraPeriod) != 0)) : true;
- bool isInterLayerPredAllowed = getVPS() ? (!getVPS()->getIndependentLayerFlag(layerIdx) && (getVPS()->getPredDirection(ge.m_temporalId) != 2) && ((m_intraPeriod < 0 && ge.m_POC != 0) || ((ge.m_POC % m_intraPeriod) != 0) || (getAvoidIntraInDepLayer() && layerIdx))) : false;
-
+ bool isIntraLayerPredAllowed = (getVPS() && !getRplOfDepLayerInSh()) ? ((m_intraPeriod < 0 && ge.m_POC != 0) || (ge.m_POC % m_intraPeriod) != 0) : true;
+ bool isInterLayerPredAllowed = (getVPS() && !getRplOfDepLayerInSh()) ? (!getVPS()->getIndependentLayerFlag(layerIdx) && ((m_intraPeriod < 0 && ge.m_POC != 0) || ((ge.m_POC % m_intraPeriod) != 0) || (getAvoidIntraInDepLayer() && layerIdx))) : false;
int numRefActive = 0;
- if (isIntraLayerPredAllowed)
+ int validNumILRef = 0;
+ for (int k = 0; k < ge.m_numRefPicsActive; k++)
{
- for (int k = 0; k < ge.m_numRefPicsActive; k++)
+ if (ge.m_deltaRefPics[k]==0 && ge.m_layerRef[k]!=-1)
{
- rpl->setRefPicIdentifier(k, -ge.m_deltaRefPics[k], 0, false, 0);
+ if(isInterLayerPredAllowed)
+ {
+ for (int refLayerIdx: refLayersIdx)
+ {
+ if (refLayerIdx == ge.m_layerRef[k])
+ {
+ rpl->setRefPicIdentifier(numRefActive, 0, true, true, m_vps->getInterLayerRefIdc(layerIdx, refLayerIdx));
+ numRefActive++;
+ validNumILRef++;
+ break;
+ }
+ }
+ }
}
- numRefActive = ge.m_numRefPicsActive;
- }
- int validNumILRef = 0;
- if (isInterLayerPredAllowed)
- {
- for (int refLayerIdx : refLayersIdx)
+ else if(isIntraLayerPredAllowed)
{
- rpl->setRefPicIdentifier(numRefActive + validNumILRef, 0, true, true, m_vps->getInterLayerRefIdc(layerIdx, refLayerIdx));
- validNumILRef++;
+ rpl->setRefPicIdentifier(numRefActive, -ge.m_deltaRefPics[k], 0, false, 0);
+ numRefActive++;
}
- rpl->setNumberOfInterLayerPictures(validNumILRef);
- rpl->setNumberOfActivePictures(numRefActive + validNumILRef);
}
- for (int k = numRefActive; k < ge.m_numRefPics; k++)
+ rpl->setNumberOfInterLayerPictures(validNumILRef);
+ rpl->setNumberOfActivePictures(numRefActive);
+ //Add non active intra layer ref pics
+ int numRefInactive = 0;
+ int inactiveStart = isIntraLayerPredAllowed ? ge.m_numRefPicsActive : 0;
+ for (int k = inactiveStart; k < ge.m_numRefPics; k++)
{
- rpl->setRefPicIdentifier(k + validNumILRef, -ge.m_deltaRefPics[k], 0, false, 0);
+ if (!(ge.m_deltaRefPics[k]==0 && ge.m_layerRef[k]!=-1))
+ {
+ rpl->setRefPicIdentifier(numRefActive+numRefInactive, -ge.m_deltaRefPics[k], 0, false, 0);
+ numRefInactive++;
+ }
}
+ rpl->setNumberOfShorttermPictures(numRefActive-validNumILRef+numRefInactive);
}
else
{
- for (int k = 0; k < ge.m_numRefPics; k++)
+ if (!getRplOfDepLayerInSh())
+ {
+ bool isIntraLayerPredAllowed = getVPS() ? ((getVPS()->getIndependentLayerFlag(layerIdx) || (getVPS()->getPredDirection(ge.m_temporalId) != 1)) && ((m_intraPeriod < 0 && ge.m_POC != 0) || (ge.m_POC % m_intraPeriod) != 0)) : true;
+ bool isInterLayerPredAllowed = getVPS() ? (!getVPS()->getIndependentLayerFlag(layerIdx) && (getVPS()->getPredDirection(ge.m_temporalId) != 2) && ((m_intraPeriod < 0 && ge.m_POC != 0) || ((ge.m_POC % m_intraPeriod) != 0) || (getAvoidIntraInDepLayer() && layerIdx))) : false;
+
+ int numRefActive = 0;
+ if (isIntraLayerPredAllowed)
+ {
+ for (int k = 0; k < ge.m_numRefPicsActive; k++)
+ {
+ rpl->setRefPicIdentifier(k, -ge.m_deltaRefPics[k], 0, false, 0);
+ }
+ numRefActive = ge.m_numRefPicsActive;
+ }
+ int validNumILRef = 0;
+ if (isInterLayerPredAllowed)
+ {
+ for (int refLayerIdx : refLayersIdx)
+ {
+ rpl->setRefPicIdentifier(numRefActive + validNumILRef, 0, true, true, m_vps->getInterLayerRefIdc(layerIdx, refLayerIdx));
+ validNumILRef++;
+ }
+ rpl->setNumberOfInterLayerPictures(validNumILRef);
+ rpl->setNumberOfActivePictures(numRefActive + validNumILRef);
+ }
+ for (int k = numRefActive; k < ge.m_numRefPics; k++)
+ {
+ rpl->setRefPicIdentifier(k + validNumILRef, -ge.m_deltaRefPics[k], 0, false, 0);
+ }
+ }
+ else
{
- rpl->setRefPicIdentifier(k, -ge.m_deltaRefPics[k], 0, false, 0);
+ for (int k = 0; k < ge.m_numRefPics; k++)
+ {
+ rpl->setRefPicIdentifier(k, -ge.m_deltaRefPics[k], 0, false, 0);
+ }
}
}
}