Changeset 699 in 3DVCSoftware for branches/HTM-8.2-dev3-Samsung/source/Lib/TLibEncoder

Timestamp:

15 Nov 2013, 05:46:48 (11 years ago)

Author:

samsung-htm

Message:

Integration of F0147 and F0151
F0147: DMM simplification and signalling
F0151: Removal of IC in depth coding

Location:

branches/HTM-8.2-dev3-Samsung/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (1 diff)
• TEncCu.cpp (modified) (1 diff)
• TEncEntropy.cpp (modified) (1 diff)

branches/HTM-8.2-dev3-Samsung/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1387 +1387 @@
     }
 #if H_3D_IC
+#if SEC_ONLY_TEXTURE_IC_F0151
+    else if( pcSlice->getViewIndex() && ( pcSlice->getSliceType() == P_SLICE || pcSlice->getSliceType() == B_SLICE ) && !pcSlice->getIsDepth())
+#else
     else if( pcSlice->getViewIndex() && ( pcSlice->getSliceType() == P_SLICE || pcSlice->getSliceType() == B_SLICE ) )
+#endif
     {
       WRITE_FLAG( pcSlice->getApplyIC() ? 1 : 0, "slice_ic_enable_flag" );

branches/HTM-8.2-dev3-Samsung/source/Lib/TLibEncoder/TEncCu.cpp

@@ -497 +497 @@
 #endif
 #if H_3D_IC
+#if SEC_ONLY_TEXTURE_IC_F0151
+  Bool bICEnabled = rpcTempCU->getSlice()->getViewIndex() && ( rpcTempCU->getSlice()->getSliceType() == P_SLICE || rpcTempCU->getSlice()->getSliceType() == B_SLICE ) && !rpcTempCU->getSlice()->getIsDepth();
+#else
   Bool bICEnabled = rpcTempCU->getSlice()->getViewIndex() && ( rpcTempCU->getSlice()->getSliceType() == P_SLICE || rpcTempCU->getSlice()->getSliceType() == B_SLICE );
+#endif
   bICEnabled = bICEnabled && rpcTempCU->getSlice()->getApplyIC();
 #endif

branches/HTM-8.2-dev3-Samsung/source/Lib/TLibEncoder/TEncEntropy.cpp

@@ -160 +160 @@
 Void TEncEntropy::encodeICFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
 {
+#if SEC_ONLY_TEXTURE_IC_F0151
+  if ( pcCU->isIntra( uiAbsPartIdx ) || ( pcCU->getSlice()->getViewIndex() == 0 ) || pcCU->getSlice()->getIsDepth() )
+#else
   if ( pcCU->isIntra( uiAbsPartIdx ) || ( pcCU->getSlice()->getViewIndex() == 0 ) )
+#endif
   {
     return;