Newer
Older
m_cVideoIOYuvReconFile[pcPic->layerId].writeUpscaledPicture( *sps, *pcPic->cs->pps, pcPic->getRecoBuf(), m_outputColourSpaceConvert, m_packedYUVMode, m_upscaledOutput, NUM_CHROMA_FORMAT, m_bClipOutputVideoToRec709Range );
#else
m_cVideoIOYuvReconFile.writeUpscaledPicture( *sps, *pcPic->cs->pps, pcPic->getRecoBuf(), m_outputColourSpaceConvert, m_packedYUVMode, m_upscaledOutput, NUM_CHROMA_FORMAT, m_bClipOutputVideoToRec709Range );
{
#if JVET_N0278_FIXES
m_cVideoIOYuvReconFile[pcPic->layerId].write( pcPic->getRecoBuf().get( COMPONENT_Y ).width, pcPic->getRecoBuf().get( COMPONENT_Y ).height, pcPic->getRecoBuf(),
#else
m_cVideoIOYuvReconFile.write( pcPic->getRecoBuf().get( COMPONENT_Y ).width, pcPic->getRecoBuf().get( COMPONENT_Y ).height, pcPic->getRecoBuf(),

Karsten Suehring
committed
m_outputColourSpaceConvert,
m_packedYUVMode,
conf.getWindowLeftOffset() * SPS::getWinUnitX( chromaFormatIDC ),
conf.getWindowRightOffset() * SPS::getWinUnitX( chromaFormatIDC ),
conf.getWindowTopOffset() * SPS::getWinUnitY( chromaFormatIDC ),
conf.getWindowBottomOffset() * SPS::getWinUnitY( chromaFormatIDC ),

Karsten Suehring
committed
NUM_CHROMA_FORMAT, m_bClipOutputVideoToRec709Range );

Karsten Suehring
committed
}
#if HEVC_SEI

Karsten Suehring
committed
if (m_seiMessageFileStream.is_open())
{
m_cColourRemapping.outputColourRemapPic (pcPic, m_seiMessageFileStream);
}
#endif

Karsten Suehring
committed
// update POC of display order
m_iPOCLastDisplay = pcPic->getPOC();
// erase non-referenced picture in the reference picture list after display
if (!pcPic->referenced && pcPic->reconstructed)
{
pcPic->reconstructed = false;
}
pcPic->neededForOutput = false;
}
iterPic++;
}
}
}
/** \param pcListPic list of pictures to be written to file
*/
#if JVET_N0278_FIXES
void DecApp::xFlushOutput( PicList* pcListPic, const int layerId )
#else

Karsten Suehring
committed
void DecApp::xFlushOutput( PicList* pcListPic )

Karsten Suehring
committed
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
{
if(!pcListPic || pcListPic->empty())
{
return;
}
PicList::iterator iterPic = pcListPic->begin();
iterPic = pcListPic->begin();
Picture* pcPic = *(iterPic);
if (pcPic->fieldPic ) //Field Decoding
{
PicList::iterator endPic = pcListPic->end();
endPic--;
Picture *pcPicTop, *pcPicBottom = NULL;
while (iterPic != endPic)
{
pcPicTop = *(iterPic);
iterPic++;
pcPicBottom = *(iterPic);
#if JVET_N0278_FIXES
if( pcPicTop->layerId != layerId && layerId != NOT_VALID )
{
continue;
}
#endif

Karsten Suehring
committed
if ( pcPicTop->neededForOutput && pcPicBottom->neededForOutput && !(pcPicTop->getPOC()%2) && (pcPicBottom->getPOC() == pcPicTop->getPOC()+1) )
{
// write to file
if ( !m_reconFileName.empty() )
{
const Window &conf = pcPicTop->cs->pps->getConformanceWindow();
const bool isTff = pcPicTop->topField;
#if JVET_N0278_FIXES
m_cVideoIOYuvReconFile[pcPicTop->layerId].write( pcPicTop->getRecoBuf(), pcPicBottom->getRecoBuf(),
#else

Karsten Suehring
committed
m_cVideoIOYuvReconFile.write( pcPicTop->getRecoBuf(), pcPicBottom->getRecoBuf(),
m_outputColourSpaceConvert,
false, // TODO: m_packedYUVMode,
conf.getWindowLeftOffset() * SPS::getWinUnitX( pcPicTop->cs->sps->getChromaFormatIdc() ),
conf.getWindowRightOffset() * SPS::getWinUnitX( pcPicTop->cs->sps->getChromaFormatIdc() ),
conf.getWindowTopOffset() * SPS::getWinUnitY( pcPicTop->cs->sps->getChromaFormatIdc() ),
conf.getWindowBottomOffset() * SPS::getWinUnitY( pcPicTop->cs->sps->getChromaFormatIdc() ),
NUM_CHROMA_FORMAT, isTff );

Karsten Suehring
committed
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
}
// update POC of display order
m_iPOCLastDisplay = pcPicBottom->getPOC();
// erase non-referenced picture in the reference picture list after display
if( ! pcPicTop->referenced && pcPicTop->reconstructed )
{
pcPicTop->reconstructed = false;
}
if( ! pcPicBottom->referenced && pcPicBottom->reconstructed )
{
pcPicBottom->reconstructed = false;
}
pcPicTop->neededForOutput = false;
pcPicBottom->neededForOutput = false;
if(pcPicTop)
{
pcPicTop->destroy();
delete pcPicTop;
pcPicTop = NULL;
}
}
}
if(pcPicBottom)
{
pcPicBottom->destroy();
delete pcPicBottom;
pcPicBottom = NULL;
}
}
else //Frame decoding
{
while (iterPic != pcListPic->end())
{
pcPic = *(iterPic);
#if JVET_N0278_FIXES
if( pcPic->layerId != layerId && layerId != NOT_VALID )
{
iterPic++;
continue;
}
#endif

Karsten Suehring
committed
if (pcPic->neededForOutput)
{
// write to file
if (!m_reconFileName.empty())
{
const Window &conf = pcPic->getConformanceWindow();
const SPS* sps = pcPic->cs->sps;
ChromaFormat chromaFormatIDC = sps->getChromaFormatIdc();
#if JVET_N0278_FIXES
m_cVideoIOYuvReconFile[pcPic->layerId].writeUpscaledPicture( *sps, *pcPic->cs->pps, pcPic->getRecoBuf(), m_outputColourSpaceConvert, m_packedYUVMode, m_upscaledOutput, NUM_CHROMA_FORMAT, m_bClipOutputVideoToRec709Range );
#else
m_cVideoIOYuvReconFile.writeUpscaledPicture( *sps, *pcPic->cs->pps, pcPic->getRecoBuf(), m_outputColourSpaceConvert, m_packedYUVMode, m_upscaledOutput, NUM_CHROMA_FORMAT, m_bClipOutputVideoToRec709Range );
{
#if JVET_N0278_FIXES
m_cVideoIOYuvReconFile[pcPic->layerId].write( pcPic->getRecoBuf().get( COMPONENT_Y ).width, pcPic->getRecoBuf().get( COMPONENT_Y ).height, pcPic->getRecoBuf(),
#else
m_cVideoIOYuvReconFile.write( pcPic->getRecoBuf().get( COMPONENT_Y ).width, pcPic->getRecoBuf().get( COMPONENT_Y ).height, pcPic->getRecoBuf(),

Karsten Suehring
committed
m_outputColourSpaceConvert,
m_packedYUVMode,
conf.getWindowLeftOffset() * SPS::getWinUnitX( chromaFormatIDC ),
conf.getWindowRightOffset() * SPS::getWinUnitX( chromaFormatIDC ),
conf.getWindowTopOffset() * SPS::getWinUnitY( chromaFormatIDC ),
conf.getWindowBottomOffset() * SPS::getWinUnitY( chromaFormatIDC ),

Karsten Suehring
committed
NUM_CHROMA_FORMAT, m_bClipOutputVideoToRec709Range );

Karsten Suehring
committed
}
#if HEVC_SEI

Karsten Suehring
committed
if (m_seiMessageFileStream.is_open())
{
m_cColourRemapping.outputColourRemapPic (pcPic, m_seiMessageFileStream);
}
#endif

Karsten Suehring
committed
// update POC of display order
m_iPOCLastDisplay = pcPic->getPOC();
// erase non-referenced picture in the reference picture list after display
if (!pcPic->referenced && pcPic->reconstructed)
{
pcPic->reconstructed = false;
}
pcPic->neededForOutput = false;
}
if(pcPic != NULL)
{
pcPic->destroy();
delete pcPic;
pcPic = NULL;
#if JVET_N0278_FIXES
*iterPic = nullptr;
#endif

Karsten Suehring
committed
}
iterPic++;
}
}
#if JVET_N0278_FIXES
if( layerId != NOT_VALID )
{
pcListPic->remove_if([](Picture* p) { return p == nullptr; });

Karsten Suehring
committed
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
pcListPic->clear();
m_iPOCLastDisplay = -MAX_INT;
}
/** \param nalu Input nalu to check whether its LayerId is within targetDecLayerIdSet
*/
bool DecApp::isNaluWithinTargetDecLayerIdSet( InputNALUnit* nalu )
{
if ( m_targetDecLayerIdSet.size() == 0 ) // By default, the set is empty, meaning all LayerIds are allowed
{
return true;
}
for (std::vector<int>::iterator it = m_targetDecLayerIdSet.begin(); it != m_targetDecLayerIdSet.end(); it++)
{
if ( nalu->m_nuhLayerId == (*it) )
{
return true;
}
}
return false;
}
#if JVET_P1019_OUTPUT_LAYER_SET
/** \param nalu Input nalu to check whether its LayerId is within targetOutputLayerIdSet
*/
bool DecApp::isNaluWithinTargetOutputLayerIdSet(InputNALUnit* nalu)
{
if (m_targetOutputLayerIdSet.size() == 0) // By default, the set is empty, meaning all LayerIds are allowed
{
return true;
}
for (std::vector<int>::iterator it = m_targetOutputLayerIdSet.begin(); it != m_targetOutputLayerIdSet.end(); it++)
{
if (nalu->m_nuhLayerId == (*it))
{
return true;
}
}
return false;
}
#else
/** \param nalu Input nalu to check whether its LayerId is the specified target layer
*/
bool DecApp::isNaluTheTargetLayer(InputNALUnit* nalu)
{
if (nalu->m_nuhLayerId == m_iTargetLayer || m_iTargetLayer < 0)
return true;
return false;
}