avcodec/evc_parse: remove pow() and log2()

The use of float based functions is both unneeded and wrong due to unpredictable rounding

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
release/7.0
Michael Niedermayer 2 years ago
parent f2687a3b69
commit d35eecd24f
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
  1. 10
      libavcodec/evc_parse.c

@ -172,7 +172,8 @@ int ff_evc_derive_poc(const EVCParamSets *ps, const EVCParserSliceHeader *sh,
poc->PicOrderCntVal = 0; poc->PicOrderCntVal = 0;
poc->DocOffset = -1; poc->DocOffset = -1;
} else { } else {
int SubGopLength = (int)pow(2.0, sps->log2_sub_gop_length); int SubGopLength = 1 << sps->log2_sub_gop_length;
if (tid == 0) { if (tid == 0) {
poc->PicOrderCntVal = poc->prevPicOrderCntVal + SubGopLength; poc->PicOrderCntVal = poc->prevPicOrderCntVal + SubGopLength;
poc->DocOffset = 0; poc->DocOffset = 0;
@ -187,15 +188,16 @@ int ff_evc_derive_poc(const EVCParamSets *ps, const EVCParserSliceHeader *sh,
poc->prevPicOrderCntVal += SubGopLength; poc->prevPicOrderCntVal += SubGopLength;
ExpectedTemporalId = 0; ExpectedTemporalId = 0;
} else } else
ExpectedTemporalId = 1 + (int)log2(poc->DocOffset); ExpectedTemporalId = 1 + av_log2(poc->DocOffset);
while (tid != ExpectedTemporalId) { while (tid != ExpectedTemporalId) {
poc->DocOffset = (poc->DocOffset + 1) % SubGopLength; poc->DocOffset = (poc->DocOffset + 1) % SubGopLength;
if (poc->DocOffset == 0) if (poc->DocOffset == 0)
ExpectedTemporalId = 0; ExpectedTemporalId = 0;
else else
ExpectedTemporalId = 1 + (int)log2(poc->DocOffset); ExpectedTemporalId = 1 + av_log2(poc->DocOffset);
} }
PocOffset = (int)(SubGopLength * ((2.0 * poc->DocOffset + 1) / (int)pow(2.0, tid) - 2)); PocOffset = (int)(SubGopLength * ((2.0 * poc->DocOffset + 1) / (1 << tid) - 2));
poc->PicOrderCntVal = poc->prevPicOrderCntVal + PocOffset; poc->PicOrderCntVal = poc->prevPicOrderCntVal + PocOffset;
} }
} }

Loading…
Cancel
Save