Changeset 468 in SHVCSoftware for branches/SHM-4.0-dev/source/Lib/TLibDecoder


Ignore:
Timestamp:
14 Nov 2013, 09:02:43 (11 years ago)
Author:
nokia
Message:

Integration of O0194: Support different bit-depth values for different layers, enable weighted prediction for ILR for color gamut scalability.

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

Legend:

Unmodified
Added
Removed

  • branches/SHM-4.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r467 r468  
    20072007
    20082008#if REPN_FORMAT_IN_VPS
    2009 #if O0194_REPN_FORMAT_IN_VPS_BUGFIX
     2009#if O0194_DIFFERENT_BITDEPTH_EL_BL
    20102010    g_bitDepthYLayer[rpcSlice->getLayerId()]     = rpcSlice->getBitDepthY();
    20112011    g_bitDepthCLayer[rpcSlice->getLayerId()]     = rpcSlice->getBitDepthC();

  • branches/SHM-4.0-dev/source/Lib/TLibDecoder/TDecCu.cpp

    r466 r468  
    616616    curChromaQpOffset = pcCU->getSlice()->getPPS()->getChromaCrQpOffset() + pcCU->getSlice()->getSliceQpDeltaCr();
    617617  }
    618 #if O0194_REPN_FORMAT_IN_VPS_BUGFIX
     618#if O0194_DIFFERENT_BITDEPTH_EL_BL
     619  // Bug-fix
    619620#if REPN_FORMAT_IN_VPS
    620621  m_pcTrQuant->setQPforQuant  ( pcCU->getQP(0), eText, pcCU->getSlice()->getQpBDOffsetC(), curChromaQpOffset );
    … …  
    776777  // Cb and Cr
    777778  Int curChromaQpOffset = pcCU->getSlice()->getPPS()->getChromaCbQpOffset() + pcCU->getSlice()->getSliceQpDeltaCb();
    778 #if O0194_REPN_FORMAT_IN_VPS_BUGFIX
     779#if O0194_DIFFERENT_BITDEPTH_EL_BL
     780  // Bug-fix
    779781#if REPN_FORMAT_IN_VPS
    780782  m_pcTrQuant->setQPforQuant( pcCU->getQP( uiAbsPartIdx ), TEXT_CHROMA, pcCU->getSlice()->getQpBDOffsetC(), curChromaQpOffset );
    … …  
    792794
    793795  curChromaQpOffset = pcCU->getSlice()->getPPS()->getChromaCrQpOffset() + pcCU->getSlice()->getSliceQpDeltaCr();
    794 #if O0194_REPN_FORMAT_IN_VPS_BUGFIX
     796#if O0194_DIFFERENT_BITDEPTH_EL_BL
     797  // Bug-fix
    795798#if REPN_FORMAT_IN_VPS
    796799  m_pcTrQuant->setQPforQuant( pcCU->getQP( uiAbsPartIdx ), TEXT_CHROMA, pcCU->getSlice()->getQpBDOffsetC(), curChromaQpOffset );
Note: See TracChangeset for help on using the changeset viewer.