Skip to content
Snippets Groups Projects
Commit e36c895f authored by Kenneth Andersson's avatar Kenneth Andersson
Browse files

Instead of overwriting variable it is initialized to the sps conformance window

parent 6aa7292b
No related branches found
No related tags found
No related merge requests found
......@@ -1424,7 +1424,7 @@ bool VideoIOYuv::writeUpscaledPicture(const SPS &sps, const PPS &pps, const CPel
ChromaFormat chromaFormatIdc = sps.getChromaFormatIdc();
bool ret = false;
static Window afterScaleWindowFullResolution;
static Window afterScaleWindowFullResolution = sps.getConformanceWindow();
// decoder does not have information about upscaled picture scaling and conformance windows, store this information when full resolution picutre is encountered
if( sps.getMaxPicWidthInLumaSamples() == pps.getPicWidthInLumaSamples() && sps.getMaxPicHeightInLumaSamples() == pps.getPicHeightInLumaSamples() )
......@@ -1441,7 +1441,6 @@ bool VideoIOYuv::writeUpscaledPicture(const SPS &sps, const PPS &pps, const CPel
upscaledPic.create(chromaFormatIdc,
Area(Position(), Size(sps.getMaxPicWidthInLumaSamples(), sps.getMaxPicHeightInLumaSamples())));
afterScaleWindowFullResolution = sps.getConformanceWindow();
int curPicWidth = sps.getMaxPicWidthInLumaSamples() - SPS::getWinUnitX( sps.getChromaFormatIdc() ) * ( afterScaleWindowFullResolution.getWindowLeftOffset() + afterScaleWindowFullResolution.getWindowRightOffset() );
int curPicHeight = sps.getMaxPicHeightInLumaSamples() - SPS::getWinUnitY( sps.getChromaFormatIdc() ) * ( afterScaleWindowFullResolution.getWindowTopOffset() + afterScaleWindowFullResolution.getWindowBottomOffset() );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment