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.

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

Jump to bottom

Cleanup of palettized-PNG, NEO and XIMG support #35

Closed
wants to merge 28 commits into from
Closed

Cleanup of palettized-PNG, NEO and XIMG support #35

wants to merge 28 commits into from

Conversation

bbbradsmith
Copy link
Contributor

@bbbradsmith bbbradsmith commented Jan 26, 2024 •
edited
Loading

Cleanup intended to consolidate: #30, #31, #33, #34

Implementing suggestions made by Eero Tamminen on the mailing list:

  • Static arrays converted to function-local stack arrays.
  • Using be_swap16 instead of custom StoreNEOU16.
  • Consolidate shared code between SaveNEO/SaveXIMG.
  • Document the command line --screnshot-format which was added.
  • Document the revised screen dialog.

Additionally:

  • Add XIMG option to the GUI.
  • Add "ximg" command line option.

Including from #33 and #34:

  • NEO format should support any GenConv format that matches one of the 3 standard ST resolutions.
  • XIMG screenshot format.
  • ConvertNextLine passes line memory stride information from GenConv (rather than duplicating/assuming it).
  • Filename field in NEO indicates HATARI and BPP.

bbbradsmith and others added 24 commits January 3, 2024 02:27
@bbbradsmith
NEO direct video memory dump option for screen snapshot (Screen.bNEOS…
f1e14ca 
…creenSnapShot)
@bbbradsmith
use palette from middle line instead of bottom line
46eb783 
note that hires palette is unavailable (and safer method of addressing it)
@bbbradsmith
use GenConvert palette for high resolution NEO
ab8188c
@bbbradsmith
in theory the GenConvert palette would work for other GenConv screens…
d70385d 
… (though we still have no FrameBuffer image data)
@bbbradsmith
TT and Falcon NEO can fall back to just dumping data from the video b…
61c2881 
…ase address
@bbbradsmith
More complete support of GenConv resolutions. Allow any screen dimens…
549ed99 
…ions and BPP, dump as much data as needed.
@bbbradsmith
Add RGB palette extension so that STe/TT/Falcon images can retain all…
e1c23ab 
… of their colour information.
@bbbradsmith
Merge remote-tracking branch 'upstream/master' into neo-shot
685dde4 
# Conflicts:
#	src/configuration.c
#	src/includes/configuration.h
#	src/screenConvert.c
#	src/screenSnapShot.c
@bbbradsmith
incorporating style edits seen in the previous merge
cf7d630
@bbbradsmith
remove support for non-standard resolutions and BPP, remove RGB palet…
594c8d3 
…te suffix, create errors to diagnose when the screenshot can't be created
@bbbradsmith
fix missing resolution case, improve comments about NEO compatibility
5060108
@bbbradsmith
remove hardcoded centre line value
7f777c8
ScreenConv routines round line width up to 16, match behaviour
83d0e3d
spacing for NEO header write
5a3fb01
XIMG support
f62ded9
use GenConv's nextline to avoid redundant recalculation of line stride
b75b3f2
typo in line size calculation
97914cf
nextline can also widen if using hscrolloffset
a9c8880
@bbbradsmith
comment tweaks: screen width/height, missing space
dd502a6
@bbbradsmith
snapshot functions use stack arrays instead of static, use be_swap16 …
8393779 
…instead of custom StoreU16NEO function,

add ximg to --screenshot-format formats, document in manual.html
@bbbradsmith
Merge remote-tracking branch 'upstream/master' into neo-ximg-png-rev
d16bf45
@bbbradsmith
consolidate shared code from SaveNEO/SaveXIMG
21fee6b
@bbbradsmith
add XIMG to screenshot GUI
3c5c8b9
@bbbradsmith
fix NEO header resolution field
0e6aef4
This was referenced Jan 26, 2024
Closed
Closed
@bbbradsmith
Copy link
Contributor Author

The CI failure looks spurious, the only change was the HTML documentation, but the logged failure was an instruction test on cygwin only?

@huth
Copy link
Member

huth commented Jan 26, 2024

The CI failure looks spurious, the only change was the HTML documentation, but the logged failure was an instruction test on cygwin only?

I think I've seen the "command-fifo" test failing on some few occasion in the past weeks, but failed to reproduce it so far ... seems to be a bit flaky ... you can certainly ignore it for this PR here for now.

@bbbradsmith
line_size computation is also common NEO/XIMG code
7c3e5e2 
make flags field for NEO explicit 0
some NEO header comments for clarity
@huth huth requested a review from npomarede January 26, 2024 16:25
npomarede
npomarede reviewed Jan 26, 2024
View reviewed changes
Copy link
Contributor

@npomarede npomarede left a comment

Choose a reason for hiding this comment

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

Seems good for me, I merged everything into Hatari

@npomarede npomarede closed this Jan 28, 2024
@npomarede
Copy link
Contributor

Closing this PR as everything was merged into Hatari

@bbbradsmith bbbradsmith deleted the neo-ximg-png-rev branch April 15, 2024 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@npomarede npomarede npomarede left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bbbradsmith @huth @npomarede