Skip to content

Commit

Permalink
Avoid name conflict with log2f64 from math.h (#161)
Browse files Browse the repository at this point in the history
Signed-off-by: korum <korum@yandex-team.ru>
  • Loading branch information
yakorum authored Dec 4, 2022
1 parent 1b08a14 commit 0cd1947
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Source/Lib/Codec/EbUtility.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ PaBlockStats * pa_get_block_stats(int block_index)
* Leading Zeros (NLZ) algorithm to get
* the log2f of a 64-bit number
*****************************************/
inline uint64_t log2f64(uint64_t x)
inline uint64_t Log2f64(uint64_t x)
{
uint64_t y;
int64_t n = 64, c = 32;
Expand Down Expand Up @@ -163,7 +163,7 @@ uint32_t eb_vp9_endian_swap(uint32_t ui)
uint64_t eb_vp9_log2f_high_precision(uint64_t x, uint8_t precision)
{

uint64_t sig_bit_location = log2f64(x);
uint64_t sig_bit_location = Log2f64(x);
uint64_t remainder = x - ((uint64_t)1 << (uint8_t) sig_bit_location);
uint64_t result;

Expand Down
2 changes: 1 addition & 1 deletion Source/Lib/Codec/EbUtility.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ extern PaBlockStats *pa_get_block_stats(int block_index);
const EpBlockStats *ep_get_block_stats(uint32_t bidx_mds);

extern uint32_t Log2f(uint32_t x);
extern uint64_t log2f64(uint64_t x);
extern uint64_t Log2f64(uint64_t x);
extern uint32_t eb_vp9_endian_swap(uint32_t ui);
extern uint64_t eb_vp9_log2f_high_precision(uint64_t x, uint8_t precision);
/****************************
Expand Down

0 comments on commit 0cd1947

Please sign in to comment.