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

Default to chroma=444/matrix_coefficients=0 in lossless mode #1039

Closed
wants to merge 3 commits into from
Closed

Default to chroma=444/matrix_coefficients=0 in lossless mode #1039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a053e1
Default to chroma=444 in lossless mode
kleisauke Nov 18, 2023
d3cf7ae
Default to matrix_coefficients=0 in lossless mode
kleisauke Nov 18, 2023
68a5534
Minor style change
kleisauke Dec 19, 2023
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
15 changes: 5 additions & 10 deletions examples/heif_enc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,23 +168,17 @@ void show_help(const char* argv0)
<< " -e, --encoder ID select encoder to use (the IDs can be listed with --list-encoders)\n"
<< " --plugin-directory DIR load all codec plugins in the directory\n"
<< " -E, --even-size [deprecated] crop images to even width and height (odd sizes are not decoded correctly by some software)\n"
<< " --matrix_coefficients nclx profile: color conversion matrix coefficients, default=6 (see h.273)\n"
<< " --colour_primaries nclx profile: color primaries (see h.273)\n"
<< " --transfer_characteristic nclx profile: transfer characteristics (see h.273)\n"
<< " --colour_primaries nclx profile: color primaries, default: 1 (see h.273)\n"
<< " --transfer_characteristic nclx profile: transfer characteristics, default: 13 (see h.273)\n"
<< " --matrix_coefficients nclx profile: color conversion matrix coefficients, default: 6 for lossy or 0 for lossless (see h.273)\n"
<< " --full_range_flag nclx profile: full range flag, default: 1\n"
<< " --enable-two-colr-boxes will write both an ICC and an nclx color profile if both are present\n"
<< " --premultiplied-alpha input image has premultiplied alpha\n"
<< " --enable-metadata-compression enable XMP metadata compression (experimental)\n"
<< " -C,--chroma-downsampling ALGO force chroma downsampling algorithm (nn = nearest-neighbor / average / sharp-yuv)\n"
<< " (sharp-yuv makes edges look sharper when using YUV420 with bilinear chroma upsampling)\n"
<< " --benchmark measure encoding time, PSNR, and output file size\n"
<< " --pitm-description TEXT (EXPERIMENTAL) set user description for primary image\n"

<< "\n"
<< "Note: to get lossless encoding, you need this set of options:\n"
<< " -L switch encoder to lossless mode\n"
<< " -p chroma=444 switch off chroma subsampling\n"
<< " --matrix_coefficients=0 encode in RGB color-space\n";
<< " --pitm-description TEXT (EXPERIMENTAL) set user description for primary image\n";
}


Expand Down Expand Up @@ -509,6 +503,7 @@ int main(int argc, char** argv)
break;
case 'L':
lossless = true;
nclx_matrix_coefficients = 0;
break;
case 'o':
output_filename = optarg;
Expand Down
20 changes: 16 additions & 4 deletions libheif/context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2429,7 +2429,9 @@ static bool nclx_profile_matches_spec(heif_colorspace colorspace,
}


static std::shared_ptr<color_profile_nclx> compute_target_nclx_profile(const std::shared_ptr<HeifPixelImage>& image, const heif_color_profile_nclx* output_nclx_profile)
static std::shared_ptr<color_profile_nclx> compute_target_nclx_profile(const std::shared_ptr<HeifPixelImage>& image,
const heif_color_profile_nclx* output_nclx_profile,
bool lossless = false)
{
auto target_nclx_profile = std::make_shared<color_profile_nclx>();

Expand All @@ -2446,7 +2448,7 @@ static std::shared_ptr<color_profile_nclx> compute_target_nclx_profile(const std
target_nclx_profile->set_undefined();
}

target_nclx_profile->replace_undefined_values_with_sRGB_defaults();
target_nclx_profile->replace_undefined_values_with_sRGB_defaults(lossless);

return target_nclx_profile;
}
Expand All @@ -2466,8 +2468,13 @@ Error HeifContext::encode_image_as_hevc(const std::shared_ptr<HeifPixelImage>& i

heif_colorspace colorspace = image->get_colorspace();
heif_chroma chroma = image->get_chroma_format();
int lossless = 0;

auto target_nclx_profile = compute_target_nclx_profile(image, options.output_nclx_profile);
if (encoder->plugin->supports_lossless_compression) {
encoder->plugin->get_parameter_lossless(encoder->encoder, &lossless);
}

auto target_nclx_profile = compute_target_nclx_profile(image, options.output_nclx_profile, static_cast<bool>(lossless));

if (encoder->plugin->plugin_api_version >= 2) {
encoder->plugin->query_input_colorspace2(encoder->encoder, &colorspace, &chroma);
Expand Down Expand Up @@ -2688,8 +2695,13 @@ Error HeifContext::encode_image_as_av1(const std::shared_ptr<HeifPixelImage>& im

heif_colorspace colorspace = image->get_colorspace();
heif_chroma chroma = image->get_chroma_format();
int lossless = 0;

auto target_nclx_profile = compute_target_nclx_profile(image, options.output_nclx_profile);
if (encoder->plugin->supports_lossless_compression) {
encoder->plugin->get_parameter_lossless(encoder->encoder, &lossless);
}

auto target_nclx_profile = compute_target_nclx_profile(image, options.output_nclx_profile, static_cast<bool>(lossless));

if (encoder->plugin->plugin_api_version >= 2) {
encoder->plugin->query_input_colorspace2(encoder->encoder, &colorspace, &chroma);
Expand Down
4 changes: 2 additions & 2 deletions libheif/nclx.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,10 +343,10 @@ void color_profile_nclx::set_from_heif_color_profile_nclx(const struct heif_colo
}


void color_profile_nclx::replace_undefined_values_with_sRGB_defaults()
void color_profile_nclx::replace_undefined_values_with_sRGB_defaults(bool lossless)
{
if (m_matrix_coefficients == heif_matrix_coefficients_unspecified) {
m_matrix_coefficients = heif_matrix_coefficients_ITU_R_BT_601_6;
m_matrix_coefficients = lossless ? heif_matrix_coefficients_RGB_GBR : heif_matrix_coefficients_ITU_R_BT_601_6;
}

if (m_colour_primaries == heif_color_primaries_unspecified) {
Expand Down
2 changes: 1 addition & 1 deletion libheif/nclx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ class color_profile_nclx : public color_profile

void set_from_heif_color_profile_nclx(const struct heif_color_profile_nclx* nclx);

void replace_undefined_values_with_sRGB_defaults();
void replace_undefined_values_with_sRGB_defaults(bool lossless = false);

private:
uint16_t m_colour_primaries = heif_color_primaries_unspecified;
Expand Down
7 changes: 4 additions & 3 deletions libheif/plugins/encoder_aom.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@ struct heif_error aom_set_parameter_lossless(void* encoder_raw, int enable)
encoder->alpha_min_q_set = true;
encoder->alpha_max_q = 0;
encoder->alpha_max_q_set = true;
encoder->chroma = heif_chroma_444;
}

encoder->lossless = enable;
Expand Down Expand Up @@ -990,9 +991,9 @@ struct heif_error aom_encode_image(void* encoder_raw, const struct heif_image* i
if (nclx &&
(input_class == heif_image_input_class_normal ||
input_class == heif_image_input_class_thumbnail)) {
aom_codec_control(&codec, AV1E_SET_COLOR_PRIMARIES, nclx->color_primaries);
aom_codec_control(&codec, AV1E_SET_MATRIX_COEFFICIENTS, nclx->matrix_coefficients);
aom_codec_control(&codec, AV1E_SET_TRANSFER_CHARACTERISTICS, nclx->transfer_characteristics);
aom_codec_control(&codec, AV1E_SET_COLOR_PRIMARIES, static_cast<aom_color_primaries>(nclx->color_primaries));
aom_codec_control(&codec, AV1E_SET_MATRIX_COEFFICIENTS, static_cast<aom_matrix_coefficients>(nclx->matrix_coefficients));
aom_codec_control(&codec, AV1E_SET_TRANSFER_CHARACTERISTICS, static_cast<aom_transfer_characteristics>(nclx->transfer_characteristics));
}

aom_codec_control(&codec, AOME_SET_TUNING, encoder->tune);
Expand Down
2 changes: 1 addition & 1 deletion libheif/plugins/encoder_rav1e.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ static const struct heif_encoder_plugin encoder_plugin_rav1e
/* id_name */ "rav1e",
/* priority */ RAV1E_PLUGIN_PRIORITY,
/* supports_lossy_compression */ true,
/* supports_lossless_compression */ false,
/* supports_lossless_compression */ false, // https://github.com/xiph/rav1e/issues/151
/* get_plugin_name */ rav1e_plugin_name,
/* init_plugin */ rav1e_init_plugin,
/* cleanup_plugin */ rav1e_cleanup_plugin,
Expand Down
2 changes: 1 addition & 1 deletion libheif/plugins/encoder_svt.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,7 @@ static const struct heif_encoder_plugin encoder_plugin_svt
/* id_name */ "svt",
/* priority */ SVT_PLUGIN_PRIORITY,
/* supports_lossy_compression */ true,
/* supports_lossless_compression */ false,
/* supports_lossless_compression */ false, // https://gitlab.com/AOMediaCodec/SVT-AV1/-/issues/1636
/* get_plugin_name */ svt_plugin_name,
/* init_plugin */ svt_init_plugin,
/* cleanup_plugin */ svt_cleanup_plugin,
Expand Down
Loading