diff --git a/media/libjxl/src/lib/jxl/cms/jxl_cms_internal.h b/media/libjxl/src/lib/jxl/cms/jxl_cms_internal.h index 152f867ea..55764c808 100644 --- a/media/libjxl/src/lib/jxl/cms/jxl_cms_internal.h +++ b/media/libjxl/src/lib/jxl/cms/jxl_cms_internal.h @@ -200,8 +200,10 @@ static std::vector CreateTableCurve(bool tone_map) { // TODO(sboukortt): make this variable? static constexpr float kPQIntensityTarget = 10000; +#if 0 static_assert(N <= 4096); // ICC MFT2 only allows 4K entries static_assert(tf == ExtraTF::kPQ || tf == ExtraTF::kHLG); +#endif static constexpr Vector3 kLuminances{1.f / 3, 1.f / 3, 1.f / 3}; Rec2408ToneMapperBase tone_mapper( diff --git a/media/libjxl/src/lib/jxl/dec_modular.cc b/media/libjxl/src/lib/jxl/dec_modular.cc index e8dc17fa7..83efd2417 100644 --- a/media/libjxl/src/lib/jxl/dec_modular.cc +++ b/media/libjxl/src/lib/jxl/dec_modular.cc @@ -106,7 +106,9 @@ void SingleFromSingleAccurate(const size_t xsize, Status int_to_float(const pixel_type* const JXL_RESTRICT row_in, float* const JXL_RESTRICT row_out, const size_t xsize, const int bits, const int exp_bits) { +#if 0 static_assert(sizeof(pixel_type) == sizeof(float)); +#endif if (bits == 32) { JXL_ENSURE(exp_bits == 8); memcpy(row_out, row_in, xsize * sizeof(float)); diff --git a/media/libjxl/src/lib/jxl/icc_codec_common.cc b/media/libjxl/src/lib/jxl/icc_codec_common.cc index 0583396ad..c969f6442 100644 --- a/media/libjxl/src/lib/jxl/icc_codec_common.cc +++ b/media/libjxl/src/lib/jxl/icc_codec_common.cc @@ -70,7 +70,9 @@ void EncodeKeyword(const Tag& keyword, uint8_t* data, size_t size, size_t pos) { } Status AppendKeyword(const Tag& keyword, PaddedBytes* data) { +#if 0 static_assert(std::tuple_size{} == 4); +#endif return data->append(keyword); } diff --git a/media/libjxl/src/lib/jxl/image.h b/media/libjxl/src/lib/jxl/image.h index 633213d25..ea1a4215b 100644 --- a/media/libjxl/src/lib/jxl/image.h +++ b/media/libjxl/src/lib/jxl/image.h @@ -147,8 +147,10 @@ class Plane : public detail::PlaneBase { static StatusOr Create(JxlMemoryManager* memory_manager, const size_t xsize, const size_t ysize, const size_t pre_padding = 0) { +#if 0 static_assert(sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 || sizeof(T) == 8); +#endif uint32_t xsize32 = static_cast(xsize); uint32_t ysize32 = static_cast(ysize); JXL_ENSURE(xsize32 == xsize); diff --git a/media/libjxl/src/lib/jxl/modular/transform/palette.h b/media/libjxl/src/lib/jxl/modular/transform/palette.h index 9daf83e74..b8aaa3792 100644 --- a/media/libjxl/src/lib/jxl/modular/transform/palette.h +++ b/media/libjxl/src/lib/jxl/modular/transform/palette.h @@ -42,7 +42,9 @@ static inline pixel_type Scale(uint64_t value, uint64_t bit_depth) { // return (value * ((static_cast(1) << bit_depth) - 1)) / denom; // We only call this function with kSmallCube or kLargeCube - 1 as denom, // allowing us to avoid a division here. +#if 0 static_assert(denom == 4); +#endif return (value * ((static_cast(1) << bit_depth) - 1)) >> 2; } diff --git a/media/libjxl/src/lib/jxl/quant_weights.h b/media/libjxl/src/lib/jxl/quant_weights.h index 60c84abde..f36fac699 100644 --- a/media/libjxl/src/lib/jxl/quant_weights.h +++ b/media/libjxl/src/lib/jxl/quant_weights.h @@ -77,7 +77,9 @@ struct QuantEncodingInternal { template static constexpr QuantEncodingInternal Library() { +#if 0 static_assert(A < kNumPredefinedTables); +#endif return QuantEncodingInternal(Tag(), A); } constexpr QuantEncodingInternal(Tag /* tag */,