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 deblocking headers and some cleanup, deblocking does not produce valid output

Browse source
This commit is contained in:
Marko Viitanen 2020-08-20 15:25:18 +03:00
parent 4da90b3722
commit b4907e6337
2 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/cabac.c
View file

@ -413,14 +413,6 @@ void kvz_cabac_write_ep_ex_golomb(encoder_state_t * const state,
bins = (bins << count) | symbol;
num_bins += count;
if (!data->only_count) {
if (state->encoder_control->cfg.crypto_features & KVZ_CRYPTO_MVs) {
uint32_t key, mask;
key = kvz_crypto_get_key(state->crypto_hdl, num_bins>>1);
mask = ( (1<<(num_bins >>1) ) -1 );
state->crypto_prev_pos = ( bins + ( state->crypto_prev_pos^key ) ) & mask;
bins = ( (bins >> (num_bins >>1) ) << (num_bins >>1) ) | state->crypto_prev_pos;
}
}
CABAC_BINS_EP(data, bins, num_bins, "ep_ex_golomb");
}

8
src/encoder_state-bitstream.c
View file

@ -917,15 +917,7 @@ static void encoder_state_write_bitstream_pic_parameter_set(bitstream_t* stream,
if (encoder->cfg.deblock_enable) {
WRITE_SE(stream, encoder->cfg.deblock_beta, "pps_beta_offset_div2");
WRITE_SE(stream, encoder->cfg.deblock_tc, "pps_tc_offset_div2");
WRITE_SE(stream, encoder->cfg.deblock_beta, "pps_cb_beta_offset_div2");
WRITE_SE(stream, encoder->cfg.deblock_tc, "pps_cb_tc_offset_div2");
WRITE_SE(stream, encoder->cfg.deblock_beta, "pps_cr_beta_offset_div2");
WRITE_SE(stream, encoder->cfg.deblock_tc, "pps_cr_tc_offset_div2");
}
//WRITE_U(stream, 0, 1, "rpl_info_in_ph_flag");
//WRITE_U(stream, 0, 1, "sao_info_in_ph_flag");
//WRITE_U(stream, 0, 1, "alf_info_in_ph_flag");
//WRITE_U(stream, 0, 1, "qp_delta_info_in_ph_flag");
#if !JVET_S0132_HLS_REORDER
WRITE_U(stream, 0, 1, "pps_ref_wraparound_enabled_flag");