hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-24 10:34:05 +00:00
Code Issues Actions Projects Releases Wiki Activity

Remove duplicated inline functions

Browse source
This commit is contained in:
Ari Koivula 2016-03-10 15:28:31 +02:00
parent e27ec2cc53
commit 9fcfba637f
2 changed files with 5 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/bitstream.c
View file

@ -28,6 +28,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include "kvz_math.h"
const uint32_t kvz_bit_set_mask[] = const uint32_t kvz_bit_set_mask[] =
{ {
0x00000001,0x00000002,0x00000004,0x00000008, 0x00000001,0x00000002,0x00000004,0x00000008,
@ -57,19 +59,6 @@ void printf_bitstream(char *msg, ...)
} }
#endif #endif
static int floor_log2(unsigned int n)
{
assert(n != 0);
int pos = 0;
if (n >= 1<<16) { n >>= 16; pos += 16; }
if (n >= 1<< 8) { n >>= 8; pos += 8; }
if (n >= 1<< 4) { n >>= 4; pos += 4; }
if (n >= 1<< 2) { n >>= 2; pos += 2; }
if (n >= 1<< 1) { pos += 1; }
return pos;
}
/** /**
* \brief Initialize the Exp Golomb code table. * \brief Initialize the Exp Golomb code table.
* *
@ -84,7 +73,7 @@ void kvz_init_exp_golomb()
uint8_t M; uint8_t M;
uint32_t info; uint32_t info;
for (code_num = 0; code_num < EXP_GOLOMB_TABLE_SIZE; code_num++) { for (code_num = 0; code_num < EXP_GOLOMB_TABLE_SIZE; code_num++) {
M = (uint8_t)floor_log2(code_num + 1); M = kvz_math_floor_log2(code_num + 1);
info = code_num + 1 - (uint32_t)pow(2, M); info = code_num + 1 - (uint32_t)pow(2, M);
kvz_g_exp_table[code_num].len = M * 2 + 1; kvz_g_exp_table[code_num].len = M * 2 + 1;
kvz_g_exp_table[code_num].value = (1<<M) | info; kvz_g_exp_table[code_num].value = (1<<M) | info;

13
src/encoder_state-bitstream.c
View file

@ -25,6 +25,7 @@
#include "checkpoint.h" #include "checkpoint.h"
#include "encoderstate.h" #include "encoderstate.h"
#include "kvz_math.h"
#include "nal.h" #include "nal.h"
@ -630,16 +631,6 @@ static void encoder_state_write_bitstream_entry_points_write(bitstream_t * const
} }
} }
static int num_bitcount(unsigned int n) {
int pos = 0;
if (n >= 1<<16) { n >>= 16; pos += 16; }
if (n >= 1<< 8) { n >>= 8; pos += 8; }
if (n >= 1<< 4) { n >>= 4; pos += 4; }
if (n >= 1<< 2) { n >>= 2; pos += 2; }
if (n >= 1<< 1) { pos += 1; }
return ((n == 0) ? (-1) : pos);
}
void kvz_encoder_state_write_bitstream_slice_header(encoder_state_t * const state) void kvz_encoder_state_write_bitstream_slice_header(encoder_state_t * const state)
{ {
const encoder_control_t * const encoder = state->encoder_control; const encoder_control_t * const encoder = state->encoder_control;
@ -777,7 +768,7 @@ void kvz_encoder_state_write_bitstream_slice_header(encoder_state_t * const stat
WRITE_UE(stream, num_entry_points - 1, "num_entry_point_offsets"); WRITE_UE(stream, num_entry_points - 1, "num_entry_point_offsets");
if (num_entry_points > 0) { if (num_entry_points > 0) {
int entry_points_written = 0; int entry_points_written = 0;
int offset_len = num_bitcount(max_length_seen) + 1; int offset_len = kvz_math_floor_log2(max_length_seen) + 1;
WRITE_UE(stream, offset_len - 1, "offset_len_minus1"); WRITE_UE(stream, offset_len - 1, "offset_len_minus1");
encoder_state_write_bitstream_entry_points_write(stream, state, num_entry_points, offset_len, &entry_points_written); encoder_state_write_bitstream_entry_points_write(stream, state, num_entry_points, offset_len, &entry_points_written);
} }