Add a few RGB-aware set & blend methods to the blitters #1680

smasher816 · 2023-10-26T16:56:26Z

Add new BB_fill_rect_color and BB_blend_rect_color functions taking a ColorRGB32.
Use a new is_rgb flag in Color structs for lua wrapper to decide which BB_ function to call.
If a ColorRGB32 is passed to fillRect/lightenRect then the new path will be taken. Otherwise original Color8A/uint8_t code is called.

No changes should occur for existing code paths. Callers must be patched to provide RGB colors if desired.
Lua blitbuffer implementation has not been changed.

This change is

smasher816 · 2023-10-26T17:08:24Z

Initial inspiration. koreader/koreader#9024 (comment)

blitbuffer.c

ffi/blitbuffer.lua

smasher816 · 2023-10-26T19:13:59Z

Unrelated, but all of a sudden after pushing to forks I am unable to recompile. Any pointers would be helpful since I haven't touched 3rd-party deps.
I would like to tests my fixes on-device before updating the MR.

dewarp2.c:144:8: error: call to undeclared function 'dewarpBuildPageModel_ex'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
return(dewarpBuildPageModel_ex(dew,debugfile,2));
       ^
dewarp2.c:144:8: note: did you mean 'dewarpBuildPageModel'?
dewarp2.c:141:1: note: 'dewarpBuildPageModel' declared here
dewarpBuildPageModel(L_DEWARP    *dew,
^
dewarp2.c:230:9: error: call to undeclared function 'dewarpFindVertDisparity_ex'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
    if (dewarpFindVertDisparity_ex(dew, ptaa2, 0, fit_order) != 0) {
        ^
dewarp2.c:230:9: note: did you mean 'dewarpFindVertDisparity'?
./allheaders.h:654:25: note: 'dewarpFindVertDisparity' declared here
LEPT_DLL extern l_int32 dewarpFindVertDisparity ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag );
                        ^
dewarp2.c:301:8: error: call to undeclared function 'dewarpFindVertDisparity_ex'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
return(dewarpFindVertDisparity_ex(dew,ptaa,rotflag,2));
       ^
dewarp2.c:1411:8: error: call to undeclared function 'dewarpBuildLineModel_ex'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
return(dewarpBuildLineModel_ex(dew,opensize,debugfile,2));
       ^
4 errors generated.
make[4]: *** [Makefile:823: dewarp2.lo] Error 1
make[4]: *** Waiting for unfinished jobs....
make[4]: Leaving directory '/home/arch/git/koreader/base/thirdparty/leptonica/build/aarch64-unknown-linux-android21/leptonica-prefix/src/leptonica/src'
make[3]: *** [Makefile:470: install-recursive] Error 1
make[3]: Leaving directory '/home/arch/git/koreader/base/thirdparty/leptonica/build/aarch64-unknown-linux-android21/leptonica-prefix/src/leptonica'
make[2]: *** [Makefile:95: liblept.so] Error 2
make[2]: Leaving directory '/home/arch/git/koreader/base/thirdparty/libk2pdfopt/build/aarch64-unknown-linux-android21/libk2pdfopt-prefix/src/libk2pdfopt'
ninja: build stopped: subcommand failed.
make[1]: *** [Makefile.third:372: build/aarch64-unknown-linux-android21/libs/libk2pdfopt.so.2] Error 1

NiLuJe · 2023-10-27T15:08:25Z

Unrelated

Make sure your submodules are up-to-date and point to the right place (both base's and base itself), then try a make dist-clean?

smasher816 · 2023-10-28T02:08:27Z

Fixed the above. A fresh clone also had issues so I figured out it was something with the machine and not the koreader repo.
After looking into env I found the following unexpectedly set.

profile.d/android-ndk.sh
2:export ANDROID_NDK=/opt/android-ndk
4:export ANDROID_NDK_HOME=/opt/android-ndk
6:export ANDROID_NDK_ROOT=/opt/android-ndk

It looks like installing a system package added those variables by default.

$ pacman -Qo /etc/profile.d/android-ndk.sh
/etc/profile.d/android-ndk.sh is owned by android-ndk r26.b-1

Unsetting the above fixed everything and now I can compile again. I'll work on resolving your comments.

smasher816 · 2023-10-28T03:23:29Z

New revision should have support for other screentypes and for real color blending (stacking multiple highlights makes the color get stronger and stronger).

smasher816 · 2023-10-28T13:57:57Z

Newest revision supports color pdf highlights. If new bb_color arg is not passed then the existing defaults are used.

blitbuffer.c

NiLuJe

I've pushed some minor simplifications, but have NOT tested them, I've just checked that it built (and was generating similar machine code before actual logic deviations were implemented ;p).

Reviewed 1 of 3 files at r2, 3 of 3 files at r3, 1 of 1 files at r4, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @smasher816)

NiLuJe

Reviewed 1 of 1 files at r5, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @smasher816)

poire-z · 2023-11-17T19:28:33Z

Is this ok? (I mean: ready to merge?)

NiLuJe · 2023-11-17T19:39:45Z

Needs testing ;).

And re-implement RGB32 fast path

(Jokes aside, we tend to prefer that syntatcit sugar (and string methods) as opposed to calling string.fn(obj) explicitly).

It'll get funkier with colors, but, oh, well.

NiLuJe · 2024-01-21T07:14:12Z

@poire-z: Because I'm super lazy, If you have a random test file with colored text on hand, that could come in handy. Thanks ;).

poire-z · 2024-01-21T09:26:43Z

Because I'm super lazy,

I know :)
Here's 2 of my test.html files where I tested various text & bg colors: test-color-stuff.zip
Any Wikipedia saved as EPUB will probably have various kinds of colored images if you need more.

Replace BB_blend_rect_color w/ BB_blend_RGB_multiply_rect

We need it from inside a Document class, and having it split between ReaderHighlights and BB is weird anyway

methods... (Into lightenRect & darkenRect, respectively). c.f, 2cb2e40

with the Lua blitter...

Leave the colorFromName fallback alone, for funsies

Requires a few bendRGB32 shims for Color <= 8A, as the usual blend methods assume Color8 input.

Which is the one we actually care about, as we don't actually have any colorblitFromRGB32 callers ;).

To deal with highlights on sw nightmode...

Implement a grayscale and a color one, like other setters Instead of implementing a full array of per-color type blend methods

And round the component values to 16 shades per component.

We often need a copy anyway, so take the opportunity to make this safer ;)

This allows us to fairly easily make gray behave as our legacy grayscale highlights, honoring the user's opacity value.

smasher816 mentioned this pull request Oct 26, 2023

Add color highlight menu koreader/koreader#11044

Draft

NiLuJe reviewed Oct 26, 2023

View reviewed changes

blitbuffer.c Outdated Show resolved Hide resolved

NiLuJe reviewed Oct 26, 2023

View reviewed changes

blitbuffer.c Show resolved Hide resolved

NiLuJe reviewed Oct 26, 2023

View reviewed changes

blitbuffer.c Show resolved Hide resolved

NiLuJe reviewed Oct 26, 2023

View reviewed changes

ffi/blitbuffer.lua Outdated Show resolved Hide resolved

smasher816 force-pushed the master branch from ce6597a to ab2d287 Compare October 28, 2023 03:21

smasher816 force-pushed the master branch from ab2d287 to a962a43 Compare October 28, 2023 13:56

NiLuJe reviewed Oct 28, 2023

View reviewed changes

blitbuffer.c Outdated Show resolved Hide resolved

smasher816 force-pushed the master branch 2 times, most recently from c610c9a to df9fb03 Compare October 30, 2023 19:05

NiLuJe reviewed Nov 1, 2023

View reviewed changes

Galunid mentioned this pull request Jan 14, 2024

FR: [Add more highlight color options] koreader/koreader#9024

Open

smasher816 and others added 3 commits January 21, 2024 06:43

Add RGB Highlights

2de3052

Simplify BB_fill_rect_color

4ac0eba

And re-implement RGB32 fast path

hashception!

73ac82b

(Jokes aside, we tend to prefer that syntatcit sugar (and string methods) as opposed to calling string.fn(obj) explicitly).

NiLuJe force-pushed the master branch from a58cb2f to 73ac82b Compare January 21, 2024 05:44

NiLuJe added 2 commits January 21, 2024 07:15

can't do that, it horribly break AA

3c7264c

Also can't really do that, it breaks the API

e2b55c8

NiLuJe marked this pull request as draft January 21, 2024 06:27

NiLuJe added 2 commits January 21, 2024 07:46

A dumb MUL blend works extremely well for blakc text.

d00b540

It'll get funkier with colors, but, oh, well.

I should got ake a nap.

baba14b

NiLuJe added 25 commits January 21, 2024 18:36

Jot down some more stuff to try

79a9191

Try some more stuff

0ff20e9

More random notes

a622868

Start rationalizing the C BB implementations

7dc80bf

Replace BB_blend_rect_color w/ BB_blend_RGB_multiply_rect

Start renaming BB_fill_rect_color to BB_fill_rect_RGB32

a20fab6

Finish renaming BB_fill_rect_color

d08eed2

Inline the source_y8 store

90be056

This needs to live in base

99d28cf

We need it from inside a Document class, and having it split between ReaderHighlights and BB is weird anyway

Rename BB_color_blit_from_rgb to BB_color_blit_from_RGB32

ce76fcf

Start moving the type-check burden to the caller

49d8b96

Address a 10-year old TODO, and properly rename dimRect & lightenRect

cd7c69b

methods... (Into lightenRect & darkenRect, respectively). c.f, 2cb2e40

Keep revamping the whole thing so it actually has a chance of working

23e74bb

with the Lua blitter...

Constify Color? pointers

f44c1a5

Wire in the C version of multiplyRectRGB

277aaa3

Update "gray" so that it matches our default grayscale highlight

211e660

Explain it.

e6f6fb2

Leave the colorFromName fallback alone, for funsies

Implement setPixelColorizeRGB32 in the Lua blitter

a7b4a2d

Requires a few bendRGB32 shims for Color <= 8A, as the usual blend methods assume Color8 input.

And implement setPixelMultiply in the Lua blitter

a737cdc

Which is the one we actually care about, as we don't actually have any colorblitFromRGB32 callers ;).

Implement blendRectRGB32

1e9f3b5

To deal with highlights on sw nightmode...

LuaCheck'ed

9bbcc83

Simplify setPixelColorizeRGB32

daf440d

Implement a grayscale and a color one, like other setters Instead of implementing a full array of per-color type blend methods

Make colorblitFromRGB32 safer

25f45b0

make red redder, and less carrot soup

9145d98

Tweak colors some more

6129c53

And round the component values to 16 shades per component.

Make sure we cast colors to the right type first

0cd88c3

We often need a copy anyway, so take the opportunity to make this safer ;)

NiLuJe changed the title ~~Add initial RGB painting support to C blitbuffer~~ Add a few RGB-aware set & blend methods to the blitters Jan 22, 2024

NiLuJe added 2 commits January 22, 2024 05:13

More logical color orders

436214e

Drop gray from the highlight colors, and let colorFromName return nil

90fbdde

This allows us to fairly easily make gray behave as our legacy grayscale highlights, honoring the user's opacity value.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add a few RGB-aware set & blend methods to the blitters #1680

Add a few RGB-aware set & blend methods to the blitters #1680

smasher816 commented Oct 26, 2023 •

edited by Frenzie

smasher816 commented Oct 26, 2023

smasher816 commented Oct 26, 2023

NiLuJe commented Oct 27, 2023

smasher816 commented Oct 28, 2023

smasher816 commented Oct 28, 2023

smasher816 commented Oct 28, 2023

NiLuJe left a comment

NiLuJe left a comment

poire-z commented Nov 17, 2023 •

edited

NiLuJe commented Nov 17, 2023

NiLuJe commented Jan 21, 2024

poire-z commented Jan 21, 2024

Add a few RGB-aware set & blend methods to the blitters #1680

Are you sure you want to change the base?

Add a few RGB-aware set & blend methods to the blitters #1680

Conversation

smasher816 commented Oct 26, 2023 • edited by Frenzie

smasher816 commented Oct 26, 2023

smasher816 commented Oct 26, 2023

NiLuJe commented Oct 27, 2023

smasher816 commented Oct 28, 2023

smasher816 commented Oct 28, 2023

smasher816 commented Oct 28, 2023

NiLuJe left a comment

Choose a reason for hiding this comment

NiLuJe left a comment

Choose a reason for hiding this comment

poire-z commented Nov 17, 2023 • edited

NiLuJe commented Nov 17, 2023

NiLuJe commented Jan 21, 2024

poire-z commented Jan 21, 2024

smasher816 commented Oct 26, 2023 •

edited by Frenzie

poire-z commented Nov 17, 2023 •

edited