Changeset 956 in 3DVCSoftware

Timestamp:

1 May 2014, 02:56:23 (11 years ago)

Author:

qualcomm

Message:

Fix for ticket #65 (Changes are guarded by Macro BUG_FIX_TK65)

Location:

branches/HTM-11.0-dev0-Qualcomm

Files:

• cfg/3D-HEVC/baseCfg_3view.cfg (modified) (1 diff)
• source/App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• source/Lib/TLibCommon/TComDataCU.cpp (modified) (4 diffs)
• source/Lib/TLibCommon/TComSlice.cpp (modified) (1 diff)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)

branches/HTM-11.0-dev0-Qualcomm/cfg/3D-HEVC/baseCfg_3view.cfg

@@ -191 +191 @@
 ViewSynthesisPred                   : 0                # View synthesis prediction 
 DepthRefinement                     : 0                # Dispary refined by depth DoNBDV
+IvMvScaling                         : 1                # Interview motion vector scaling
+SubPULog2Size                       : 3                # Log2 of sub-PU size for IvMvPred (2...6)
+SubPUMPILog2Size                    : 3                # Log2 of sub-PU size for MPI (3...6)
+DBBP                                : 0                # Depth-based Block Partitioning
 
 ### DO NOT ADD ANYTHING BELOW THIS LINE ###

branches/HTM-11.0-dev0-Qualcomm/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -1591 +1591 @@
   xConfirmPara( m_pchCameraParameterFile    == 0                ,   "CameraParameterFile must be given");
   xConfirmPara( m_pchBaseViewCameraNumbers  == 0                ,   "BaseViewCameraNumbers must be given" );
+#if BUG_FIX_TK65
+  xConfirmPara( ( ((UInt) m_numberOfLayers >> 1 ) != m_cCameraData.getBaseViewNumbers().size() ) && ( m_numberOfLayers != m_cCameraData.getBaseViewNumbers().size() ),   "Number of Views in BaseViewCameraNumbers must be equal to NumberOfViews" );
+#else
   xConfirmPara( ((UInt) m_numberOfLayers >> 1 ) != m_cCameraData.getBaseViewNumbers().size(),   "Number of Views in BaseViewCameraNumbers must be equal to NumberOfViews" );
+#endif
   xConfirmPara    ( m_iCodedCamParPrecision < 0 || m_iCodedCamParPrecision > 5,       "CodedCamParsPrecision must be in range of 0..5" );
 #if H_3D_VSO

branches/HTM-11.0-dev0-Qualcomm/source/Lib/TLibCommon/TComDataCU.cpp

@@ -6830 +6830 @@
 #else
         picDepth = getSlice()->getIvPic( true, iTargetViewIdx );
+#if !BUG_FIX_TK65
         assert(picDepth != NULL);
+#endif
 #endif
         if (picDepth && bDepthRefine)
@@ -6901 +6903 @@
 #else
           TComPic* picDepth = getSlice()->getIvPic( true, pDInfo->m_aVIdxCan );
+#if !BUG_FIX_TK65
           assert(picDepth!=NULL);
+#endif
 #endif
 
@@ -6960 +6964 @@
 #else
     picDepth = getSlice()->getIvPic( true, viewIndex );
+#if !BUG_FIX_TK65
     assert(picDepth!=NULL);
+#endif
 #endif
     if (picDepth && bDepthRefine)
@@ -7060 +7066 @@
 #else
           picDepth   = getSlice()->getIvPic (true, refViewIdx );
+#if !BUG_FIX_TK65
           assert(picDepth != NULL);
+#endif
 #endif
           UInt uiPartIdx = 0;   //Notes from MTK: Please confirm that using 0 as partition index and partition address is correct for CU-level DoNBDV

branches/HTM-11.0-dev0-Qualcomm/source/Lib/TLibCommon/TComSlice.cpp

@@ -1936 +1936 @@
     }
   }
+#if !BUG_FIX_TK65
   assert( foundLayerIdinNuh != -1 ); 
-
+#endif
   return foundLayerIdinNuh;
 }

branches/HTM-11.0-dev0-Qualcomm/source/Lib/TLibCommon/TypeDef.h

@@ -66 +66 @@
 
 #define NTT_BUG_FIX_TK54    1
-
+#define BUG_FIX_TK65        1
 
 /////////////////////////////////////////////////////////////////////////////////////////