Changeset 1196 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncGOP.cpp

Timestamp:

4 May 2015, 17:47:40 (10 years ago)

Author:

tech

Message:

Merged 14.0-dev0@1187.

File:

• trunk/source/Lib/TLibEncoder/TEncGOP.cpp (modified) (6 diffs)

trunk/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -395 +395 @@
 Void TEncGOP::initGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP)
 {
-#if H_MV_ALIGN_HM_15
   xInitGOP( iPOCLast, iNumPicRcvd, rcListPic, rcListPicYuvRecOut, false );
-#else
-  xInitGOP( iPOCLast, iNumPicRcvd, rcListPic, rcListPicYuvRecOut );
-#endif
   m_iNumPicCoded = 0;
 }
@@ -885 +881 @@
     Int numDirectRefLayers = vps    ->getNumDirectRefLayers( getLayerId() ); 
 #endif
-#if HHI_INTER_COMP_PRED_K0052
+#if H_3D
     pcSlice->setIvPicLists( m_ivPicLists );         
 
@@ -893 +889 @@
     GOPEntry gopEntry      = m_pcCfg->getGOPEntry( (pcSlice->getRapPicFlag() && getLayerId() > 0) ? MAX_GOP : iGOPid );     
 #endif
+
+
     
     Bool interLayerPredLayerIdcPresentFlag = false; 
@@ -929 +927 @@
     assert( pcSlice->getNumActiveRefLayerPics() == gopEntry.m_numActiveRefLayerPics ); 
     
-#if HHI_INTER_COMP_PRED_K0052
 #if H_3D
     if ( m_pcEncTop->decProcAnnexI() )
@@ -962 +959 @@
     pcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand()   + ( ( pcSlice->getMpiFlag( ) || pcSlice->getIvMvPredFlag( ) || pcSlice->getViewSynthesisPredFlag( )   ) ? 1 : 0 ));
 #endif
-#endif
 
     pcSlice->createInterLayerReferencePictureSet( m_ivPicLists, m_refPicSetInterLayer0, m_refPicSetInterLayer1 ); 
@@ -1009 +1005 @@
       }
     }
-#endif
-#if !HHI_INTER_COMP_PRED_K0052
-#if H_3D
-    pcSlice->setIvPicLists( m_ivPicLists );         
-#if H_3D_IV_MERGE    
-    assert( !m_pcEncTop->getIsDepth() || ( pcSlice->getTexturePic() != 0 ) );
-#endif    
-#endif
 #endif
 #if H_3D_IC