Changeset 1502 in SHVCSoftware for branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.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/App/TAppDecoder/TAppDecTop.cpp (modified) (9 diffs)

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -328 +328 @@
       if ( !m_reconFileName[curLayerId].empty() && !openedReconFile[curLayerId] )
       {
-        const BitDepths& bitDepths = m_apcTDecTop[curLayerId]->getParameterSetManager()->getActiveVPS()->getBitDepths( m_apcTDecTop[curLayerId]->getParameterSetManager()->getActiveSPS(), curLayerId );
+        const BitDepths& bitDepths = m_apcTDecTop[curLayerId]->getParameterSetManager()->getActiveSPS()->getBitDepths();
 
         for( UInt channelType = 0; channelType < MAX_NUM_CHANNEL_TYPE; channelType++)
@@ -786 +786 @@
           if (display)
           {            
-            UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
+            UInt chromaFormatIdc = pcPic->getSlice(0)->getSPS()->getChromaFormatIdc();
             Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
 
@@ -881 +881 @@
           const Window  defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();          
 
-          UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
+          UInt chromaFormatIdc = pcPic->getSlice(0)->getSPS()->getChromaFormatIdc();
           Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
 
@@ -972 +972 @@
           const Bool isTff = pcPicTop->isTopField();          
 
-          UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
+          UInt chromaFormatIdc = pcPic->getSlice(0)->getSPS()->getChromaFormatIdc();
           Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
 
@@ -1050 +1050 @@
           const Window  defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();          
 
-          UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
+          UInt chromaFormatIdc = pcPic->getSlice(0)->getSPS()->getChromaFormatIdc();
           Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
 
@@ -1472 +1472 @@
     Int xScal =  1, yScal = 1;
 
-    UInt chromaFormatIdc = pic->getSlice(0)->getChromaFormatIdc();
+    UInt chromaFormatIdc = pic->getSlice(0)->getSPS()->getChromaFormatIdc();
     xScal = TComSPS::getWinUnitX( chromaFormatIdc );
     yScal = TComSPS::getWinUnitY( chromaFormatIdc );
@@ -1701 +1701 @@
 
         TComPictureHash recon_digest;
-        Int numChar = calcMD5(*pic->getPicYuvRec(), recon_digest, pic->getSlice(0)->getBitDepths());
+        Int numChar = calcMD5(*pic->getPicYuvRec(), recon_digest, pic->getSlice(0)->getSPS()->getBitDepths());
         fprintf(fptr, "%8d%9d    MD5:%s\n", pic->getLayerId(), pic->getSlice(0)->getPOC(), hashToString(recon_digest, numChar).c_str());
         fclose(fptr);
@@ -1729 +1729 @@
         strcpy(tempFileName, this->getDecodedYuvLayerFileName( layerId ).c_str());
 
-        const TComVPS *vps = m_apcTDecTop[layerId]->getParameterSetManager()->getActiveVPS();
         const TComSPS *sps = m_apcTDecTop[layerId]->getParameterSetManager()->getActiveSPS();
-        const BitDepths &bitDpeths = vps->getBitDepths(sps, layerId);
+        const BitDepths &bitDpeths = sps->getBitDepths();
         Int bitDepth[] = {bitDpeths.recon[CHANNEL_TYPE_LUMA], bitDpeths.recon[CHANNEL_TYPE_CHROMA]};
 
@@ -1746 +1745 @@
         Int xScal = 1, yScal = 1;
   
-        UInt chromaFormatIdc = checkPic.getSlice(0)->getChromaFormatIdc();
+        UInt chromaFormatIdc = checkPic.getSlice(0)->getSPS()->getChromaFormatIdc();
         xScal = TComSPS::getWinUnitX( chromaFormatIdc );
         yScal = TComSPS::getWinUnitY( chromaFormatIdc );