RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-21 15:12:48 +00:00
Code Issues Releases Wiki Activity

Fix vo_fbdev to also work with Intel framebuffer.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30248 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-01-09 11:26:39 +00:00
parent 0a411a89e9
commit 52e2d23da6
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libvo/vo_fbdev.c
View File

@ -692,8 +692,9 @@ static int fb_preinit(int reset)
mp_msg(MSGT_VO, MSGL_ERR, "notice: Can't open /dev/tty: %s\n", strerror(errno)); mp_msg(MSGT_VO, MSGL_ERR, "notice: Can't open /dev/tty: %s\n", strerror(errno));
} }
fb_bpp = fb_vinfo.red.length + fb_vinfo.green.length + fb_bpp = fb_vinfo.bits_per_pixel;
fb_vinfo.blue.length + fb_vinfo.transp.length; if (fb_bpp == 16)
fb_bpp = fb_vinfo.red.length + fb_vinfo.green.length + fb_vinfo.blue.length;
if (fb_bpp == 8 && !vo_dbpp) { if (fb_bpp == 8 && !vo_dbpp) {
mp_msg(MSGT_VO, MSGL_ERR, "8 bpp output is not supported.\n"); mp_msg(MSGT_VO, MSGL_ERR, "8 bpp output is not supported.\n");
@ -811,6 +812,9 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
fb_tty_fd = -1; fb_tty_fd = -1;
} }
if (ioctl(fb_dev_fd, FBIOPUT_VSCREENINFO, &fb_vinfo))
// Intel drivers fail if we request a transparency channel
fb_vinfo.transp.length = fb_vinfo.transp.offset = 0;
if (ioctl(fb_dev_fd, FBIOPUT_VSCREENINFO, &fb_vinfo)) { if (ioctl(fb_dev_fd, FBIOPUT_VSCREENINFO, &fb_vinfo)) {
mp_msg(MSGT_VO, MSGL_ERR, "Can't put VSCREENINFO: %s\n", strerror(errno)); mp_msg(MSGT_VO, MSGL_ERR, "Can't put VSCREENINFO: %s\n", strerror(errno));
if (fb_tty_fd >= 0 && ioctl(fb_tty_fd, KDSETMODE, KD_TEXT) < 0) { if (fb_tty_fd >= 0 && ioctl(fb_tty_fd, KDSETMODE, KD_TEXT) < 0) {
@ -820,8 +824,9 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
} }
fb_pixel_size = fb_vinfo.bits_per_pixel / 8; fb_pixel_size = fb_vinfo.bits_per_pixel / 8;
fb_bpp = fb_vinfo.red.length + fb_vinfo.green.length + fb_bpp = fb_vinfo.bits_per_pixel;
fb_vinfo.blue.length + fb_vinfo.transp.length; if (fb_bpp == 16)
fb_bpp = fb_vinfo.red.length + fb_vinfo.green.length + fb_vinfo.blue.length;
if (fb_bpp_we_want != fb_bpp) if (fb_bpp_we_want != fb_bpp)
mp_msg(MSGT_VO, MSGL_WARN, "requested %d bpp, got %d bpp!!!\n", mp_msg(MSGT_VO, MSGL_WARN, "requested %d bpp, got %d bpp!!!\n",
fb_bpp_we_want, fb_bpp); fb_bpp_we_want, fb_bpp);