guint32 id;
gdouble num;
/* Precision defined by HEVC specification */
- const guint chroma_den = 50000;
- const guint luma_den = 10000;
+ const guint chroma_scale = 50000;
+ const guint luma_scale = 10000;
gst_video_mastering_display_info_init (&minfo);
* 1000 cd/m^2 is generally used value on HDR. Just check guint range here.
* See https://www.webmproject.org/docs/container/#LuminanceMax
*/
- if (num < 0 || num > (gdouble) (G_MAXUINT32 / luma_den)) {
+ if (num < 0 || num > (gdouble) (G_MAXUINT32 / luma_scale)) {
GST_WARNING_OBJECT (demux, "0x%x has invalid value %f", id, num);
goto beach;
}
switch (id) {
case GST_MATROSKA_ID_PRIMARYRCHROMATICITYX:
- minfo.Rx_n = (guint) round (num * chroma_den);
- minfo.Rx_d = chroma_den;
+ minfo.display_primaries[0].x = (guint16) (num * chroma_scale);
break;
case GST_MATROSKA_ID_PRIMARYRCHROMATICITYY:
- minfo.Ry_n = (guint) round (num * chroma_den);
- minfo.Ry_d = chroma_den;
+ minfo.display_primaries[0].y = (guint16) (num * chroma_scale);
break;
case GST_MATROSKA_ID_PRIMARYGCHROMATICITYX:
- minfo.Gx_n = (guint) round (num * chroma_den);
- minfo.Gx_d = chroma_den;
+ minfo.display_primaries[1].x = (guint16) (num * chroma_scale);
break;
case GST_MATROSKA_ID_PRIMARYGCHROMATICITYY:
- minfo.Gy_n = (guint) round (num * chroma_den);
- minfo.Gy_d = chroma_den;
+ minfo.display_primaries[1].y = (guint16) (num * chroma_scale);
break;
case GST_MATROSKA_ID_PRIMARYBCHROMATICITYX:
- minfo.Bx_n = (guint) round (num * chroma_den);
- minfo.Bx_d = chroma_den;
+ minfo.display_primaries[2].x = (guint16) (num * chroma_scale);
break;
case GST_MATROSKA_ID_PRIMARYBCHROMATICITYY:
- minfo.By_n = (guint) round (num * chroma_den);
- minfo.By_d = chroma_den;
+ minfo.display_primaries[2].y = (guint16) (num * chroma_scale);
break;
case GST_MATROSKA_ID_WHITEPOINTCHROMATICITYX:
- minfo.Wx_n = (guint) round (num * chroma_den);
- minfo.Wx_d = chroma_den;
+ minfo.white_point.x = (guint16) (num * chroma_scale);
break;
case GST_MATROSKA_ID_WHITEPOINTCHROMATICITYY:
- minfo.Wy_n = (guint) round (num * chroma_den);
- minfo.Wy_d = chroma_den;
+ minfo.white_point.y = (guint16) (num * chroma_scale);
break;
case GST_MATROSKA_ID_LUMINANCEMAX:
- minfo.max_luma_n = (guint) round (num * luma_den);
- minfo.max_luma_d = luma_den;
+ minfo.max_display_mastering_luminance = (guint32) (num * luma_scale);
break;
case GST_MATROSKA_ID_LUMINANCEMIN:
- minfo.min_luma_n = (guint) round (num * luma_den);
- minfo.min_luma_d = luma_den;
+ minfo.min_display_mastering_luminance = (guint32) (num * luma_scale);
break;
default:
GST_FIXME_OBJECT (demux,
case GST_MATROSKA_ID_MAXCLL:{
if ((ret = gst_ebml_read_uint (ebml, &id, &num)) != GST_FLOW_OK)
goto beach;
- if (num >= G_MAXUINT32) {
+ if (num > G_MAXUINT16) {
GST_WARNING_OBJECT (demux,
"Too large maxCLL value %" G_GUINT64_FORMAT, num);
} else {
- video_context->content_light_level.maxCLL_n = num;
- video_context->content_light_level.maxCLL_d = 1;
+ video_context->content_light_level.max_content_light_level = num;
}
break;
}
case GST_MATROSKA_ID_MAXFALL:{
if ((ret = gst_ebml_read_uint (ebml, &id, &num)) != GST_FLOW_OK)
goto beach;
- if (num >= G_MAXUINT32) {
+ if (num >= G_MAXUINT16) {
GST_WARNING_OBJECT (demux,
"Too large maxFALL value %" G_GUINT64_FORMAT, num);
} else {
- video_context->content_light_level.maxFALL_n = num;
- video_context->content_light_level.maxFALL_d = 1;
+ video_context->content_light_level.max_frame_average_light_level =
+ num;
}
break;
}
}
}
- if (videocontext->content_light_level.maxCLL_n &&
- videocontext->content_light_level.maxFALL_n) {
+ if (videocontext->content_light_level.max_content_light_level &&
+ videocontext->content_light_level.max_frame_average_light_level) {
if (!gst_video_content_light_level_add_to_caps
(&videocontext->content_light_level, caps)) {
GST_WARNING ("couldn't set content light level to caps");
guint64 master;
GstVideoMasteringDisplayInfo *minfo = &videocontext->mastering_display_info;
gdouble value;
+ const gdouble chroma_scale = 50000;
+ const gdouble luma_scale = 50000;
if (!videocontext->mastering_display_info_present)
return;
master =
gst_ebml_write_master_start (ebml, GST_MATROSKA_ID_MASTERINGMETADATA);
- gst_util_fraction_to_double (minfo->Rx_n, minfo->Rx_d, &value);
+ value = (gdouble) minfo->display_primaries[0].x / chroma_scale;
gst_ebml_write_float (ebml, GST_MATROSKA_ID_PRIMARYRCHROMATICITYX, value);
- gst_util_fraction_to_double (minfo->Ry_n, minfo->Ry_d, &value);
+ value = (gdouble) minfo->display_primaries[0].y / chroma_scale;
gst_ebml_write_float (ebml, GST_MATROSKA_ID_PRIMARYRCHROMATICITYY, value);
- gst_util_fraction_to_double (minfo->Gx_n, minfo->Gx_d, &value);
+ value = (gdouble) minfo->display_primaries[1].x / chroma_scale;
gst_ebml_write_float (ebml, GST_MATROSKA_ID_PRIMARYGCHROMATICITYX, value);
- gst_util_fraction_to_double (minfo->Gy_n, minfo->Gy_d, &value);
+ value = (gdouble) minfo->display_primaries[1].y / chroma_scale;
gst_ebml_write_float (ebml, GST_MATROSKA_ID_PRIMARYGCHROMATICITYY, value);
- gst_util_fraction_to_double (minfo->Bx_n, minfo->Bx_d, &value);
+ value = (gdouble) minfo->display_primaries[2].x / chroma_scale;
gst_ebml_write_float (ebml, GST_MATROSKA_ID_PRIMARYBCHROMATICITYX, value);
- gst_util_fraction_to_double (minfo->By_n, minfo->By_d, &value);
+ value = (gdouble) minfo->display_primaries[2].y / chroma_scale;
gst_ebml_write_float (ebml, GST_MATROSKA_ID_PRIMARYBCHROMATICITYY, value);
- gst_util_fraction_to_double (minfo->Wx_n, minfo->Wx_d, &value);
+ value = (gdouble) minfo->white_point.x / chroma_scale;
gst_ebml_write_float (ebml, GST_MATROSKA_ID_WHITEPOINTCHROMATICITYX, value);
- gst_util_fraction_to_double (minfo->Wy_n, minfo->Wy_d, &value);
+ value = (gdouble) minfo->white_point.y / chroma_scale;
gst_ebml_write_float (ebml, GST_MATROSKA_ID_WHITEPOINTCHROMATICITYY, value);
- gst_util_fraction_to_double (minfo->max_luma_n, minfo->max_luma_d, &value);
+ value = (gdouble) minfo->max_display_mastering_luminance / luma_scale;
gst_ebml_write_float (ebml, GST_MATROSKA_ID_LUMINANCEMAX, value);
- gst_util_fraction_to_double (minfo->min_luma_n, minfo->min_luma_d, &value);
+ value = (gdouble) minfo->min_display_mastering_luminance / luma_scale;
gst_ebml_write_float (ebml, GST_MATROSKA_ID_LUMINANCEMIN, value);
gst_ebml_write_master_finish (ebml, master);
gst_ebml_write_uint (ebml, GST_MATROSKA_ID_VIDEOTRANSFERCHARACTERISTICS,
transfer_id);
gst_ebml_write_uint (ebml, GST_MATROSKA_ID_VIDEOPRIMARIES, primaries_id);
- if (videocontext->content_light_level.maxCLL_n &&
- videocontext->content_light_level.maxFALL_n) {
- gdouble maxCLL = 0, maxFALL = 0;
-
- gst_util_fraction_to_double (videocontext->content_light_level.maxCLL_n,
- videocontext->content_light_level.maxCLL_d, &maxCLL);
- gst_util_fraction_to_double (videocontext->content_light_level.maxFALL_n,
- videocontext->content_light_level.maxFALL_d, &maxFALL);
- gst_ebml_write_uint (ebml, GST_MATROSKA_ID_MAXCLL, (guint) maxCLL);
- gst_ebml_write_uint (ebml, GST_MATROSKA_ID_MAXFALL, (guint) maxFALL);
+ if (videocontext->content_light_level.max_content_light_level &&
+ videocontext->content_light_level.max_frame_average_light_level) {
+ gst_ebml_write_uint (ebml, GST_MATROSKA_ID_MAXCLL,
+ videocontext->content_light_level.max_content_light_level);
+ gst_ebml_write_uint (ebml, GST_MATROSKA_ID_MAXFALL,
+ videocontext->content_light_level.max_frame_average_light_level);
}
gst_matroska_mux_write_mastering_metadata (mux, videocontext);