Changeset 1502 in SHVCSoftware for branches/SHM-dev/source/App/TAppDecoder
- Timestamp:
- 11 Dec 2015, 00:05:48 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp
r1490 r1502 328 328 if ( !m_reconFileName[curLayerId].empty() && !openedReconFile[curLayerId] ) 329 329 { 330 const BitDepths& bitDepths = m_apcTDecTop[curLayerId]->getParameterSetManager()->getActive VPS()->getBitDepths( m_apcTDecTop[curLayerId]->getParameterSetManager()->getActiveSPS(), curLayerId);330 const BitDepths& bitDepths = m_apcTDecTop[curLayerId]->getParameterSetManager()->getActiveSPS()->getBitDepths(); 331 331 332 332 for( UInt channelType = 0; channelType < MAX_NUM_CHANNEL_TYPE; channelType++) … … 786 786 if (display) 787 787 { 788 UInt chromaFormatIdc = pcPic->getSlice(0)->get ChromaFormatIdc();788 UInt chromaFormatIdc = pcPic->getSlice(0)->getSPS()->getChromaFormatIdc(); 789 789 Int xScal = TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc ); 790 790 … … 881 881 const Window defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window(); 882 882 883 UInt chromaFormatIdc = pcPic->getSlice(0)->get ChromaFormatIdc();883 UInt chromaFormatIdc = pcPic->getSlice(0)->getSPS()->getChromaFormatIdc(); 884 884 Int xScal = TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc ); 885 885 … … 972 972 const Bool isTff = pcPicTop->isTopField(); 973 973 974 UInt chromaFormatIdc = pcPic->getSlice(0)->get ChromaFormatIdc();974 UInt chromaFormatIdc = pcPic->getSlice(0)->getSPS()->getChromaFormatIdc(); 975 975 Int xScal = TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc ); 976 976 … … 1050 1050 const Window defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window(); 1051 1051 1052 UInt chromaFormatIdc = pcPic->getSlice(0)->get ChromaFormatIdc();1052 UInt chromaFormatIdc = pcPic->getSlice(0)->getSPS()->getChromaFormatIdc(); 1053 1053 Int xScal = TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc ); 1054 1054 … … 1472 1472 Int xScal = 1, yScal = 1; 1473 1473 1474 UInt chromaFormatIdc = pic->getSlice(0)->get ChromaFormatIdc();1474 UInt chromaFormatIdc = pic->getSlice(0)->getSPS()->getChromaFormatIdc(); 1475 1475 xScal = TComSPS::getWinUnitX( chromaFormatIdc ); 1476 1476 yScal = TComSPS::getWinUnitY( chromaFormatIdc ); … … 1701 1701 1702 1702 TComPictureHash recon_digest; 1703 Int numChar = calcMD5(*pic->getPicYuvRec(), recon_digest, pic->getSlice(0)->get BitDepths());1703 Int numChar = calcMD5(*pic->getPicYuvRec(), recon_digest, pic->getSlice(0)->getSPS()->getBitDepths()); 1704 1704 fprintf(fptr, "%8d%9d MD5:%s\n", pic->getLayerId(), pic->getSlice(0)->getPOC(), hashToString(recon_digest, numChar).c_str()); 1705 1705 fclose(fptr); … … 1729 1729 strcpy(tempFileName, this->getDecodedYuvLayerFileName( layerId ).c_str()); 1730 1730 1731 const TComVPS *vps = m_apcTDecTop[layerId]->getParameterSetManager()->getActiveVPS();1732 1731 const TComSPS *sps = m_apcTDecTop[layerId]->getParameterSetManager()->getActiveSPS(); 1733 const BitDepths &bitDpeths = vps->getBitDepths(sps, layerId);1732 const BitDepths &bitDpeths = sps->getBitDepths(); 1734 1733 Int bitDepth[] = {bitDpeths.recon[CHANNEL_TYPE_LUMA], bitDpeths.recon[CHANNEL_TYPE_CHROMA]}; 1735 1734 … … 1746 1745 Int xScal = 1, yScal = 1; 1747 1746 1748 UInt chromaFormatIdc = checkPic.getSlice(0)->get ChromaFormatIdc();1747 UInt chromaFormatIdc = checkPic.getSlice(0)->getSPS()->getChromaFormatIdc(); 1749 1748 xScal = TComSPS::getWinUnitX( chromaFormatIdc ); 1750 1749 yScal = TComSPS::getWinUnitY( chromaFormatIdc );
Note: See TracChangeset for help on using the changeset viewer.