Changeset 655 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncGOP.h


Ignore:
Timestamp:
23 Oct 2013, 23:01:30 (11 years ago)
Author:
tech
Message:

Merged 8.1-Cleanup@654

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibEncoder/TEncGOP.h

    r622 r655  
    5757#include "TEncAnalyze.h"
    5858#include "TEncRateCtrl.h"
     59#if KWU_RC_MADPRED_E0227
     60#include "../App/TAppEncoder/TAppEncTop.h"
     61#endif
    5962#include <vector>
    6063
     
    99102#if H_MV
    100103  TComPicLists*           m_ivPicLists;
    101 #if H_MV5
    102104  std::vector<TComPic*>   m_refPicSetInterLayer0;
    103105  std::vector<TComPic*>   m_refPicSetInterLayer1;
    104 #else
    105   std::vector<TComPic*>   m_refPicSetInterLayer;
    106 #endif
    107106
    108107  Int                     m_pocLastCoded;
     
    148147#if H_MV
    149148  Void  initGOP     ( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP);
    150   Void  compressPicInGOP ( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP, Int iGOPid );
     149  Void  compressPicInGOP ( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP, Int iGOPid, Bool isField, Bool isTff );
    151150#else
    152   Void  compressGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRec, std::list<AccessUnit>& accessUnitsInGOP );
     151  Void  compressGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRec, std::list<AccessUnit>& accessUnitsInGOP, Bool isField, Bool isTff );
    153152#endif
    154153  Void  xAttachSliceDataToNalUnit (OutputNALUnit& rNalu, TComOutputBitstream*& rpcBitstreamRedirect);
     
    169168
    170169#if !H_MV
    171   Void  printOutSummary      ( UInt uiNumAllPicCoded );
     170  Void  printOutSummary      ( UInt uiNumAllPicCoded , bool isField);
    172171#endif
    173172#if H_3D_VSO
     
    176175  Void  preLoopFilterPicAll  ( TComPic* pcPic, UInt64& ruiDist, UInt64& ruiBits );
    177176#endif
    178  
     177
     178#if KWU_RC_MADPRED_E0227
     179  TEncTop* getEncTop() { return m_pcEncTop; }
     180#endif
     181
    179182  TEncSlice*  getSliceEncoder()   { return m_pcSliceEncoder; }
    180183  NalUnitType getNalUnitType( Int pocCurr, Int lastIdr );
     
    184187
    185188protected:
     189  Void xInitGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, bool isField );
     190
    186191  Void  xInitGOP          ( Int iPOC, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut );
    187   Void  xGetBuffer        ( TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, Int iNumPicRcvd, Int iTimeOffset, TComPic*& rpcPic, TComPicYuv*& rpcPicYuvRecOut, Int pocCurr );
     192  Void  xGetBuffer        ( TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, Int iNumPicRcvd, Int iTimeOffset, TComPic*& rpcPic, TComPicYuv*& rpcPicYuvRecOut, Int pocCurr, bool isField );
    188193 
    189194  Void  xCalculateAddPSNR ( TComPic* pcPic, TComPicYuv* pcPicD, const AccessUnit&, Double dEncTime );
     195  Void  xCalculateInterlacedAddPSNR( TComPic* pcPicOrgTop, TComPic* pcPicOrgBottom, TComPicYuv* pcPicRecTop, TComPicYuv* pcPicRecBottom, const AccessUnit& accessUnit, Double dEncTime );
     196
    190197#if H_3D_VSO
    191198  Dist64 xFindDistortionFrame (TComPicYuv* pcPic0, TComPicYuv* pcPic1);
     
    216223  }
    217224#if H_MV
    218 #if H_MV5
    219225   Void  xSetRefPicListModificationsMv( std::vector<TComPic*> tempPicLists[2], TComSlice* pcSlice, UInt iGOPid );
    220 #else
    221    Void  xSetRefPicListModificationsMv( TComSlice* pcSlice, UInt iGOPid );
    222 #endif
    223226#endif
    224227  Void dblMetric( TComPic* pcPic, UInt uiNumSlices );
Note: See TracChangeset for help on using the changeset viewer.