Changeset 1325 in 3DVCSoftware for branches/HTM-15.1-MV-draft-4/source/Lib/TLibEncoder/TEncGOP.cpp

Timestamp:

7 Sep 2015, 18:40:35 (10 years ago)

Author:

tech

Message:

Removed 3D-HEVC.

File:

• branches/HTM-15.1-MV-draft-4/source/Lib/TLibEncoder/TEncGOP.cpp (modified) (18 diffs)

branches/HTM-15.1-MV-draft-4/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -101 +101 @@
   m_viewId       = 0;
   m_pocLastCoded = -1; 
-#if NH_3D
-  m_viewIndex  =   0; 
-  m_isDepth = false;
-#endif
 #endif
   m_associatedIRAPType = NAL_UNIT_CODED_SLICE_IDR_N_LP;
@@ -150 +146 @@
   m_layerId              = pcTEncTop->getLayerId();
   m_viewId               = pcTEncTop->getViewId();
-#if NH_3D
-  m_viewIndex            = pcTEncTop->getViewIndex();
-  m_isDepth              = pcTEncTop->getIsDepth();
-#endif
-#endif
-#if NH_3D_IC
-  m_aICEnableCandidate   = pcTEncTop->getICEnableCandidate(); 
-  m_aICEnableNum         = pcTEncTop->getICEnableNum(); 
-#endif
-#if KWU_FIX_URQ
-  m_pcRateCtrl           = pcTEncTop->getRateCtrl();
 #endif
 }
@@ -1184 +1169 @@
     pcPic  ->setLayerId     ( getLayerId()   );
     pcPic  ->setViewId      ( getViewId()    );    
-#if !NH_3D
     pcSlice->setLayerId     ( getLayerId() );
     pcSlice->setViewId      ( getViewId()  );    
     pcSlice->setVPS         ( m_pcEncTop->getVPS() );
-#else
-    pcPic  ->setViewIndex   ( getViewIndex() ); 
-    pcPic  ->setIsDepth( getIsDepth() );
-    pcSlice->setCamparaSlice( pcPic->getCodedScale(), pcPic->getCodedOffset() );    
-#endif
 #endif 
     //set default slice level flag to the same as SPS level flag
@@ -1363 +1342 @@
 
     const TComVPS*           vps = pcSlice->getVPS();     
-#if NH_3D
-    Int numDirectRefLayers = vps    ->getNumRefListLayers( getLayerId() ); 
-#else
     Int numDirectRefLayers = vps    ->getNumDirectRefLayers( getLayerId() ); 
-#endif
-#if NH_3D
-    pcSlice->setIvPicLists( m_ivPicLists );         
-
-    Int gopNum = (pcSlice->getRapPicFlag() && getLayerId() > 0) ? MAX_GOP : iGOPid;
-    GOPEntry gopEntry      = m_pcCfg->getGOPEntry( gopNum );     
-#else
     GOPEntry gopEntry      = m_pcCfg->getGOPEntry( (pcSlice->getRapPicFlag() && getLayerId() > 0) ? MAX_GOP : iGOPid );     
-#endif
 
 
@@ -1389 +1357 @@
           pcSlice->setNumInterLayerRefPicsMinus1( gopEntry.m_numActiveRefLayerPics - 1 ); 
         }
-#if NH_3D
-        if ( gopEntry.m_numActiveRefLayerPics != vps->getNumRefListLayers( getLayerId() ) )
-#else
         if ( gopEntry.m_numActiveRefLayerPics != vps->getNumDirectRefLayers( getLayerId() ) )
-#endif
         {        
           interLayerPredLayerIdcPresentFlag = true; 
@@ -1414 +1378 @@
     assert( pcSlice->getNumActiveRefLayerPics() == gopEntry.m_numActiveRefLayerPics ); 
     
-#if NH_3D
-    if ( m_pcEncTop->decProcAnnexI() )
-    {    
-      pcSlice->deriveInCmpPredAndCpAvailFlag( ); 
-      if ( pcSlice->getInCmpPredAvailFlag() )
-      {      
-        pcSlice->setInCompPredFlag( gopEntry.m_interCompPredFlag ); 
-      }
-      else
-      {
-        if (gopEntry.m_interCompPredFlag )
-        {
-          if ( gopNum == MAX_GOP)
-          {
-            printf( "\nError: FrameI_l%d cannot enable inter-component prediction on slice level. All reference layers need to be available and at least one tool using inter-component prediction must be enabled in the SPS. \n", pcSlice->getVPS()->getLayerIdInVps( getLayerId() ) );
-          }
-          else
-          {
-            printf( "\nError: Frame%d_l%d cannot enable inter-component prediction on slice level. All reference layers need to be available and at least one tool using inter-component prediction must be enabled in the SPS. \n", gopNum, pcSlice->getVPS()->getLayerIdInVps( getLayerId() ) );
-          }
-          
-          exit(EXIT_FAILURE);
-        }
-      }
-      pcSlice->init3dToolParameters(); 
-      pcSlice->checkInCompPredRefLayers(); 
-    }   
-#if NH_3D_IV_MERGE
-    // This needs to be done after initialization of 3D tool parameters.
-    pcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand()   + ( ( pcSlice->getMpiFlag( ) || pcSlice->getIvMvPredFlag( ) || pcSlice->getViewSynthesisPredFlag( )   ) ? 1 : 0 ));
-#endif
-#endif
 
     pcSlice->createInterLayerReferencePictureSet( m_ivPicLists, m_refPicSetInterLayer0, m_refPicSetInterLayer1 ); 
@@ -1469 +1401 @@
     pcSlice->setRefPicList ( rcListPic );
 #endif
-#if NH_3D_NBDV
-    pcSlice->setDefaultRefView();
-#endif
-#if NH_3D_ARP
-    //GT: This seems to be broken when layerId in vps is not equal to layerId in nuh
-    pcSlice->setARPStepNum(m_ivPicLists);
-#endif
-#if NH_3D_IC
-    pcSlice->setICEnableCandidate( m_aICEnableCandidate );         
-    pcSlice->setICEnableNum( m_aICEnableNum );         
-#endif
 
     //  Slice info. refinement
@@ -1533 +1454 @@
 
     pcSlice->setList1IdxToList0Idx();
-#if NH_3D_TMVP
-    if(pcSlice->getLayerId())
-      pcSlice->generateAlterRefforTMVP();
-#endif
 
     if (m_pcEncTop->getTMVPModeId() == 2)
@@ -1565 +1482 @@
 #endif
 
-#if NH_3D_VSO
-  // Should be moved to TEncTop !!! 
-  Bool bUseVSO = m_pcEncTop->getUseVSO();
-  
-  TComRdCost* pcRdCost = m_pcEncTop->getRdCost();   
-
-  pcRdCost->setUseVSO( bUseVSO );
-
-  // SAIT_VSO_EST_A0033
-  pcRdCost->setUseEstimatedVSD( m_pcEncTop->getUseEstimatedVSD() );
-
-  if ( bUseVSO )
-  {
-    Int iVSOMode = m_pcEncTop->getVSOMode();
-    pcRdCost->setVSOMode( iVSOMode  );
-    pcRdCost->setAllowNegDist( m_pcEncTop->getAllowNegDist() );
-
-    // SAIT_VSO_EST_A0033
-#if H_3D_FCO
-    Bool flagRec;
-    flagRec =  ((m_pcEncTop->getIvPicLists()->getPicYuv( pcSlice->getViewIndex(), false, pcSlice->getPOC(), true) == NULL) ? false: true);
-    pcRdCost->setVideoRecPicYuv( m_pcEncTop->getIvPicLists()->getPicYuv( pcSlice->getViewIndex(), false, pcSlice->getPOC(), flagRec ) );
-    pcRdCost->setDepthPicYuv   ( m_pcEncTop->getIvPicLists()->getPicYuv( pcSlice->getViewIndex(), true, pcSlice->getPOC(), false ) );
-#else
-    pcRdCost->setVideoRecPicYuv( m_pcEncTop->getIvPicLists()->getPicYuv( pcSlice->getViewIndex(), false , pcSlice->getPOC(), true ) );
-    pcRdCost->setDepthPicYuv   ( m_pcEncTop->getIvPicLists()->getPicYuv( pcSlice->getViewIndex(), true  , pcSlice->getPOC(), false ) );
-#endif
-
-    // LGE_WVSO_A0119
-    Bool bUseWVSO  = m_pcEncTop->getUseWVSO();
-    pcRdCost->setUseWVSO( bUseWVSO );
-
-  }
-#endif
 
     /////////////////////////////////////////////////////////////////////////////////////////////////// Compress a slice
@@ -1649 +1532 @@
       m_pcRateCtrl->initRCPic( frameLevel );
 
-#if KWU_RC_MADPRED_E0227
-      if(m_pcCfg->getLayerId() != 0)
-      {
-        m_pcRateCtrl->getRCPic()->setIVPic( m_pcEncTop->getEncTop()->getTEncTop(0)->getRateCtrl()->getRCPic() );
-      }
-#endif
 
       estimatedBits = m_pcRateCtrl->getRCPic()->getTargetBits();
@@ -1691 +1568 @@
       else    // normal case
       {
-#if KWU_RC_MADPRED_E0227
-        if(m_pcRateCtrl->getLayerID() != 0)
-        {
-          list<TEncRCPic*> listPreviousPicture = m_pcRateCtrl->getPicList();
-          lambda  = m_pcRateCtrl->getRCPic()->estimatePicLambdaIV( listPreviousPicture, pcSlice->getPOC() );
-          sliceQP = m_pcRateCtrl->getRCPic()->estimatePicQP( lambda, listPreviousPicture );
-        }
-        else
-        {
-#endif
         list<TEncRCPic*> listPreviousPicture = m_pcRateCtrl->getPicList();
         lambda  = m_pcRateCtrl->getRCPic()->estimatePicLambda( listPreviousPicture, pcSlice->getSliceType());
         sliceQP = m_pcRateCtrl->getRCPic()->estimatePicQP( lambda, listPreviousPicture );
-#if KWU_RC_MADPRED_E0227
-        }
-#endif
       }
 
@@ -1717 +1581 @@
     UInt uiNumSliceSegments = 1;
 
-#if NH_3D_NBDV
-      if(pcSlice->getViewIndex() && !pcSlice->getIsDepth()) //Notes from QC: this condition shall be changed once the configuration is completed, e.g. in pcSlice->getSPS()->getMultiviewMvPredMode() || ARP in prev. HTM. Remove this comment once it is done.
-      {
-        Int iColPoc = pcSlice->getRefPOC(RefPicList(1 - pcSlice->getColFromL0Flag()), pcSlice->getColRefIdx());
-        pcPic->setNumDdvCandPics(pcPic->getDisCandRefPictures(iColPoc));
-      }
-#endif
-#if NH_3D
-      pcSlice->setDepthToDisparityLUTs(); 
-
-#endif
-
-#if NH_3D_NBDV
-      if(pcSlice->getViewIndex() && !pcSlice->getIsDepth() && !pcSlice->isIntra()) //Notes from QC: this condition shall be changed once the configuration is completed, e.g. in pcSlice->getSPS()->getMultiviewMvPredMode() || ARP in prev. HTM. Remove this comment once it is done.
-      {
-        pcPic->checkTemporalIVRef();
-      }
-
-      if(pcSlice->getIsDepth())
-      {
-        pcPic->checkTextureRef();
-      }
-#endif
+
     // Allocate some coders, now the number of tiles are known.
     const Int numSubstreamsColumns = (pcSlice->getPPS()->getNumTileColumnsMinus1() + 1);
@@ -1814 +1656 @@
       // write various parameter sets
       actualTotalBits += xWriteParameterSets(accessUnit, pcSlice);
-#if PPS_FIX_DEPTH
-      if(!pcSlice->getIsDepth() || !pcSlice->getViewIndex() )
-      {
-#endif
-#if PPS_FIX_DEPTH
-      }
-#endif
 
 
@@ -1979 +1814 @@
     // cabac_zero_words processing
     cabac_zero_word_padding(pcSlice, pcPic, binCountsInNalUnits, numBytesInVclNalUnits, accessUnit.back()->m_nalUnitData, m_pcCfg->getCabacZeroWordPaddingEnabled());
-#if NH_3D
-      pcPic->compressMotion(2); 
-#else
     pcPic->compressMotion();
-#endif
 #if NH_MV
       m_pocLastCoded = pcPic->getPOC();
@@ -2140 +1971 @@
 }
 
-#if NH_3D_VSO
-Void TEncGOP::preLoopFilterPicAll( TComPic* pcPic, Dist64& ruiDist )
-#else
 Void TEncGOP::preLoopFilterPicAll( TComPic* pcPic, UInt64& ruiDist )
-#endif
 {
   Bool bCalcDist = false;
@@ -2225 +2052 @@
 }
 
-#if NH_3D_VSO
-Dist64 TEncGOP::xFindDistortionFrame (TComPicYuv* pcPic0, TComPicYuv* pcPic1, const BitDepths &bitDepths)
-#else
 UInt64 TEncGOP::xFindDistortionFrame (TComPicYuv* pcPic0, TComPicYuv* pcPic1, const BitDepths &bitDepths)
-#endif
-{
-#if NH_3D_VSO
-  Dist64  uiTotalDiff = 0;
-#else
+{
   UInt64  uiTotalDiff = 0;
-#endif
 
   for(Int chan=0; chan<pcPic0 ->getNumberValidComponents(); chan++)
@@ -2375 +2194 @@
       pRec += iRecStride;
     }
-#if NH_3D_VSO
-#if H_3D_VSO_SYNTH_DIST_OUT
-  if ( m_pcRdCost->getUseRenModel() )
-  {
-    unsigned int maxval = 255 * (1<<(g_uiBitDepth + g_uiBitIncrement -8));
-    Double fRefValueY = (double) maxval * maxval * iSize;
-    Double fRefValueC = fRefValueY / 4.0;
-    TRenModel*  pcRenModel = m_pcEncTop->getEncTop()->getRenModel();
-    Int64 iDistVSOY, iDistVSOU, iDistVSOV;
-    pcRenModel->getTotalSSE( iDistVSOY, iDistVSOU, iDistVSOV );
-    dYPSNR = ( iDistVSOY ? 10.0 * log10( fRefValueY / (Double) iDistVSOY ) : 99.99 );
-    dUPSNR = ( iDistVSOU ? 10.0 * log10( fRefValueC / (Double) iDistVSOU ) : 99.99 );
-    dVPSNR = ( iDistVSOV ? 10.0 * log10( fRefValueC / (Double) iDistVSOV ) : 99.99 );
-  }
-  else
-  {
-#endif
-#endif
     const Int maxval = 255 << (pcPic->getPicSym()->getSPS().getBitDepth(toChannelType(ch)) - 8);
     const Double fRefValue = (Double) maxval * maxval * iSize;
@@ -2399 +2200 @@
   }
 
-#if NH_3D_VSO
-#if H_3D_VSO_SYNTH_DIST_OUT
-}
-#endif 
-#endif  
   /* calculate the size of the access unit, excluding:
    *  - any AnnexB contributions (start_code_prefix, zero_byte, etc.,)