Skip to content

Commit de7bdd4

Browse files
committed
Updates cpu detection
1 parent ec723d6 commit de7bdd4

File tree

9 files changed

+25
-29
lines changed

9 files changed

+25
-29
lines changed

avif-coder/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ afterEvaluate {
4242
create<MavenPublication>("mavenJava") {
4343
groupId = "com.github.awxkee"
4444
artifactId = "avif-coder"
45-
version = "2.0.8"
45+
version = "2.0.9"
4646
from(components["release"])
4747
// artifact("androidSourcesJar")
4848
}

avif-coder/src/main/cpp/colorspace/FilmicToneMapper.cpp

+4-10
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,10 @@ void FilmicToneMapper::transferTone(float *inPlace, uint32_t width) {
3737
float r = targetPlace[0];
3838
float g = targetPlace[1];
3939
float b = targetPlace[2];
40-
coder::Oklab oklab = coder::Oklab::fromLinearRGB(r, g, b);
41-
if (oklab.L == 0) {
42-
continue;
43-
}
44-
float shScale = this->uncharted2_filmic(oklab.L) / oklab.L;
45-
oklab.L = oklab.L * shScale;
46-
coder::Rgb linearRgb = oklab.toLinearRGB();
47-
targetPlace[0] = std::min(linearRgb.r, 1.f);
48-
targetPlace[1] = std::min(linearRgb.g, 1.f);
49-
targetPlace[2] = std::min(linearRgb.b, 1.f);
40+
41+
targetPlace[0] = std::min(FilmicToneMapper::uncharted2_filmic(r), 1.f);
42+
targetPlace[1] = std::min(FilmicToneMapper::uncharted2_filmic(g), 1.f);
43+
targetPlace[2] = std::min(FilmicToneMapper::uncharted2_filmic(b), 1.f);
5044
targetPlace += 3;
5145
}
5246
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

avifpixart/Cargo.lock

+18-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

avifpixart/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2021"
66
[dependencies]
77
num-traits = "0.2.19"
88
pic-scale = { version = "0.3.0", default-features = false }
9-
yuvutils-rs = { path = "../../../RustroverProjects/yuvutils-rs" }
9+
yuvutils-rs = "0.5.1"
1010
bytemuck = "1.19.0"
1111

1212
[lib]

avifpixart/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ RUSTFLAGS="-C opt-level=z -C strip=symbols" cargo +nightly build -Z build-std=st
4242

4343

4444
cp -r target/aarch64-linux-android/release/libavifweaver.a ../avif-coder/src/main/cpp/lib/arm64-v8a/libavifweaver.a
45-
cp -r target/x86_64-linux-android/release/libavifweaver.a ../avif-coder/src/pmain/cpp/lib/x86_64/libavifweaver.a
45+
cp -r target/x86_64-linux-android/release/libavifweaver.a ../avif-coder/src/main/cpp/lib/x86_64/libavifweaver.a
4646
cp -r target/armv7-linux-androideabi/release/libavifweaver.a ../avif-coder/src/main/cpp/lib/armeabi-v7a/libavifweaver.a
4747
cp -r target/i686-linux-android/release/libavifweaver.a ../avif-coder/src/main/cpp/lib/x86/libavifweaver.a

0 commit comments

Comments
 (0)