Skip to content

Commit 270979e

Browse files
authored
Merge pull request #1413 from wantehchang/remove-AOM_CTRL_AV1E_SET_ENABLE_INTRABC
Remove AOM_CTRL_AV1E_SET_ENABLE_INTRABC checks
2 parents 57d6f0a + 465ff0a commit 270979e

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

libheif/plugins/encoder_aom.cc

-6
Original file line numberDiff line numberDiff line change
@@ -375,15 +375,13 @@ static void aom_init_parameters()
375375
p->has_default = true;
376376
d[i++] = p++;
377377

378-
#if defined(AOM_CTRL_AV1E_SET_ENABLE_INTRABC)
379378
assert(i < MAX_NPARAMETERS);
380379
p->version = 2;
381380
p->name = kParam_enable_intra_block_copy;
382381
p->type = heif_encoder_parameter_type_boolean;
383382
p->boolean.default_value = true;
384383
p->has_default = true;
385384
d[i++] = p++;
386-
#endif
387385

388386
assert(i < MAX_NPARAMETERS + 1);
389387
d[i++] = nullptr;
@@ -597,11 +595,9 @@ struct heif_error aom_set_parameter_boolean(void* encoder_raw, const char* name,
597595
} else if (strcmp(name, kParam_auto_tiles) == 0) {
598596
encoder->auto_tiles = value;
599597
return heif_error_ok;
600-
#if defined(AOM_CTRL_AV1E_SET_ENABLE_INTRABC)
601598
} else if (strcmp(name, kParam_enable_intra_block_copy) == 0) {
602599
encoder->enable_intra_block_copy = value;
603600
return heif_error_ok;
604-
#endif
605601
}
606602

607603
set_value(kParam_realtime, realtime_mode);
@@ -1056,9 +1052,7 @@ struct heif_error aom_encode_image(void* encoder_raw, const struct heif_image* i
10561052
}
10571053
#endif
10581054

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

10631057
#if defined(HAVE_AOM_CODEC_SET_OPTION)
10641058
// Apply the custom AOM encoder options.

0 commit comments

Comments
 (0)