Skip to content

support SVT-AV1 3.0.0 #1475

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

Merged
farindk merged 1 commit into from
Feb 24, 2025
Merged

support SVT-AV1 3.0.0 #1475

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
14 changes: 14 additions & 0 deletions libheif/plugins/encoder_svt.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,11 @@ struct heif_error svt_encode_image(void* encoder_raw, const struct heif_image* i
EbSvtAv1EncConfiguration svt_config;
memset(&svt_config, 0, sizeof(EbSvtAv1EncConfiguration));

#if SVT_AV1_CHECK_VERSION(3, 0, 0)
res = svt_av1_enc_init_handle(&svt_encoder, &svt_config);
#else
res = svt_av1_enc_init_handle(&svt_encoder, nullptr, &svt_config);
#endif
if (res != EB_ErrorNone) {
//goto cleanup;
return heif_error_codec_library_error;
Expand All @@ -698,7 +702,9 @@ struct heif_error svt_encode_image(void* encoder_raw, const struct heif_image* i
auto nclx_deleter = std::unique_ptr<heif_color_profile_nclx, void (*)(heif_color_profile_nclx*)>(nclx, heif_nclx_color_profile_free);

if (nclx) {
#if !SVT_AV1_CHECK_VERSION(3, 0, 0)
svt_config.color_description_present_flag = true;
#endif
#if SVT_AV1_VERSION_MAJOR >= 1
svt_config.color_primaries = static_cast<EbColorPrimaries>(nclx->color_primaries);
svt_config.transfer_characteristics = static_cast<EbTransferCharacteristics>(nclx->transfer_characteristics);
Expand All @@ -712,20 +718,28 @@ struct heif_error svt_encode_image(void* encoder_raw, const struct heif_image* i
#endif


#if !SVT_AV1_CHECK_VERSION(3, 0, 0)
Copy link
Contributor

@farindk farindk Feb 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a corresponding flag for high_dynamic_range_input in v3.0.0 or was this simply removed?

Copy link
Contributor Author

@stefantalpalaru stefantalpalaru Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was removed in: https://gitlab.com/AOMediaCodec/SVT-AV1/-/commit/92d44bdcc6331ecc28338f99207be912bfd05729#900962ec0dfb11881a5f25ce6fcad8e815c8fd45_341_333

libavif also removed it completely: AOMediaCodec/libavif@e649830#diff-29748a2db41273018a16b71ccb60bcd7b632b86c78cc69bb88784702122ebddeL127-L132

Copy link
Contributor

@farindk farindk Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the background information.

// Follow comment in svt header: set if input is HDR10 BT2020 using SMPTE ST2084.
svt_config.high_dynamic_range_input = (bitdepth_y == 10 && // TODO: should this be >8 ?
nclx->color_primaries == heif_color_primaries_ITU_R_BT_2020_2_and_2100_0 &&
nclx->transfer_characteristics == heif_transfer_characteristic_ITU_R_BT_2100_0_PQ &&
nclx->matrix_coefficients == heif_matrix_coefficients_ITU_R_BT_2020_2_non_constant_luminance);
#endif
}
else {
#if !SVT_AV1_CHECK_VERSION(3, 0, 0)
svt_config.color_description_present_flag = false;
#endif
}


svt_config.source_width = encoded_width;
svt_config.source_height = encoded_height;
#if SVT_AV1_CHECK_VERSION(3, 0, 0)
svt_config.level_of_parallelism = encoder->threads;
#else
svt_config.logical_processors = encoder->threads;
#endif

// disable 2-pass
svt_config.rc_stats_buffer = SvtAv1FixedBuf {nullptr, 0};
Expand Down
Loading