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

Fix compilation for VS2010.

Browse source
This commit is contained in:
Ari Koivula 2014-05-08 17:28:12 +03:00
parent 0452806ec4
commit cb5d7e6541
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/encoder.c
View file

@ -1484,20 +1484,23 @@ static void encoder_state_write_bitstream_leaf(encoder_state * const encoder_sta
}
}
//Last LCU
const lcu_order_element * const lcu = &encoder_state->lcu_order[encoder_state->lcu_order_count - 1];
const int lcu_addr_in_ts = lcu->id + encoder_state->tile->lcu_offset_in_ts;
const int end_of_slice_segment_flag = lcu_at_slice_end(encoder, lcu_addr_in_ts);
{
const lcu_order_element * const lcu = &encoder_state->lcu_order[encoder_state->lcu_order_count - 1];
const int lcu_addr_in_ts = lcu->id + encoder_state->tile->lcu_offset_in_ts;
const int end_of_slice_segment_flag = lcu_at_slice_end(encoder, lcu_addr_in_ts);
cabac_encode_bin_trm(&encoder_state->cabac, end_of_slice_segment_flag); // end_of_slice_segment_flag
cabac_encode_bin_trm(&encoder_state->cabac, end_of_slice_segment_flag); // end_of_slice_segment_flag
if (!end_of_slice_segment_flag) {
assert(lcu_at_tile_end(encoder, lcu_addr_in_ts) || lcu->position.x == (encoder_state->tile->cur_pic->width_in_lcu - 1));
cabac_encode_bin_trm(&encoder_state->cabac, 1); // end_of_sub_stream_one_bit == 1
cabac_flush(&encoder_state->cabac);
} else {
cabac_flush(&encoder_state->cabac);
bitstream_align(&encoder_state->stream);
if (!end_of_slice_segment_flag) {
assert(lcu_at_tile_end(encoder, lcu_addr_in_ts) || lcu->position.x == (encoder_state->tile->cur_pic->width_in_lcu - 1));
cabac_encode_bin_trm(&encoder_state->cabac, 1); // end_of_sub_stream_one_bit == 1
cabac_flush(&encoder_state->cabac);
} else {
cabac_flush(&encoder_state->cabac);
bitstream_align(&encoder_state->stream);
}
}
}