Commit 79229cdd authored by Frank Bossen's avatar Frank Bossen

Merge branch 'fix_unicode2' into 'master'

Fix unicode in several files

See merge request jvet/VVCSoftware_VTM!1556
parents 2a9242d1 3587fb76
......@@ -63,7 +63,7 @@
#define JVET_R0143_TSRCdisableLL 1 // JVET-R0143: disable TSRC for lossless coding
#define JVET_R0371_MAX_NUM_SUB_BLK_MRG_CAND 1 // JVET-R0371: set the range of max number of subblock based merge candidate to 0 to 5 sps_sbtmvp_enabled_flag.
#define JVET_R0371_MAX_NUM_SUB_BLK_MRG_CAND 1 // JVET-R0371: set the range of max number of subblock based merge candidate to 0 to 5 - sps_sbtmvp_enabled_flag.
#define JVET_R0233_CCALF_LINE_BUFFER_REDUCTION 1 // JVET-R0233 method 2: Line buffer reduction for CCALF
......
This diff is collapsed.
......@@ -1168,8 +1168,8 @@ static void
validateMinCrRequirements(const ProfileLevelTierFeatures &plt, std::size_t numBytesInVclNalUnits, const Picture *pPic, const EncCfg *pCfg)
{
// numBytesInVclNalUnits shall be less than or equal to
// FormatCapabilityFactor * MaxLumaSr * framePeriod ÷ MinCr,
// ( = FormatCapabilityFactor * MaxLumaSr ÷ (MinCr * frameRate),
// FormatCapabilityFactor * MaxLumaSr * framePeriod / MinCr,
// ( = FormatCapabilityFactor * MaxLumaSr / (MinCr * frameRate),
if (plt.getLevelTierFeatures() && plt.getProfileFeatures() && plt.getLevelTierFeatures()->level!=Level::LEVEL8_5)
{
const uint32_t formatCapabilityFactorx1000 = plt.getProfileFeatures()->formatCapabilityFactorx1000;
......
Markdown is supported
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