Commit 6eeea0e8 authored by Zoe Liu's avatar Zoe Liu
Browse files

Enable ext-refs as default

Fixed a couple of compiling warnings when the "deep" analyzer is on.

Change-Id: I96842e8226f1993a1329217c0dbf4a081d0c94f9
parent 775a4bed
...@@ -3911,11 +3911,11 @@ static int get_refresh_mask(AV1_COMP *cpi) { ...@@ -3911,11 +3911,11 @@ static int get_refresh_mask(AV1_COMP *cpi) {
// (like RTC/temporal scalability). // (like RTC/temporal scalability).
return refresh_mask | (cpi->refresh_golden_frame << cpi->alt_fb_idx); return refresh_mask | (cpi->refresh_golden_frame << cpi->alt_fb_idx);
} else { } else {
int arf_idx = cpi->alt_fb_idx;
#if CONFIG_EXT_REFS #if CONFIG_EXT_REFS
const GF_GROUP *const gf_group = &cpi->twopass.gf_group; const GF_GROUP *const gf_group = &cpi->twopass.gf_group;
arf_idx = cpi->arf_map[gf_group->arf_update_idx[gf_group->index]]; int arf_idx = cpi->arf_map[gf_group->arf_update_idx[gf_group->index]];
#else #else
int arf_idx = cpi->alt_fb_idx;
if ((cpi->oxcf.pass == 2) && cpi->multi_arf_allowed) { if ((cpi->oxcf.pass == 2) && cpi->multi_arf_allowed) {
const GF_GROUP *const gf_group = &cpi->twopass.gf_group; const GF_GROUP *const gf_group = &cpi->twopass.gf_group;
arf_idx = gf_group->arf_update_idx[gf_group->index]; arf_idx = gf_group->arf_update_idx[gf_group->index];
......
...@@ -1930,7 +1930,8 @@ static void allocate_gf_group_bits(AV1_COMP *cpi, int64_t gf_group_bits, ...@@ -1930,7 +1930,8 @@ static void allocate_gf_group_bits(AV1_COMP *cpi, int64_t gf_group_bits,
#if CONFIG_EXT_REFS #if CONFIG_EXT_REFS
// Check if we need to update the ARF // Check if we need to update the ARF
if (cpi->num_extra_arfs && frame_index > arf_pos[which_arf]) { if (is_sg_bipred_enabled && cpi->num_extra_arfs && which_arf > 0 &&
frame_index > arf_pos[which_arf]) {
--which_arf; --which_arf;
accumulative_subgroup_interval += subgroup_interval[which_arf] + 1; accumulative_subgroup_interval += subgroup_interval[which_arf] + 1;
// Meet the new subgroup. Reset the bipred_group_end flag; // Meet the new subgroup. Reset the bipred_group_end flag;
......
...@@ -487,6 +487,7 @@ post_process_cmdline() { ...@@ -487,6 +487,7 @@ post_process_cmdline() {
soft_enable new_tokenset soft_enable new_tokenset
soft_enable ext_intra soft_enable ext_intra
soft_enable mv_compress soft_enable mv_compress
soft_enable ext_refs
# Backwards/jenkins compatibility with --enable-aom-highbitdepth # Backwards/jenkins compatibility with --enable-aom-highbitdepth
enabled aom_highbitdepth && enable_feature highbitdepth enabled aom_highbitdepth && enable_feature highbitdepth
......
Supports Markdown
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