Changeset 1100 in 3DVCSoftware for branches/HTM-12.2-dev2-Samsung/source/Lib/TLibEncoder

Timestamp:

4 Nov 2014, 08:31:17 (10 years ago)

Author:

samsung-htm

Message:

Integration of JCT3V-J0037 (Item1 and Item4)

Location:

branches/HTM-12.2-dev2-Samsung/source/Lib/TLibEncoder

Files:

• TEncCu.cpp (modified) (2 diffs)
• TEncEntropy.cpp (modified) (1 diff)
• TEncGOP.cpp (modified) (1 diff)
• TEncSlice.cpp (modified) (1 diff)

branches/HTM-12.2-dev2-Samsung/source/Lib/TLibEncoder/TEncCu.cpp

@@ -605 +605 @@
       }
 #if  H_3D_FAST_TEXTURE_ENCODING
+#if SEC_ARP_VIEW_REF_CHECK_J0037 || SEC_DBBP_VIEW_REF_CHECK_J0037
+      if(rpcTempCU->getSlice()->getViewIndex() && !rpcTempCU->getSlice()->getIsDepth() && rpcTempCU->getSlice()->getDefaultRefViewIdxAvailableFlag() )
+#else
       if(rpcTempCU->getSlice()->getViewIndex() && !rpcTempCU->getSlice()->getIsDepth())
+#endif
       {
         PartSize ePartTemp = rpcTempCU->getPartitionSize(0);
@@ -668 +672 @@
           
 #if H_3D_DBBP
+#if SEC_DBBP_VIEW_REF_CHECK_J0037
+          if( m_pcEncCfg->getUseDBBP() && rpcTempCU->getSlice()->getDefaultRefViewIdxAvailableFlag() )
+#else
           if( m_pcEncCfg->getUseDBBP() )
+#endif
           {
             xCheckRDCostInterDBBP( rpcBestCU, rpcTempCU, false );

branches/HTM-12.2-dev2-Samsung/source/Lib/TLibEncoder/TEncEntropy.cpp

@@ -268 +268 @@
   
 #if H_3D_DBBP
+#if SEC_DBBP_VIEW_REF_CHECK_J0037
+  if( pcCU->getSlice()->getVPS()->getUseDBBP(pcCU->getSlice()->getLayerIdInVps()) && (pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_2NxN || pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_Nx2N) && pcCU->getWidth(uiAbsPartIdx) > 8 && pcCU->getSlice()->getDefaultRefViewIdxAvailableFlag() )
+#else
   if( pcCU->getSlice()->getVPS()->getUseDBBP(pcCU->getSlice()->getLayerIdInVps()) && (pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_2NxN || pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_Nx2N) && pcCU->getWidth(uiAbsPartIdx) > 8 )
+#endif
   {
     encodeDBBPFlag(pcCU, uiAbsPartIdx, bRD);

branches/HTM-12.2-dev2-Samsung/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -953 +953 @@
     pcSlice->setApplySingleDepthMode(enableSingleDepthMode);
 #endif    
+#if SEC_ARP_VIEW_REF_CHECK_J0037 || SEC_DBBP_VIEW_REF_CHECK_J0037
+    pcSlice->setDefaultRefView();
+#endif
 #if H_3D_ARP
     //GT: This seems to be broken when layerId in vps is not equal to layerId in nuh

branches/HTM-12.2-dev2-Samsung/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -1011 +1011 @@
     }
   }
-#if LGE_DEFAULT_DV_J0046
+#if LGE_DEFAULT_DV_J0046 && !SEC_ARP_VIEW_REF_CHECK_J0037 && !SEC_DBBP_VIEW_REF_CHECK_J0037
   pcSlice->setDefaultRefViewIdx( -1 );
   pcSlice->setDefaultRefViewIdxAvailableFlag( false );