pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rpi video - Use dispmanx scaling (#1)

Browse source 
* Use dispmanx scaling
* There is the new SDL hint SDL_VIDEO_RPI_SCALE_MODE. There are three values.
 * The variable can be set to the following values:
 *   "0"       - Window resolution is desktop resolution.
 *               This is the behaviour of SDL <= 2.0.4. (default)
 *   "1"       - Requested video resolution will be scaled to desktop resolution.
 *               Aspect ratio of requested video resolution will be respected.
 *   "2"       - Requested video resolution will be scaled to desktop resolution
 *   "3"       - Integer scaling. dst_rect is an integral multiple of src_rect. Should prevent scaling artifacts.
* Add aspect ratio hint
This commit is contained in:
Stefan 2016-07-06 21:53:43 +02:00 • committed by Jools Wills
parent 248d8c8447
commit d9927c706c
2 changed files with 106 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
include/SDL_hints.h
View file

@ -660,6 +660,33 @@ extern "C" {
*/
#define SDL_HINT_NO_SIGNAL_HANDLERS "SDL_NO_SIGNAL_HANDLERS"
/**
* \brief Tell dispmanx to stretch the SDL window to fill the display.
*
* This hint only applies to the rpi video driver.
*
* The variable can be set to the following values:
* "0" - Window resolution is desktop resolution.
* This is the behaviour of SDL <= 2.0.4. (default)
* "1" - Requested video resolution will be scaled to desktop resolution.
* Aspect ratio of requested video resolution will be respected.
* "2" - Requested video resolution will be scaled to desktop resolution.
* "3" - Requested video resolution will be scaled to desktop resolution.
* Aspect ratio of requested video resolution will be respected.
* If possible output resolution will be integral multiple of video
* resolution.
*/
#define SDL_HINT_VIDEO_RPI_SCALE_MODE "SDL_VIDEO_RPI_SCALE_MODE"
/**
* \brief Tell dispmanx to set a specific aspect ratio.
*
* This hint only applies to the rpi video driver.
*
* Must be set together with SDL_HINT_VIDEO_RPI_SCALE_MODE=1.
*/
#define SDL_HINT_VIDEO_RPI_RATIO "SDL_VIDEO_RPI_RATIO"
/**
* \brief Tell SDL not to generate window-close events for Alt+F4 on Windows.
*

89
src/video/raspberry/SDL_rpivideo.c
View file

@ -31,6 +31,7 @@
*/
/* SDL internals */
#include "SDL_hints.h"
#include "../SDL_sysvideo.h"
#include "SDL_version.h"
#include "SDL_syswm.h"
@ -215,6 +216,9 @@ RPI_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
int
RPI_CreateWindow(_THIS, SDL_Window * window)
{
const char *hintScale = SDL_GetHint(SDL_HINT_VIDEO_RPI_SCALE_MODE);
const char *hintRatio = SDL_GetHint(SDL_HINT_VIDEO_RPI_RATIO);
char scalemode = '0';
SDL_WindowData *wdata;
SDL_VideoDisplay *display;
SDL_DisplayData *displaydata;
@ -224,6 +228,10 @@ RPI_CreateWindow(_THIS, SDL_Window * window)
DISPMANX_UPDATE_HANDLE_T dispman_update;
uint32_t layer = SDL_RPI_VIDEOLAYER;
const char *env;
float srcAspect = 1;
float dstAspect = 1;
int factor_x = 0;
int factor_y = 0;
/* Disable alpha, otherwise the app looks composed with whatever dispman is showing (X11, console,etc) */
dispman_alpha.flags = DISPMANX_FLAGS_ALPHA_FIXED_ALL_PIXELS;
@ -238,23 +246,84 @@ RPI_CreateWindow(_THIS, SDL_Window * window)
display = SDL_GetDisplayForWindow(window);
displaydata = (SDL_DisplayData *) display->driverdata;
/* Windows have one size for now */
window->w = display->desktop_mode.w;
window->h = display->desktop_mode.h;
/* OpenGL ES is the law here, buddy */
window->flags |= SDL_WINDOW_OPENGL;
if (hintScale != NULL)
scalemode = *hintScale;
/* Create a dispman element and associate a window to it */
dst_rect.x = 0;
dst_rect.y = 0;
dst_rect.width = window->w;
dst_rect.height = window->h;
switch(scalemode) {
case '3':
/* Pixel perfect scaling mode. */
factor_x = (display->desktop_mode.w / window->w);
factor_y = (display->desktop_mode.h / window->h);
if ((factor_x != 0) && (factor_y != 0)) {
if (factor_x >= factor_y) {
dst_rect.width = window->w * factor_y;
dst_rect.height = window->h * factor_y;
}
else {
dst_rect.width = window->w * factor_x;
dst_rect.height = window->h * factor_x;
}
/* Center window. */
dst_rect.x = (display->desktop_mode.w - dst_rect.width) / 2;
dst_rect.y = (display->desktop_mode.h - dst_rect.height) / 2;
break;
}
/* If integer scale is not possible fallback to mode 1. */
case '1':
/* Fullscreen mode. */
/* Calculate source and destination aspect ratios. */
if (hintRatio != NULL)
srcAspect = strtof(hintRatio, NULL);
else
srcAspect = (float)window->w / (float)window->h;
/* only allow sensible aspect ratios */
if (srcAspect < 0.2f || srcAspect > 6.0f)
srcAspect = (float)window->w / (float)window->h;
dstAspect = (float)display->desktop_mode.w / (float)display->desktop_mode.h;
/* If source and destination aspect ratios are not equal correct destination width. */
if (srcAspect < dstAspect) {
dst_rect.width = (unsigned)(display->desktop_mode.h * srcAspect);
dst_rect.height = display->desktop_mode.h;
}
else if (srcAspect > dstAspect) {
dst_rect.width = display->desktop_mode.w;
dst_rect.height = (unsigned)((float)display->desktop_mode.w / srcAspect);
}
else {
dst_rect.width = display->desktop_mode.w;
dst_rect.height = display->desktop_mode.h;
}
/* Center window. */
dst_rect.x = (display->desktop_mode.w - dst_rect.width) / 2;
dst_rect.y = (display->desktop_mode.h - dst_rect.height) / 2;
break;
case '2':
/* Fullscreen streched mode. */
dst_rect.x = 0;
dst_rect.y = 0;
dst_rect.width = display->desktop_mode.w;
dst_rect.height = display->desktop_mode.h;
break;
default:
/* Default mode. */
window->w = display->desktop_mode.w;
window->h = display->desktop_mode.h;
dst_rect.x = 0;
dst_rect.y = 0;
dst_rect.width = window->w;
dst_rect.height = window->h;
break;
}
src_rect.x = 0;
src_rect.y = 0;
src_rect.width = window->w << 16;
src_rect.height = window->h << 16;
/* OpenGL ES is the law here, buddy */
window->flags |= SDL_WINDOW_OPENGL;
env = SDL_GetHint(SDL_HINT_RPI_VIDEO_LAYER);
if (env) {