Changeset 542 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder

Timestamp:

23 Jul 2013, 15:19:06 (11 years ago)

Author:

tech

Message:

Further removal of unused macros.

Location:

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (1 diff)
• TEncGOP.cpp (modified) (3 diffs)
• TEncSlice.cpp (modified) (2 diffs)
• TEncSlice.h (modified) (1 diff)
• TEncTop.cpp (modified) (1 diff)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -801 +801 @@
     WRITE_FLAG ( 0,                    "vps_shvc_reserved_zero_flag" ); 
 
-#if H_3D_GEN  
+#if H_3D
   WRITE_FLAG( 1,                                             "vps_extension2_flag" );
   m_pcBitIf->writeAlignOne();      

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -471 +471 @@
     pcPic->setCurrSliceIdx(0);
 
-#if H_3D_GEN
+#if H_3D
     m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getVPS(), m_pcEncTop->getSPS(), m_pcEncTop->getPPS(), getLayerId() );     
 #else
@@ -482 +482 @@
     pcPic  ->setLayerId     ( getLayerId()   );
     pcPic  ->setViewId      ( getViewId()    );    
-#if !H_3D_GEN    
+#if !H_3D
     pcSlice->setLayerId     ( getLayerId() );
     pcSlice->setViewId      ( getViewId()  );    
     pcSlice->setVPS         ( m_pcEncTop->getVPS() );
-#endif
-#if H_3D
+#else
     pcPic  ->setViewIndex   ( getViewIndex() ); 
     pcPic  ->setIsDepth( getIsDepth() );
-#if !H_3D_GEN
-    pcSlice->setViewIndex   ( getViewIndex()  );
-    pcSlice->setIsDepth( getIsDepth() );    
-#endif
     pcSlice->setCamparaSlice( pcPic->getCodedScale(), pcPic->getCodedOffset() );    
 #endif
@@ -1078 +1073 @@
         pcPic->setNumDdvCandPics(pcPic->getDisCandRefPictures(iColPoc));
       }
-#if H_3D_GEN
+#if H_3D
       pcSlice->setDepthToDisparityLUTs(); 
 

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -176 +176 @@
  \param pPPS          PPS associated with the slice
  */
-#if H_3D_GEN
+#if H_3D
 Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComVPS* pVPS, TComSPS* pSPS, TComPPS *pPPS, Int layerId )
 #else
@@ -186 +186 @@
   
   rpcSlice = pcPic->getSlice(0);
-#if H_3D_GEN 
+#if H_3D
   // GT: Should also be activated for MV-HEVC at some stage
   rpcSlice->setVPS( pVPS );

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncSlice.h

@@ -116 +116 @@
   
   /// preparation of slice encoding (reference marking, QP and lambda)
-#if H_3D_GEN
+#if H_3D
   Void    initEncSlice        ( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, 
                                 Int iGOPid, TComSlice*& rpcSlice, TComVPS* pVPS, TComSPS* pSPS, TComPPS *pPPS, Int layerId ); 

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncTop.cpp

@@ -511 +511 @@
   // mark it should be extended
   rpcPic->getPicYuvRec()->setBorderExtension(false);
-#if H_3D_VSO_FIX_BORDRE_EXTENSION
   rpcPic->getPicYuvOrg()->setBorderExtension(false);
-#endif
 }