Skip to content
Snippets Groups Projects
Commit 0a6fb9f9 authored by Frank Bossen's avatar Frank Bossen
Browse files

Merge branch 'fix_ticket_1409' into 'master'

Fix #1409: Don't scale 15/16 bit sequences to lower bit depths if...

See merge request jvet/VVCSoftware_VTM!1916
parents 1bc907c5 6e1e8a69
No related branches found
No related tags found
No related merge requests found
...@@ -952,6 +952,12 @@ bool VideoIOYuv::read ( PelUnitBuf& pic, PelUnitBuf& picOrg, const InputColourSp ...@@ -952,6 +952,12 @@ bool VideoIOYuv::read ( PelUnitBuf& pic, PelUnitBuf& picOrg, const InputColourSp
{ {
EXIT("Source image contains values outside the specified bit range!"); EXIT("Source image contains values outside the specified bit range!");
} }
#if !JVET_R0351_HIGH_BIT_DEPTH_ENABLED
if (m_fileBitdepth[chType] > 14 && m_bitdepthShift[chType] < 0)
{
EXIT("JVET_R0351_HIGH_BIT_DEPTH_ENABLED must be enabled for bit depths above 14 if INTERNALBITDEPTH < INPUTBITDEPTH");
}
#endif
scalePlane( picOrg.get(compID), m_bitdepthShift[chType], minval, maxval); scalePlane( picOrg.get(compID), m_bitdepthShift[chType], minval, maxval);
} }
} }
......
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