len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

lcd-color: Fix mpeg_player regression introduced in 034b6d5b

Browse source 
The lcd_blit_yuv() function shadowed a variable, but was "fixed" by
removing the inner declaration entirely, causing the inner loop to
clobber a variable used by the outer loop.

Fix this by declaring these variables independently, and for clarity
moved the inner loop declarations to a narrower scope.

Change-Id: I07652199929b84298b783374b8551a49baf093f3
This commit is contained in:
Solomon Peachy 2023-11-21 16:45:04 -05:00
parent 92e77ddbd8
commit 6e90bfe029
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
firmware/drivers/lcd-color-common.c
View file

@ -239,10 +239,9 @@ __attribute__((weak))
#endif #endif
void lcd_blit_yuv(unsigned char * const src[3], void lcd_blit_yuv(unsigned char * const src[3],
int src_x, int src_y, int stride, int src_x, int src_y, int stride,
int x, int y, int width, int height) int dst_x, int dst_y, int width, int height)
{ {
const unsigned char *ysrc, *usrc, *vsrc; const unsigned char *ysrc, *usrc, *vsrc;
int cb, cr, rv, guv, bu, r, g, b;
int linecounter; int linecounter;
fb_data *dst, *row_end; fb_data *dst, *row_end;
@ -253,10 +252,10 @@ void lcd_blit_yuv(unsigned char * const src[3],
linecounter = height >> 1; linecounter = height >> 1;
#if LCD_WIDTH >= LCD_HEIGHT #if LCD_WIDTH >= LCD_HEIGHT
dst = FBADDR(x, y); dst = FBADDR(dst_x, dst_y);
row_end = dst + width; row_end = dst + width;
#else #else
dst = FBADDR(LCD_WIDTH - y - 1, x); dst = FBADDR(LCD_WIDTH - dst_y - 1, dst_x);
row_end = dst + LCD_WIDTH * width; row_end = dst + LCD_WIDTH * width;
#endif #endif
@ -272,6 +271,8 @@ void lcd_blit_yuv(unsigned char * const src[3],
do do
{ {
int y, cb, cr, rv, guv, bu, r, g, b;
do do
{ {
y = YFAC*(*ysrc++ - 16); y = YFAC*(*ysrc++ - 16);
@ -401,9 +402,9 @@ void lcd_blit_yuv(unsigned char * const src[3],
while (--linecounter > 0); while (--linecounter > 0);
#if LCD_WIDTH >= LCD_HEIGHT #if LCD_WIDTH >= LCD_HEIGHT
lcd_update_rect(x, y, width, height); lcd_update_rect(dst_x, dst_y, width, height);
#else #else
lcd_update_rect(LCD_WIDTH - y - height, x, height, width); lcd_update_rect(LCD_WIDTH - dst_y - height, dst_x, height, width);
#endif #endif
} }