_first_video = node->optional_number_child<double> ("FirstVideo");
-
_color_range = static_cast<AVColorRange> (node->optional_number_child<int>("ColorRange").get_value_or (AVCOL_RANGE_UNSPECIFIED));
_color_primaries = static_cast<AVColorPrimaries> (node->optional_number_child<int>("ColorPrimaries").get_value_or (AVCOL_PRI_UNSPECIFIED));
_color_trc = static_cast<AVColorTransferCharacteristic> (
node->optional_number_child<int>("ColorTransferCharacteristic").get_value_or (AVCOL_TRC_UNSPECIFIED)
);
_colorspace = static_cast<AVColorSpace> (node->optional_number_child<int>("Colorspace").get_value_or (AVCOL_SPC_UNSPECIFIED));
+ _bits_per_pixel = static_cast<int> (node->number_child<int> ("BitsPerPixel"));
}
node->add_child("ColorPrimaries")->add_child_text (raw_convert<string> (_color_primaries));
node->add_child("ColorTransferCharacteristic")->add_child_text (raw_convert<string> (_color_trc));
node->add_child("Colorspace")->add_child_text (raw_convert<string> (_colorspace));
+ node->add_child("BitsPerPixel")->add_child_text (raw_convert<string> (_bits_per_pixel));
}
void
_color_primaries = examiner->color_primaries ();
_color_trc = examiner->color_trc ();
_colorspace = examiner->colorspace ();
+ _bits_per_pixel = examiner->bits_per_pixel ();
}
signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
{
VideoContent::add_properties (p);
- /* I tried av_*_name for these but they are not the most
- nicely formatted.
- */
-
- char const * ranges[] = {
- _("Unspecified"),
- _("MPEG (0-219 or equivalent)"),
- _("JPEG (0-255 or equivalent)")
- };
-
- DCPOMATIC_ASSERT (AVCOL_RANGE_NB == 3);
- p.push_back (make_pair (_("Colour range"), ranges[_color_range]));
+ int const sub = 219 * pow (2, _bits_per_pixel - 8);
+ int const total = pow (2, _bits_per_pixel);
+
+ switch (_color_range) {
+ case AVCOL_RANGE_UNSPECIFIED:
+ p.push_back (make_pair (_("Colour range"), _("Unspecified")));
+ break;
+ case AVCOL_RANGE_MPEG:
+ p.push_back (make_pair (_("Colour range"), String::compose ("Limited (%1-%2)", (total - sub) / 2, (total + sub) / 2)));
+ break;
+ case AVCOL_RANGE_JPEG:
+ p.push_back (make_pair (_("Colour range"), String::compose ("Full (0-total)", (total - sub) / 2, (total + sub) / 2)));
+ break;
+ default:
+ DCPOMATIC_ASSERT (false);
+ }
char const * primaries[] = {
_("Unspecified"),
DCPOMATIC_ASSERT (AVCOL_SPC_NB == 11);
p.push_back (make_pair (_("Colourspace"), spaces[_colorspace]));
+
+ p.push_back (make_pair (_("Bits per pixel"), raw_convert<string> (_bits_per_pixel)));
}