Changeset 144 in SHVCSoftware for branches/SHM-2.0-dev/source

Timestamp:

2 May 2013, 21:04:41 (12 years ago)

Author:

seregin

Message:

ILP_DECODED_PICTURE: use decoded picture size for inter-layer prediction (M0274)

Location:

branches/SHM-2.0-dev/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (2 diffs)
• TComPic.cpp (modified) (4 diffs)
• TypeDef.h (modified) (1 diff)

branches/SHM-2.0-dev/source/Lib/TLibCommon/TComDataCU.cpp

@@ -4176 +4176 @@
 
 #if !SIMPLIFIED_MV_POS_SCALING
-#if SVC_UPSAMPLING
+#if SVC_UPSAMPLING && !ILP_DECODED_PICTURE
   const Window &confBL = cBaseColPic->getPicYuvRec()->getConformanceWindow();
   const Window &confEL = m_pcPic->getPicYuvRec()->getConformanceWindow();
@@ -4212 +4212 @@
   }
 
-#if AVC_SYNTAX
+#if AVC_SYNTAX && !ILP_DECODED_PICTURE
   if( iBX >= widthBL || iBY >= heightBL ) //outside of the reference layer cropped picture
   {

branches/SHM-2.0-dev/source/Lib/TLibCommon/TComPic.cpp

@@ -587 +587 @@
 Void TComPic::copyUpsampledMvField(TComPic* pcPicBase)
 {
-#if AVC_SYNTAX
+#if AVC_SYNTAX && !ILP_DECODED_PICTURE
   const Window &confBL = pcPicBase->getConformanceWindow();
   const Window &confEL = getPicYuvRec()->getConformanceWindow();
@@ -617 +617 @@
       pcColCU = pcCUDes->getBaseColCU(pelX + 8, pelY + 8, baseCUAddr, baseAbsPartIdx);
 
-#if AVC_SYNTAX
+#if AVC_SYNTAX && !ILP_DECODED_PICTURE
       Int xBL = ( (pelX + 8) * widthBL + widthEL/2 ) / widthEL;
       Int yBL = ( (pelY + 8) * heightBL+ heightEL/2 ) / heightEL;
@@ -689 +689 @@
   }
 
+#if ILP_DECODED_PICTURE
+  UInt   width      = this->getPicYuvRec()->getWidth();
+  UInt   height     = this->getPicYuvRec()->getHeight();
+#else
   const Window &conf = this->getPicYuvRec()->getConformanceWindow();
   UInt   width      = this->getPicYuvRec()->getWidth() - conf.getWindowLeftOffset() - conf.getWindowRightOffset();
   UInt   height     = this->getPicYuvRec()->getHeight() - conf.getWindowTopOffset() - conf.getWindowBottomOffset();
+#endif
   UInt64 poc        = (UInt64)this->getPOC();
   UInt   partWidth  = width / 4;
@@ -768 +773 @@
   }
 
+#if ILP_DECODED_PICTURE
+  UInt   width       = this->getPicYuvRec()->getWidth();
+  UInt   height      = this->getPicYuvRec()->getHeight();
+#else
   const Window &conf = this->getConformanceWindow();
   UInt   width       = this->getPicYuvRec()->getWidth() - conf.getWindowLeftOffset() - conf.getWindowRightOffset();
   UInt   height      = this->getPicYuvRec()->getHeight() - conf.getWindowTopOffset() - conf.getWindowBottomOffset();
+#endif
 
   UInt64 poc        = (UInt64)this->getPOC();

branches/SHM-2.0-dev/source/Lib/TLibCommon/TypeDef.h

@@ -63 +63 @@
 
 #define SIMPLIFIED_MV_POS_SCALING        1      ///< M0133/M0449: inter-layer MV scaling and pixel mapping position calculation
+#define ILP_DECODED_PICTURE              1      ///< M0274: use decoded picture size for inter-layer prediction
 
 #define AVC_BASE                         0      ///< YUV BL reading for AVC base SVC
 #define REF_IDX_FRAMEWORK                1      ///< inter-layer reference framework
 
-#if SVC_UPSAMPLING
+#if SVC_UPSAMPLING && !ILP_DECODED_PICTURE
 #define JCTVC_L0178                      1      ///< implementation of JCTVC-L0178 (code only supports right and bottom croppping offsets)
 #endif