Merge branch 'ECM10_AE0078_SET_LICIDX' into 'master'

Fix: set bvLicIdx in SrchCostBv intBvList for AE0078

See merge request !515

source/Lib/EncoderLib/InterSearch.cpp

@@ -4051,6 +4051,9 @@ bool InterSearch::predIBCSearch(CodingUnit& cu, Partitioner& partitioner, const
 #endif
 #if JVET_AC0060_IBC_BVP_CLUSTER_RRIBC_BVD_SIGN_DERIV && JVET_AA0070_RRIBC
                                               , (pu.cu->rribcFlipType > 0)
+#endif
+#if JVET_AE0078_IBC_LIC_EXTENSION
+                                              , pu.cu->ibcLicIdx
 #endif
       ))
       {
@@ -4063,6 +4066,9 @@ bool InterSearch::predIBCSearch(CodingUnit& cu, Partitioner& partitioner, const
 #endif
 #if JVET_AC0060_IBC_BVP_CLUSTER_RRIBC_BVD_SIGN_DERIV && JVET_AA0070_RRIBC
                                  , (pu.cu->rribcFlipType > 0)
+#endif
+#if JVET_AE0078_IBC_LIC_EXTENSION
+                                 , pu.cu->ibcLicIdx
 #endif
         );
       }
@@ -4769,6 +4775,9 @@ Distortion InterSearch::xPredIBCFracPelSearch(PredictionUnit&              pu
 #endif
 #if JVET_AC0060_IBC_BVP_CLUSTER_RRIBC_BVD_SIGN_DERIV && JVET_AA0070_RRIBC
                                   , intBvList.bvFlipList[intBvList.maxSize]
+#endif
+#if JVET_AE0078_IBC_LIC_EXTENSION
+                                  , intBvList.bvLicIdx[intBvList.maxSize]
 #endif
       ))
     {

source/Lib/EncoderLib/InterSearch.h

@@ -476,6 +476,9 @@ struct SrchCostBv
 #endif
 #if JVET_AC0060_IBC_BVP_CLUSTER_RRIBC_BVD_SIGN_DERIV && JVET_AA0070_RRIBC
          , bool bvFlip
+#endif
+#if JVET_AE0078_IBC_LIC_EXTENSION
+         , int bvLic
 #endif
   )
   {
@@ -490,6 +493,9 @@ struct SrchCostBv
 #endif
 #if JVET_AC0060_IBC_BVP_CLUSTER_RRIBC_BVD_SIGN_DERIV && JVET_AA0070_RRIBC
         && bvFlipList[i] == bvFlip
+#endif
+#if JVET_AE0078_IBC_LIC_EXTENSION
+        && bvLicIdx[i] == bvLic
 #endif
         )
       {
@@ -515,6 +521,9 @@ struct SrchCostBv
 #endif
 #if JVET_AC0060_IBC_BVP_CLUSTER_RRIBC_BVD_SIGN_DERIV && JVET_AA0070_RRIBC
       bvFlipList[idxDst] = bvFlipList[idxSrc];
+#endif
+#if JVET_AE0078_IBC_LIC_EXTENSION
+      bvLicIdx[idxDst] = bvLicIdx[idxSrc];
 #endif
     }
   }
@@ -528,6 +537,9 @@ struct SrchCostBv
 #endif
 #if JVET_AC0060_IBC_BVP_CLUSTER_RRIBC_BVD_SIGN_DERIV && JVET_AA0070_RRIBC
             , bool bvFlip = true
+#endif
+#if JVET_AE0078_IBC_LIC_EXTENSION
+            , int bvLic = 0
 #endif
   )
   {
@@ -559,6 +571,9 @@ struct SrchCostBv
 #endif
 #if JVET_AC0060_IBC_BVP_CLUSTER_RRIBC_BVD_SIGN_DERIV && JVET_AA0070_RRIBC
             && bvFlipList[i] == bvFlip
+#endif
+#if JVET_AE0078_IBC_LIC_EXTENSION
+            && bvLicIdx[i] == bvLic
 #endif
             )
           {
@@ -586,6 +601,9 @@ struct SrchCostBv
 #endif
 #if JVET_AC0060_IBC_BVP_CLUSTER_RRIBC_BVD_SIGN_DERIV && JVET_AA0070_RRIBC
       bvFlipList[idx] = bvFlip;
+#endif
+#if JVET_AE0078_IBC_LIC_EXTENSION
+      bvLicIdx[idx] = bvLic;
 #endif
     };
 
@@ -601,6 +619,9 @@ struct SrchCostBv
 #endif
 #if JVET_AC0060_IBC_BVP_CLUSTER_RRIBC_BVD_SIGN_DERIV && JVET_AA0070_RRIBC
       bvFlipList[idx + 1] = bvFlipList[idx];
+#endif
+#if JVET_AE0078_IBC_LIC_EXTENSION
+      bvLicIdx[idx + 1] = bvLicIdx[idx];
 #endif
     };