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

Replace bitstream->simulation with cabac->only_count

Browse source
This commit is contained in:
Marko Viitanen 2021-09-14 17:44:56 +03:00
parent 4e5482817f
commit 78363ccab0
3 changed files with 18 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/bitstream.c
View file

@ -136,24 +136,22 @@ uint64_t kvz_bitstream_tell(const bitstream_t *const stream)
*/
void kvz_bitstream_writebyte(bitstream_t *const stream, const uint8_t byte)
{
assert(stream->cur_bit == 0 || stream->simulation);
assert(stream->cur_bit == 0);
if (!stream->simulation) {
if (stream->last == NULL || stream->last->len == KVZ_DATA_CHUNK_SIZE) {
// Need to allocate a new chunk.
kvz_data_chunk* new_chunk = kvz_bitstream_alloc_chunk();
assert(new_chunk);
if (stream->last == NULL || stream->last->len == KVZ_DATA_CHUNK_SIZE) {
// Need to allocate a new chunk.
kvz_data_chunk* new_chunk = kvz_bitstream_alloc_chunk();
assert(new_chunk);
if (!stream->first) stream->first = new_chunk;
if (stream->last) stream->last->next = new_chunk;
stream->last = new_chunk;
}
assert(stream->last->len < KVZ_DATA_CHUNK_SIZE);
stream->last->data[stream->last->len] = byte;
stream->last->len += 1;
if (!stream->first) stream->first = new_chunk;
if (stream->last) stream->last->next = new_chunk;
stream->last = new_chunk;
}
assert(stream->last->len < KVZ_DATA_CHUNK_SIZE);
stream->last->data[stream->last->len] = byte;
stream->last->len += 1;
stream->len += 1;
}
@ -164,9 +162,9 @@ void kvz_bitstream_writebyte(bitstream_t *const stream, const uint8_t byte)
*/
void kvz_bitstream_move(bitstream_t *const dst, bitstream_t *const src)
{
assert(dst->cur_bit == 0 || src->simulation);
assert(dst->cur_bit == 0);
if (src->len > 0 && !src->simulation) {
if (src->len > 0) {
if (dst->first == NULL) {
dst->first = src->first;
dst->last = src->last;
@ -182,7 +180,6 @@ void kvz_bitstream_move(bitstream_t *const dst, bitstream_t *const src)
dst->data = src->data;
dst->cur_bit = src->cur_bit;
dst->zerocount = src->zerocount;
dst->simulation = src->simulation;
src->first = src->last = NULL;
kvz_bitstream_clear(src);
@ -204,7 +201,7 @@ void kvz_bitstream_clear(bitstream_t *const stream)
*/
void kvz_bitstream_put_byte(bitstream_t *const stream, uint32_t data)
{
assert(stream->cur_bit == 0 || stream->simulation);
assert(stream->cur_bit == 0);
const uint8_t emulation_prevention_three_byte = 0x03;
if ((stream->zerocount == 2) && (data < 4)) {
@ -224,10 +221,6 @@ void kvz_bitstream_put_byte(bitstream_t *const stream, uint32_t data)
*/
void kvz_bitstream_put(bitstream_t *const stream, const uint32_t data, uint8_t bits)
{
if (stream->simulation) {
stream->cur_bit += bits;
return;
}
while (bits--) {
stream->data <<= 1;

1
src/bitstream.h
View file

@ -53,7 +53,6 @@ typedef struct bitstream_t
uint8_t zerocount;
bool simulation;
} bitstream_t;
typedef struct

4
src/encoderstate.c
View file

@ -676,7 +676,7 @@ static void encoder_state_worker_encode_lcu_search(void * opaque)
// Do simulated bitstream writing to update the cabac contexts
if (encoder->cfg.alf_type) {
state->stream.simulation = true;
state->cabac.only_count = 1;
encoder_state_worker_encode_lcu_bitstream(opaque);
}
}
@ -703,7 +703,7 @@ static void encoder_state_worker_encode_lcu_bitstream(void * opaque)
//Encode coding tree
kvz_encode_coding_tree(state, lcu->position.x * LCU_WIDTH, lcu->position.y * LCU_WIDTH, 0, lcu->coeff);
if (!state->stream.simulation) {
if (!state->cabac.only_count) {
// Coeffs are not needed anymore.
free(lcu->coeff);
lcu->coeff = NULL;