Changeset 310 in 3DVCSoftware for branches/HTM-6.0-dev0/source

Timestamp:

15 Mar 2013, 13:54:23 (12 years ago)

Author:

tech

Message:

Incorporated MERL_VSP_C0152_BugFix_ForNoDepthCase

Location:

branches/HTM-6.0-dev0/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)
• Lib/TLibCommon/TComDataCU.cpp (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)

branches/HTM-6.0-dev0/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1071 +1071 @@
 
 #if MERL_VSP_C0152
+#if MERL_VSP_C0152_BugFix_ForNoDepthCase
+        if(m_bUsingDepthMaps) //VSP can be used only when depth is available as input
+        {
+#endif
         Int iCurPoc = m_acTEncDepthTopList[iViewIdx]->getFrameId(gopId);
         if( iCurPoc < m_acTEncDepthTopList[iViewIdx]->getFrameToBeEncoded() && iViewIdx!=0 )
@@ -1081 +1085 @@
         }
         setBWVSPLUT( iViewIdx, gopId, false);
+#if MERL_VSP_C0152_BugFix_ForNoDepthCase
+        }
+        else
+        {
+          Int iCurPoc = m_acTEncTopList[iViewIdx]->getFrameId(gopId);
+          if( iCurPoc < m_acTEncTopList[iViewIdx]->getFrameToBeEncoded() && iViewIdx!=0 )
+          {
+            TEncSlice* pEncSlice = m_acTEncTopList[iViewIdx]->getSliceEncoder();
+            pEncSlice->setRefPicBaseTxt(NULL);//Initialize the base view reconstructed texture buffer
+            pEncSlice->setRefPicBaseDepth(NULL);//Initialize the base view reconstructed depth buffer
+          }
+        }
+#endif
+
 #endif
         // call encoding function for one frame

branches/HTM-6.0-dev0/source/Lib/TLibCommon/TComDataCU.cpp

@@ -81 +81 @@
                                           UChar* puhInterDirNeighbours, TComMvField* pcMvFieldNeighbours, Int* iVSPIndexTrue, Int mrgCandIdx, DisInfo* pDInfo )
 {
+#if MERL_VSP_C0152_BugFix_ForNoDepthCase
+  TComPic* pRefPicBaseDepth = NULL;
+  pRefPicBaseDepth = getSlice()->getRefPicBaseDepth();
+  if(ucVspMergePos == VSP_MERGE_POS && pRefPicBaseDepth) //VSP can be used only when depth is used as input
+#else
+  if( ucVspMergePos == VSP_MERGE_POS )
+#endif
   if( ucVspMergePos == VSP_MERGE_POS )
   {

branches/HTM-6.0-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -186 +186 @@
 #define MERL_VSP_C0152                    1 // JCT3V-C0152: 1: enable VSP-related tools; 0: disable VSP-related tools
 #if MERL_VSP_C0152
-
+#define MERL_VSP_C0152_BugFix_ForNoDepthCase     1// MERL bugfix for test condition of no depth
 /*
  * Two macros are used to configure combinations of JCT3V-C0152 and JCT3V-C0131