Changeset 956 in 3DVCSoftware for branches/HTM-11.0-dev0-Qualcomm/source/Lib

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/source/Lib/TLibCommon

Files:

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

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
 
 /////////////////////////////////////////////////////////////////////////////////////////