Center bootsplash on bigger framebuffers

In the JPEG decoder, use `bytes_per_line` instead of `width` for
address calculations, to allow for bigger framebuffers. When
calling jpeg_decode(), add an offset to the framebuffer address
so the picture gets centered.

Change-Id: I0174bdccfaad425e708a5fa50bcb28a1b98a23f7
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76424
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Subrata Banik <subratabanik@google.com>
This commit is contained in:
Nico Huber
2023-07-14 00:09:00 +02:00
committed by Felix Held
parent 9b186e0ffe
commit 99eee16a13
6 changed files with 32 additions and 18 deletions

View File

@ -11,7 +11,8 @@
void set_bootsplash(unsigned char *framebuffer, unsigned int x_resolution,
unsigned int y_resolution, unsigned int fb_resolution)
unsigned int y_resolution, unsigned int bytes_per_line,
unsigned int fb_resolution)
{
printk(BIOS_INFO, "Setting up bootsplash in %dx%d@%d\n", x_resolution, y_resolution,
fb_resolution);
@ -27,9 +28,20 @@ void set_bootsplash(unsigned char *framebuffer, unsigned int x_resolution,
printk(BIOS_DEBUG, "Bootsplash image resolution: %dx%d\n", image_width, image_height);
if (image_width > x_resolution || image_height > y_resolution) {
printk(BIOS_NOTICE, "Bootsplash image can't fit framebuffer.\n");
cbfs_unmap(jpeg);
return;
}
/* center image: */
framebuffer += (y_resolution - image_height) / 2 * bytes_per_line +
(x_resolution - image_width) / 2 * (fb_resolution / 8);
decdata = malloc(sizeof(*decdata));
int ret = jpeg_decode(jpeg, framebuffer, x_resolution, y_resolution, fb_resolution,
decdata);
int ret = jpeg_decode(jpeg, framebuffer, image_width, image_height,
bytes_per_line, fb_resolution, decdata);
free(decdata);
cbfs_unmap(jpeg);
if (ret != 0) {
printk(BIOS_ERR, "Bootsplash could not be decoded. jpeg_decode returned %d.\n",