Changeset 655 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComPic.h

Timestamp:

23 Oct 2013, 23:01:30 (11 years ago)

Author:

tech

Message:

Merged 8.1-Cleanup@654

File:

• trunk/source/Lib/TLibCommon/TComPic.h (modified) (6 diffs)

trunk/source/Lib/TLibCommon/TComPic.h

@@ -61 +61 @@
   Bool                  m_bUsedByCurr;            //  Used by current picture
   Bool                  m_bIsLongTerm;            //  IS long term picture
-  Bool                  m_bIsUsedAsLongTerm;      //  long term picture is used as reference before
   TComPicSym*           m_apcPicSym;              //  Symbol
   
@@ -83 +82 @@
   Window                m_defaultDisplayWindow;
 
+  bool                  m_isTop;
+  bool                  m_isField;
+  
   std::vector<std::vector<TComDataCU*> > m_vSliceCUDataLink;
 
@@ -104 +106 @@
   RefPicList  m_eRapRefList;
   Int         m_iNumDdvCandPics;
-#endif
-#if MTK_NBDV_TN_FIX_E0172 
   Bool        m_abTIVRINCurrRL  [2][2][MAX_NUM_REF]; //whether an inter-view reference picture with the same view index of the inter-view reference picture of temporal reference picture of current picture exists in current reference picture lists
-#endif
-#if MTK_TEXTURE_MRGCAND_BUGFIX_E0182  
   Int         m_aiTexToDepRef  [2][MAX_NUM_REF];
 #endif
@@ -186 +184 @@
   Void          setNumReorderPics(Int i, UInt tlayer) { m_numReorderPics[tlayer] = i;    }
   Int           getNumReorderPics(UInt tlayer)        { return m_numReorderPics[tlayer]; }
-#if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
-  Void          compressMotion(int scale); 
+#if H_3D
+  Void          compressMotion(Int scale); 
 #else   
   Void          compressMotion(); 
@@ -212 +210 @@
   TComPicYuv*   getYuvPicBufferForIndependentBoundaryProcessing()             {return m_pNDBFilterYuvTmp;}
   std::vector<TComDataCU*>& getOneSliceCUDataForNDBFilter      (Int sliceID) { return m_vSliceCUDataLink[sliceID];}
+
+
+  /* field coding parameters*/
+
+   Void              setTopField(bool b)                  {m_isTop = b;}
+   bool              isTopField()                         {return m_isTop;}
+   Void              setField(bool b)                     {m_isField = b;}
+   bool              isField()                            {return m_isField;}
 
 #if H_MV
@@ -224 +230 @@
   UInt          getRapRefIdx()                         {return m_uiRapRefIdx;       }
   RefPicList    getRapRefList()                        {return m_eRapRefList;       }
-#endif
-#if MTK_NBDV_TN_FIX_E0172
-  Void      checkTemporalIVRef();
-  Bool      isTempIVRefValid(Int currCandPic, Int iTempRefDir, Int iTempRefIdx);
-#endif
-#if MTK_TEXTURE_MRGCAND_BUGFIX_E0182
-  Void      checkTextureRef(  );
-  Int       isTextRefValid(Int iTextRefDir, Int iTextRefIdx);
+  Void          checkTemporalIVRef();
+  Bool          isTempIVRefValid(Int currCandPic, Int iTempRefDir, Int iTempRefIdx);
+  Void          checkTextureRef(  );
+  Int           isTextRefValid(Int iTextRefDir, Int iTextRefIdx);
 #endif
   /** transfer ownership of seis to this picture */