Changeset 1288 in SHVCSoftware

Timestamp:

17 Jul 2015, 06:06:56 (9 years ago)

Author:

seregin

Message:

address compiler warnings

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TComTrQuant.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncSlice.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncTop.cpp (modified) (2 diffs)

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -4268 +4268 @@
   // Check for layerIdx equal to 0, it has to pe extended to other layers.
   UInt layerIdx = 0;
-  Bool m_useExtendedPrecision = m_acLayerCfg[layerIdx].m_useExtendedPrecision;
-  Int m_internalBitDepth[]    = {m_acLayerCfg[layerIdx].m_internalBitDepth[CHANNEL_TYPE_LUMA], m_acLayerCfg[layerIdx].m_internalBitDepth[CHANNEL_TYPE_CHROMA]};
-  Int m_MSBExtendedBitDepth[] = {m_acLayerCfg[layerIdx].m_MSBExtendedBitDepth[CHANNEL_TYPE_LUMA], m_acLayerCfg[layerIdx].m_MSBExtendedBitDepth[CHANNEL_TYPE_CHROMA]};
   ChromaFormat m_chromaFormatIDC = m_acLayerCfg[layerIdx].m_chromaFormatIDC;
 #endif

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1211 +1211 @@
       for( i = 0; i < m_numLayerInIdList[setId]; i++ )
       {
-        Int layerId = m_layerSetLayerIdList[setId][i];
-        Int layerIdx = vps->getLayerIdxInVps(m_layerSetLayerIdList[setId][i]);
         //4
-        vps->setLayerIdIncludedFlag(true, setId, layerId);
+        vps->setLayerIdIncludedFlag(true, setId, m_layerSetLayerIdList[setId][i]);
       }
     }

branches/SHM-dev/source/Lib/TLibCommon/TComTrQuant.cpp

@@ -111 +111 @@
     chromaQpOffset += cu.getSlice()->getPPS()->getChromaQpAdjTableAt(cu.getChromaQpAdj(0)).u.offset[Int(compID)-1];
   }
-
-#if SVC_EXTENSION
-  TComSlice* slice = const_cast<TComSlice*> (cu.getSlice());
-#endif
 
   *this = QpParam(cu.getQP( 0 ),

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -492 +492 @@
       {
         UInt refLayerId = 0;
-        const RepFormat* repFormat = vps->getVpsRepFormat( vps->getVpsRepFormatIdx(refLayerId) );
 
         pBLPic->create( *vps, *sps, *pps, sps->getMaxCUWidth(), sps->getMaxCUHeight(), sps->getMaxCUDepth(), true, refLayerId);

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

@@ -243 +243 @@
   rpcSlice->setPic( pcPic );
 #if SVC_EXTENSION
-  const TComPPS* pPPS = &pcPic->getPicSym()->getPPS();
-
   UInt layerId = pcPic->getLayerId();
   rpcSlice->initSlice( layerId );

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

@@ -957 +957 @@
   for (Int 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);
@@ -1500 +1503 @@
 Void TEncTop::xInitILRP()
 {
-  RepFormat *repFormat = m_cVPS.getVpsRepFormat( m_cSPS.getUpdateRepFormatFlag() ? m_cSPS.getUpdateRepFormatIndex() : m_cVPS.getVpsRepFormatIdx( m_cVPS.getLayerIdxInVps(m_layerId) ) );
-  
   if( m_layerId > 0 )
   {