Merge branch 'clean311' into 'master'

Remove singleComp function and clean up singleChan function

See merge request jvet/VVCSoftware_VTM!2617

source/Lib/CommonLib/Unit.cpp

@@ -209,39 +209,13 @@ void UnitArea::repositionTo(const UnitArea& unitArea)
   }
 }
 
-const UnitArea UnitArea::singleComp(const ComponentID compID) const
+UnitArea UnitArea::singleChan(const ChannelType chType) const
 {
   UnitArea ret(chromaFormat);
 
   for (const auto &blk : blocks)
   {
-    if (blk.compID == compID)
-    {
-      ret.blocks.push_back(blk);
-    }
-    else
-    {
-      ret.blocks.push_back(CompArea());
-    }
-  }
-
-  return ret;
-}
-
-const UnitArea UnitArea::singleChan(const ChannelType chType) const
-{
-  UnitArea ret(chromaFormat);
-
-  for (const auto &blk : blocks)
-  {
-    if (toChannelType(blk.compID) == chType)
-    {
-      ret.blocks.push_back(blk);
-    }
-    else
-    {
-      ret.blocks.push_back(CompArea());
-    }
+    ret.blocks.push_back(toChannelType(blk.compID) == chType ? blk : CompArea());
   }
 
   return ret;

source/Lib/CommonLib/Unit.h

@@ -239,8 +239,7 @@ struct UnitArea
   const Position& chromaPos () const { return Cb(); }
   const Size&     chromaSize() const { return Cb(); }
 
-  const UnitArea  singleComp(const ComponentID compID) const;
-  const UnitArea  singleChan(const ChannelType chType) const;
+  UnitArea singleChan(const ChannelType chType) const;
 
   const SizeType  lwidth()  const { return Y().width; }  /*! luma width  */
   const SizeType  lheight() const { return Y().height; } /*! luma height */