Changeset 1191 in 3DVCSoftware for branches/HTM-14.0-MV-draft-3/source/Lib/TLibDecoder/TDecTop.h

Timestamp:

15 Apr 2015, 11:36:33 (10 years ago)

Author:

tech

Message:

Removed 3D-HEVC.

File:

• branches/HTM-14.0-MV-draft-3/source/Lib/TLibDecoder/TDecTop.h (modified) (3 diffs)

branches/HTM-14.0-MV-draft-3/source/Lib/TLibDecoder/TDecTop.h

@@ -64 +64 @@
 class TAppDecTop;
 #endif
-#if H_3D
-class CamParsCollector
-{
-public:
-  CamParsCollector  ();
-  ~CamParsCollector ();
-
-  Void  init        ( FILE* pCodedScaleOffsetFile, TComVPS* vps );
-
-  Void  uninit      ();
-  Void  setSlice    ( TComSlice* pcSlice );
-
-  Bool  isInitialized() const     { return m_bInitialized; }
-  Int**** getBaseViewShiftLUTI()  { return m_aiBaseViewShiftLUT;   }
-
-#if H_3D_IV_MERGE
-  Void  copyCamParamForSlice( TComSlice* pcSlice );
-#endif
-
-
-private:
-  Void xResetReceivedIdc( Bool overWriteFlag ); 
-  Void  xOutput     ( Int iPOC );
-
-private:
-  Bool    m_bInitialized;
-  FILE*   m_pCodedScaleOffsetFile;
-
-  Int**   m_aaiCodedOffset;
-  Int**   m_aaiCodedScale;
-  
-  TComVPS* m_vps; 
-  Int**    m_receivedIdc; 
-#if!HHI_CAM_PARA_K0052
-  Int      m_uiMaxViewIndex; 
-#endif
-  Int      m_lastPoc; 
-  Int      m_firstReceivedPoc; 
-
-  
-  Bool    m_bCamParsVaryOverTime;
-
-  UInt    m_uiBitDepthForLUT;
-  UInt    m_iLog2Precision;
-  UInt    m_uiInputBitDepth;
-
-  // look-up tables
-  Double****   m_adBaseViewShiftLUT;       ///< Disparity LUT
-  Int****      m_aiBaseViewShiftLUT;       ///< Disparity LUT
-  Void xCreateLUTs( UInt uiNumberSourceViews, UInt uiNumberTargetViews, Double****& radLUT, Int****& raiLUT);
-  Void xInitLUTs( UInt uiSourceView, UInt uiTargetView, Int iScale, Int iOffset, Double****& radLUT, Int****& raiLUT);
-  template<class T> Void  xDeleteArray  ( T*& rpt, UInt uiSize1, UInt uiSize2, UInt uiSize3 );
-  template<class T> Void  xDeleteArray  ( T*& rpt, UInt uiSize1, UInt uiSize2 );
-  template<class T> Void  xDeleteArray  ( T*& rpt, UInt uiSize );
-
-};
-
-template <class T>
-Void CamParsCollector::xDeleteArray( T*& rpt, UInt uiSize1, UInt uiSize2, UInt uiSize3 )
-{
-  if( rpt )
-  {
-    for( UInt uiK = 0; uiK < uiSize1; uiK++ )
-    {
-      for( UInt uiL = 0; uiL < uiSize2; uiL++ )
-      {
-        for( UInt uiM = 0; uiM < uiSize3; uiM++ )
-        {
-          delete[] rpt[ uiK ][ uiL ][ uiM ];
-        }
-        delete[] rpt[ uiK ][ uiL ];
-      }
-      delete[] rpt[ uiK ];
-    }
-    delete[] rpt;
-  }
-  rpt = NULL;
-};
-
-
-template <class T>
-Void CamParsCollector::xDeleteArray( T*& rpt, UInt uiSize1, UInt uiSize2 )
-{
-  if( rpt )
-  {
-    for( UInt uiK = 0; uiK < uiSize1; uiK++ )
-    {
-      for( UInt uiL = 0; uiL < uiSize2; uiL++ )
-      {
-        delete[] rpt[ uiK ][ uiL ];
-      }
-      delete[] rpt[ uiK ];
-    }
-    delete[] rpt;
-  }
-  rpt = NULL;
-};
-
-
-template <class T>
-Void CamParsCollector::xDeleteArray( T*& rpt, UInt uiSize )
-{
-  if( rpt )
-  {
-    for( UInt uiK = 0; uiK < uiSize; uiK++ )
-    {
-      delete[] rpt[ uiK ];
-    }
-    delete[] rpt;
-  }
-  rpt = NULL;
-};
-
-#endif //H_3D
 /// decoder class
 class TDecTop
@@ -240 +126 @@
   std::vector<TComPic*>   m_refPicSetInterLayer0; 
   std::vector<TComPic*>   m_refPicSetInterLayer1; 
-#if H_3D
-  Int                     m_viewIndex; 
-  Bool                    m_isDepth;
-  CamParsCollector*       m_pcCamParsCollector;
-#endif
-#if H_3D_ANNEX_SELECTION_FIX
-  Int                     m_profileIdc;
-#endif
 #endif
 
@@ -299 +177 @@
   Void                    setViewId             ( Int viewId  )  { m_viewId  = viewId;  }
   Int                     getViewId             ()               { return m_viewId;     }  
-#if H_3D    
-  Void                    setViewIndex          ( Int viewIndex  )  { m_viewIndex  = viewIndex;  }
-  Int                     getViewIndex          ()               { return m_viewIndex;     }  
-  Void                    setIsDepth            ( Bool isDepth ) { m_isDepth = isDepth; }
-  Bool                    getIsDepth            ()               { return m_isDepth;    }
-  Void                    setCamParsCollector( CamParsCollector* pcCamParsCollector ) { m_pcCamParsCollector = pcCamParsCollector; }
-#endif
-#if H_3D_ANNEX_SELECTION_FIX
-  Void                    setProfileIdc()
-  {        
-    if (m_targetOptLayerSetIdx != -1 )
-    {    
-      TComVPS* vps = getPrefetchedVPS(); 
-      Int lsIdx = vps->olsIdxToLsIdx( m_targetOptLayerSetIdx );
-      Int lIdx = -1; 
-      for (Int j = 0; j < vps->getNumLayersInIdList( lsIdx ); j++ )
-      {
-        if ( vps->getLayerSetLayerIdList( lsIdx, j ) == getLayerId() )
-        {
-          lIdx = j; 
-          break; 
-        }        
-      }
-      assert( lIdx != -1 ); 
-
-      Int profileIdc = vps->getPTL( vps->getProfileTierLevelIdx( m_targetOptLayerSetIdx, lIdx ) )->getGeneralPTL()->getProfileIdc();
-      assert( profileIdc == 1 || profileIdc == 6 || profileIdc == 8 ); 
-      m_profileIdc = profileIdc;   
-    };
-  }
-  Bool                    decProcAnnexI()           { assert( m_profileIdc != -1 ); return ( m_profileIdc == 8); }    
-#endif
 
 #endif