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.
Showing the changes to libavcodec (1 of 1 file). Show all
Unified · Split
| @@ -587,38 +587,61 @@ static int h2645_sei_to_side_data(AVCodecContext *avctx, H2645SEI *sei, · 586 unmodified lines | |||
| 587 | return ret; | 587 | return ret; |
| 588 | 588 | ||
| 589 | if (metadata) { | 589 | if (metadata) { |
| 590 | metadata->has_luminance = 1; | ||
| 591 | metadata->has_primaries = 1; | ||
| 592 | |||
| 590 | for (i = 0; i < 3; i++) { | 593 | for (i = 0; i < 3; i++) { |
| 591 | const int j = mapping[i]; | 594 | const int j = mapping[i]; |
| 592 | metadata->display_primaries[i][0].num = sei->mastering_display.display_primaries[j][0]; | 595 | metadata->display_primaries[i][0].num = sei->mastering_display.display_primaries[j][0]; |
| 593 | metadata->display_primaries[i][0].den = chroma_den; | 596 | 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 | |||
| 594 | metadata->display_primaries[i][1].num = sei->mastering_display.display_primaries[j][1]; | 600 | metadata->display_primaries[i][1].num = sei->mastering_display.display_primaries[j][1]; |
| 595 | metadata->display_primaries[i][1].den = chroma_den; | 601 | 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; | ||
| 596 | } | 604 | } |
| 597 | metadata->white_point[0].num = sei->mastering_display.white_point[0]; | 605 | metadata->white_point[0].num = sei->mastering_display.white_point[0]; |
| 598 | metadata->white_point[0].den = chroma_den; | 606 | 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 | |||
| 599 | metadata->white_point[1].num = sei->mastering_display.white_point[1]; | 610 | metadata->white_point[1].num = sei->mastering_display.white_point[1]; |
| 600 | metadata->white_point[1].den = chroma_den; | 611 | 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; | ||
| 601 | 614 | ||
| 602 | metadata->max_luminance.num = sei->mastering_display.max_luminance; | 615 | metadata->max_luminance.num = sei->mastering_display.max_luminance; |
| 603 | metadata->max_luminance.den = luma_den; | 616 | metadata->max_luminance.den = luma_den; |
| 617 | metadata->has_luminance &= sei->mastering_display.max_luminance >= 50000 && | ||
| 618 | sei->mastering_display.max_luminance <= 100000000; | ||
| 619 | |||
| 604 | metadata->min_luminance.num = sei->mastering_display.min_luminance; | 620 | metadata->min_luminance.num = sei->mastering_display.min_luminance; |
| 605 | metadata->min_luminance.den = luma_den; | 621 | metadata->min_luminance.den = luma_den; |
| 606 | metadata->has_luminance = 1; | 622 | metadata->has_luminance &= sei->mastering_display.min_luminance >= 1 && |
| 607 | metadata->has_primaries = 1; | 623 | sei->mastering_display.min_luminance <= 50000 && |
| 608 | 624 | sei->mastering_display.min_luminance < | |
| 609 | av_log(avctx, AV_LOG_DEBUG, "Mastering Display Metadata:\n"); | 625 | sei->mastering_display.max_luminance; |
| 610 | av_log(avctx, AV_LOG_DEBUG, | 626 | |
| 611 | "r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, %5.4f)\n", | 627 | if (metadata->has_luminance || metadata->has_primaries) |
| 612 | av_q2d(metadata->display_primaries[0][0]), | 628 | av_log(avctx, AV_LOG_DEBUG, "Mastering Display Metadata:\n"); |
| 613 | av_q2d(metadata->display_primaries[0][1]), | 629 | if (metadata->has_primaries) { |
| 614 | av_q2d(metadata->display_primaries[1][0]), | 630 | av_log(avctx, AV_LOG_DEBUG, |
| 615 | av_q2d(metadata->display_primaries[1][1]), | 631 | "r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, %5.4f)\n", |
| 616 | av_q2d(metadata->display_primaries[2][0]), | 632 | av_q2d(metadata->display_primaries[0][0]), |
| 617 | av_q2d(metadata->display_primaries[2][1]), | 633 | av_q2d(metadata->display_primaries[0][1]), |
| 618 | av_q2d(metadata->white_point[0]), av_q2d(metadata->white_point[1])); | 634 | av_q2d(metadata->display_primaries[1][0]), |
| 619 | av_log(avctx, AV_LOG_DEBUG, | 635 | av_q2d(metadata->display_primaries[1][1]), |
| 620 | "min_luminance=%f, max_luminance=%f\n", | 636 | av_q2d(metadata->display_primaries[2][0]), |
| 621 | av_q2d(metadata->min_luminance), av_q2d(metadata->max_luminance)); | 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 | } | ||
| 622 | } | 645 | } |
| 623 | } | 646 | } |
| 624 | 647 | ||