Changeset 1502 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp

Timestamp:

11 Dec 2015, 00:05:48 (8 years ago)

Author:

seregin

Message:

infer parameters in SPS after activation, fixing chroma scaling for non 4:2:0

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp (modified) (12 diffs)

branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -173 +173 @@
 
   // store lambda
-#if SVC_EXTENSION
-  m_pcRdCost ->setLambda( dLambda, slice->getBitDepths() );
-#else
   m_pcRdCost ->setLambda( dLambda, slice->getSPS()->getBitDepths() );
-#endif
 
   // for RDO
@@ -193 +189 @@
     {
       dLambdas[0] = dLambda * 1.1;
-      m_pcRdCost->setLambda( dLambdas[0], slice->getBitDepths() );
+      m_pcRdCost->setLambda( dLambdas[0], slice->getSPS()->getBitDepths() );
 
       m_pcRdCost->setDistortionWeight(compID, tmpWeight * 1.15);
@@ -337 +333 @@
   if(eSliceType!=I_SLICE)
   {
-#if SVC_EXTENSION
-    if (!(( m_pcCfg->getMaxDeltaQP() == 0 ) && (dQP == -rpcSlice->getQpBDOffset(CHANNEL_TYPE_LUMA) ) && (rpcSlice->getPPS()->getTransquantBypassEnableFlag())))
-#else
     if (!(( m_pcCfg->getMaxDeltaQP() == 0 ) && (dQP == -rpcSlice->getSPS()->getQpBDOffset(CHANNEL_TYPE_LUMA) ) && (rpcSlice->getPPS()->getTransquantBypassEnableFlag())))
-#endif
     {
       dQP += m_pcCfg->getGOPEntry(iGOPid).m_QPOffset;
@@ -378 +370 @@
 
 #if FULL_NBIT
-#if SVC_EXTENSION
-    Int    bitdepth_luma_qp_scale = 6 * (rpcSlice->getBitDepth(CHANNEL_TYPE_LUMA) - 8);
-#else
     Int    bitdepth_luma_qp_scale = 6 * (rpcSlice->getSPS()->getBitDepth(CHANNEL_TYPE_LUMA) - 8);
-#endif
 #else
     Int    bitdepth_luma_qp_scale = 0;
@@ -423 +411 @@
     }
 
-#if SVC_EXTENSION
-    iQP = max( -rpcSlice->getQpBDOffset(CHANNEL_TYPE_LUMA), min( MAX_QP, (Int) floor( dQP + 0.5 ) ) );
-#else
     iQP = max( -rpcSlice->getSPS()->getQpBDOffset(CHANNEL_TYPE_LUMA), min( MAX_QP, (Int) floor( dQP + 0.5 ) ) );
-#endif
 
     m_pdRdPicLambda[iDQpIdx] = dLambda;
@@ -489 +473 @@
   {
     dQP = xGetQPValueAccordingToLambda( dLambda );
-#if SVC_EXTENSION
-    iQP = max( -rpcSlice->getQpBDOffset(CHANNEL_TYPE_LUMA), min( MAX_QP, (Int) floor( dQP + 0.5 ) ) );
-#else
     iQP = max( -rpcSlice->getSPS()->getQpBDOffset(CHANNEL_TYPE_LUMA), min( MAX_QP, (Int) floor( dQP + 0.5 ) ) );
-#endif
   }
 
@@ -669 +649 @@
   Double dFrameLambda;
 #if FULL_NBIT
-#if SVC_EXTENSION
-  Int    SHIFT_QP = 12 + 6 * (pcSlice->getBitDepth(CHANNEL_TYPE_LUMA) - 8);
-#else
   Int    SHIFT_QP = 12 + 6 * (pcSlice->getSPS()->getBitDepth(CHANNEL_TYPE_LUMA) - 8);
-#endif
 #else
   Int    SHIFT_QP = 12;
@@ -732 +708 @@
   TComSlice * const pcSlice           = pcPic->getSlice(getSliceIdx());
   const TComSPS    &sps               = *(pcSlice->getSPS());
-#if SVC_EXTENSION
-  const Int         shift             = pcSlice->getBitDepth(CHANNEL_TYPE_LUMA)-8;
-#else
   const Int         shift             = sps.getBitDepth(CHANNEL_TYPE_LUMA)-8;
-#endif
   const Int         offset            = (shift>0)?(1<<(shift-1)):0;
 
@@ -752 +724 @@
     pCtu->initCtu( pcPic, ctuRsAddr );
 
-#if SVC_EXTENSION
-    Int height  = min( sps.getMaxCUHeight(),pcSlice->getPicHeightInLumaSamples() - ctuRsAddr / pcPic->getFrameWidthInCtus() * sps.getMaxCUHeight() );
-    Int width   = min( sps.getMaxCUWidth(),pcSlice->getPicWidthInLumaSamples() - ctuRsAddr % pcPic->getFrameWidthInCtus() * sps.getMaxCUWidth() );
-#else
     Int height  = min( sps.getMaxCUHeight(),sps.getPicHeightInLumaSamples() - ctuRsAddr / pcPic->getFrameWidthInCtus() * sps.getMaxCUHeight() );
     Int width   = min( sps.getMaxCUWidth(), sps.getPicWidthInLumaSamples()  - ctuRsAddr % pcPic->getFrameWidthInCtus() * sps.getMaxCUWidth() );
-#endif
 
     Int iSumHad = m_pcCuEncoder->updateCtuDataISlice(pCtu, width, height);
@@ -938 +905 @@
         }
 
-#if SVC_EXTENSION
-        estQP     = Clip3( -pcSlice->getQpBDOffset(CHANNEL_TYPE_LUMA), MAX_QP, estQP );
-
-        m_pcRdCost->setLambda(estLambda, pcSlice->getBitDepths());
-#else
         estQP     = Clip3( -pcSlice->getSPS()->getQpBDOffset(CHANNEL_TYPE_LUMA), MAX_QP, estQP );
 
         m_pcRdCost->setLambda(estLambda, pcSlice->getSPS()->getBitDepths());
-#endif        
 
 #if RDOQ_CHROMA_LAMBDA
@@ -1040 +1001 @@
         actualQP = pCtu->getQP( 0 );
       }
-#if SVC_EXTENSION
-      m_pcRdCost->setLambda(oldLambda, pcSlice->getBitDepths());
-#else
       m_pcRdCost->setLambda(oldLambda, pcSlice->getSPS()->getBitDepths());
-#endif
       m_pcRateCtrl->getRCPic()->updateAfterCTU( m_pcRateCtrl->getRCPic()->getLCUCoded(), actualBits, actualQP, actualLambda,
                                                 pCtu->getSlice()->getSliceType() == I_SLICE ? 0 : m_pcCfg->getLCULevelRC() );
@@ -1201 +1158 @@
         }
 
-#if SVC_EXTENSION
-        m_pcEntropyCoder->encodeSAOBlkParam(saoblkParam, pcPic->getPicSym()->getSlice(0)->getBitDepths(), sliceEnabled, leftMergeAvail, aboveMergeAvail);
-#else
         m_pcEntropyCoder->encodeSAOBlkParam(saoblkParam, pcPic->getPicSym()->getSPS().getBitDepths(), sliceEnabled, leftMergeAvail, aboveMergeAvail);
-#endif
       }
     }