Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove AOM_CTRL_AV1E_SET_ENABLE_INTRABC checks #1413

Merged
merged 1 commit into from
Nov 27, 2024
Merged

Remove AOM_CTRL_AV1E_SET_ENABLE_INTRABC checks #1413

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions libheif/plugins/encoder_aom.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,15 +375,13 @@ static void aom_init_parameters()
p->has_default = true;
d[i++] = p++;

#if defined(AOM_CTRL_AV1E_SET_ENABLE_INTRABC)
assert(i < MAX_NPARAMETERS);
p->version = 2;
p->name = kParam_enable_intra_block_copy;
p->type = heif_encoder_parameter_type_boolean;
p->boolean.default_value = true;
p->has_default = true;
d[i++] = p++;
#endif

assert(i < MAX_NPARAMETERS + 1);
d[i++] = nullptr;
Expand Down Expand Up @@ -597,11 +595,9 @@ struct heif_error aom_set_parameter_boolean(void* encoder_raw, const char* name,
} else if (strcmp(name, kParam_auto_tiles) == 0) {
encoder->auto_tiles = value;
return heif_error_ok;
#if defined(AOM_CTRL_AV1E_SET_ENABLE_INTRABC)
} else if (strcmp(name, kParam_enable_intra_block_copy) == 0) {
encoder->enable_intra_block_copy = value;
return heif_error_ok;
#endif
}

set_value(kParam_realtime, realtime_mode);
Expand Down Expand Up @@ -1056,9 +1052,7 @@ struct heif_error aom_encode_image(void* encoder_raw, const struct heif_image* i
}
#endif

#if defined(AOM_CTRL_AV1E_SET_ENABLE_INTRABC)
aom_codec_control(&codec, AV1E_SET_ENABLE_INTRABC, encoder->enable_intra_block_copy);
#endif

#if defined(HAVE_AOM_CODEC_SET_OPTION)
// Apply the custom AOM encoder options.
Expand Down
Loading