Changeset 593 in SHVCSoftware for branches/SHM-5.0-dev/source/Lib/TLibCommon/TComPicYuv.h

Timestamp:

2 Feb 2014, 04:51:29 (11 years ago)

Author:

seregin

Message:

update to HM-13.0

File:

• branches/SHM-5.0-dev/source/Lib/TLibCommon/TComPicYuv.h (modified) (6 diffs)

branches/SHM-5.0-dev/source/Lib/TLibCommon/TComPicYuv.h

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2013, ITU/ISO/IEC
+ * Copyright (c) 2010-2014, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -75 +75 @@
   Int   m_iPicWidth;            ///< Width of picture
   Int   m_iPicHeight;           ///< Height of picture
-#if AUXILIARY_PICTURES
-  ChromaFormat m_chromaFormatIDC; ////< Chroma Format
-#endif
   
   Int   m_iCuWidth;             ///< Width of Coding Unit (CU)
@@ -91 +88 @@
   Int   m_iChromaMarginY;
   
+  Bool  m_bIsBorderExtended;
+
+#if SVC_EXTENSION
+#if AUXILIARY_PICTURES
+  ChromaFormat m_chromaFormatIDC; ////< Chroma Format
+#endif
 #if SVC_UPSAMPLING
   Window  m_conformanceWindow;
 #endif
-
 #if M0040_ADAPTIVE_RESOLUTION_CHANGE
   Bool    m_isReconstructed;
 #endif
-
-  Bool  m_bIsBorderExtended;
+#endif //SVC_EXTENSION
   
 protected:
@@ -136 +137 @@
   Int   getWidth    ()     { return  m_iPicWidth;    }
   Int   getHeight   ()     { return  m_iPicHeight;   }
-#if AUXILIARY_PICTURES
-  ChromaFormat  getChromaFormat   ()                     const { return m_chromaFormatIDC; }
-#endif
-  
-#if SVC_EXTENSION
-  Void   setHeight   ( Int iPicHeight )     { m_iPicHeight = iPicHeight; }
-#endif
 
   Int   getStride   ()     { return (m_iPicWidth     ) + (m_iLumaMarginX  <<1); }
@@ -172 +166 @@
   Pel*  getCrAddr   ( Int iCuAddr, Int uiAbsZorderIdx ) { return m_piPicOrgV + m_cuOffsetC[iCuAddr] + m_buOffsetC[g_auiZscanToRaster[uiAbsZorderIdx]]; }
   
-#if SVC_UPSAMPLING
-  Window& getConformanceWindow()                           { return  m_conformanceWindow;             }
-  Void    setConformanceWindow(Window& conformanceWindow ) { m_conformanceWindow = conformanceWindow; }
-#endif
-
   // ------------------------------------------------------------------------------------------------
   //  Miscellaneous
@@ -193 +182 @@
   Void  dump (Char* pFileName, Bool bAdd = false);
 
+  // Set border extension flag
+  Void  setBorderExtension(Bool b) { m_bIsBorderExtended = b; }
+  
+#if SVC_EXTENSION
+  Void   setHeight   ( Int iPicHeight )     { m_iPicHeight = iPicHeight; }
+#if SVC_UPSAMPLING
+  Window& getConformanceWindow()                           { return  m_conformanceWindow;             }
+  Void    setConformanceWindow(Window& conformanceWindow ) { m_conformanceWindow = conformanceWindow; }
+#endif
 #if M0040_ADAPTIVE_RESOLUTION_CHANGE
   Void  setReconstructed(Bool x) { m_isReconstructed = x;    }
   Bool  isReconstructed()        { return m_isReconstructed; }
 #endif
-
 #if AUXILIARY_PICTURES
+  ChromaFormat  getChromaFormat   ()                     const { return m_chromaFormatIDC; }
   Void convertToMonochrome();
 #endif
-
-  // Set border extension flag
-  Void  setBorderExtension(Bool b) { m_bIsBorderExtended = b; }
+#endif //SVC_EXTENSION
+
 };// END CLASS DEFINITION TComPicYuv