Changeset 54 in SHVCSoftware for branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TComPicYuv.h

Timestamp:

2 Mar 2013, 09:25:00 (12 years ago)

Author:

seregin

Message:

port simulcast

File:

• branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TComPicYuv.h (modified) (5 diffs)

branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TComPicYuv.h

@@ -42 +42 @@
 #include "CommonDef.h"
 #include "TComRom.h"
-
+#if SVC_UPSAMPLING
+#include "TComSlice.h"
+#endif
 //! \ingroup TLibCommon
 //! \{
@@ -86 +88 @@
   Int   m_iChromaMarginY;
   
+#if SVC_UPSAMPLING
+  Window  m_conformanceWindow;
+#endif
+
   Bool  m_bIsBorderExtended;
   
@@ -98 +104 @@
   //  Memory management
   // ------------------------------------------------------------------------------------------------
+#if SVC_UPSAMPLING
+  Void  create      ( Int iPicWidth, Int iPicHeight, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth, TComSPS* pcSps = NULL);
+#else
+  Void  create      ( Int iPicWidth, Int iPicHeight, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth );
+#endif  
   
-  Void  create      ( Int iPicWidth, Int iPicHeight, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth );
   Void  destroy     ();
   
@@ -112 +122 @@
   Int   getHeight   ()     { return  m_iPicHeight;   }
   
+#if SVC_EXTENSION
+  Void   setHeight   ( Int iPicHeight )     { m_iPicHeight = iPicHeight; }
+#endif
+
+#if JCTVC_L0178
+  Void   setWidth   ( Int iPicWidth )     { m_iPicWidth = iPicWidth; }
+#endif
   Int   getStride   ()     { return (m_iPicWidth     ) + (m_iLumaMarginX  <<1); }
   Int   getCStride  ()     { return (m_iPicWidth >> 1) + (m_iChromaMarginX<<1); }
@@ -140 +157 @@
   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