History

avcodec/h2645_sei: validate Mastering Display Colour Volume SEI values

As we can read in ST 2086: Values outside the specified ranges of luminance and chromaticity values are not reserved by SMPTE, and can be used for purposes outside the scope of this standard. This is further acknowledged by ITU-T H.264 and ITU-T H.265. Which says that values out of range are unknown or unspecified or specified by other means not specified in this Specification.

Kacper Michajłow committed 2 years ago

Commit 1c451041 parent 65c1c831 file · +39 −16Browse files

Unified · Split

libavcodec/h2645_sei.c+39−16
@@ -587,38 +587,61 @@ static int h2645_sei_to_side_data(AVCodecContext *avctx, H2645SEI *sei, · 586 unmodified lines
587587 return ret;
588588
589589 if (metadata) {
590+ metadata->has_luminance = 1;
591+ metadata->has_primaries = 1;
592+
590593 for (i = 0; i < 3; i++) {
591594 const int j = mapping[i];
592595 metadata->display_primaries[i][0].num = sei->mastering_display.display_primaries[j][0];
593596 metadata->display_primaries[i][0].den = chroma_den;
597+ metadata->has_primaries &= sei->mastering_display.display_primaries[j][0] >= 5 &&
598+ sei->mastering_display.display_primaries[j][0] <= 37000;
599+
594600 metadata->display_primaries[i][1].num = sei->mastering_display.display_primaries[j][1];
595601 metadata->display_primaries[i][1].den = chroma_den;
602+ metadata->has_primaries &= sei->mastering_display.display_primaries[j][1] >= 5 &&
603+ sei->mastering_display.display_primaries[j][1] <= 42000;
596604 }
597605 metadata->white_point[0].num = sei->mastering_display.white_point[0];
598606 metadata->white_point[0].den = chroma_den;
607+ metadata->has_primaries &= sei->mastering_display.white_point[0] >= 5 &&
608+ sei->mastering_display.white_point[0] <= 37000;
609+
599610 metadata->white_point[1].num = sei->mastering_display.white_point[1];
600611 metadata->white_point[1].den = chroma_den;
612+ metadata->has_primaries &= sei->mastering_display.white_point[1] >= 5 &&
613+ sei->mastering_display.white_point[1] <= 42000;
601614
602615 metadata->max_luminance.num = sei->mastering_display.max_luminance;
603616 metadata->max_luminance.den = luma_den;
617+ metadata->has_luminance &= sei->mastering_display.max_luminance >= 50000 &&
618+ sei->mastering_display.max_luminance <= 100000000;
619+
604620 metadata->min_luminance.num = sei->mastering_display.min_luminance;
605621 metadata->min_luminance.den = luma_den;
606− metadata->has_luminance = 1;
607− metadata->has_primaries = 1;
608−
609− av_log(avctx, AV_LOG_DEBUG, "Mastering Display Metadata:\n");
610− av_log(avctx, AV_LOG_DEBUG,
611− "r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, %5.4f)\n",
612− av_q2d(metadata->display_primaries[0][0]),
613− av_q2d(metadata->display_primaries[0][1]),
614− av_q2d(metadata->display_primaries[1][0]),
615− av_q2d(metadata->display_primaries[1][1]),
616− av_q2d(metadata->display_primaries[2][0]),
617− av_q2d(metadata->display_primaries[2][1]),
618− av_q2d(metadata->white_point[0]), av_q2d(metadata->white_point[1]));
619− av_log(avctx, AV_LOG_DEBUG,
620− "min_luminance=%f, max_luminance=%f\n",
621− av_q2d(metadata->min_luminance), av_q2d(metadata->max_luminance));
622+ metadata->has_luminance &= sei->mastering_display.min_luminance >= 1 &&
623+ sei->mastering_display.min_luminance <= 50000 &&
624+ sei->mastering_display.min_luminance <
625+ sei->mastering_display.max_luminance;
626+
627+ if (metadata->has_luminance || metadata->has_primaries)
628+ av_log(avctx, AV_LOG_DEBUG, "Mastering Display Metadata:\n");
629+ if (metadata->has_primaries) {
630+ av_log(avctx, AV_LOG_DEBUG,
631+ "r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, %5.4f)\n",
632+ av_q2d(metadata->display_primaries[0][0]),
633+ av_q2d(metadata->display_primaries[0][1]),
634+ av_q2d(metadata->display_primaries[1][0]),
635+ av_q2d(metadata->display_primaries[1][1]),
636+ av_q2d(metadata->display_primaries[2][0]),
637+ av_q2d(metadata->display_primaries[2][1]),
638+ av_q2d(metadata->white_point[0]), av_q2d(metadata->white_point[1]));
639+ }
640+ if (metadata->has_luminance) {
641+ av_log(avctx, AV_LOG_DEBUG,
642+ "min_luminance=%f, max_luminance=%f\n",
643+ av_q2d(metadata->min_luminance), av_q2d(metadata->max_luminance));
644+ }
622645 }
623646 }
624647

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t