Changeset 193 in 3DVCSoftware for branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibCommon/TComSlice.cpp

Timestamp:

19 Nov 2012, 21:15:40 (12 years ago)

Author:

mitsubishi-htm

Message:

A second release, as planned

• Migrate to HTM 4.1
• Move VSP related switches to cfg file instead of #define in the source code
• A few bug fixes
• For VC project files, only VC9 file is updated

TODO

• Migrate to HTM 5.0, to be used as anchor for CE1 toward Geneva meeting

File:

• branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibCommon/TComSlice.cpp (modified) (8 diffs)

branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibCommon/TComSlice.cpp

@@ -112 +112 @@
 , m_iViewOrderIdx                 ( 0 )
 #endif
+#if VSP_CFG
+, m_uiNumVspRefPics               ( 0 )
+#endif
 {
   m_aiNumRefIdx[0] = m_aiNumRefIdx[1] = m_aiNumRefIdx[2] = 0;
@@ -146 +149 @@
 #if VSP_SLICE_HEADER
   m_bVspFlag = false;
+#if VSP_CFG
+  memset( m_uiVspRefPos[0], 0, sizeof(UInt)*MAX_NUM_REF_PICS );
+  memset( m_uiVspRefPos[1], 0, sizeof(UInt)*MAX_NUM_REF_PICS );
+#else
+  m_bVspDepthDisableFlag = false;
+#endif
 #endif
 }
@@ -195 +204 @@
 #if VSP_SLICE_HEADER
   m_bVspFlag = false;
+#if VSP_CFG
+  m_uiNumVspRefPics = 0;
+  memset( m_uiVspRefPos[0], 0, sizeof(UInt)*MAX_NUM_REF_PICS );
+  memset( m_uiVspRefPos[1], 0, sizeof(UInt)*MAX_NUM_REF_PICS );
+#else
+  m_bVspDepthDisableFlag = false;
+#endif
 #endif
 
@@ -544 +560 @@
   }
 
+#if VSP_CFG
+  UInt cIdxTmp;
+  for( cIdx = 0, cIdxTmp = 0; cIdx <= num_ref_idx_l0_active_minus1; cIdx ++ )
+#else
   for( cIdx = 0; cIdx <= num_ref_idx_l0_active_minus1; cIdx ++ )
+#endif
   {
 #if VSP_N
+#if VSP_CFG
+    Int iVspRefPos = getVspRefPos(REF_PIC_LIST_0, 0);
+    iVspRefPos = ( iVspRefPos > 0 ? iVspRefPos - 1 : -1 );
+    if( pcVspPic && iVspRefPos != -1 && cIdx == (iVspRefPos >= num_ref_idx_l0_active_minus1 ? num_ref_idx_l0_active_minus1 : iVspRefPos) )
+#else
     if( pcVspPic && cIdx == num_ref_idx_l0_active_minus1 )
+#endif
     {
       m_apcRefPicList[0][cIdx] = RefPicSetVspCurr[0];
@@ -555 +582 @@
     }
     else
+    {
+#if VSP_CFG
+      m_apcRefPicList[0][cIdx] = m_RefPicListModification.getRefPicListModificationFlagL0() ? refPicListTemp0[ m_RefPicListModification.getRefPicSetIdxL0(cIdxTmp) ] : refPicListTemp0[cIdxTmp];
+      cIdxTmp++;
+#else
       m_apcRefPicList[0][cIdx] = m_RefPicListModification.getRefPicListModificationFlagL0() ? refPicListTemp0[ m_RefPicListModification.getRefPicSetIdxL0(cIdx) ] : refPicListTemp0[cIdx];
+#endif
+    }
 #else
     m_apcRefPicList[0][cIdx] = m_RefPicListModification.getRefPicListModificationFlagL0() ? refPicListTemp0[ m_RefPicListModification.getRefPicSetIdxL0(cIdx) ] : refPicListTemp0[cIdx];
@@ -567 +601 @@
   else
   {
+#if VSP_CFG
+    for( cIdx = 0, cIdxTmp = 0; cIdx <= num_ref_idx_l1_active_minus1; cIdx ++ )
+#else
     for( cIdx = 0; cIdx <= num_ref_idx_l1_active_minus1; cIdx ++ )
+#endif
     {
 #if VSP_N
+#if VSP_CFG
+      Int iVspRefPos = getVspRefPos(REF_PIC_LIST_1, 0);
+      iVspRefPos = ( iVspRefPos > 0 ? iVspRefPos - 1 : -1 );
+      if( pcVspPic && iVspRefPos != -1 && cIdx == (iVspRefPos >= num_ref_idx_l1_active_minus1 ? num_ref_idx_l1_active_minus1 : iVspRefPos) )
+#else
       if( pcVspPic && cIdx == num_ref_idx_l1_active_minus1 )
+#endif
       {
         m_apcRefPicList[1][cIdx] = RefPicSetVspCurr[0];
@@ -578 +622 @@
       }
       else
+      {
+#if VSP_CFG
+        m_apcRefPicList[1][cIdx] = m_RefPicListModification.getRefPicListModificationFlagL1() ? refPicListTemp1[ m_RefPicListModification.getRefPicSetIdxL1(cIdxTmp) ] : refPicListTemp1[cIdxTmp];
+        cIdxTmp++;
+#else
         m_apcRefPicList[1][cIdx] = m_RefPicListModification.getRefPicListModificationFlagL1() ? refPicListTemp1[ m_RefPicListModification.getRefPicSetIdxL1(cIdx) ] : refPicListTemp1[cIdx];
+#endif
+      }
 #else
       m_apcRefPicList[1][cIdx] = m_RefPicListModification.getRefPicListModificationFlagL1() ? refPicListTemp1[ m_RefPicListModification.getRefPicSetIdxL1(cIdx) ] : refPicListTemp1[cIdx];
@@ -1501 +1552 @@
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
 , m_bUseDMM                   (false)
+#endif
+#if OL_DEPTHLIMIT_A0044
+, m_bDepthPartitionLimiting   (false)
+#endif
+#if VSP_N
+, m_bVspPresentFlag           (false)
+#if VSP_CFG
+, m_bVspDepthPresentFlag      (false)
+#endif
 #endif
 {