diff --git a/source/Lib/CommonLib/Picture.cpp b/source/Lib/CommonLib/Picture.cpp index a07b05a595275d82ea2f0e0f7c77946a7c9e6fa8..4775f64fb0b9274e51b2c6b405d527814e610bda 100644 --- a/source/Lib/CommonLib/Picture.cpp +++ b/source/Lib/CommonLib/Picture.cpp @@ -281,7 +281,6 @@ void Picture::finalInit( const VPS* vps, const SPS& sps, const PPS& pps, PicHead cs->lmcsAps = lmcsAps; cs->scalinglistAps = scalingListAps; cs->pcv = pps.pcv; - m_numSubPic = sps.getNumSubPics(); m_conformanceWindow = pps.getConformanceWindow(); m_scalingWindow = pps.getScalingWindow(); mixedNaluTypesInPicFlag = pps.getMixedNaluTypesInPicFlag(); diff --git a/source/Lib/CommonLib/Picture.h b/source/Lib/CommonLib/Picture.h index eb5ef94e3ab45435af39674e5643e69a47588dc4..580f07c98fc21f8961e3e76f3ca7f616edeaf9d5 100644 --- a/source/Lib/CommonLib/Picture.h +++ b/source/Lib/CommonLib/Picture.h @@ -203,7 +203,6 @@ public: PelStorage m_bufSubPicBelow; PelStorage m_bufSubPicLeft; PelStorage m_bufSubPicRight; - int m_numSubPic = 1; PelStorage m_bufWrapSubPicAbove; PelStorage m_bufWrapSubPicBelow; @@ -271,14 +270,13 @@ public: const Window& getConformanceWindow() const { return m_conformanceWindow; } Window& getScalingWindow() { return m_scalingWindow; } const Window& getScalingWindow() const { return m_scalingWindow; } - int getNumSubPic() const { return m_numSubPic; } bool isRefScaled(const SPS* sps, const PPS* pps) const { return unscaledPic->getPicWidthInLumaSamples() != pps->getPicWidthInLumaSamples() || unscaledPic->getPicHeightInLumaSamples() != pps->getPicHeightInLumaSamples() || unscaledPic->getScalingWindow() != pps->getScalingWindow() - || unscaledPic->getNumSubPic() != sps->getNumSubPics() + || unscaledPic->cs->sps->getNumSubPics() != sps->getNumSubPics() ; }