Commit a14de5b3 authored by Yaowu Xu's avatar Yaowu Xu

Revert "enable obu (HLS R19) by default"

This reverts commit 0dc0ddc0.

Reason for revert: enc/dec mismatch was found and tracked down to this commit. 

BUG=aomedia:1123

Change-Id: I47ac289426e18d2118117d56c2cbc8930b78bda2
parent 5d5078e2
......@@ -1326,13 +1326,10 @@ static aom_codec_err_t encoder_encode(aom_codec_alg_priv_t *ctx,
#if CONFIG_OBU
// move data PRE_OBU_SIZE_BYTES + 1 bytes and insert OBU_TD preceded by
// optional 4 byte size
// 4-byte size
uint32_t obu_size = 1;
if (ctx->pending_cx_data) {
const size_t index_sz = PRE_OBU_SIZE_BYTES + 1;
memmove(ctx->pending_cx_data + index_sz, ctx->pending_cx_data,
ctx->pending_cx_data_sz);
}
memmove(ctx->pending_cx_data + PRE_OBU_SIZE_BYTES + 1,
ctx->pending_cx_data, ctx->pending_cx_data_sz);
obu_size = write_obu_header(
OBU_TEMPORAL_DELIMITER, 0,
(uint8_t *)(ctx->pending_cx_data + PRE_OBU_SIZE_BYTES));
......
......@@ -682,7 +682,7 @@ static aom_codec_err_t decoder_decode(aom_codec_alg_priv_t *ctx,
void *user_priv, long deadline) {
const uint8_t *data_start = data;
const uint8_t *const data_end = data + data_sz;
aom_codec_err_t res = AOM_CODEC_OK;
aom_codec_err_t res;
uint32_t frame_sizes[8];
int frame_count = 0;
......
......@@ -3918,7 +3918,7 @@ void av1_decode_frame_from_obus(struct AV1Decoder *pbi, const uint8_t *data,
#if CONFIG_ADD_4BYTES_OBUSIZE
obu_size = mem_get_le32(data);
#else
obu_size = (size_t)(data_end - data);
obu_size = data_end - data;
#endif
obu_type = read_obu_header(&rb, &obu_header_size);
data += (PRE_OBU_SIZE_BYTES + obu_header_size);
......
......@@ -4344,12 +4344,11 @@ static void write_uncompressed_header_obu(AV1_COMP *cpi,
aom_wb_write_bit(wb, cm->delta_lf_present_flag);
if (cm->delta_lf_present_flag) {
aom_wb_write_literal(wb, OD_ILOG_NZ(cm->delta_lf_res) - 1, 2);
xd->prev_delta_lf_from_base = 0;
#if CONFIG_LOOPFILTER_LEVEL
aom_wb_write_bit(wb, cm->delta_lf_multi);
for (int lf_id = 0; lf_id < FRAME_LF_COUNT; ++lf_id)
xd->prev_delta_lf[lf_id] = 0;
#endif // CONFIG_LOOPFILTER_LEVEL
xd->prev_delta_lf_from_base = 0;
}
#endif // CONFIG_EXT_DELTA_Q
}
......
......@@ -169,7 +169,7 @@ set(CONFIG_MONO_VIDEO 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_MV_COMPRESS 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_NEW_QUANT 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_NO_FRAME_CONTEXT_SIGNALING 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_OBU 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_OBU 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_OBU_NO_IVF 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_OPT_REF_MV 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_PALETTE_DELTA_ENCODING 1 CACHE NUMBER "AV1 experiment flag.")
......
......@@ -511,7 +511,6 @@ post_process_cmdline() {
soft_enable ext_comp_refs
soft_enable ext_delta_q
soft_enable parallel_deblocking
soft_enable obu
soft_enable simple_bwd_adapt
soft_enable loopfilter_level
soft_enable cfl
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment