Skip to content

Commit

Permalink
Add missing kvz_ prefix
Browse files Browse the repository at this point in the history
  • Loading branch information
Venti- committed Jan 31, 2017
1 parent ed3bd89 commit 4467506
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions src/bitstream.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ void kvz_bitstream_put(bitstream_t *const stream, const uint32_t data, uint8_t b
/**
* \brief Write unsigned Exp-Golomb bit string
*/
void bitstream_put_ue(bitstream_t *stream, uint32_t code_num)
void kvz_bitstream_put_ue(bitstream_t *stream, uint32_t code_num)
{
unsigned code_num_log2 = kvz_math_floor_log2(code_num + 1);
unsigned prefix = 1 << code_num_log2;
Expand All @@ -251,11 +251,11 @@ void bitstream_put_ue(bitstream_t *stream, uint32_t code_num)
/**
* \brief Write signed Exp-Golomb bit string
*/
void bitstream_put_se(bitstream_t *stream, int32_t data)
void kvz_bitstream_put_se(bitstream_t *stream, int32_t data)
{
// Map positive values to even and negative to odd values.
uint32_t code_num = data <= 0 ? (-data) << 1 : (data << 1) - 1;
bitstream_put_ue(stream, code_num);
kvz_bitstream_put_ue(stream, code_num);
}

/**
Expand Down
12 changes: 6 additions & 6 deletions src/bitstream.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ void kvz_bitstream_clear(bitstream_t *stream);
void kvz_bitstream_put(bitstream_t *stream, uint32_t data, uint8_t bits);
void kvz_bitstream_put_byte(bitstream_t *const stream, const uint32_t data);

void bitstream_put_ue(bitstream_t *stream, uint32_t data);
void bitstream_put_se(bitstream_t *stream, int32_t data);
void kvz_bitstream_put_ue(bitstream_t *stream, uint32_t data);
void kvz_bitstream_put_se(bitstream_t *stream, int32_t data);

void kvz_bitstream_add_rbsp_trailing_bits(bitstream_t *stream);
void kvz_bitstream_align(bitstream_t *stream);
Expand All @@ -86,12 +86,12 @@ void kvz_bitstream_align_zero(bitstream_t *stream);
#ifdef KVZ_DEBUG_PRINT_CABAC
/* Counter to keep up with bits written */
#define WRITE_U(stream, data, bits, name) { printf("%-40s u(%d) : %d\n", name,bits,data); kvz_bitstream_put(stream,data,bits);}
#define WRITE_UE(stream, data, name) { printf("%-40s ue(v): %d\n", name,data); bitstream_put_ue(stream,data);}
#define WRITE_SE(stream, data, name) { printf("%-40s se(v): %d\n", name,data); bitstream_put_se(stream,(data));}
#define WRITE_UE(stream, data, name) { printf("%-40s ue(v): %d\n", name,data); kvz_bitstream_put_ue(stream,data);}
#define WRITE_SE(stream, data, name) { printf("%-40s se(v): %d\n", name,data); kvz_bitstream_put_se(stream,(data));}
#else
#define WRITE_U(stream, data, bits, name) { kvz_bitstream_put(stream,data,bits); }
#define WRITE_UE(stream, data, name) { bitstream_put_ue(stream,data); }
#define WRITE_SE(stream, data, name) { bitstream_put_se(stream,data); }
#define WRITE_UE(stream, data, name) { kvz_bitstream_put_ue(stream,data); }
#define WRITE_SE(stream, data, name) { kvz_bitstream_put_se(stream,data); }
#endif


Expand Down

0 comments on commit 4467506

Please sign in to comment.