Changeset 364 in 3DVCSoftware for branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon

Timestamp:

3 May 2013, 16:34:51 (12 years ago)

Author:

tech

Message:

Further cleanups

Location:

branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon

Files:

• CommonDef.h (modified) (1 diff)
• NAL.h (modified) (1 diff)
• TComDataCU.cpp (modified) (1 diff)
• TComPic.h (modified) (3 diffs)
• TComSlice.h (modified) (7 diffs)
• TypeDef.h (modified) (3 diffs)

branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/CommonDef.h

@@ -168 +168 @@
 
 #endif
-
 
 // ====================================================================================================================

branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/NAL.h

@@ -47 +47 @@
   NalUnitType m_nalUnitType; ///< nal_unit_type
   UInt        m_temporalId;  ///< temporal_id
-
 #if H_MV
   Int         m_layerId;     ///< layer id

branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3200 +3200 @@
   Bool bIsCurrRefLongTerm = m_pcSlice->getRefPic( eRefPicList, iRefIdx)->getIsLongTerm();
   Bool bIsNeibRefLongTerm = false;
-
   //---------------  V1 (END) ------------------//
   if( pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx) >= 0)

branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComPic.h

@@ -93 +93 @@
 #endif
 #endif
-
 public:
   TComPic();
@@ -116 +115 @@
 #endif
 #endif
-
   Bool          getUsedByCurr()             { return m_bUsedByCurr; }
   Void          setUsedByCurr( Bool bUsed ) { m_bUsedByCurr = bUsed; }
@@ -186 +184 @@
   Void          print( Bool legend );
 #endif
-
-
-
   /** transfer ownership of seis to this picture */
   void setSEIs(SEIMessages& seis) { m_SEIs = seis; }

branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.h

@@ -603 +603 @@
   TimingInfo* getTimingInfo() { return &m_timingInfo; }
 #endif
-
 #if H_MV
   Void    setAvcBaseLayerFlag( Bool val )                                  { m_avcBaseLayerFlag = val;  }
@@ -971 +970 @@
   static const Int   m_winUnitY[MAX_CHROMA_FORMAT_IDC+1];
   TComPTL     m_pcPTL;
-
 #if H_MV
   Bool        m_interViewMvVertConstraintFlag;
 #endif
-
 public:
   TComSPS();
@@ -1106 +1103 @@
 
   TComPTL* getPTL()     { return &m_pcPTL; }
-
 #if H_MV
   Void setInterViewMvVertConstraintFlag(Bool val) { m_interViewMvVertConstraintFlag = val; }
@@ -1464 +1460 @@
 
   Bool       m_enableTMVPFlag;
-
 #if H_MV
   Int        m_layerId; 
@@ -1472 +1467 @@
 #endif
 #endif
-
 public:
   TComSlice();
@@ -1639 +1633 @@
   Void decodingMarking( TComList<TComPic*>& rcListPic, Int iGOPSIze, Int& iMaxRefPicNum ); 
   Void applyReferencePictureSet( TComList<TComPic*>& rcListPic, TComReferencePictureSet *RPSList);
-
 #if H_MV
   Void createAndApplyIvReferencePictureSet( TComPicLists* ivPicLists, std::vector<TComPic*>& refPicSetInterLayer );
@@ -1648 +1641 @@
   Void xPrintRefPicList();
 #endif
-
   Bool isTemporalLayerSwitchingPoint( TComList<TComPic*>& rcListPic );
   Bool isStepwiseTemporalLayerSwitchingPointCandidate( TComList<TComPic*>& rcListPic );

branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TypeDef.h

@@ -91 +91 @@
 #define MAX_VPS_NUM_HRD_PARAMETERS                1
 #define MAX_VPS_OP_SETS_PLUS1                     1024
-
 #if H_MV
 #define MAX_VPS_NUH_LAYER_ID_PLUS1  64
@@ -105 +104 @@
 #define MAX_CPB_CNT                     32  ///< Upper bound of (cpb_cnt_minus1 + 1)
 #define MAX_NUM_LAYER_IDS               64
+#if H_MV
 #define MAX_NUM_LAYERS                  64
+#endif
 
 #define COEF_REMAIN_BIN_REDUCTION        3 ///< indicates the level at which the VLC 
@@ -569 +570 @@
 #endif
 #endif
-