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

Timestamp:

23 Jul 2013, 14:37:07 (11 years ago)

Author:

tech

Message:

• Changed HM Version number
• Minor cleanups

Location:

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

Files:

• TEncCavlc.cpp (modified) (2 diffs)
• TEncCfg.h (modified) (5 diffs)
• TEncCu.cpp (modified) (2 diffs)
• TEncSbac.cpp (modified) (4 diffs)
• TEncSlice.cpp (modified) (1 diff)
• TEncTop.cpp (modified) (2 diffs)

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

@@ -551 +551 @@
     }  
   } 
-
 #if H_3D_QTLPC
   if( depthFlag )
@@ -559 +558 @@
   }
 #endif
-
   ////   sps_extension_vui_parameters( ) END
   WRITE_UVLC( 0, "sps_shvc_reserved_zero_idc" ); 

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

@@ -313 +313 @@
   Bool      m_TransquantBypassEnableFlag;                     ///< transquant_bypass_enable_flag setting in PPS.
   Bool      m_CUTransquantBypassFlagValue;                    ///< if transquant_bypass_enable_flag, the fixed value to use for the per-CU cu_transquant_bypass_flag.
-#if H_MV_FIX_VPS_POINTER
+#if H_MV
   TComVPS*  m_cVPS;                                           ///< pointer to VPS, same for all layers
 #else
@@ -401 +401 @@
   Bool      m_useDLT;
 #endif
-
 #if H_3D_QTLPC
   Bool      m_bUseQTL;
   Bool      m_bUsePC;
 #endif
-
 #endif
 public:
@@ -813 +811 @@
   Bool      getCUTransquantBypassFlagValue()          { return m_CUTransquantBypassFlagValue; }
   Void      setCUTransquantBypassFlagValue(Bool flag) { m_CUTransquantBypassFlagValue = flag; }
-#if H_MV_FIX_VPS_POINTER
+#if H_MV
   Void      setVPS           ( TComVPS *p ) { m_cVPS = p;    }
   TComVPS*  getVPS           ()             { return m_cVPS; }
@@ -952 +950 @@
   Void      setUseDLT                       ( Bool b) { m_useDLT = b;    }
 #endif
-
 #if H_3D_QTLPC
   Void      setUseQTL                       ( Bool b ) { m_bUseQTL = b;    }
@@ -959 +956 @@
   Bool      getUsePC                        ()         { return m_bUsePC;  }
 #endif
-
 #endif // H_3D
 };

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

@@ -400 +400 @@
   Bool bTryNx2N           = true;
 #endif
-
   // get Original YUV data from picture
   m_ppcOrigYuv[uiDepth]->copyFromPicYuv( pcPic->getPicYuvOrg(), rpcBestCU->getAddr(), rpcBestCU->getZorderIdxInCU() );
@@ -494 +493 @@
 
       rpcTempCU->initEstData( uiDepth, iQP );
-
 #if H_3D_QTLPC
       //logic for setting bTrySplit using the partition information that is stored of the texture colocated CU

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

@@ -730 +730 @@
 {
   PartSize eSize         = pcCU->getPartitionSize( uiAbsPartIdx );
-
 #if H_3D_QTLPC
   TComSPS *sps           = pcCU->getPic()->getSlice(0)->getSPS();
@@ -751 +750 @@
   }
 #endif
-
   if ( pcCU->isIntra( uiAbsPartIdx ) )
   {
@@ -1011 +1009 @@
   
   assert( uiCtx < 3 );
-
 #if H_3D_QTLPC
   Bool bCodeSplitFlag    = true;
@@ -1036 +1033 @@
   }
 #endif
-
   m_pcBinIf->encodeBin( uiCurrSplitFlag, m_cCUSplitFlagSCModel.get( 0, 0, uiCtx ) );
 #if !H_MV_ENC_DEC_TRAC

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

@@ -1617 +1617 @@
     rpcPic->setReduceBitsFlag(true);
 #endif
-
     TComDataCU*& pcCU = rpcPic->getCU( uiCUAddr );    
     if ( pcSlice->getSPS()->getUseSAO() && (pcSlice->getSaoEnabledFlag()||pcSlice->getSaoEnabledFlagChroma()) )

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

@@ -290 +290 @@
   
   /* set the VPS profile information */
-#if H_MV_FIX_VPS_POINTER
+#if H_MV
   // This seems to be incorrect, but irrelevant for the MV-HEVC
   *(m_cVPS->getPTL()) = *m_cSPS.getPTL();
@@ -668 +668 @@
 {
 #if H_MV
-#if H_MV_FIX_VPS_POINTER
   if( getVPS()->getNumDirectRefLayers( getLayerIdInVps() ) > 0 )
-#else
-  if( m_cVPS.getNumDirectRefLayers( getLayerIdInVps() ) > 0 )
-#endif
   {
     m_cPPS.setListsModificationPresentFlag( true );