Changeset 1094 in 3DVCSoftware for branches/HTM-12.2-dev2-LGE/source/Lib/TLibDecoder

Timestamp:

3 Nov 2014, 01:32:52 (10 years ago)

Author:

lg

Message:

Integration of JCT3V-J0042. The MACRO is "LGE_DDD_REMOVAL_J0042_J0030."
Integration of JCT3V-J0046. The MACRO is "LGE_DEFAULT_DV_J0046."
Integration of JCT3V-J0050. The MACRO is "LGE_CHROMA_IC_J0050_J0034."
Integration of JCT3V-J0041. The MACRO is "LGE_SIMP_DISP_AVAIL_J0041."

By Sunmi Yoo (sunmi.yoo@…) and Junghak Nam (junghak.nam@…)

Location:

branches/HTM-12.2-dev2-LGE/source/Lib/TLibDecoder

Files:

• TDecCu.cpp (modified) (3 diffs)
• TDecEntropy.cpp (modified) (2 diffs)
• TDecSlice.cpp (modified) (1 diff)
• TDecTop.h (modified) (1 diff)

branches/HTM-12.2-dev2-LGE/source/Lib/TLibDecoder/TDecCu.cpp

@@ -291 +291 @@
   DTRACE_CU_S("=========== coding_unit ===========\n")
 #endif
-
-
+#if !LGE_DDD_REMOVAL_J0042_J0030
 #if H_3D_DDD
       pcCU->setUseDDD( false, uiAbsPartIdx, uiDepth );
+#endif
 #endif
 
@@ -452 +452 @@
 #endif
     pcCU->setInterDirSubParts( uhInterDirNeighbours[uiMergeIndex], uiAbsPartIdx, 0, uiDepth );
-
+#if !LGE_DDD_REMOVAL_J0042_J0030
 #if H_3D_DDD
     if( uiMergeIndex == m_ppcCU[uiDepth]->getUseDDDCandIdx() )
@@ -460 +460 @@
         pcCU->setDDDepthSubParts( m_ppcCU[uiDepth]->getDDTmpDepth(),uiAbsPartIdx, 0, uiDepth );
     }
+#endif
 #endif
 

branches/HTM-12.2-dev2-LGE/source/Lib/TLibDecoder/TDecEntropy.cpp

@@ -337 +337 @@
       }
       pcCU->setInterDirSubParts( uhInterDirNeighbours[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );
-
+#if !LGE_DDD_REMOVAL_J0042_J0030
 #if H_3D_DDD
       if( uiMergeIndex == pcSubCU->getUseDDDCandIdx() )
@@ -349 +349 @@
           pcCU->setUseDDD( false, uiSubPartIdx, uiPartIdx, uiDepth );
       }
+#endif
 #endif
 

branches/HTM-12.2-dev2-LGE/source/Lib/TLibDecoder/TDecSlice.cpp

@@ -280 +280 @@
       iNumSubstreamsPerTile = 1;
     }
+#if LGE_DEFAULT_DV_J0046
+    pcSlice->setDefaultRefViewIdx( -1 );
+    pcSlice->setDefaultRefViewIdxAvailableFlag( false ); 
+
+    Int valid = 0;
+    Int viewIndex = 0;
+    for( UInt uiBId = 0; uiBId < pcSlice->getViewIndex() && valid==0; uiBId++ )
+    {
+        UInt        uiBaseId    = uiBId;
+        TComPic*    pcBasePic   = pcSlice->getIvPic( false, uiBaseId );
+        for( Int iRefListId = 0; ( iRefListId < (pcSlice->isInterB()? 2:1) ) && !pcSlice->isIntra() && valid==0; iRefListId++ )
+        {
+            RefPicList  eRefPicListTest = RefPicList( iRefListId );
+            Int         iNumRefPics = pcSlice->getNumRefIdx( eRefPicListTest ) ;
+            for( Int iRefIndex = 0; iRefIndex < iNumRefPics; iRefIndex++ )
+            { 
+                if(pcBasePic->getPOC() == pcSlice->getRefPic( eRefPicListTest, iRefIndex )->getPOC() 
+                    && pcBasePic->getViewIndex() == pcSlice->getRefPic( eRefPicListTest, iRefIndex )->getViewIndex())
+                {
+                    valid=1;
+                    viewIndex = uiBaseId;
+                    break;
+                }
+            }
+        }
+    }
+    if( valid )
+    {
+        pcSlice->setDefaultRefViewIdx( viewIndex );
+        pcSlice->setDefaultRefViewIdxAvailableFlag( true );   
+    }
+#endif
 
     if ( (iCUAddr == rpcPic->getPicSym()->getTComTile(rpcPic->getPicSym()->getTileIdxMap(iCUAddr))->getFirstCUAddr()) && // 1st in tile.

branches/HTM-12.2-dev2-LGE/source/Lib/TLibDecoder/TDecTop.h

@@ -83 +83 @@
 #endif
 
+#if !LGE_DDD_REMOVAL_J0042_J0030
 #if H_3D_DDD
   Int getCodedScale( Int iBaseView, Int iCureView){ return m_aaiCodedScale[ iBaseView ][ iCureView ];}
   Int getCodedOffset( Int iBaseView, Int iCureView){ return m_aaiCodedOffset[ iBaseView ][ iCureView ];}
   UInt getCamParsCodedPrecision(){ return m_vps->getCamParPrecision(); }
+#endif
 #endif