Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade ndk + libcimbar #19

Merged
merged 4 commits into from
Jun 24, 2023
Merged

Upgrade ndk + libcimbar #19

merged 4 commits into from
Jun 24, 2023

Conversation

sz3
Copy link
Owner

@sz3 sz3 commented Jun 24, 2023

This contains what should be the real fix for the android 12/13 crash (see #14 and #15), as well as various decoding improvementsI hope they're all improvements from sz3/libcimbar#73.

sz3 added 4 commits June 24, 2023 06:52
f219e877 Merge pull request #75 from sz3/web-fix
20f16012 The GL window height, or width, or both, needs to be divisible by 4?
98368d71 Pass dummy values to configure() to use config defaults
1b09a772 Use Config settings for cimbar_js defaults
b392e57b Pin the emscripten/emsdk docker image
d9bd2a29 Merge pull request #73 from sz3/bugfix-improve-and-5x5
709a3484 Add back a few test cases, add some comments, and check in the 5x5 tileset
b9d9d039 Simplify calculate_cooldown() + a comment for FloodDecodePositions::update()
55fcadb0 gh workflow updates
6baf0c43 Odd emscripten workaround -- not sure if this is the "right way", but it works
9f114732 Fix wasm packaging script
04528bb5 Add the 5x5 tileset to bitmaps.h + missing include
dce68331 Fix off-by-one type bug!
d452652b Update regression tests
8c891d01 Put back the Config.cpp for broader compiler support...
55956de1 Update more tests?
9204892a Misc fix
4d2943c1 Experimenting with ways to improve the flood decode
6daa9476 3,-5 for adaptiveThreshhold on symbols seems better?
18e54802 Put back the skip param for mean_rgb on larger cell sizes
1ec077b9 Running afoul of constexpr rules
4e33841c Put us back on 8x8
ec74f7c9 For now, put the uint128s back
02d4573e Have ahash_result take a template param for cell size
e2b55fce + do all bitextract index magic in "pattern()" function
24a291a2 Add some compile-time magic to auto-generate the bit extract pattern
173087ce Move grid params into their own file?
cad107cd Minor tweaks to make it easier to switch between grid sizes
f9326023 Special case for running the "ALL" check (9-way compare) on seed locations
92a33ef4 More warnings \o/
3479d39b Better(?) threshold params, and a thought
99e0f512 Drift cooldown?
f3cdabe9 More const, and add more seed positions for the decode?
6849234e These should all be const...
f9a9dd8a Scale window size off the size of the image.
3616c367 Pass image_size/anchor_size to extractor...
7766cfd8 Attempt to use 988x988 grid...?
c4f87506 A 5x5 that works with both 4 bit and 5 bit
c34ae889 Calculate total_cells() and frame capacity, and ...
cdd2f5c5 Update ahash_result for 5-bit reads + lots of test fixes for average_hash
ec629809 Changes to average_hash...
e2cab430 Small changes to average_hash(), decode_color()
731dfb1a Update the bitextractor to deal with reads other than len=8
1fd265d6 Minimal changes for encoding with a grid of 5x5s
b0aae780 Merge pull request #68 from sz3/packaging-cimbar-html
6ca0650f Post cimbar_js.html as part of package build.
0906f682 Script to bundle cimbar_js's asm.js build into a single html file
c8529e33 Merge pull request #63 from sz3/stdin
d17dcf31 -f is now the default
21f99327 A bit silly, but: py3.6 compatibility for now
2ff867d7 Test cli?
d646ec72 Have fountain_decoder_sink optionally print its work...
892579ae Have the encoder be stdin-aware too
21cc6a79 🤔
aad249d4 Read filenames from stdin iff no inputs are provided, + ...
074d813a Make fountain encoding the default. Add StdinLineReader for decodes.
89762c1e An idea

git-subtree-dir: app/src/cpp/libcimbar
git-subtree-split: f219e877652220702624e5ca06c5d1982060d0bb
Keeping libcimbar master up to date. The most interesting included PR is
probably sz3/libcimbar#73.
@@ -3,13 +3,13 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 33
buildToolsVersion "29.0.3"
ndkVersion "22.1.7171670"
ndkVersion "25.2.9519653"
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ndk 25.x, sdk version 33

@sz3 sz3 merged commit a7190ce into master Jun 24, 2023
@sz3 sz3 deleted the upgrade-ndk-and-libcimbar branch June 24, 2023 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant