Skip to content

Commit

Permalink
mini: additional debug dump
Browse files Browse the repository at this point in the history
  • Loading branch information
@bradh
bradh committed Oct 15, 2024
1 parent a229035 commit 95b7ceb
Showing 1 changed file with 118 additions and 17 deletions.
135 changes: 118 additions & 17 deletions libheif/mini.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,18 @@ Error Box_mini::parse(BitstreamRange &range, const heif_security_limits *limits)
}
if (m_reve_flag)
{
// TODO: ReferenceViewingEnvironment
// TODO: ReferenceViewingEnvironment isn't published yet
bits.skip_bits(32);
bits.skip_bits(16);
bits.skip_bits(16);
bits.skip_bits(32);
bits.skip_bits(16);
bits.skip_bits(16);
}
if (m_ndwt_flag)
{
// TODO: NominalDiffuseWhit
// TODO: NominalDiffuseWhite isn't published yet
bits.skip_bits(32);
}
if (m_gainmap_flag)
{
Expand Down Expand Up @@ -306,11 +313,18 @@ Error Box_mini::parse(BitstreamRange &range, const heif_security_limits *limits)
}
if (m_tmap_reve_flag)
{
// TODO: ReferenceViewingEnvironment
// TODO: ReferenceViewingEnvironment isn't published yet
bits.skip_bits(32);
bits.skip_bits(16);
bits.skip_bits(16);
bits.skip_bits(32);
bits.skip_bits(16);
bits.skip_bits(16);
}
if (m_tmap_ndwt_flag)
{
// TODO: NominalDiffuseWhit
// TODO: NominalDiffuseWhite isn't published yet
bits.skip_bits(32);
}
}
}
Expand Down Expand Up @@ -480,7 +494,30 @@ std::string Box_mini::dump(Indent &indent) const
sstr << indent << "gainmap_flag: " << m_gainmap_flag << "\n";
if (m_gainmap_flag)
{
// TODO
sstr << indent << "gainmap_width: " << m_gainmap_width << "\n";
sstr << indent << "gainmap_height: " << m_gainmap_height << "\n";
sstr << indent << "gainmap_matrix_coefficients: " << (int)m_gainmap_matrix_coefficients << "\n";
sstr << indent << "gainmap_full_range_flag: " << m_gainmap_full_range_flag << "\n";
sstr << indent << "gainmap_chroma_subsampling: " << (int)m_gainmap_chroma_subsampling << "\n";
if ((m_gainmap_chroma_subsampling == 1) || (m_gainmap_chroma_subsampling == 2))
{
sstr << indent << "gainmap_chroma_is_horizontally_centred: " << m_gainmap_chroma_is_horizontally_centred << "\n";
}
if (m_gainmap_chroma_subsampling == 1)
{
sstr << indent << "gainmap_chroma_is_vertically_centred: " << m_gainmap_chroma_is_vertically_centred << "\n";
}
sstr << indent << "gainmap_float_flag: " << m_gainmap_float_flag << "\n";
sstr << "gainmap_bit_depth: " << (int)m_gainmap_bit_depth << "\n";
sstr << indent << "tmap_icc_flag: " << m_tmap_icc_flag << "\n";
sstr << indent << "tmap_explicit_cicp_flag: " << m_tmap_explicit_cicp_flag << "\n";
if (m_tmap_explicit_cicp_flag)
{
sstr << "tmap_colour_primaries: " << (int)m_tmap_colour_primaries << "\n";
sstr << "tmap_transfer_characteristics: " << (int)m_tmap_transfer_characteristics << "\n";
sstr << "tmap_matrix_coefficients: " << (int)m_tmap_matrix_coefficients << "\n";
sstr << "tmap_full_range_flag: " << m_tmap_full_range_flag << "\n";
}
}
sstr << indent << "clli_flag: " << m_clli_flag << "\n";
sstr << indent << "mdcv_flag: " << m_mdcv_flag << "\n";
Expand All @@ -490,27 +527,59 @@ std::string Box_mini::dump(Indent &indent) const
sstr << indent << "ndwt_flag: " << m_ndwt_flag << "\n";
if (m_clli_flag)
{
// TODO
sstr << indent << "ccli.max_content_light_level: " << m_clli->clli.max_content_light_level << "\n";
sstr << indent << "ccli.max_pic_average_light_level: " << m_clli->clli.max_pic_average_light_level << "\n";
}
if (m_mdcv_flag)
{
// TODO
sstr << indent << "mdcv.display_primaries (x,y): ";
sstr << "(" << m_mdcv->mdcv.display_primaries_x[0] << ";" << m_mdcv->mdcv.display_primaries_y[0] << "), ";
sstr << "(" << m_mdcv->mdcv.display_primaries_x[1] << ";" << m_mdcv->mdcv.display_primaries_y[1] << "), ";
sstr << "(" << m_mdcv->mdcv.display_primaries_x[2] << ";" << m_mdcv->mdcv.display_primaries_y[2] << ")\n";

sstr << indent << "mdcv.white point (x,y): (" << m_mdcv->mdcv.white_point_x << ";" << m_mdcv->mdcv.white_point_y << ")\n";
sstr << indent << "mdcv.max display mastering luminance: " << m_mdcv->mdcv.max_display_mastering_luminance << "\n";
sstr << indent << "mdcv.min display mastering luminance: " << m_mdcv->mdcv.min_display_mastering_luminance << "\n";
}
if (m_cclv_flag)
{
// TODO
sstr << indent << "cclv.ccv_primaries_present_flag: " << m_cclv->ccv_primaries_are_valid() << "\n";
sstr << indent << "cclv.ccv_min_luminance_value_present_flag: " << m_cclv->min_luminance_is_valid() << "\n";
sstr << indent << "cclv.ccv_max_luminance_value_present_flag: " << m_cclv->max_luminance_is_valid() << "\n";
sstr << indent << "cclv.ccv_avg_luminance_value_present_flag: " << m_cclv->avg_luminance_is_valid() << "\n";
if (m_cclv->ccv_primaries_are_valid())
{
sstr << indent << "cclv.ccv_primaries (x,y): ";
sstr << "(" << m_cclv->get_ccv_primary_x0() << ";" << m_cclv->get_ccv_primary_y0() << "), ";
sstr << "(" << m_cclv->get_ccv_primary_x1() << ";" << m_cclv->get_ccv_primary_y1() << "), ";
sstr << "(" << m_cclv->get_ccv_primary_x2() << ";" << m_cclv->get_ccv_primary_y2() << ")\n";
}
if (m_cclv->min_luminance_is_valid())
{
sstr << indent << "cclv.ccv_min_luminance_value: " << m_cclv->get_min_luminance() << "\n";
}
if (m_cclv->max_luminance_is_valid())
{
sstr << indent << "cclv.ccv_max_luminance_value: " << m_cclv->get_max_luminance() << "\n";
}
if (m_cclv->avg_luminance_is_valid())
{
sstr << indent << "cclv.ccv_avg_luminance_value: " << m_cclv->get_avg_luminance() << "\n";
}
}
if (m_amve_flag)
{
// TODO
sstr << indent << "amve.ambient_illumination: " << m_amve->amve.ambient_illumination << "\n";
sstr << indent << "amve.ambient_light_x: " << m_amve->amve.ambient_light_x << "\n";
sstr << indent << "amve.ambient_light_y: " << m_amve->amve.ambient_light_y << "\n";
}
if (m_reve_flag)
{
// TODO
// TODO - this isn't published yet
}
if (m_ndwt_flag)
{
// TODO
// TODO - this isn't published yet
}
if (m_gainmap_flag)
{
Expand All @@ -522,27 +591,59 @@ std::string Box_mini::dump(Indent &indent) const
sstr << indent << "tmap_ndwt_flag: " << m_tmap_ndwt_flag << "\n";
if (m_tmap_clli_flag)
{
// TODO
sstr << indent << "tmap_ccli.max_content_light_level: " << m_tmap_clli->clli.max_content_light_level << "\n";
sstr << indent << "tmap_ccli.max_pic_average_light_level: " << m_tmap_clli->clli.max_pic_average_light_level << "\n";
}
if (m_tmap_mdcv_flag)
{
// TODO
sstr << indent << "tmap_mdcv.display_primaries (x,y): ";
sstr << "(" << m_tmap_mdcv->mdcv.display_primaries_x[0] << ";" << m_tmap_mdcv->mdcv.display_primaries_y[0] << "), ";
sstr << "(" << m_tmap_mdcv->mdcv.display_primaries_x[1] << ";" << m_tmap_mdcv->mdcv.display_primaries_y[1] << "), ";
sstr << "(" << m_tmap_mdcv->mdcv.display_primaries_x[2] << ";" << m_tmap_mdcv->mdcv.display_primaries_y[2] << ")\n";

sstr << indent << "tmap_mdcv.white point (x,y): (" << m_tmap_mdcv->mdcv.white_point_x << ";" << m_tmap_mdcv->mdcv.white_point_y << ")\n";
sstr << indent << "tmap_mdcv.max display mastering luminance: " << m_tmap_mdcv->mdcv.max_display_mastering_luminance << "\n";
sstr << indent << "tmap_mdcv.min display mastering luminance: " << m_tmap_mdcv->mdcv.min_display_mastering_luminance << "\n";
}
if (m_tmap_cclv_flag)
{
// TODO
sstr << indent << "tmap_cclv.ccv_primaries_present_flag: " << m_tmap_cclv->ccv_primaries_are_valid() << "\n";
sstr << indent << "tmap_cclv.ccv_min_luminance_value_present_flag: " << m_tmap_cclv->min_luminance_is_valid() << "\n";
sstr << indent << "tmap_cclv.ccv_max_luminance_value_present_flag: " << m_tmap_cclv->max_luminance_is_valid() << "\n";
sstr << indent << "tmap_cclv.ccv_avg_luminance_value_present_flag: " << m_tmap_cclv->avg_luminance_is_valid() << "\n";
if (m_tmap_cclv->ccv_primaries_are_valid())
{
sstr << indent << "tmap_cclv.ccv_primaries (x,y): ";
sstr << "(" << m_tmap_cclv->get_ccv_primary_x0() << ";" << m_tmap_cclv->get_ccv_primary_y0() << "), ";
sstr << "(" << m_tmap_cclv->get_ccv_primary_x1() << ";" << m_tmap_cclv->get_ccv_primary_y1() << "), ";
sstr << "(" << m_tmap_cclv->get_ccv_primary_x2() << ";" << m_tmap_cclv->get_ccv_primary_y2() << ")\n";
}
if (m_tmap_cclv->min_luminance_is_valid())
{
sstr << indent << "tmap_cclv.ccv_min_luminance_value: " << m_tmap_cclv->get_min_luminance() << "\n";
}
if (m_tmap_cclv->max_luminance_is_valid())
{
sstr << indent << "tmap_cclv.ccv_max_luminance_value: " << m_tmap_cclv->get_max_luminance() << "\n";
}
if (m_tmap_cclv->avg_luminance_is_valid())
{
sstr << indent << "tmap_cclv.ccv_avg_luminance_value: " << m_tmap_cclv->get_avg_luminance() << "\n";
}
}
if (m_tmap_amve_flag)
{
// TODO
sstr << indent << "tmap_amve.ambient_illumination: " << m_tmap_amve->amve.ambient_illumination << "\n";
sstr << indent << "tmap_amve.ambient_light_x: " << m_tmap_amve->amve.ambient_light_x << "\n";
sstr << indent << "tmap_amve.ambient_light_y: " << m_tmap_amve->amve.ambient_light_y << "\n";
}
if (m_tmap_reve_flag)
{
// TODO
// TODO - this isn't published yet
}
if (m_tmap_ndwt_flag)
{
// TODO
// TODO - this isn't published yet
}
}
}
Expand Down

0 comments on commit 95b7ceb

Please sign in to comment.