Changeset 926 in SHVCSoftware

Timestamp:

10 Dec 2014, 02:35:15 (10 years ago)

Author:

seregin

Message:

fix compiler warnings, rep format

Location:

branches/SHM-upgrade/source/Lib

Files:

• TLibCommon/TComDataCU.cpp (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibDecoder/TDecCu.cpp (modified) (1 diff)
• TLibEncoder/TEncCu.cpp (modified) (7 diffs)
• TLibEncoder/TEncGOP.cpp (modified) (1 diff)
• TLibEncoder/TEncSlice.h (modified) (1 diff)
• TLibEncoder/TEncTop.cpp (modified) (1 diff)

branches/SHM-upgrade/source/Lib/TLibCommon/TComDataCU.cpp

@@ -326 +326 @@
   TComSlice * pcSlice = pcPic->getSlice(pcPic->getCurrSliceIdx());
 
+#if REPN_FORMAT_IN_VPS
+  const UInt picWidth = pcSlice->getPicWidthInLumaSamples();
+  const UInt picHeight = pcSlice->getPicHeightInLumaSamples();
+#else
   const UInt picWidth = pcSlice->getSPS()->getPicWidthInLumaSamples();
   const UInt picHeight = pcSlice->getSPS()->getPicHeightInLumaSamples();
+#endif
   const UInt granularityWidth = g_uiMaxCUWidth;
 

branches/SHM-upgrade/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2430 +2430 @@
 #endif
 
+#if REPN_FORMAT_IN_VPS
+  Int qpBdOffsetY = pcCU->getSlice()->getQpBDOffsetY();
+#else
   Int qpBdOffsetY = pcCU->getSlice()->getSPS()->getQpBDOffset(CHANNEL_TYPE_LUMA);
+#endif
   qp = (((Int) pcCU->getRefQP( uiAbsPartIdx ) + iDQp + 52 + 2*qpBdOffsetY )%(52+ qpBdOffsetY)) -  qpBdOffsetY;
 

branches/SHM-upgrade/source/Lib/TLibDecoder/TDecCu.cpp

@@ -223 +223 @@
   TComSlice * pcSlice = pcCU->getPic()->getSlice(pcCU->getPic()->getCurrSliceIdx());
 #if REPN_FORMAT_IN_VPS
-  if( ( uiRPelX < pcSlice->getSPS()->getPicWidthInLumaSamples() ) && ( uiBPelY < pcSlice->getPicHeightInLumaSamples() ) )
+  if( ( uiRPelX < pcSlice->getPicWidthInLumaSamples() ) && ( uiBPelY < pcSlice->getPicHeightInLumaSamples() ) )
 #else
   if( ( uiRPelX < pcSlice->getSPS()->getPicWidthInLumaSamples() ) && ( uiBPelY < pcSlice->getSPS()->getPicHeightInLumaSamples() ) )

branches/SHM-upgrade/source/Lib/TLibEncoder/TEncCu.cpp

@@ -410 +410 @@
   {
     Int idQP = m_pcEncCfg->getMaxDeltaQP();
+#if REPN_FORMAT_IN_VPS
+    iMinQP = Clip3( -rpcTempCU->getSlice()->getQpBDOffsetY(), MAX_QP, iBaseQP-idQP );
+    iMaxQP = Clip3( -rpcTempCU->getSlice()->getQpBDOffsetY(), MAX_QP, iBaseQP+idQP );
+#else
     iMinQP = Clip3( -rpcTempCU->getSlice()->getSPS()->getQpBDOffset(CHANNEL_TYPE_LUMA), MAX_QP, iBaseQP-idQP );
     iMaxQP = Clip3( -rpcTempCU->getSlice()->getSPS()->getQpBDOffset(CHANNEL_TYPE_LUMA), MAX_QP, iBaseQP+idQP );
+#endif
   }
   else
@@ -467 +472 @@
     {
 #endif
-#if (ENCODER_FAST_MODE)
+#if ENCODER_FAST_MODE
     Bool testInter = true;
-    if (rpcBestCU->getLayerId() > 0)
+    if( rpcBestCU->getLayerId() > 0 )
     {
       if(pcSlice->getSliceType() == P_SLICE && pcSlice->getNumRefIdx(REF_PIC_LIST_0) == pcSlice->getActiveNumILRRefIdx())
@@ -505 +510 @@
 
       // do inter modes, SKIP and 2Nx2N
-#if (ENCODER_FAST_MODE == 1)
+#if ENCODER_FAST_MODE == 1
       if( rpcBestCU->getSlice()->getSliceType() != I_SLICE && testInter )
 #else
@@ -521 +526 @@
         rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
         
-#if (ENCODER_FAST_MODE == 2)
+#if ENCODER_FAST_MODE == 2
         if (testInter)
         {
@@ -535 +540 @@
           }
         }
-#if (ENCODER_FAST_MODE == 2)
+#if ENCODER_FAST_MODE == 2
         }
 #endif
@@ -560 +565 @@
 
         // do inter modes, NxN, 2NxN, and Nx2N
-#if (ENCODER_FAST_MODE)
+#if ENCODER_FAST_MODE
         if( rpcBestCU->getSlice()->getSliceType() != I_SLICE && testInter )
 #else
@@ -714 +719 @@
         if((rpcBestCU->getSlice()->getSliceType() == I_SLICE)                                     ||
 #if ENCODER_FAST_MODE
-          ( rpcBestCU->getPredictionMode(0) != MODE_INTRA && rpcBestCU->getPredictionMode(0) != MODE_INTER )   ||  // if there is no valid inter prediction
-          !testInter                                                                                           ||
+          rpcBestCU->getPredictionMode(0) == NUMBER_OF_PREDICTION_MODES                           ||  // if there is no valid inter prediction
+          !testInter                                                                              ||
 #endif
            (rpcBestCU->getCbf( 0, COMPONENT_Y  ) != 0)                                            ||

branches/SHM-upgrade/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -2955 +2955 @@
       const Int minCuWidth  = pcPic->getMinCUWidth();
       const Int minCuHeight = pcPic->getMinCUHeight();
+#if REPN_FORMAT_IN_VPS
+      const Int paddedWidth = ((pcSlice->getPicWidthInLumaSamples()  + minCuWidth  - 1) / minCuWidth) * minCuWidth;
+      const Int paddedHeight= ((pcSlice->getPicHeightInLumaSamples() + minCuHeight - 1) / minCuHeight) * minCuHeight;
+#else
       const Int paddedWidth = ((pcSlice->getSPS()->getPicWidthInLumaSamples()  + minCuWidth  - 1) / minCuWidth) * minCuWidth;
       const Int paddedHeight= ((pcSlice->getSPS()->getPicHeightInLumaSamples() + minCuHeight - 1) / minCuHeight) * minCuHeight;
+#endif
       const Int rawBits = paddedWidth * paddedHeight *
                              (g_bitDepth[CHANNEL_TYPE_LUMA] + 2*(g_bitDepth[CHANNEL_TYPE_CHROMA]>>log2subWidthCxsubHeightC));

branches/SHM-upgrade/source/Lib/TLibEncoder/TEncSlice.h

@@ -99 +99 @@
   TEncSbac                m_entropyCodingSyncContextState;      ///< context storate for state of contexts at the wavefront/WPP/entropy-coding-sync second CTU of tile-row
 
-#if SVC_EXTENSION
+#if SVC_EXTENSION && JCTVC_M0259_LAMBDAREFINEMENT
   Void     setUpLambda(TComSlice* slice, Double dLambda, Int iQP, Int dpeth = -1);
 #else

branches/SHM-upgrade/source/Lib/TLibEncoder/TEncTop.cpp

@@ -956 +956 @@
   for ( i = 0; i < min(m_cSPS.getMaxTLayers(),(UInt) MAX_TLAYER); i++ )
   {
+#if SVC_EXTENSION
+    assert(i < MAX_TLAYER);
+#endif
     m_cSPS.setMaxDecPicBuffering(m_maxDecPicBuffering[i], i);
     m_cSPS.setNumReorderPics(m_numReorderPics[i], i);