Changeset 125 in SHVCSoftware for trunk/source/Lib/TLibCommon/TComPicYuv.h

Timestamp:

16 Apr 2013, 06:39:31 (12 years ago)

Author:

seregin

Message:

copy from HM-10.0-dev-SHM

File:

• trunk/source/Lib/TLibCommon/TComPicYuv.h (modified) (6 diffs)

trunk/source/Lib/TLibCommon/TComPicYuv.h

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2012, ITU/ISO/IEC
+ * Copyright (c) 2010-2013, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -89 +89 @@
   
 #if SVC_UPSAMPLING
-  Int   m_picCropLeftOffset;
-  Int   m_picCropRightOffset;
-  Int   m_picCropTopOffset;
-  Int   m_picCropBottomOffset;
+  Window  m_conformanceWindow;
 #endif
 
@@ -124 +121 @@
   Int   getWidth    ()     { return  m_iPicWidth;    }
   Int   getHeight   ()     { return  m_iPicHeight;   }
-
+  
 #if SVC_EXTENSION
   Void   setHeight   ( Int iPicHeight )     { m_iPicHeight = iPicHeight; }
@@ -137 +134 @@
   Int   getLumaMargin   () { return m_iLumaMarginX;  }
   Int   getChromaMargin () { return m_iChromaMarginX;}
-  
-  Void  getLumaMinMax( Int* pMin, Int* pMax );
   
   // ------------------------------------------------------------------------------------------------
@@ -163 +158 @@
   
 #if SVC_UPSAMPLING
-  Int  getPicCropLeftOffset() const        { return m_picCropLeftOffset; }
-  Void setPicCropLeftOffset(Int val)       { m_picCropLeftOffset = val; }
-  Int  getPicCropRightOffset() const       { return m_picCropRightOffset; }
-  Void setPicCropRightOffset(Int val)      { m_picCropRightOffset = val; }
-  Int  getPicCropTopOffset() const         { return m_picCropTopOffset; }
-  Void setPicCropTopOffset(Int val)        { m_picCropTopOffset = val; }
-  Int  getPicCropBottomOffset() const      { return m_picCropBottomOffset; }
-  Void setPicCropBottomOffset(Int val)     { m_picCropBottomOffset = val; }
+  Window& getConformanceWindow()                           { return  m_conformanceWindow;             }
+  Void    setConformanceWindow(Window& conformanceWindow ) { m_conformanceWindow = conformanceWindow; }
 #endif
 
@@ -187 +176 @@
   
   //  Dump picture
-  Void  dump (char* pFileName, Bool bAdd = false);
+  Void  dump (Char* pFileName, Bool bAdd = false);
   
   // Set border extension flag
   Void  setBorderExtension(Bool b) { m_bIsBorderExtended = b; }
-#if FIXED_ROUNDING_FRAME_MEMORY
-  Void  xFixedRoundingPic();
-#endif  
 };// END CLASS DEFINITION TComPicYuv
 
-void calcChecksum(TComPicYuv& pic, unsigned char digest[3][16]);
-void calcCRC(TComPicYuv& pic, unsigned char digest[3][16]);
-void calcMD5(TComPicYuv& pic, unsigned char digest[3][16]);
+void calcChecksum(TComPicYuv& pic, UChar digest[3][16]);
+void calcCRC(TComPicYuv& pic, UChar digest[3][16]);
+void calcMD5(TComPicYuv& pic, UChar digest[3][16]);
 //! \}