Skip to content

fix: PICO_SCANVIDEO_PIXEL_... macros assume 5-bit color #87

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: PICO_SCANVIDEO_PIXEL_... macros assume 5-bit color #87

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/common/pico_scanvideo/include/pico/scanvideo/scanvideo_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,23 +338,35 @@ extern void scanvideo_default_configure_pio(pio_hw_t *pio, uint sm, uint offset,
#define PICO_SCANVIDEO_ALPHA_MASK (1u << PICO_SCANVIDEO_ALPHA_PIN)

#ifndef PICO_SCANVIDEO_PIXEL_FROM_RGB8
#define PICO_SCANVIDEO_PIXEL_FROM_RGB8(r, g, b) ((((b)>>3u)<<PICO_SCANVIDEO_PIXEL_BSHIFT)|(((g)>>3u)<<PICO_SCANVIDEO_PIXEL_GSHIFT)|(((r)>>3u)<<PICO_SCANVIDEO_PIXEL_RSHIFT))
#define PICO_SCANVIDEO_PIXEL_FROM_RGB8(r, g, b) ((((b)>>(8-PICO_SCANVIDEO_PIXEL_BCOUNT))<<PICO_SCANVIDEO_PIXEL_BSHIFT)|(((g)>>(8-PICO_SCANVIDEO_PIXEL_GCOUNT))<<PICO_SCANVIDEO_PIXEL_GSHIFT)|(((r)>>(8-PICO_SCANVIDEO_PIXEL_RCOUNT))<<PICO_SCANVIDEO_PIXEL_RSHIFT))
#endif

#ifndef PICO_SCANVIDEO_PIXEL_FROM_RGB5
#define PICO_SCANVIDEO_PIXEL_FROM_RGB5(r, g, b) (((b)<<PICO_SCANVIDEO_PIXEL_BSHIFT)|((g)<<PICO_SCANVIDEO_PIXEL_GSHIFT)|((r)<<PICO_SCANVIDEO_PIXEL_RSHIFT))
#define PICO_SCANVIDEO_PIXEL_FROM_RGB5(r, g, b) PICO_SCANVIDEO_PIXEL_FROM_RGB8(r<<3, b<<3, g<<3)
#endif

#ifndef PICO_SCANVIDEO_R8_FROM_PIXEL
#define PICO_SCANVIDEO_R8_FROM_PIXEL(p) (((p)>>PICO_SCANVIDEO_PIXEL_RSHIFT)<<(8-PICO_SCANVIDEO_PIXEL_RCOUNT)&0xff)
#endif

#ifndef PICO_SCANVIDEO_G8_FROM_PIXEL
#define PICO_SCANVIDEO_G8_FROM_PIXEL(p) (((p)>>PICO_SCANVIDEO_PIXEL_GSHIFT)<<(8-PICO_SCANVIDEO_PIXEL_GCOUNT)&0xff)
#endif

#ifndef PICO_SCANVIDEO_B8_FROM_PIXEL
#define PICO_SCANVIDEO_B8_FROM_PIXEL(p) (((p)>>PICO_SCANVIDEO_PIXEL_BSHIFT)<<(8-PICO_SCANVIDEO_PIXEL_BCOUNT)&0xff)
#endif

#ifndef PICO_SCANVIDEO_R5_FROM_PIXEL
#define PICO_SCANVIDEO_R5_FROM_PIXEL(p) (((p)>>PICO_SCANVIDEO_PIXEL_RSHIFT)&0x1f)
#define PICO_SCANVIDEO_R5_FROM_PIXEL(p) (PICO_SCANVIDEO_R8_FROM_PIXEL(p)>>3)
#endif

#ifndef PICO_SCANVIDEO_G5_FROM_PIXEL
#define PICO_SCANVIDEO_G5_FROM_PIXEL(p) (((p)>>PICO_SCANVIDEO_PIXEL_GSHIFT)&0x1f)
#define PICO_SCANVIDEO_G5_FROM_PIXEL(p) (PICO_SCANVIDEO_G8_FROM_PIXEL(p)>>3)
#endif

#ifndef PICO_SCANVIDEO_B5_FROM_PIXEL
#define PICO_SCANVIDEO_B5_FROM_PIXEL(p) (((p)>>PICO_SCANVIDEO_PIXEL_BSHIFT)&0x1f)
#define PICO_SCANVIDEO_B5_FROM_PIXEL(p) (PICO_SCANVIDEO_B8_FROM_PIXEL(p)>>3)
#endif

#ifdef __cplusplus
Expand Down