Changeset 42 in 3DVCSoftware for trunk/source/Lib


Ignore:
Timestamp:
26 Mar 2012, 18:05:40 (12 years ago)
Author:
tech
Message:

Nokia (Flexible Coding Order)
Ericsson ( High Level Syntax )
changes

Location:
trunk/source/Lib
Files:
3 added
24 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/CommonDef.h

    r21 r42  
    5858
    5959#define HM_VERSION        "3.0rc2"                 ///< Current software version
    60 #define NV_VERSION        "0.3"                    ///< Current software version
     60#define NV_VERSION        "0.4"                    ///< Current software version
    6161
    6262// ====================================================================================================================
  • trunk/source/Lib/TLibCommon/SEI.h

    r5 r42  
    4141class SEI
    4242{
     43#if BITSTREAM_EXTRACTION
     44protected:
     45  UInt m_uiLayerId;
     46#endif
     47
    4348public:
    4449  enum PayloadType {
     
    5156 
    5257  virtual PayloadType payloadType() const = 0;
     58
     59#if BITSTREAM_EXTRACTION
     60  Void      setLayerId              ( UInt u )       { m_uiLayerId = u; }
     61  UInt      getLayerId              ()         const { return m_uiLayerId; }
     62#endif
    5363};
    5464
  • trunk/source/Lib/TLibCommon/TComBitStream.cpp

    r5 r42  
    6161  m_auiSliceByteLocation = NULL;
    6262  m_uiSliceCount         = 0;
     63#if BITSTREAM_EXTRACTION
     64  m_apulPacketPayloadBuffer = new UInt[uiSize];
     65  m_uiPacketPayloadSize = 0;
     66#endif 
    6367}
    6468
     
    6670{
    6771  delete [] m_apulStreamPacketBegin;     m_apulStreamPacketBegin = NULL;
     72#if BITSTREAM_EXTRACTION
     73  delete [] m_apulPacketPayloadBuffer;   m_apulPacketPayloadBuffer = NULL;
     74#endif
    6875}
    6976
     
    148155  xReadNextWord();
    149156}
     157
     158#if BITSTREAM_EXTRACTION
     159UInt TComBitstream::reinitParsing()
     160{
     161  rewindStreamPacket();
     162  memcpy( m_apulStreamPacketBegin, m_apulPacketPayloadBuffer, m_uiPacketPayloadSize );
     163  initParsing( m_uiPacketPayloadSize );
     164  return m_uiPacketPayloadSize;
     165}
     166#endif
    150167
    151168#if LCEC_INTRA_MODE || QC_LCEC_INTER_MODE
     
    319336  UChar* pucWrite      = reinterpret_cast<UChar*> (getBuffer());
    320337 
     338#if BITSTREAM_EXTRACTION
     339  memcpy( m_apulPacketPayloadBuffer, m_apulStreamPacketBegin, uiBytesRead );
     340  m_uiPacketPayloadSize = uiBytesRead;
     341#endif
     342
    321343  for( ; uiReadOffset < uiBytesRead; uiReadOffset++ )
    322344  {
  • trunk/source/Lib/TLibCommon/TComBitStream.h

    r5 r42  
    8585  UInt        m_uiSliceProcessed;
    8686
     87#if BITSTREAM_EXTRACTION
     88  UInt*       m_apulPacketPayloadBuffer;
     89  UInt        m_uiPacketPayloadSize;
     90#endif 
     91
    8792  UInt xSwap ( UInt ui )
    8893  {
     
    164169
    165170  void insertAt(const TComBitstream& src, unsigned pos);
     171
     172#if BITSTREAM_EXTRACTION
     173  UInt        reinitParsing();
     174#endif 
    166175};
    167176
  • trunk/source/Lib/TLibCommon/TComSlice.cpp

    r21 r42  
    6666  m_iViewIdx = 0 ;
    6767
     68#if BITSTREAM_EXTRACTION
     69  m_uiLayerId = 0;
     70#endif
     71
    6872#if SONY_COLPIC_AVAILABILITY
    6973  m_iViewOrderIdx = 0;
     
    659663  m_bUseMVI = false;
    660664#endif
    661  
     665
     666#if BITSTREAM_EXTRACTION
     667  m_uiLayerId             = 0;
     668#endif
    662669  m_uiViewId              = 0;
    663670  m_iViewOrderIdx         = 0;
     
    687694  m_bUseDMM = false;
    688695#endif
     696#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     697   m_bUseDMM34 = false;
     698#endif
    689699}
    690700
     
    695705TComPPS::TComPPS()
    696706{
     707#if BITSTREAM_EXTRACTION
     708  m_uiLayerId             = 0;
     709#endif
    697710#if CONSTRAINED_INTRA_PRED
    698711  m_bConstrainedIntraPred = false;
  • trunk/source/Lib/TLibCommon/TComSlice.h

    r21 r42  
    7676  UInt        m_uiMaxTrDepth;
    7777
     78#if BITSTREAM_EXTRACTION
     79  UInt        m_uiLayerId;
     80#endif
    7881  UInt        m_uiViewId;
    7982  Int         m_iViewOrderIdx;
     
    133136#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    134137  Bool  m_bUseDMM;
     138#endif
     139#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     140  Bool  m_bUseDMM34;
    135141#endif
    136142
     
    230236  Void setUseDMM( Bool b ) { m_bUseDMM = b;    }
    231237#endif
    232 
     238#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     239  Bool getUseDMM34()         { return m_bUseDMM34; }
     240  Void setUseDMM34( Bool b ) { m_bUseDMM34 = b;    }
     241#endif
    233242
    234243#if DCM_COMB_LIST
     
    304313  Void                    setResidualGenerator( TComResidualGenerator* pcResidualGenerator )  { m_pcResidualGenerator = pcResidualGenerator; }
    305314  TComResidualGenerator*  getResidualGenerator()                                              { return m_pcResidualGenerator; }
     315#endif
     316
     317#if BITSTREAM_EXTRACTION
     318  Void      setLayerId              ( UInt u ) { m_uiLayerId = u; }
     319  UInt      getLayerId              ()         { return m_uiLayerId; }
    306320#endif
    307321};
     
    320334  UInt        m_uiPPSId;
    321335  UInt        m_uiSPSId;
     336#if BITSTREAM_EXTRACTION
     337  UInt        m_uiLayerId;
     338#endif
    322339
    323340public:
     
    340357  Void setUseWP                     ( Bool b )  { m_bUseWeightPred = b;       }
    341358  Void setWPBiPredIdc               ( UInt u )  { m_uiBiPredIdc = u;          }
     359#endif
     360
     361#if BITSTREAM_EXTRACTION
     362  Void      setLayerId              ( UInt u ) { m_uiLayerId = u; }
     363  UInt      getLayerId              ()         { return m_uiLayerId; }
    342364#endif
    343365};
     
    370392  UInt        m_uiPPSId;
    371393  Int         m_iPOC;
     394#if BITSTREAM_EXTRACTION
     395  UInt        m_uiLayerId;
     396#endif
    372397#if SONY_COLPIC_AVAILABILITY
    373398  Int         m_iViewOrderIdx;
     
    534559  Void      setLambda( Double d ) { m_dLambda = d; }
    535560  Double    getLambda() { return m_dLambda;        }
     561
     562#if BITSTREAM_EXTRACTION
     563  Void      setLayerId( UInt u )                        { m_uiLayerId = u; }
     564  UInt      getLayerId()                                { return m_uiLayerId; }
     565#endif
    536566
    537567  Void      setViewIdx(Int i)                           { m_iViewIdx = i; }
  • trunk/source/Lib/TLibCommon/TypeDef.h

    r21 r42  
    4040
    4141
    42 
    43 #define SONY_COLPIC_AVAILABILITY                  1
     42#define BITSTREAM_EXTRACTION            1
     43#define FLEX_CODING_ORDER               1
     44#define DISABLE_FCO_FOR_VSO             0
     45
     46#define SONY_COLPIC_AVAILABILITY        1
    4447
    4548//>>>>> HHI 3DV tools >>>>>
     
    5457#define HHI_VSO_DIST_INT                1   // view synthesis optimization integer distorition in rdo process
    5558#define HHI_VSO_LS_TABLE                1   // table based lambda scaling
     59#define HHI_VSO_PRINT_DIST              0   // print VSO distortion instead of depth distrotion
    5660
    5761#if HHI_INTERVIEW_SKIP_LAMBDA_SCALE && !HHI_INTERVIEW_SKIP
     
    328332#endif
    329333#endif
     334
     335
    330336
    331337// ====================================================================================================================
  • trunk/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r5 r42  
    8282// ====================================================================================================================
    8383
     84#if BITSTREAM_EXTRACTION
     85Void  TDecCavlc::parseNalUnitHeader ( NalUnitType& eNalUnitType, UInt& TemporalId, UInt& uiLayerId )
     86{
     87  UInt  uiCode;
     88
     89  xReadCode ( 1, uiCode ); assert( 0 == uiCode); // forbidden_zero_bit
     90  xReadCode ( 1, uiCode );                       // nal_ref_flag
     91  xReadCode ( 6, uiCode );                       // nal_unit_type
     92  eNalUnitType = (NalUnitType) uiCode;
     93
     94  xReadCode(3, uiCode); // temporal_id
     95  TemporalId = uiCode;
     96  xReadCode(5, uiCode); // layer_id_plus1
     97  assert( 1 <= uiCode );
     98  uiLayerId = uiCode - 1;
     99}
     100#else
    84101Void  TDecCavlc::parseNalUnitHeader ( NalUnitType& eNalUnitType, UInt& TemporalId, Bool& bOutputFlag )
    85102{
     
    105122  }
    106123}
     124#endif
    107125
    108126/**
  • trunk/source/Lib/TLibDecoder/TDecCAVLC.h

    r5 r42  
    182182#endif
    183183 
     184#if BITSTREAM_EXTRACTION
     185  Void  parseNalUnitHeader  ( NalUnitType& eNalUnitType, UInt& TemporalId, UInt& uiLayerId );
     186#else
    184187  Void  parseNalUnitHeader  ( NalUnitType& eNalUnitType, UInt& TemporalId, Bool& bOutputFlag );
     188#endif
     189
    185190 
    186191  Void  parseSPS            ( TComSPS* pcSPS );
  • trunk/source/Lib/TLibDecoder/TDecEntropy.h

    r5 r42  
    6767  virtual Void  setBitstream          ( TComBitstream* p )  = 0;
    6868
     69#if BITSTREAM_EXTRACTION
     70  virtual Void  parseNalUnitHeader    ( NalUnitType& eNalUnitType, UInt& TemporalId, UInt& uiLayerId )  = 0;
     71#else
    6972  virtual Void  parseNalUnitHeader    ( NalUnitType& eNalUnitType, UInt& TemporalId, Bool& bOutputFlag )  = 0;
     73#endif
    7074
    7175  virtual Void  parseSPS                  ( TComSPS* pcSPS )                                      = 0;
     
    147151  Void    resetEntropy                ( TComSlice* p)           { m_pcEntropyDecoderIf->resetEntropy(p);                    }
    148152
     153#if BITSTREAM_EXTRACTION
     154  Void    decodeNalUnitHeader         ( NalUnitType& eNalUnitType, UInt& TemporalId, UInt& uiLayerId )
     155                                                                { m_pcEntropyDecoderIf->parseNalUnitHeader( eNalUnitType, TemporalId, uiLayerId ); }
     156#else
    149157  Void    decodeNalUnitHeader         ( NalUnitType& eNalUnitType, UInt& TemporalId, Bool& bOutputFlag )
    150158                                                                { m_pcEntropyDecoderIf->parseNalUnitHeader(eNalUnitType, TemporalId, bOutputFlag ); }
    151 
     159#endif
    152160
    153161  Void    decodeSPS                   ( TComSPS* pcSPS     )    { m_pcEntropyDecoderIf->parseSPS(pcSPS);                    }
  • trunk/source/Lib/TLibDecoder/TDecSbac.h

    r5 r42  
    7575  Void  setMaxAlfCtrlDepth        ( UInt uiMaxAlfCtrlDepth ) { m_uiMaxAlfCtrlDepth = uiMaxAlfCtrlDepth; }
    7676 
     77#if BITSTREAM_EXTRACTION
     78  Void  parseNalUnitHeader    ( NalUnitType& eNalUnitType, UInt& TemporalId, UInt& uiLayerId ) {}
     79#else
    7780  Void  parseNalUnitHeader    ( NalUnitType& eNalUnitType, UInt& TemporalId, Bool& bOutputFlag ) {}
     81#endif
    7882 
    7983  Void  parseSPS                  ( TComSPS* pcSPS         ) {}
  • trunk/source/Lib/TLibDecoder/TDecTop.cpp

    r21 r42  
    513513
    514514#if DCM_SKIP_DECODING_FRAMES
     515#if FLEX_CODING_ORDER
     516Bool TDecTop::decode (Bool bEos, TComBitstream* pcBitstream, UInt& ruiPOC, TComList<TComPic*>*& rpcListPic, NalUnitType& reNalUnitType, TComSPS& cComSPS, Int& iSkipFrame,  Int& iPOCLastDisplay, Bool& bNewPictureType)
     517#else
    515518Bool TDecTop::decode (Bool bEos, TComBitstream* pcBitstream, UInt& ruiPOC, TComList<TComPic*>*& rpcListPic, NalUnitType& reNalUnitType, TComSPS& cComSPS, Int& iSkipFrame,  Int& iPOCLastDisplay)
     519
     520#endif
    516521#else
    517522Void TDecTop::decode (Bool bEos, TComBitstream* pcBitstream, UInt& ruiPOC, TComList<TComPic*>*& rpcListPic, NalUnitType& reNalUnitType, TComSPS& cComSPS )
     
    530535  NalUnitType eNalUnitType;
    531536  UInt        TemporalId;
     537
     538#if BITSTREAM_EXTRACTION
     539  UInt        uiLayerId;
     540
     541  m_cEntropyDecoder.decodeNalUnitHeader(eNalUnitType, TemporalId, uiLayerId);
     542#else
    532543  Bool        OutputFlag;
    533544
    534545  m_cEntropyDecoder.decodeNalUnitHeader(eNalUnitType, TemporalId, OutputFlag);
     546#endif
     547
    535548  reNalUnitType = eNalUnitType;
    536549
     
    541554      TComSPS cTempSPS;
    542555      m_cEntropyDecoder.decodeSPS( &cTempSPS );
     556#if FLEX_CODING_ORDER
     557      m_cNewSPS = cTempSPS;
     558#endif
    543559
    544560      if( (m_iViewIdx == cTempSPS.getViewId()) && ( m_bIsDepth == cTempSPS.isDepth() ) )
     
    615631      {
    616632        m_uiPrevPOC = m_apcSlicePilot->getPOC();
     633#if FLEX_CODING_ORDER
     634        bNewPictureType = m_cNewSPS.isDepth();
     635#endif
    617636        return true;
    618637      }
     
    697716        std::vector<TComPic*> apcSpatRefPics = getDecTop()->getSpatialRefPics( pcPic->getViewIdx(), pcSlice->getPOC(), m_cSPS.isDepth() );
    698717        TComPic * const pcTexturePic = m_cSPS.isDepth() ? getDecTop()->getPicFromView( pcPic->getViewIdx(), pcSlice->getPOC(), false ) : NULL;
     718
     719#if FLEX_CODING_ORDER
     720        if (pcTexturePic != NULL)
     721        {
     722          assert( ! m_cSPS.isDepth() || pcTexturePic != NULL );
     723          pcSlice->setTexturePic( pcTexturePic );
     724        }
     725#else
    699726        assert( ! m_cSPS.isDepth() || pcTexturePic != NULL );
    700727        pcSlice->setTexturePic( pcTexturePic );
    701728        pcSlice->setViewIdx( pcPic->getViewIdx() );
     729#endif
    702730#if SONY_COLPIC_AVAILABILITY
    703731        pcSlice->setViewOrderIdx( pcPic->getViewOrderIdx() );
  • trunk/source/Lib/TLibDecoder/TDecTop.h

    r21 r42  
    111111  TComList<TComPic*>      m_cListPic;         //  Dynamic buffer
    112112  TComSPS                 m_cSPS;
     113#if FLEX_CODING_ORDER
     114  TComSPS                 m_cNewSPS;
     115#endif
    113116  TComPPS                 m_cPPS;
    114117  TComSlice*              m_apcSlicePilot;
     
    167170  Void  init( TAppDecTop* pcTAppDecTop, Bool bFirstInstance = true );
    168171#if DCM_SKIP_DECODING_FRAMES
     172#if FLEX_CODING_ORDER
     173  Bool  decode (Bool bEos, TComBitstream* pcBitstream, UInt& ruiPOC, TComList<TComPic*>*& rpcListPic, NalUnitType& reNalUnitType, TComSPS& cComSPS, Int& iSkipFrame, Int& iPOCLastDisplay, Bool& bNewPictureType);
     174#else
    169175  Bool  decode (Bool bEos, TComBitstream* pcBitstream, UInt& ruiPOC, TComList<TComPic*>*& rpcListPic, NalUnitType& reNalUnitType, TComSPS& cComSPS, Int& iSkipFrame, Int& iPOCLastDisplay);
     176
     177#endif
    170178#else
    171179  Void  decode ( Bool bEos, TComBitstream* pcBitstream, UInt& ruiPOC, TComList<TComPic*>*& rpcListPic, NalUnitType& reNalUnitType, TComSPS& cComSPS );
  • trunk/source/Lib/TLibEncoder/TEncCavlc.cpp

    r5 r42  
    3939
    4040#include "TEncCavlc.h"
     41#include "../TLibCommon/SEI.h"
    4142#include "SEIwrite.h"
    4243
     
    228229void TEncCavlc::codeSEI(const SEI& sei)
    229230{
     231#if BITSTREAM_EXTRACTION
     232  codeNALUnitHeader( NAL_UNIT_SEI, NAL_REF_IDC_PRIORITY_LOWEST, 0, sei.getLayerId() );
     233#else
    230234  codeNALUnitHeader(NAL_UNIT_SEI, NAL_REF_IDC_PRIORITY_LOWEST);
     235#endif
    231236  writeSEImessage(*m_pcBitIf, sei);
    232237}
     
    235240{
    236241  // uiFirstByte
     242#if BITSTREAM_EXTRACTION
     243  codeNALUnitHeader( NAL_UNIT_PPS, NAL_REF_IDC_PRIORITY_HIGHEST, 0, pcPPS->getLayerId() );
     244#else
    237245  codeNALUnitHeader( NAL_UNIT_PPS, NAL_REF_IDC_PRIORITY_HIGHEST );
     246#endif
    238247
    239248  xWriteUvlc( pcPPS->getPPSId() );
     
    249258}
    250259
     260#if BITSTREAM_EXTRACTION
     261Void TEncCavlc::codeNALUnitHeader( NalUnitType eNalUnitType, NalRefIdc eNalRefIdc, UInt TemporalId, UInt uiLayerId )
     262{
     263  // uiFirstByte
     264  xWriteCode( 0, 1);                    // forbidden_zero_flag
     265  xWriteCode( eNalRefIdc==0 ? 0:1, 1);  // nal_ref_flag
     266  xWriteCode( eNalUnitType, 6);         // nal_unit_type
     267
     268  xWriteCode( TemporalId, 3);           // temporal_id
     269  xWriteCode( uiLayerId+1, 5);          // layer_id_plus1
     270}
     271#else
    251272Void TEncCavlc::codeNALUnitHeader( NalUnitType eNalUnitType, NalRefIdc eNalRefIdc, UInt TemporalId, Bool bOutputFlag )
    252273{
     
    263284  }
    264285}
     286#endif
    265287
    266288Void TEncCavlc::codeSPS( TComSPS* pcSPS )
    267289{
    268290  // uiFirstByte
     291#if BITSTREAM_EXTRACTION
     292  codeNALUnitHeader( NAL_UNIT_SPS, NAL_REF_IDC_PRIORITY_HIGHEST, 0, pcSPS->getLayerId() );
     293#else
    269294  codeNALUnitHeader( NAL_UNIT_SPS, NAL_REF_IDC_PRIORITY_HIGHEST );
     295#endif
    270296
    271297  // Structure
     
    385411  // here someone can add an appropriated NalRefIdc type
    386412#if DCM_DECODING_REFRESH
     413#if BITSTREAM_EXTRACTION
     414  codeNALUnitHeader (pcSlice->getNalUnitType(), NAL_REF_IDC_PRIORITY_HIGHEST, 1, pcSlice->getLayerId());
     415#else
    387416  codeNALUnitHeader (pcSlice->getNalUnitType(), NAL_REF_IDC_PRIORITY_HIGHEST, 1, true);
     417#endif
     418#else
     419#if BITSTREAM_EXTRACTION
     420  codeNALUnitHeader (NAL_UNIT_CODED_SLICE, NAL_REF_IDC_PRIORITY_HIGHEST, 0, pcSlice->getLayerId());
    388421#else
    389422  codeNALUnitHeader (NAL_UNIT_CODED_SLICE, NAL_REF_IDC_PRIORITY_HIGHEST);
     423#endif
    390424#endif
    391425
  • trunk/source/Lib/TLibEncoder/TEncCavlc.h

    r5 r42  
    206206  UInt  getCoeffCost          ()                { return  m_uiCoeffCost;  }
    207207 
     208#if BITSTREAM_EXTRACTION
     209  Void  codeNALUnitHeader       ( NalUnitType eNalUnitType, NalRefIdc eNalRefIdc, UInt TemporalId = 0, UInt uiLayerId = 0 );
     210#else
    208211  Void  codeNALUnitHeader       ( NalUnitType eNalUnitType, NalRefIdc eNalRefIdc, UInt TemporalId = 0, Bool bOutputFlag = true );
     212#endif
    209213 
    210214  Void  codeSPS                 ( TComSPS* pcSPS );
  • trunk/source/Lib/TLibEncoder/TEncCfg.h

    r21 r42  
    159159  Bool m_bUseDMM;
    160160#endif
     161#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     162  Bool m_bUseDMM34;
     163#endif
    161164#if HHI_MPI
    162165  Bool m_bUseMVI;
     
    184187  //std::vector<int>  m_aiLayerQPOffset;
    185188
     189#if BITSTREAM_EXTRACTION
     190  UInt        m_uiLayerId;
     191#endif
    186192  UInt        m_uiViewId;
    187193  Int         m_iViewOrderIdx;
     
    235241  Void      setRateGOPSize                  ( Int   i )      { m_iRateGOPSize = i; }
    236242
     243#if BITSTREAM_EXTRACTION
     244  Void      setLayerId                      ( UInt  u )      { m_uiLayerId              = u; }
     245  UInt      getLayerId                      ( )              { return m_uiLayerId; }
     246#endif
    237247  Void      setViewId                       ( UInt  u )      { m_uiViewId               = u; }
    238248  Void      setViewOrderIdx                 ( Int   i )      { m_iViewOrderIdx          = i; }
     
    424434  Bool getUseDMM()        { return m_bUseDMM; }
    425435#endif
    426 
     436#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     437  Void setUseDMM34( Bool b) { m_bUseDMM34 = b;    }
     438  Bool getUseDMM34()        { return m_bUseDMM34; }
     439#endif
    427440#if LM_CHROMA
    428441  Bool getUseLMChroma                       ()      { return m_bUseLMChroma;        }
  • trunk/source/Lib/TLibEncoder/TEncEntropy.h

    r5 r42  
    7272  virtual UInt  getCoeffCost          ()                = 0;
    7373 
     74#if BITSTREAM_EXTRACTION
     75  virtual Void  codeNALUnitHeader       ( NalUnitType eNalUnitType, NalRefIdc eNalRefIdc, UInt TemporalId = 0, UInt uiLayerId = 0 ) = 0;
     76#else
    7477  virtual Void  codeNALUnitHeader       ( NalUnitType eNalUnitType, NalRefIdc eNalRefIdc, UInt TemporalId = 0, Bool bOutputFlag = true ) = 0;
     78#endif
    7579
    7680  virtual Void  codeSPS                 ( TComSPS* pcSPS )                                      = 0;
  • trunk/source/Lib/TLibEncoder/TEncGOP.cpp

    r5 r42  
    639639        seiBs.create(1024);
    640640        /* write the SEI messages */
     641#if BITSTREAM_EXTRACTION
     642        sei_recon_picture_digest.setLayerId( pcSlice->getLayerId() );
     643#endif
    641644        m_pcEntropyCoder->setEntropyCoder(m_pcCavlcCoder, pcSlice);
    642645        m_pcEntropyCoder->setBitstream(&seiBs);
     
    824827  }
    825828
    826 #if HHI_VSO
     829#if HHI_VSO_PRINT_DIST
    827830  if ( m_pcRdCost->getUseRenModel() )
    828831  {
  • trunk/source/Lib/TLibEncoder/TEncSbac.cpp

    r5 r42  
    177177}
    178178
     179#if BITSTREAM_EXTRACTION
     180Void TEncSbac::codeNALUnitHeader( NalUnitType eNalUnitType, NalRefIdc eNalRefIdc, UInt TemporalId, UInt uiLayerId )
     181#else
    179182Void TEncSbac::codeNALUnitHeader( NalUnitType eNalUnitType, NalRefIdc eNalRefIdc, UInt TemporalId, Bool bOutputFlag )
     183#endif
    180184{
    181185  assert (0);
     
    11261130#endif
    11271131#if HHI_DMM_PRED_TEX
     1132#if FLEX_CODING_ORDER
     1133    if ( !pcCU->getSlice()->getSPS()->getUseDMM34() )
     1134    {
     1135      assert( uiDir != DMM_WEDGE_PREDTEX_D_IDX );
     1136      assert( uiDir != DMM_CONTOUR_PREDTEX_D_IDX );
     1137    }
     1138#endif
    11281139    if( uiDir == DMM_WEDGE_PREDTEX_D_IDX )     { xCodeWedgePredTexDeltaInfo  ( pcCU, uiAbsPartIdx ); }
    11291140    if( uiDir == DMM_CONTOUR_PREDTEX_D_IDX )   { xCodeContourPredTexDeltaInfo( pcCU, uiAbsPartIdx ); }
  • trunk/source/Lib/TLibEncoder/TEncSbac.h

    r5 r42  
    8989  //--SBAC RD
    9090 
     91#if BITSTREAM_EXTRACTION
     92  Void  codeNALUnitHeader       ( NalUnitType eNalUnitType, NalRefIdc eNalRefIdc, UInt TemporalId = 0, UInt uiLayerId = 0 );
     93#else
    9194  Void  codeNALUnitHeader       ( NalUnitType eNalUnitType, NalRefIdc eNalRefIdc, UInt TemporalId = 0, Bool bOutputFlag = true );
     95#endif
    9296
    9397  Void  codeSPS                 ( TComSPS* pcSPS     );
  • trunk/source/Lib/TLibEncoder/TEncSearch.cpp

    r5 r42  
    19261926#endif
    19271927#if HHI_DMM_PRED_TEX
     1928#if FLEX_CODING_ORDER
     1929      if ( pcCU->getSlice()->getSPS()->getUseDMM34() )
     1930      {
     1931#endif
    19281932      TComYuv cTempYuv; cTempYuv.create( uiWidth, uiHeight ); cTempYuv.clear();
    19291933      Pel* piTempY      = cTempYuv.getLumaAddr();
     
    19581962        uiRdModeList[ uiNewMaxMode++ ] = DMM_CONTOUR_PREDTEX_D_IDX;
    19591963      }
    1960 
    19611964      cTempYuv.destroy();
     1965#if FLEX_CODING_ORDER
     1966      }
     1967#endif
    19621968#endif
    19631969    }
     
    19881994#else
    19891995#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
     1996#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     1997      if( m_pcEncCfg->isDepthCoder() && !predIntraLumaDMMAvailable( uiOrgMode, uiWidth, uiHeight, pcCU->getSlice()->getSPS()->getUseDMM34() ) )
     1998#else
    19901999      if( m_pcEncCfg->isDepthCoder() && !predIntraLumaDMMAvailable( uiOrgMode, uiWidth, uiHeight ) )
     2000#endif
    19912001        continue;
    19922002#endif
     
    20762086#else
    20772087#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
     2088#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     2089      if( m_pcEncCfg->isDepthCoder() && !predIntraLumaDMMAvailable( uiOrgMode, uiWidth, uiHeight, pcCU->getSlice()->getSPS()->getUseDMM34() ) )
     2090#else
    20782091      if( m_pcEncCfg->isDepthCoder() && !predIntraLumaDMMAvailable( uiOrgMode, uiWidth, uiHeight ) )
     2092#endif
    20792093        continue;
    20802094#endif
     
    27192733}
    27202734
     2735#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     2736Bool TEncSearch::predIntraLumaDMMAvailable( UInt uiMode, UInt uiWidth, UInt uiHeight, Bool bDMMAvailable34 )
     2737#else
    27212738Bool TEncSearch::predIntraLumaDMMAvailable( UInt uiMode, UInt uiWidth, UInt uiHeight )
     2739#endif
    27222740{
    27232741  if( uiMode <= MAX_MODE_ID_INTRA_DIR ) return true;
     
    27472765      bDMMAvailable = false;
    27482766    }
     2767#if FLEX_CODING_ORDER
     2768    if ( !bDMMAvailable34 )
     2769    {
     2770      bDMMAvailable = false;
     2771    }
     2772#endif
    27492773  }
    27502774
  • trunk/source/Lib/TLibEncoder/TEncSearch.h

    r5 r42  
    207207  Bool predIntraLumaDMMAvailable( UInt         uiMode,
    208208                                  UInt         uiWidth,
     209#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     210                                  UInt         uiHeight,
     211                                  Bool         bDMMAvailable34 );
     212#else
    209213                                  UInt         uiHeight );
     214#endif
    210215#endif
    211216#if HHI_DMM_WEDGE_INTRA
  • trunk/source/Lib/TLibEncoder/TEncSlice.cpp

    r21 r42  
    149149  rpcSlice->initSlice();
    150150  rpcSlice->setPOC( pcPic->getPOC() );
     151#if BITSTREAM_EXTRACTION
     152  rpcSlice->setLayerId( m_pcCfg->getLayerId() );
     153#endif
    151154#if SONY_COLPIC_AVAILABILITY
    152155  rpcSlice->setViewOrderIdx(m_pcCfg->getViewOrderIdx());
  • trunk/source/Lib/TLibEncoder/TEncTop.cpp

    r21 r42  
    287287
    288288  bool bSomethingCoded = false ;
    289 
     289#if FLEX_CODING_ORDER 
     290  if (TEncTop::m_bPicWaitingForCoding )
     291#else
    290292  if (m_bPicWaitingForCoding )
     293#endif
    291294  {
    292295    std::map<Int, TComPic*>::iterator cIter = m_acInputPicMap.find( (Int)m_cSeqIter.getPoc() );
     
    543546  m_cSPS.setMaxTrSize   ( 1 << m_uiQuadtreeTULog2MaxSize );
    544547
     548#if BITSTREAM_EXTRACTION
     549  m_cSPS.setLayerId( m_uiLayerId );
     550#endif
     551
    545552  if( m_bIsDepth )
    546553  {
     
    616623  m_cSPS.setUseDMM( m_bUseDMM );
    617624#endif
     625#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     626  m_cSPS.setUseDMM34( m_bUseDMM34 );
     627#endif
    618628#if HHI_MPI
    619629  m_cSPS.setUseMVI( m_bUseMVI );
     
    626636Void TEncTop::xInitPPS()
    627637{
     638#if BITSTREAM_EXTRACTION
     639  m_cPPS.setLayerId( m_uiLayerId );
     640#endif
     641
    628642  m_cPPS.setConstrainedIntraPred( m_bUseConstrainedIntraPred );
    629643  m_cPPS.setPPSId( ( m_uiViewId << 1 ) + ( m_bIsDepth ? 1 : 0 ) );
Note: See TracChangeset for help on using the changeset viewer.