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

Timestamp:

21 Jul 2015, 01:21:46 (10 years ago)

Author:

seregin

Message:

port rev 4363

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• SEIread.cpp (modified) (2 diffs)
• TDecCAVLC.cpp (modified) (1 diff)
• TDecCu.cpp (modified) (1 diff)
• TDecTop.cpp (modified) (2 diffs)

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

@@ -104 +104 @@
   {
     std::string seiMessageHdr(SEI::getSEIMessageString(sei.payloadType())); seiMessageHdr+=" SEI message";
-    (*pDecodedMessageOutputStream) << std::setfill('-') << std::setw(seiMessageHdr.size()) << "-" << std::setfill(' ') << "\n" << seiMessageHdr << "\n";
+    (*pDecodedMessageOutputStream) << std::setfill('-') << std::setw(seiMessageHdr.size()) << "-" << std::setfill(' ') << "\n" << seiMessageHdr << " (" << payloadSize << " bytes)"<< "\n";
   }
 }
@@ -647 +647 @@
   }
 #else
-  const TComVUI *vui = sps->getVuiParameters(); 
-
+  const TComVUI *vui = sps->getVuiParameters();
   if(vui->getHrdParameters()->getSubPicCpbParamsInPicTimingSEIFlag())
   {

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

@@ -2656 +2656 @@
 }
 
-Void TDecCavlc::parseExplicitRdpcmMode( TComTU &rTu, ComponentID compID )
+Void TDecCavlc::parseExplicitRdpcmMode( TComTU& /*rTu*/, ComponentID /*compID*/ )
 {
   assert(0);

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

@@ -442 +442 @@
   m_ppcYuvResi[uiDepth]->clear();
 
-  m_ppcCU[uiDepth]->copySubCU( pCtu, uiAbsPartIdx, uiDepth );
+  m_ppcCU[uiDepth]->copySubCU( pCtu, uiAbsPartIdx );
 
   switch( m_ppcCU[uiDepth]->getPredictionMode(0) )

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

@@ -1776 +1776 @@
       scalingList.setDefaultScalingList();
     }
-#if SVC_EXTENSION
-    m_cTrQuant.setScalingListDec(scalingList, pcSlice->getChromaFormatIdc());
-#else
-    m_cTrQuant.setScalingListDec(scalingList, pcSlice->getSPS()->getChromaFormatIdc());
-#endif
+    m_cTrQuant.setScalingListDec(scalingList);
     m_cTrQuant.setUseScalingList(true);
   }
@@ -1791 +1787 @@
     };
 #if SVC_EXTENSION
-    m_cTrQuant.setFlatScalingList(pcSlice->getChromaFormatIdc(), maxLog2TrDynamicRange, pcSlice->getBitDepths());
+    m_cTrQuant.setFlatScalingList(maxLog2TrDynamicRange, pcSlice->getBitDepths());
 #else
-    m_cTrQuant.setFlatScalingList(pcSlice->getSPS()->getChromaFormatIdc(), maxLog2TrDynamicRange, pcSlice->getSPS()->getBitDepths());
+    m_cTrQuant.setFlatScalingList(maxLog2TrDynamicRange, pcSlice->getSPS()->getBitDepths());
 #endif
     m_cTrQuant.setUseScalingList(false);