mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-21 09:49:14 +00:00
Backed out changeset d629f462a605 (bug 1729539) for causing Wd failures. CLOSED TREE
This commit is contained in:
Butkovits Atila
parent
cc49cdbcd1
commit
f2a5d438bb
@ -21,7 +21,7 @@
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
use std::{
|
||||
convert::{TryFrom, TryInto},
|
||||
convert::TryInto,
|
||||
sync::atomic::{AtomicBool, Ordering},
|
||||
sync::Arc,
|
||||
};
|
||||
@ -136,7 +136,7 @@ pub struct XYZNumber {
|
||||
/// A color in the CIE xyY color space
|
||||
/* the names for the following two types are sort of ugly */
|
||||
#[repr(C)]
|
||||
#[derive(Copy, Clone, Debug)]
|
||||
#[derive(Copy, Clone)]
|
||||
#[allow(clippy::upper_case_acronyms)]
|
||||
pub struct qcms_CIE_xyY {
|
||||
pub x: f64,
|
||||
@ -166,7 +166,7 @@ impl From<qcms_chromaticity> for qcms_CIE_xyY {
|
||||
|
||||
/// a set of CIE_xyY values that can use to describe the primaries of a color space
|
||||
#[repr(C)]
|
||||
#[derive(Copy, Clone, Debug)]
|
||||
#[derive(Copy, Clone)]
|
||||
#[allow(clippy::upper_case_acronyms)]
|
||||
pub struct qcms_CIE_xyYTRIPLE {
|
||||
pub red: qcms_CIE_xyY,
|
||||
@ -1066,40 +1066,26 @@ impl From<u8> for ColourPrimaries {
|
||||
fn colour_primaries() {
|
||||
for value in 0..=u8::MAX {
|
||||
match ColourPrimaries::from(value) {
|
||||
invalid_variant @ ColourPrimaries::Reserved
|
||||
| invalid_variant @ ColourPrimaries::Unspecified => {
|
||||
assert!(invalid_variant.white_point().is_err());
|
||||
assert!(qcms_CIE_xyYTRIPLE::try_from(invalid_variant).is_err());
|
||||
}
|
||||
variant => {
|
||||
assert_eq!(value, variant as u8);
|
||||
let wp_result = variant.white_point();
|
||||
assert!(wp_result.is_ok(), "{:?} failed: {:?}", variant, wp_result);
|
||||
let result = qcms_CIE_xyYTRIPLE::try_from(variant);
|
||||
assert!(result.is_ok(), "{:?} failed: {:?}", variant, result);
|
||||
}
|
||||
ColourPrimaries::Reserved => {}
|
||||
variant => assert_eq!(value, variant as u8),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl TryFrom<ColourPrimaries> for qcms_CIE_xyYTRIPLE {
|
||||
type Error = String;
|
||||
|
||||
fn try_from(value: ColourPrimaries) -> Result<Self, Self::Error> {
|
||||
impl From<ColourPrimaries> for qcms_CIE_xyYTRIPLE {
|
||||
fn from(value: ColourPrimaries) -> Self {
|
||||
let red;
|
||||
let green;
|
||||
let blue;
|
||||
|
||||
match value {
|
||||
ColourPrimaries::Reserved => return Err(format!("CP={} is reserved", value as u8)),
|
||||
ColourPrimaries::Reserved => panic!("CP={} is reserved", value as u8),
|
||||
ColourPrimaries::Bt709 => {
|
||||
green = qcms_chromaticity { x: 0.300, y: 0.600 };
|
||||
blue = qcms_chromaticity { x: 0.150, y: 0.060 };
|
||||
red = qcms_chromaticity { x: 0.640, y: 0.330 };
|
||||
}
|
||||
ColourPrimaries::Unspecified => {
|
||||
return Err(format!("CP={} is unspecified", value as u8))
|
||||
}
|
||||
ColourPrimaries::Unspecified => panic!("CP={} is unspecified", value as u8),
|
||||
ColourPrimaries::Bt470M => {
|
||||
green = qcms_chromaticity { x: 0.21, y: 0.71 };
|
||||
blue = qcms_chromaticity { x: 0.14, y: 0.08 };
|
||||
@ -1143,35 +1129,35 @@ impl TryFrom<ColourPrimaries> for qcms_CIE_xyYTRIPLE {
|
||||
}
|
||||
}
|
||||
|
||||
Ok(Self {
|
||||
Self {
|
||||
red: red.into(),
|
||||
green: green.into(),
|
||||
blue: blue.into(),
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ColourPrimaries {
|
||||
fn white_point(self) -> Result<qcms_CIE_xyY, String> {
|
||||
fn white_point(self) -> qcms_CIE_xyY {
|
||||
match self {
|
||||
Self::Reserved => Err(format!("CP={} is reserved", self as u8)),
|
||||
Self::Reserved => panic!("CP={} is reserved", self as u8),
|
||||
Self::Bt709
|
||||
| Self::Bt470Bg
|
||||
| Self::Bt601
|
||||
| Self::Smpte240
|
||||
| Self::Bt2020
|
||||
| Self::Smpte432
|
||||
| Self::Ebu3213 => Ok(qcms_chromaticity::D65),
|
||||
Self::Unspecified => Err(format!("CP={} is unspecified", self as u8)),
|
||||
Self::Bt470M => Ok(qcms_chromaticity { x: 0.310, y: 0.316 }),
|
||||
Self::Generic_film => Ok(qcms_chromaticity { x: 0.310, y: 0.316 }),
|
||||
Self::Xyz => Ok(qcms_chromaticity {
|
||||
| Self::Ebu3213 => qcms_chromaticity::D65,
|
||||
Self::Unspecified => panic!("CP={} is unspecified", self as u8),
|
||||
Self::Bt470M => qcms_chromaticity { x: 0.310, y: 0.316 },
|
||||
Self::Generic_film => qcms_chromaticity { x: 0.310, y: 0.316 },
|
||||
Self::Xyz => qcms_chromaticity {
|
||||
x: 1. / 3.,
|
||||
y: 1. / 3.,
|
||||
}),
|
||||
Self::Smpte431 => Ok(qcms_chromaticity { x: 0.314, y: 0.351 }),
|
||||
},
|
||||
Self::Smpte431 => qcms_chromaticity { x: 0.314, y: 0.351 },
|
||||
}
|
||||
.map(Into::into)
|
||||
.into()
|
||||
}
|
||||
}
|
||||
|
||||
@ -1233,21 +1219,8 @@ pub enum TransferCharacteristics {
|
||||
fn transfer_characteristics() {
|
||||
for value in 0..=u8::MAX {
|
||||
match TransferCharacteristics::from(value) {
|
||||
invalid_variant @ TransferCharacteristics::Reserved
|
||||
| invalid_variant @ TransferCharacteristics::Unspecified => {
|
||||
assert!(curveType::try_from(invalid_variant).is_err());
|
||||
}
|
||||
unimplemented_variant @ TransferCharacteristics::Smpte240
|
||||
| unimplemented_variant @ TransferCharacteristics::Iec61966
|
||||
| unimplemented_variant @ TransferCharacteristics::Bt_1361
|
||||
| unimplemented_variant @ TransferCharacteristics::Smpte428 => {
|
||||
assert!(curveType::try_from(unimplemented_variant).is_err())
|
||||
}
|
||||
variant => {
|
||||
assert_eq!(value, variant as u8);
|
||||
let result = curveType::try_from(variant);
|
||||
assert!(result.is_ok(), "{:?} failed: {:?}", variant, result);
|
||||
}
|
||||
TransferCharacteristics::Reserved => {}
|
||||
variant => assert_eq!(value, variant as u8),
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1277,16 +1250,14 @@ impl From<u8> for TransferCharacteristics {
|
||||
}
|
||||
}
|
||||
|
||||
impl TryFrom<TransferCharacteristics> for curveType {
|
||||
type Error = String;
|
||||
|
||||
impl From<TransferCharacteristics> for curveType {
|
||||
/// See [ICC.1:2010](https://www.color.org/specification/ICC1v43_2010-12.pdf)
|
||||
/// See [Rec. ITU-R BT.2100-2](https://www.itu.int/dms_pubrec/itu-r/rec/bt/R-REC-BT.2100-2-201807-I!!PDF-E.pdf)
|
||||
fn try_from(value: TransferCharacteristics) -> Result<Self, Self::Error> {
|
||||
fn from(value: TransferCharacteristics) -> Self {
|
||||
const NUM_TRC_TABLE_ENTRIES: i32 = 1024;
|
||||
|
||||
match value {
|
||||
TransferCharacteristics::Reserved => Err(format!("TC={} is reserved", value as u8)),
|
||||
TransferCharacteristics::Reserved => panic!("TC={} is reserved", value as u8),
|
||||
TransferCharacteristics::Bt709
|
||||
| TransferCharacteristics::Bt601
|
||||
| TransferCharacteristics::Bt2020_10bit
|
||||
@ -1335,17 +1306,13 @@ impl TryFrom<TransferCharacteristics> for curveType {
|
||||
const c: Float = 1. / linear_coef;
|
||||
const d: Float = linear_coef * beta;
|
||||
|
||||
Ok(curveType::Parametric(vec![g, a, b, c, d]))
|
||||
curveType::Parametric(vec![g, a, b, c, d])
|
||||
}
|
||||
TransferCharacteristics::Unspecified => {
|
||||
Err(format!("TC={} is unspecified", value as u8))
|
||||
}
|
||||
TransferCharacteristics::Bt470M => Ok(*curve_from_gamma(2.2)),
|
||||
TransferCharacteristics::Bt470Bg => Ok(*curve_from_gamma(2.8)),
|
||||
TransferCharacteristics::Smpte240 => {
|
||||
Err(format!("TC={} ({:?}) is unimplemented", value as u8, value))
|
||||
}
|
||||
TransferCharacteristics::Linear => Ok(*curve_from_gamma(1.)),
|
||||
TransferCharacteristics::Unspecified => panic!("TC={} is unspecified", value as u8),
|
||||
TransferCharacteristics::Bt470M => *curve_from_gamma(2.2),
|
||||
TransferCharacteristics::Bt470Bg => *curve_from_gamma(2.8),
|
||||
TransferCharacteristics::Smpte240 => unimplemented!(),
|
||||
TransferCharacteristics::Linear => *curve_from_gamma(1.),
|
||||
TransferCharacteristics::Log_100 => {
|
||||
// See log_100_transfer_characteristics() for derivation
|
||||
// The opto-electronic transfer characteristic function (OETF)
|
||||
@ -1358,7 +1325,7 @@ impl TryFrom<TransferCharacteristics> for curveType {
|
||||
//
|
||||
// Lc = 10^(2*V - 2) for 1 >= V >= 0
|
||||
let table = build_trc_table(NUM_TRC_TABLE_ENTRIES, |v| 10f64.powf(2. * v - 2.));
|
||||
Ok(curveType::Curve(table))
|
||||
curveType::Curve(table)
|
||||
}
|
||||
TransferCharacteristics::Log_100_sqrt10 => {
|
||||
// The opto-electronic transfer characteristic function (OETF)
|
||||
@ -1371,19 +1338,13 @@ impl TryFrom<TransferCharacteristics> for curveType {
|
||||
//
|
||||
// Lc = 10^(2.5*V - 2.5) for 1 >= V >= 0
|
||||
let table = build_trc_table(NUM_TRC_TABLE_ENTRIES, |v| 10f64.powf(2.5 * v - 2.5));
|
||||
Ok(curveType::Curve(table))
|
||||
}
|
||||
TransferCharacteristics::Iec61966 => {
|
||||
Err(format!("TC={} ({:?}) is unimplemented", value as u8, value))
|
||||
}
|
||||
TransferCharacteristics::Bt_1361 => {
|
||||
Err(format!("TC={} ({:?}) is unimplemented", value as u8, value))
|
||||
curveType::Curve(table)
|
||||
}
|
||||
TransferCharacteristics::Iec61966 => unimplemented!(),
|
||||
TransferCharacteristics::Bt_1361 => unimplemented!(),
|
||||
TransferCharacteristics::Srgb => {
|
||||
// Should we prefer this or Ok(curveType::Parametric?)
|
||||
Ok(curveType::Curve(build_sRGB_gamma_table(
|
||||
NUM_TRC_TABLE_ENTRIES,
|
||||
)))
|
||||
// Should we prefer this or curveType::Parametric?
|
||||
curveType::Curve(build_sRGB_gamma_table(NUM_TRC_TABLE_ENTRIES))
|
||||
}
|
||||
|
||||
TransferCharacteristics::Smpte2084 => {
|
||||
@ -1403,11 +1364,9 @@ impl TryFrom<TransferCharacteristics> for curveType {
|
||||
let table = build_trc_table(NUM_TRC_TABLE_ENTRIES, |x| {
|
||||
((x.powf(1. / m) - c1).max(0.) / (c2 - c3 * x.powf(1. / m))).powf(1. / n)
|
||||
});
|
||||
Ok(curveType::Curve(table))
|
||||
}
|
||||
TransferCharacteristics::Smpte428 => {
|
||||
Err(format!("TC={} ({:?}) is unimplemented", value as u8, value))
|
||||
curveType::Curve(table)
|
||||
}
|
||||
TransferCharacteristics::Smpte428 => unimplemented!(),
|
||||
TransferCharacteristics::Hlg => {
|
||||
// The opto-electronic transfer characteristic function (OETF)
|
||||
// as defined in ITU-T H.273 table 3, row 18:
|
||||
@ -1429,10 +1388,12 @@ impl TryFrom<TransferCharacteristics> for curveType {
|
||||
assert!((0. ..=1. / 12.).contains(&y1));
|
||||
y1
|
||||
} else {
|
||||
(std::f64::consts::E.powf((x - c) / a) + b) / 12.
|
||||
let y2 = (std::f64::consts::E.powf((x - c) / a) + b) / 12.;
|
||||
assert!(y2 > 1. / 12. && y2 <= 1.);
|
||||
y2
|
||||
}
|
||||
});
|
||||
Ok(curveType::Curve(table))
|
||||
curveType::Curve(table)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1442,7 +1403,7 @@ impl TryFrom<TransferCharacteristics> for curveType {
|
||||
fn check_transfer_characteristics(cicp: TransferCharacteristics, icc_path: &str) {
|
||||
let mut cicp_out = [0u8; crate::transform::PRECACHE_OUTPUT_SIZE];
|
||||
let mut icc_out = [0u8; crate::transform::PRECACHE_OUTPUT_SIZE];
|
||||
let cicp_tc = curveType::try_from(cicp).expect("valid cicp");
|
||||
let cicp_tc = curveType::from(cicp);
|
||||
let icc = Profile::new_from_path(icc_path).unwrap();
|
||||
let icc_tc = icc.redTRC.as_ref().unwrap();
|
||||
|
||||
@ -1485,16 +1446,6 @@ fn bt2020_12bit_transfer_characteristics() {
|
||||
check_transfer_characteristics(TransferCharacteristics::Bt2020_12bit, "ITU-2020.icc");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn new_sRGB() {
|
||||
Profile::new_sRGB();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn new_sRGB_parametric() {
|
||||
Profile::new_sRGB_parametric();
|
||||
}
|
||||
|
||||
impl Profile {
|
||||
//XXX: it would be nice if we had a way of ensuring
|
||||
// everything in a profile was initialized regardless of how it was created
|
||||
@ -1525,7 +1476,7 @@ impl Profile {
|
||||
|
||||
let mut srgb = Profile::new_rgb_with_table(
|
||||
D65,
|
||||
qcms_CIE_xyYTRIPLE::try_from(ColourPrimaries::Bt709).unwrap(),
|
||||
qcms_CIE_xyYTRIPLE::from(ColourPrimaries::Bt709),
|
||||
&table,
|
||||
)
|
||||
.unwrap();
|
||||
@ -1539,7 +1490,7 @@ impl Profile {
|
||||
}
|
||||
|
||||
pub(crate) fn new_sRGB_parametric() -> Box<Profile> {
|
||||
let primaries = qcms_CIE_xyYTRIPLE::try_from(ColourPrimaries::Bt709).unwrap();
|
||||
let primaries = qcms_CIE_xyYTRIPLE::from(ColourPrimaries::Bt709);
|
||||
let white_point = qcms_white_point_sRGB();
|
||||
let mut profile = profile_create();
|
||||
set_rgb_colorants(&mut profile, white_point, primaries);
|
||||
@ -1588,14 +1539,10 @@ impl Profile {
|
||||
pub fn new_cicp(cp: ColourPrimaries, tc: TransferCharacteristics) -> Option<Box<Profile>> {
|
||||
let mut profile = profile_create();
|
||||
//XXX: should store the whitepoint
|
||||
if !set_rgb_colorants(
|
||||
&mut profile,
|
||||
cp.white_point().ok()?,
|
||||
qcms_CIE_xyYTRIPLE::try_from(cp).ok()?,
|
||||
) {
|
||||
if !set_rgb_colorants(&mut profile, cp.white_point(), qcms_CIE_xyYTRIPLE::from(cp)) {
|
||||
return None;
|
||||
}
|
||||
let curve = curveType::try_from(tc).ok()?;
|
||||
let curve = curveType::from(tc);
|
||||
profile.redTRC = Some(Box::new(curve.clone()));
|
||||
profile.blueTRC = Some(Box::new(curve.clone()));
|
||||
profile.greenTRC = Some(Box::new(curve));
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user