Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
SDL: Migrate to SDL2
Incorporates large portions of g#5879 g#5282 g#5285 g#5286 g#5287
Differences from the above patches:
* Removed all MacOS-specific stuff
* Removed support for SDL1 entirely
* Properly implement mousewheel support
* Bumped up minimum stack size for sigalstack threading
* Check for overflow before enqueing scrollwheel events
Tested on:
* sdl application (Linux)
* Simulator (x86_64, Linux) -- xduoox3/ipod4g/sansafuze
* Simulator (i686, Windows) -- xduoox3
* Simulator (arm64, Linux)
Change-Id: Ia3012dd1be123feb2888798a42d5b7cc149f382b
+709
-717
+2
-2
firmware/asm/thread.h
+2
-2
firmware/asm/thread.h
···
50
50
#ifndef MINSIGSTKSZ
51
51
#define MINSIGSTKSZ 16384
52
52
#endif
53
-
/* MINSIGSTKSZ for the OS to deliver the signal + 0x3000 for us */
54
-
#define DEFAULT_STACK_SIZE (MINSIGSTKSZ+0x3000) /* Bytes */
53
+
/* MINSIGSTKSZ for the OS to deliver the signal + 0x6000 for us */
54
+
#define DEFAULT_STACK_SIZE (MINSIGSTKSZ+0x6000) /* Bytes */
55
55
#elif defined(HAVE_WIN32_FIBER_THREADS)
56
56
#define DEFAULT_STACK_SIZE 0x1000 /* Bytes */
57
57
#endif
+6
-6
firmware/target/hosted/sdl/kernel-sdl.c
+6
-6
firmware/target/hosted/sdl/kernel-sdl.c
···
153
153
SDL_Delay(10);
154
154
155
155
SDL_DestroyMutex(sim_irq_mtx);
156
-
SDL_DestroyCond(sim_thread_cond);
156
+
SDL_DestroyCond(sim_thread_cond);
157
157
}
158
158
159
159
Uint32 tick_timer(Uint32 interval, void *param)
···
162
162
163
163
(void) interval;
164
164
(void) param;
165
-
165
+
166
166
new_tick = (SDL_GetTicks() - start_tick) / (1000/HZ);
167
-
167
+
168
168
while(new_tick != current_tick)
169
169
{
170
170
sim_enter_irq_handler();
···
175
175
176
176
sim_exit_irq_handler();
177
177
}
178
-
178
+
179
179
return interval;
180
180
}
181
181
···
187
187
exit(-1);
188
188
}
189
189
190
-
if (tick_timer_id != NULL)
190
+
if (tick_timer_id != 0)
191
191
{
192
192
SDL_RemoveTimer(tick_timer_id);
193
-
tick_timer_id = NULL;
193
+
tick_timer_id = 0;
194
194
}
195
195
else
196
196
{
+5
-4
firmware/target/hosted/sdl/lcd-bitmap.c
+5
-4
firmware/target/hosted/sdl/lcd-bitmap.c
···
164
164
#else /* LCD_DEPTH > 8 */
165
165
#if defined(HAVE_TRANSFLECTIVE_LCD) && defined(HAVE_LCD_SLEEP)
166
166
if (!lcd_active())
167
-
SDL_SetAlpha(lcd_surface, SDL_SRCALPHA, 0);
167
+
SDL_SetSurfaceAlphaMod(lcd_surface, 0);
168
168
else
169
-
SDL_SetAlpha(lcd_surface, SDL_SRCALPHA,
169
+
SDL_SetSurfaceAlphaMod(lcd_surface,
170
170
MAX(BACKLIGHT_OFF_ALPHA, (value * 255) / 100));
171
171
#else
172
-
SDL_SetAlpha(lcd_surface, SDL_SRCALPHA, (value * 255) / 100);
172
+
SDL_SetSurfaceAlphaMod(lcd_surface, (value * 255) / 100);
173
173
#endif
174
174
#endif /* LCD_DEPTH */
175
175
···
187
187
SIM_LCD_WIDTH * display_zoom,
188
188
SIM_LCD_HEIGHT * display_zoom,
189
189
LCD_DEPTH, 0, 0, 0, 0);
190
+
SDL_SetSurfaceBlendMode(lcd_surface, SDL_BLENDMODE_BLEND);
190
191
#elif LCD_DEPTH <= 8
191
192
lcd_surface = SDL_CreateRGBSurface(SDL_SWSURFACE,
192
193
SIM_LCD_WIDTH * display_zoom,
···
222
223
if (lcd_ex_getpixel) {
223
224
sdl_update_rect(lcd_surface, x_start, y_start, width, height,
224
225
LCD_WIDTH, LCD_HEIGHT, lcd_ex_getpixel);
225
-
sdl_gui_update(lcd_surface, x_start, y_start, width,
226
+
sdl_gui_update(lcd_surface, x_start, y_start, width,
226
227
height + LCD_SPLIT_LINES, SIM_LCD_WIDTH, SIM_LCD_HEIGHT,
227
228
background ? UI_LCD_POSX : 0,
228
229
background ? UI_LCD_POSY : 0);
+9
-4
firmware/target/hosted/sdl/lcd-sdl.c
+9
-4
firmware/target/hosted/sdl/lcd-sdl.c
···
115
115
(ui_y + y_start) * display_zoom,
116
116
width * display_zoom, height * display_zoom};
117
117
118
-
if (surface->flags & SDL_SRCALPHA) /* alpha needs a black background */
118
+
uint8_t alpha;
119
+
if (SDL_GetSurfaceAlphaMod(surface,&alpha) == 0 && alpha < 255)
119
120
SDL_FillRect(gui_surface, &dest, 0);
120
121
121
-
SDL_BlitSurface(surface, &src, gui_surface, &dest);
122
+
SDL_BlitSurface(surface, &src, gui_surface, &dest); /* alpha needs a black background */
122
123
123
-
SDL_Flip(gui_surface);
124
+
SDL_Texture *sdlTexture = SDL_CreateTextureFromSurface(sdlRenderer, gui_surface);
125
+
SDL_RenderClear(sdlRenderer);
126
+
SDL_RenderCopy(sdlRenderer, sdlTexture, NULL, NULL);
127
+
SDL_RenderPresent(sdlRenderer);
128
+
SDL_DestroyTexture(sdlTexture);
124
129
}
125
130
126
131
/* set a range of bitmap indices to a gradient from startcolour to endcolour */
···
136
141
palette[i].b = start->b + (end->b - start->b) * i / (steps - 1);
137
142
}
138
143
139
-
SDL_SetPalette(surface, SDL_LOGPAL|SDL_PHYSPAL, palette, first, steps);
144
+
SDL_SetPaletteColors(surface->format->palette, palette, first , steps);
140
145
}
141
146
142
147
int lcd_get_dpi(void)
+2
-2
firmware/target/hosted/sdl/lcd-sdl.h
+2
-2
firmware/target/hosted/sdl/lcd-sdl.h
···
3
3
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
4
4
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5
5
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6
-
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
6
+
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7
7
* \/ \/ \/ \/ \/
8
8
* $Id$
9
9
*
···
27
27
28
28
/* Default display zoom level */
29
29
extern SDL_Surface *gui_surface;
30
+
extern SDL_Renderer *sdlRenderer;
30
31
31
32
void sdl_update_rect(SDL_Surface *surface, int x_start, int y_start, int width,
32
33
int height, int max_x, int max_y,
···
39
40
int first, int steps);
40
41
41
42
#endif /* #ifndef __LCDSDL_H__ */
42
-
+41
-46
firmware/target/hosted/sdl/pcm-sdl.c
+41
-46
firmware/target/hosted/sdl/pcm-sdl.c
···
1
1
/***************************************************************************
2
-
* __________ __ ___.
3
-
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
4
-
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5
-
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6
-
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7
-
* \/ \/ \/ \/ \/
2
+
* __________ __ ___.
3
+
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
4
+
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5
+
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6
+
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7
+
* \/ \/ \/ \/ \/
8
8
* $Id$
9
9
*
10
10
* Copyright (C) 2005 by Nick Lanham
···
85
85
SDL_UnlockMutex(audio_lock);
86
86
}
87
87
88
+
static void sdl_audio_callback(struct pcm_udata *udata, Uint8 *stream, int len);
88
89
static void pcm_dma_apply_settings_nolock(void)
89
90
{
91
+
SDL_AudioSpec wanted_spec;
92
+
wanted_spec.freq = pcm_sampr;
93
+
wanted_spec.format = AUDIO_S16SYS;
94
+
wanted_spec.channels = 2;
95
+
wanted_spec.samples = 2048;
96
+
wanted_spec.callback =
97
+
(void (SDLCALL *)(void *userdata,
98
+
Uint8 *stream, int len))sdl_audio_callback;
99
+
wanted_spec.userdata = &udata;
100
+
SDL_CloseAudio();
101
+
/* Open the audio device and start playing sound! */
102
+
if(SDL_OpenAudio(&wanted_spec, &obtained) < 0) {
103
+
DEBUGF("Unable to open audio: %s\n", SDL_GetError());
104
+
return;
105
+
}
106
+
switch (obtained.format)
107
+
{
108
+
case AUDIO_U8:
109
+
case AUDIO_S8:
110
+
pcm_channel_bytes = 1;
111
+
break;
112
+
case AUDIO_U16LSB:
113
+
case AUDIO_S16LSB:
114
+
case AUDIO_U16MSB:
115
+
case AUDIO_S16MSB:
116
+
pcm_channel_bytes = 2;
117
+
break;
118
+
default:
119
+
DEBUGF("Unknown sample format obtained: %u\n",
120
+
(unsigned)obtained.format);
121
+
return;
122
+
}
123
+
pcm_sample_bytes = obtained.channels * pcm_channel_bytes;
124
+
90
125
cvt_status = SDL_BuildAudioCVT(&cvt, AUDIO_S16SYS, 2, pcm_sampr,
91
126
obtained.format, obtained.channels, obtained.freq);
92
127
···
256
291
257
292
if (delay > 0)
258
293
{
259
-
SDL_UnlockMutex(audio_lock);
260
294
SDL_Delay(delay);
261
-
SDL_LockMutex(audio_lock);
262
295
263
296
if (!pcm_is_playing())
264
297
break;
···
339
372
return;
340
373
}
341
374
342
-
SDL_AudioSpec wanted_spec;
343
375
#ifdef DEBUG
344
376
udata.debug = NULL;
345
377
if (debug_audio) {
···
347
379
DEBUGF("Audio debug file open\n");
348
380
}
349
381
#endif
350
-
/* Set 16-bit stereo audio at 44Khz */
351
-
wanted_spec.freq = 44100;
352
-
wanted_spec.format = AUDIO_S16SYS;
353
-
wanted_spec.channels = 2;
354
-
wanted_spec.samples = 2048;
355
-
wanted_spec.callback =
356
-
(void (SDLCALL *)(void *userdata,
357
-
Uint8 *stream, int len))sdl_audio_callback;
358
-
wanted_spec.userdata = &udata;
359
-
360
-
/* Open the audio device and start playing sound! */
361
-
if(SDL_OpenAudio(&wanted_spec, &obtained) < 0) {
362
-
DEBUGF("Unable to open audio: %s\n", SDL_GetError());
363
-
return;
364
-
}
365
-
366
-
switch (obtained.format)
367
-
{
368
-
case AUDIO_U8:
369
-
case AUDIO_S8:
370
-
pcm_channel_bytes = 1;
371
-
break;
372
-
case AUDIO_U16LSB:
373
-
case AUDIO_S16LSB:
374
-
case AUDIO_U16MSB:
375
-
case AUDIO_S16MSB:
376
-
pcm_channel_bytes = 2;
377
-
break;
378
-
default:
379
-
DEBUGF("Unknown sample format obtained: %u\n",
380
-
(unsigned)obtained.format);
381
-
return;
382
-
}
383
-
384
-
pcm_sample_bytes = obtained.channels * pcm_channel_bytes;
385
-
386
-
pcm_dma_apply_settings_nolock();
387
382
}
388
383
389
384
void pcm_play_dma_postinit(void)
+64
-52
firmware/target/hosted/sdl/system-sdl.c
+64
-52
firmware/target/hosted/sdl/system-sdl.c
···
1
1
/***************************************************************************
2
-
* __________ __ ___.
3
-
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
4
-
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5
-
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6
-
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7
-
* \/ \/ \/ \/ \/
2
+
* __________ __ ___.
3
+
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
4
+
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5
+
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6
+
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7
+
* \/ \/ \/ \/ \/
8
8
* $Id$
9
9
*
10
10
* Copyright (C) 2006 by Daniel Everton <dan@iocaine.org>
···
50
50
#define SIMULATOR_DEFAULT_ROOT "simdisk"
51
51
52
52
SDL_Surface *gui_surface;
53
+
SDL_Window *window;
54
+
SDL_Renderer *sdlRenderer;
53
55
54
56
bool background = true; /* use backgrounds by default */
55
57
#ifdef HAVE_REMOTE_LCD
···
72
74
bool debug_wps = false;
73
75
int wps_verbose_level = 3;
74
76
75
-
/*
76
-
* This thread will read the buttons in an interrupt like fashion, and
77
-
* also initializes SDL_INIT_VIDEO and the surfaces
78
-
*
79
-
* it must be done in the same thread (at least on windows) because events only
80
-
* work in the thread which called SDL_Init(SubSystem) with SDL_INIT_VIDEO
81
-
*
82
-
* This is an SDL thread and relies on preemptive behavoir of the host
83
-
**/
84
-
static int sdl_event_thread(void * param)
77
+
static void sdl_window_setup(void)
85
78
{
86
-
SDL_InitSubSystem(SDL_INIT_VIDEO);
87
-
88
-
#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
89
-
SDL_sem *wait_for_maemo_startup;
90
-
#endif
91
79
SDL_Surface *picture_surface = NULL;
92
80
int width, height;
93
81
int depth;
94
-
Uint32 flags;
82
+
Uint32 flags = 0;
95
83
96
84
/* Try and load the background image. If it fails go without */
97
85
if (background) {
···
101
89
DEBUGF("warn: %s\n", SDL_GetError());
102
90
}
103
91
}
104
-
92
+
105
93
/* Set things up */
106
94
if (background)
107
95
{
108
96
width = UI_WIDTH;
109
97
height = UI_HEIGHT;
110
-
}
111
-
else
98
+
}
99
+
else
112
100
{
113
101
#ifdef HAVE_REMOTE_LCD
114
102
if (showremote)
···
128
116
if (depth < 8)
129
117
depth = 16;
130
118
131
-
flags = SDL_HWSURFACE|SDL_DOUBLEBUF;
132
119
#if (CONFIG_PLATFORM & (PLATFORM_MAEMO|PLATFORM_PANDORA))
133
120
/* Fullscreen mode for maemo app */
134
-
flags |= SDL_FULLSCREEN;
121
+
flags |= SDL_WINDOW_FULLSCREEN;
135
122
#endif
136
123
137
-
SDL_WM_SetCaption(UI_TITLE, NULL);
138
-
139
-
if ((gui_surface = SDL_SetVideoMode(width * display_zoom, height * display_zoom, depth, flags)) == NULL) {
124
+
if ((window = SDL_CreateWindow(UI_TITLE, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
125
+
width * display_zoom, height * display_zoom , flags)) == NULL)
126
+
panicf("%s", SDL_GetError());
127
+
if ((sdlRenderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC)) == NULL)
128
+
panicf("%s", SDL_GetError());
129
+
if ((gui_surface = SDL_CreateRGBSurface(0, width * display_zoom, height * display_zoom, depth,
130
+
0, 0, 0, 0)) == NULL)
140
131
panicf("%s", SDL_GetError());
132
+
133
+
/* If we have a background, blit it over to the display surface */
134
+
if (background && picture_surface)
135
+
{
136
+
SDL_BlitSurface(picture_surface, NULL, gui_surface, NULL);
137
+
SDL_FreeSurface(picture_surface);
141
138
}
139
+
}
140
+
141
+
/*
142
+
* This thread will read the buttons in an interrupt like fashion, and
143
+
* also initializes SDL_INIT_VIDEO and the surfaces
144
+
*
145
+
* it must be done in the same thread (at least on windows) because events only
146
+
* work in the thread that called SDL_InitSubSystem(SDL_INIT_VIDEO)
147
+
*
148
+
* This is an SDL thread and relies on preemptive behavoir of the host
149
+
**/
150
+
static int sdl_event_thread(void * param)
151
+
{
152
+
#ifdef __WIN32 /* Fails on Linux and MacOS */
153
+
SDL_InitSubSystem(SDL_INIT_VIDEO);
154
+
sdl_window_setup();
155
+
#endif
156
+
157
+
#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
158
+
SDL_sem *wait_for_maemo_startup;
159
+
#endif
142
160
143
161
#if (CONFIG_PLATFORM & (PLATFORM_MAEMO|PLATFORM_PANDORA))
144
162
/* SDL touch screen fix: Work around a SDL assumption that returns
···
152
170
SDL_SetCursor(hiddenCursor);
153
171
#endif
154
172
155
-
if (background && picture_surface != NULL)
156
-
SDL_BlitSurface(picture_surface, NULL, gui_surface, NULL);
157
-
158
173
#if (CONFIG_PLATFORM & PLATFORM_MAEMO)
159
174
/* start maemo thread: Listen to display on/off events and battery monitoring */
160
175
wait_for_maemo_startup = SDL_CreateSemaphore(0); /* 0-count so it blocks */
161
-
SDL_Thread *maemo_thread = SDL_CreateThread(maemo_thread_func, wait_for_maemo_startup);
162
-
176
+
SDL_Thread *maemo_thread = SDL_CreateThread(maemo_thread_func, NULL, wait_for_maemo_startup);
163
177
SDL_SemWait(wait_for_maemo_startup);
164
178
SDL_DestroySemaphore(wait_for_maemo_startup);
165
179
#endif
···
183
197
#if (CONFIG_PLATFORM & (PLATFORM_MAEMO|PLATFORM_PANDORA))
184
198
SDL_FreeCursor(hiddenCursor);
185
199
#endif
186
-
187
-
if(picture_surface)
188
-
SDL_FreeSurface(picture_surface);
189
200
190
201
/* Order here is relevent to prevent deadlocks and use of destroyed
191
202
sync primitives by kernel threads */
···
251
262
g_type_init();
252
263
#endif
253
264
254
-
if (SDL_Init(SDL_INIT_TIMER))
265
+
if (SDL_InitSubSystem(SDL_INIT_TIMER))
255
266
panicf("%s", SDL_GetError());
267
+
268
+
#ifndef __WIN32 /* Fails on Windows */
269
+
SDL_InitSubSystem(SDL_INIT_VIDEO);
270
+
sdl_window_setup();
271
+
#endif
256
272
257
273
s = SDL_CreateSemaphore(0); /* 0-count so it blocks */
258
-
259
-
evt_thread = SDL_CreateThread(sdl_event_thread, s);
260
-
261
-
/* wait for sdl_event_thread to run so that it can initialize the surfaces
262
-
* and video subsystem needed for SDL events */
274
+
evt_thread = SDL_CreateThread(sdl_event_thread, NULL, s);
263
275
SDL_SemWait(s);
264
276
/* cleanup */
265
277
SDL_DestroySemaphore(s);
···
303
315
304
316
void sys_handle_argv(int argc, char *argv[])
305
317
{
306
-
if (argc >= 1)
318
+
if (argc >= 1)
307
319
{
308
320
int x;
309
-
for (x = 1; x < argc; x++)
321
+
for (x = 1; x < argc; x++)
310
322
{
311
323
#ifdef DEBUG
312
-
if (!strcmp("--debugaudio", argv[x]))
324
+
if (!strcmp("--debugaudio", argv[x]))
313
325
{
314
326
debug_audio = true;
315
327
printf("Writing debug audio file.\n");
316
328
}
317
-
else
329
+
else
318
330
#endif
319
331
if (!strcmp("--debugwps", argv[x]))
320
332
{
321
333
debug_wps = true;
322
334
printf("WPS debug mode enabled.\n");
323
-
}
335
+
}
324
336
else if (!strcmp("--nobackground", argv[x]))
325
337
{
326
338
background = false;
327
339
printf("Disabling background image.\n");
328
-
}
340
+
}
329
341
#ifdef HAVE_REMOTE_LCD
330
342
else if (!strcmp("--noremote", argv[x]))
331
343
{
···
346
358
display_zoom=atof(argv[x]);
347
359
else
348
360
display_zoom = 2;
349
-
printf("Window zoom is %d\n", display_zoom);
361
+
printf("Window zoom is %f\n", display_zoom);
350
362
}
351
363
else if (!strcmp("--alarm", argv[x]))
352
364
{
···
372
384
debug_buttons = true;
373
385
printf("Printing background button clicks.\n");
374
386
}
375
-
else
387
+
else
376
388
{
377
389
printf("rockboxui\n");
378
390
printf("Arguments:\n");
+2
-2
firmware/target/hosted/sdl/thread-sdl.c
+2
-2
firmware/target/hosted/sdl/thread-sdl.c
···
340
340
return 0;
341
341
}
342
342
343
-
SDL_Thread *t = SDL_CreateThread(runthread, thread);
343
+
SDL_Thread *t = SDL_CreateThread(runthread, NULL, thread);
344
344
if (t == NULL)
345
345
{
346
346
DEBUGF("Failed to create SDL thread\n");
···
447
447
thread->context.s = SDL_CreateSemaphore(0);
448
448
thread->context.t = NULL; /* NULL for the implicit main thread */
449
449
__running_self_entry() = thread;
450
-
450
+
451
451
if (thread->context.s == NULL)
452
452
{
453
453
fprintf(stderr, "Failed to create main semaphore\n");
+2
-2
tools/configure
+2
-2
tools/configure
···
162
162
# scan the $PATH for sdl-config - check whether for a (cross-)win32
163
163
# sdl as requested
164
164
findsdl(){
165
-
files=sdl-config
165
+
files=sdl2-config
166
166
if [ -n "$CROSS_COMPILE" ]; then
167
167
# sdl-config might (not) be prefixed for cross compiles so try both.
168
168
files="${CROSS_COMPILE}sdl-config:${files}"
···
1676
1676
==AIGO== 244) M3K Linux
1677
1677
245) Eros Q / K 246) M3K baremetal ==Shanling==
1678
1678
247) Eros Q / K native 260) Q1
1679
-
248) Eros Q / K native v3
1679
+
248) Eros Q / K native v3
1680
1680
(GC9A01 LCD Controller)
1681
1681
EOF
1682
1682