hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-23 18:14:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Add kvz_math.h for common inline math functions

Browse source 
Calling it just math.h would have prevented including system math.h.
This commit is contained in:
Ari Koivula 2016-03-09 16:55:26 +02:00
parent f8edf28161
commit e27ec2cc53
4 changed files with 59 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/kvazaar_lib/kvazaar_lib.vcxproj
View file

@ -211,6 +211,7 @@
<ClCompile Include="..\..\src\transform.c" />
<ClInclude Include="..\..\src\input_frame_buffer.h" />
<ClInclude Include="..\..\src\kvazaar_internal.h" />
<ClInclude Include="..\..\src\kvz_math.h" />
<ClInclude Include="..\..\src\search_inter.h" />
<ClInclude Include="..\..\src\search_intra.h" />
<ClInclude Include="..\..\src\strategies\avx2\intra-avx2.h" />
@ -278,4 +279,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="..\yasm\vsyasm.targets" />
</ImportGroup>
</Project>
</Project>

3
build/kvazaar_lib/kvazaar_lib.vcxproj.filters
View file

@ -382,6 +382,7 @@
<ClInclude Include="..\..\src\encoder_state-bitstream.h">
<Filter>Bitstream</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kvz_math.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\extras\x86inc.asm">
@ -394,4 +395,4 @@
<Filter>Optimization\strategies\x86_asm</Filter>
</YASM>
</ItemGroup>
</Project>
</Project>

1
src/Makefile.am
View file

@ -70,6 +70,7 @@ libkvazaar_la_SOURCES = \
intra.h \
kvazaar.c \
kvazaar_internal.h \
kvz_math.h \
nal.c \
nal.h \
rate_control.c \

54
src/kvz_math.h Normal file
View file

@ -0,0 +1,54 @@
#ifndef MATH_H_
#define MATH_H_
/*****************************************************************************
* This file is part of Kvazaar HEVC encoder.
*
* Copyright (C) 2013-2015 Tampere University of Technology and others (see
* COPYING file).
*
* Kvazaar is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the
* Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version.
*
* Kvazaar is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* with Kvazaar. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
/**
* \file
* Generic math functions
*/
#include "global.h"
static INLINE unsigned kvz_math_floor_log2(unsigned value)
{
assert(value > 0);
unsigned result = 0;
for (int i = 4; i >= 0; --i) {
unsigned bits = 1ull << i;
unsigned shift = value >= (1 << bits) ? bits : 0;
result += shift;
value >>= shift;
}
return result;
}
static INLINE unsigned kvz_math_ceil_log2(unsigned value)
{
assert(value > 0);
// The ceil_log2 is just floor_log2 + 1, except for exact powers of 2.
return kvz_math_floor_log2(value) + ((value & (value - 1)) ? 1 : 0);
}
#endif //CHECKPOINT_H_