Commit 2ccf7dd6 authored by Karsten Suehring's avatar Karsten Suehring
Browse files

Merge branch 'RPR_PIC_SIZE_CLEANUP' into 'master'

RPR cleanup: remove picture size class members

See merge request jvet/VVCSoftware_VTM!1130
parents 8d258694 b4b53044
......@@ -980,8 +980,8 @@ void Picture::finalInit( const SPS& sps, const PPS& pps, APS** alfApss, APS* lmc
memcpy(cs->alfApss, alfApss, sizeof(cs->alfApss));
cs->lmcsAps = lmcsAps;
cs->scalinglistAps = scalingListAps;
cs->pcv = pps.pcv;
m_conformanceWindow = pps.getConformanceWindow();
brickMap = new BrickMap;
brickMap->create( sps, pps );
......
......@@ -257,6 +257,9 @@ struct Picture : public UnitArea
static void rescalePicture(const CPelUnitBuf& beforeScaling, const Window& confBefore, const PelUnitBuf& afterScaling, const Window& confAfter, const ChromaFormat chromaFormatIDC, const BitDepths& bitDepths, const bool useLumaFilter, const bool downsampling = false);
private:
Window m_conformanceWindow;
public:
bool m_bIsBorderExtended;
bool referenced;
......@@ -296,18 +299,11 @@ public:
std::deque<Slice*> slices;
SEIMessages SEIs;
uint32_t m_picWidthInLumaSamples;
uint32_t m_picHeightInLumaSamples;
Window m_conformanceWindow;
void setPicWidthInLumaSamples( uint32_t u ) { m_picWidthInLumaSamples = u; }
uint32_t getPicWidthInLumaSamples() const { return m_picWidthInLumaSamples; }
void setPicHeightInLumaSamples( uint32_t u ) { m_picHeightInLumaSamples = u; }
uint32_t getPicHeightInLumaSamples() const { return m_picHeightInLumaSamples; }
uint32_t getPicWidthInLumaSamples() const { return getRecoBuf( COMPONENT_Y ).width; }
uint32_t getPicHeightInLumaSamples() const { return getRecoBuf( COMPONENT_Y ).height; }
Window& getConformanceWindow() { return m_conformanceWindow; }
const Window& getConformanceWindow() const { return m_conformanceWindow; }
void setConformanceWindow( Window& conformanceWindow ) { m_conformanceWindow = conformanceWindow; }
void allocateNewSlice();
Slice *swapSliceObject(Slice * p, uint32_t i);
......
......@@ -929,11 +929,6 @@ void DecLib::xActivateParameterSets()
m_pcPic->cs->sps = sps;
m_pcPic->cs->pps = pps;
Window confWin = pps->getConformanceWindow( );
m_pcPic->setPicWidthInLumaSamples( pps->getPicWidthInLumaSamples() );
m_pcPic->setPicHeightInLumaSamples( pps->getPicHeightInLumaSamples() );
m_pcPic->setConformanceWindow( confWin );
memcpy(m_pcPic->cs->alfApss, apss, sizeof(m_pcPic->cs->alfApss));
m_pcPic->cs->lmcsAps = lmcsAPS;
m_pcPic->cs->scalinglistAps = scalinglistAPS;
......
......@@ -571,11 +571,6 @@ void EncLib::encode( bool flush, PelStorage* pcPicYuvOrg, PelStorage* cPicYuvTru
const PPS *pps = m_ppsMap.getPS(2);
const SPS *sps = m_spsMap.getPS(pps->getSPSId());
Window confWin = pps->getConformanceWindow( );
picCurr->setPicWidthInLumaSamples( pps->getPicWidthInLumaSamples() );
picCurr->setPicHeightInLumaSamples( pps->getPicHeightInLumaSamples() );
picCurr->setConformanceWindow( confWin );
picCurr->M_BUFS(0, PIC_ORIGINAL).copyFrom(m_cGOPEncoder.getPicBg()->getRecoBuf());
picCurr->finalInit( *sps, *pps, m_apss, m_lmcsAPS, m_scalinglistAPS );
picCurr->poc = m_iPOCLast - 1;
......@@ -637,11 +632,6 @@ void EncLib::encode( bool flush, PelStorage* pcPicYuvOrg, PelStorage* cPicYuvTru
const PPS *pPPS=(ppsID<0) ? m_ppsMap.getFirstPS() : m_ppsMap.getPS(ppsID);
const SPS *pSPS=m_spsMap.getPS(pPPS->getSPSId());
Window confWin = pPPS->getConformanceWindow( );
pcPicCurr->setPicWidthInLumaSamples( pPPS->getPicWidthInLumaSamples() );
pcPicCurr->setPicHeightInLumaSamples( pPPS->getPicHeightInLumaSamples() );
pcPicCurr->setConformanceWindow( confWin );
if( m_rprEnabled )
{
pcPicCurr->M_BUFS( 0, PIC_ORIGINAL_INPUT ).getBuf( COMPONENT_Y ).copyFrom( pcPicYuvOrg->getBuf( COMPONENT_Y ) );
......@@ -763,10 +753,6 @@ void EncLib::encode( bool flush, PelStorage* pcPicYuvOrg, PelStorage* pcPicYuvTr
int ppsID=-1; // Use default PPS ID
const PPS *pPPS=(ppsID<0) ? m_ppsMap.getFirstPS() : m_ppsMap.getPS(ppsID);
const SPS *pSPS=m_spsMap.getPS(pPPS->getSPSId());
Window confWin = pPPS->getConformanceWindow( );
pcField->setPicWidthInLumaSamples( pPPS->getPicWidthInLumaSamples() );
pcField->setPicHeightInLumaSamples( pPPS->getPicHeightInLumaSamples() );
pcField->setConformanceWindow( confWin );
pcField->finalInit( *pSPS, *pPPS, m_apss, m_lmcsAPS, m_scalinglistAPS );
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment