Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/Lib/TLibCommon/TComPattern.h

Timestamp:

12 Apr 2018, 11:12:21 (7 years ago)

Author:

tech

Message:

• Update HM-16.18
• Cleanups
• Encoder Extension

-- Representation formats
-- Parameter set sharing
-- GOP configuration

File:

• branches/HTM-16.2-dev/source/Lib/TLibCommon/TComPattern.h (modified) (3 diffs)

branches/HTM-16.2-dev/source/Lib/TLibCommon/TComPattern.h

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -52 +52 @@
 class TComTU;
 
-/// neighbouring pixel access class for one component
-class TComPatternParam
+/// neighbouring pixel access class for all components
+class TComPattern
 {
 private:
   Pel*  m_piROIOrigin;
+  Int   m_roiWidth;
+  Int   m_roiHeight;
+  Int   m_patternStride;
+  Int   m_bitDepth;
+
+#if MCTS_ENC_CHECK  
+  Int   m_roiPosX;
+  Int   m_roiPosY;
+  Int   m_tileLeftTopPelPosX;
+  Int   m_tileLeftTopPelPosY;
+  Int   m_tileRightBottomPelPosX;
+  Int   m_tileRightBottomPelPosY;
+#endif
 
 public:
-  Int   m_iROIWidth;
-  Int   m_iROIHeight;
-  Int   m_iPatternStride;
-  Int   m_bitDepth;
+  // ROI & pattern information, (ROI = &pattern[AboveOffset][LeftOffset])
+  Int   getROIYWidth() const      { return m_roiWidth;       }
+  Int   getROIYHeight() const     { return m_roiHeight;      }
+  Int   getPatternLStride() const { return m_patternStride;  }
+  Int   getBitDepthY() const      { return m_bitDepth;       }
+#if MCTS_ENC_CHECK
+  Int   getROIYPosX() const       { return m_roiPosX; }
+  Int   getROIYPosY() const       { return m_roiPosY; }
 
-  /// return starting position of ROI (ROI = &pattern[AboveOffset][LeftOffset])
-  __inline Pel*  getROIOrigin()
+  Int   getTileLeftTopPelPosX() const { return m_tileLeftTopPelPosX; }
+  Int   getTileLeftTopPelPosY() const { return m_tileLeftTopPelPosY; }
+  Int   getTileRightBottomPelPosX() const { return m_tileRightBottomPelPosX; }
+  Int   getTileRightBottomPelPosY() const { return m_tileRightBottomPelPosY; }
+#endif
+
+  __inline Pel*  getROIY()
   {
     return  m_piROIOrigin;
   }
-  __inline const Pel*  getROIOrigin() const
+  __inline const Pel*  getROIY() const
   {
     return  m_piROIOrigin;
   }
 
-  /// set parameters from Pel buffer for accessing neighbouring pixels
-  Void setPatternParamPel( Pel* piTexture, Int iRoiWidth, Int iRoiHeight, Int iStride, Int bitDepth );
-};
+#if NH_3D
+  Bool              m_bICFlag;
+  Bool              m_bSDCMRSADFlag;
 
-/// neighbouring pixel access class for all components
-class TComPattern
-{
-private:
-  TComPatternParam  m_cPatternY;
-//  TComPatternParam  m_cPatternCb;
-  //TComPatternParam  m_cPatternCr;
-#if NH_3D_IC
-  Bool              m_bICFlag;
-#endif
-#if NH_3D_SDC_INTER
-  Bool              m_bSDCMRSADFlag;
+  Bool  getICFlag()               const { return m_bICFlag; }
+  Void  setICFlag( Bool bICFlag ) { m_bICFlag = bICFlag; }
+  Bool  getSDCMRSADFlag()         const { return m_bSDCMRSADFlag; }
+  Void  setSDCMRSADFlag( Bool bSDCMRSADFlag )    { m_bSDCMRSADFlag = bSDCMRSADFlag; }
 #endif
 
 
-public:
+  TComPattern()
+  : m_piROIOrigin(NULL)
+  , m_roiWidth(0)
+  , m_roiHeight(0)
+  , m_patternStride(0)
+  , m_bitDepth(0)
+#if MCTS_ENC_CHECK
+  , m_roiPosX(0)
+  , m_roiPosY(0)
+  , m_tileLeftTopPelPosX(0)
+  , m_tileLeftTopPelPosY(0)
+  , m_tileRightBottomPelPosX(0)
+  , m_tileRightBottomPelPosY(0)
+#endif
+  {};
 
-  // ROI & pattern information, (ROI = &pattern[AboveOffset][LeftOffset])
-  Pel*  getROIY()                 { return m_cPatternY.getROIOrigin();    }
-  const Pel*  getROIY() const     { return m_cPatternY.getROIOrigin();    }
-  Int   getROIYWidth() const      { return m_cPatternY.m_iROIWidth;       }
-  Int   getROIYHeight() const     { return m_cPatternY.m_iROIHeight;      }
-  Int   getPatternLStride() const { return m_cPatternY.m_iPatternStride;  }
-  Int   getBitDepthY() const      { return m_cPatternY.m_bitDepth;        }
-
-#if NH_3D_IC
-  Bool  getICFlag()               const { return m_bICFlag; }
-  Void  setICFlag( Bool bICFlag ) { m_bICFlag = bICFlag; }
-#endif
-#if NH_3D_SDC_INTER
-  Bool  getSDCMRSADFlag()         const { return m_bSDCMRSADFlag; }
-  Void  setSDCMRSADFlag( Bool bSDCMRSADFlag )    { m_bSDCMRSADFlag = bSDCMRSADFlag; }
-#endif
 
   // -------------------------------------------------------------------------------------------------------------------
@@ -117 +129 @@
 
   /// set parameters from Pel buffers for accessing neighbouring pixels
-  Void initPattern( Pel* piY, Int iRoiWidth, Int iRoiHeight, Int iStride, Int bitDepthLuma );
+#if MCTS_ENC_CHECK
+  Void initPattern(Pel* piY, Int roiWidth, Int roiHeight, Int stride, Int bitDepthLuma, Int roiPosX, Int roiPosY);
+  Void setTileBorders(Int tileLeftTopPelPosX, Int tileLeftTopPelPosY, Int tileRightBottomPelPosX, Int tileRightBottomPelPosY);
+#else
+  Void initPattern(Pel* piY, Int roiWidth, Int roiHeight, Int stride, Int bitDepthLuma);
+#endif
 };