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

Timestamp:

1 Nov 2012, 19:22:41 (12 years ago)

Author:

mitsubishi-htm

Message:

Initial integration of VSP into HTM 4.0.1. The version used for JCT3V-B0102 at Shanghai meeting.

• VC9 project/solution files updated. Other Visual C++ project/solution files are not updated.
• Linux make file updated.

TODO

• A second release is expected to include some bug fix and improvements on the interface, e.g. to move switches from macro definition to the configuration file.
• A third release is expected after being integrated within HTM 5.x, which is to be used for CE1.h anchor.

File:

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

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

@@ -114 +114 @@
 {
   m_aiNumRefIdx[0] = m_aiNumRefIdx[1] = m_aiNumRefIdx[2] = 0;
+
+#if FORCE_REF_VSP
+  m_iRefIdxVsp[0] = m_iRefIdxVsp[1] = NOT_VALID;
+#endif
   
   initEqualRef();
@@ -139 +143 @@
   resetWpScalingLC(m_weightPredTableLC);
   initWpAcDcParam();
+
+#if VSP_SLICE_HEADER
+  m_bVspFlag = false;
+#endif
 }
 
@@ -185 +193 @@
   m_numEntryPointOffsets = 0;
 #endif
+#if VSP_SLICE_HEADER
+  m_bVspFlag = false;
+#endif
+
 }
 
@@ -407 +419 @@
 }
 
+#if VSP_N
+Void TComSlice::setRefPicListMvc( TComList<TComPic*>& rcListPic, std::vector<TComPic*>& rapcInterViewRefPics, TComPic* pcVspPic )
+#else
 Void TComSlice::setRefPicListMvc( TComList<TComPic*>& rcListPic, std::vector<TComPic*>& rapcInterViewRefPics )
+#endif
 {
   if( m_eSliceType == I_SLICE )
@@ -422 +438 @@
   TComPic*  RefPicSetLtCurr [16];
   TComPic*  RefPicSetIvCurr [16];
+#if VSP_N
+  TComPic*  RefPicSetVspCurr [16] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; //for Linux comp
+#endif
 
   UInt NumPocStCurr0 = 0;
@@ -427 +446 @@
   UInt NumPocLtCurr  = 0;
   UInt NumPocIvCurr  = 0;
+#if VSP_N
+  UInt NumPocVspCurr  = 0;
+#endif
 
   Int i;
@@ -474 +496 @@
     NumPocIvCurr++;
   }
+#if VSP_N
+  if( pcVspPic )
+  {
+    pcRefPic = pcVspPic;
+    pcRefPic->setIsLongTerm( 0 );
+    pcRefPic->getPicYuvRec()->extendPicBorder();
+    RefPicSetVspCurr[NumPocVspCurr] = pcRefPic;
+    NumPocVspCurr++;
+  }
+#endif
 
   // ref_pic_list_init
@@ -481 +513 @@
 
   assert( (NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr + NumPocIvCurr) == getNumPocTotalCurrMvc() );
+#if VSP_N
+  Int numRpsCurrTempList0 = max( (num_ref_idx_l0_active_minus1 + 1), (NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr + NumPocIvCurr + NumPocVspCurr) );
+  Int numRpsCurrTempList1 = max( (num_ref_idx_l1_active_minus1 + 1), (NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr + NumPocIvCurr + NumPocVspCurr) );
+#else
   Int numRpsCurrTempList0 = max( (num_ref_idx_l0_active_minus1 + 1), (NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr + NumPocIvCurr) );
   Int numRpsCurrTempList1 = max( (num_ref_idx_l1_active_minus1 + 1), (NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr + NumPocIvCurr) );
+#endif
 
   assert( numRpsCurrTempList0 <= 16 );
@@ -509 +546 @@
   for( cIdx = 0; cIdx <= num_ref_idx_l0_active_minus1; cIdx ++ )
   {
+#if VSP_N
+    if( pcVspPic && cIdx == num_ref_idx_l0_active_minus1 )
+    {
+      m_apcRefPicList[0][cIdx] = RefPicSetVspCurr[0];
+#if FORCE_REF_VSP
+      m_iRefIdxVsp[0] = cIdx;
+#endif
+    }
+    else
+      m_apcRefPicList[0][cIdx] = m_RefPicListModification.getRefPicListModificationFlagL0() ? refPicListTemp0[ m_RefPicListModification.getRefPicSetIdxL0(cIdx) ] : refPicListTemp0[cIdx];
+#else
     m_apcRefPicList[0][cIdx] = m_RefPicListModification.getRefPicListModificationFlagL0() ? refPicListTemp0[ m_RefPicListModification.getRefPicSetIdxL0(cIdx) ] : refPicListTemp0[cIdx];
+#endif
   }
   if( m_eSliceType == P_SLICE )
@@ -520 +569 @@
     for( cIdx = 0; cIdx <= num_ref_idx_l1_active_minus1; cIdx ++ )
     {
+#if VSP_N
+      if( pcVspPic && cIdx == num_ref_idx_l1_active_minus1 )
+      {
+        m_apcRefPicList[1][cIdx] = RefPicSetVspCurr[0];
+#if FORCE_REF_VSP
+        m_iRefIdxVsp[1] = cIdx;
+#endif
+      }
+      else
+        m_apcRefPicList[1][cIdx] = m_RefPicListModification.getRefPicListModificationFlagL1() ? refPicListTemp1[ m_RefPicListModification.getRefPicSetIdxL1(cIdx) ] : refPicListTemp1[cIdx];
+#else
       m_apcRefPicList[1][cIdx] = m_RefPicListModification.getRefPicListModificationFlagL1() ? refPicListTemp1[ m_RefPicListModification.getRefPicSetIdxL1(cIdx) ] : refPicListTemp1[cIdx];
+#endif
     }
   }