Changeset 418 in SHVCSoftware


Ignore:
Timestamp:
8 Oct 2013, 19:10:25 (11 years ago)
Author:
seregin
Message:

formatting the code

Location:
branches/SHM-3.1-dev/source/Lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/SHM-3.1-dev/source/Lib/TLibCommon/TypeDef.h

    r416 r418  
    4141#define SVC_EXTENSION                    1
    4242
    43 #define SCALABILITY_MASK_E0104           1
    44 
    4543#define SYNTAX_BYTES                     10      ///< number of bytes taken by syntaxes per 4x4 block [RefIdxL0(1byte), RefIdxL1(1byte), MVxL0(2bytes), MVyL0(2bytes), MVxL1(2bytes), MVyL1(2bytes)]
    4644
     
    6664#define SCALED_REF_LAYER_OFFSETS         1      ///< M0309: Signal scaled reference layer offsets in SPS
    6765#define VERT_MV_CONSTRAINT               1      ///< Vertical MV component constraint flag
     66#define SCALABILITY_MASK_E0104           1      ///< scalability mask for depth
    6867
    6968#define ILP_SSH_SIG                      1      ///< JCTVC-N0195 proposal 2, JCTVC-N0118: add presence flag in VPS ext to condition inter-layer prediction signaling in slice segment header
  • branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r416 r418  
    773773      {
    774774#if N0147_IRAP_ALIGN_FLAG
    775        if( m_layerId > 0 && pcSlice->getVPS()->getCrossLayerIrapAlignFlag())
    776        {
    777          TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic();
    778          TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() );
    779          if( picLayer0->getSlice(0)->isIRAP())
    780          {
    781            pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType());
    782          }
    783          else
    784          {
    785            pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
    786          }
    787        }
    788 #else
     775        if( m_layerId > 0 && pcSlice->getVPS()->getCrossLayerIrapAlignFlag())
     776        {
     777          TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic();
     778          TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() );
     779          if( picLayer0->getSlice(0)->isIRAP())
     780          {
     781            pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType());
     782          }
     783          else
     784          {
     785            pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
     786          }
     787        }
     788#else
     789        pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
     790#endif
     791
     792#if IDR_ALIGNMENT
     793        TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic();
     794        TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() );
     795        if( picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP )
     796        {
     797          pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType());
     798        }
     799        else
     800        {
    789801          pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
    790 #endif
    791 
    792 #if IDR_ALIGNMENT
    793          TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic();
    794          TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() );
    795         if( picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP )
    796          {
    797            pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType());
    798          }
    799          else
    800          {
    801           pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
    802          }
     802        }
    803803#endif
    804804      }
Note: See TracChangeset for help on using the changeset viewer.