# include "config.h"
#endif
-#include <errno.h> /* ENOMEM */
#include <signal.h> /* SIGUSR1, SIGUSR2 */
#include <fcntl.h> /* open() */
#include <unistd.h> /* close() */
#include <vlc_plugin.h>
#include <vlc_vout_display.h>
#include <vlc_picture_pool.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
/*****************************************************************************
* Module descriptor
#define DEVICE_LONGTEXT N_(\
"Framebuffer device to use for rendering (usually /dev/fb0).")
-#define TTY_TEXT N_("Run fb on current tty.")
+#define TTY_TEXT N_("Run fb on current tty")
#define TTY_LONGTEXT N_(\
"Run framebuffer on current TTY device (default enabled). " \
"(disable tty handling with caution)")
-#define FB_MODE_TEXT N_("Framebuffer resolution to use.")
+#define FB_MODE_TEXT N_("Framebuffer resolution to use")
#define FB_MODE_LONGTEXT N_(\
"Select the resolution for the framebuffer. Currently it supports " \
"the values 0=QCIF 1=CIF 2=NTSC 3=PAL, 4=auto (default 4=auto)")
-#define HW_ACCEL_TEXT N_("Framebuffer uses hw acceleration.")
+#define HW_ACCEL_TEXT N_("Framebuffer uses hw acceleration")
#define HW_ACCEL_LONGTEXT N_(\
"If your framebuffer supports hardware acceleration or does double buffering " \
"in hardware then you must disable this option. It then does double buffering " \
"in software.")
+#define CHROMA_TEXT N_("Image format (default RGB)")
+#define CHROMA_LONGTEXT N_("Chroma fourcc used by the framebuffer. Default is RGB since the fb device has no way to report its chroma.")
+
static int Open (vlc_object_t *);
static void Close(vlc_object_t *);
add_file(FB_DEV_VAR, "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
false)
add_bool("fb-tty", true, NULL, TTY_TEXT, TTY_LONGTEXT, true)
- add_obsolete_string("fb-chroma")
+ add_string( "fb-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
add_obsolete_string("fb-aspect-ratio")
add_integer("fb-mode", 4, NULL, FB_MODE_TEXT, FB_MODE_LONGTEXT,
true)
/* */
static int OpenDisplay (vout_display_t *, bool force_resolution);
static void CloseDisplay (vout_display_t *);
+#if 0
static void SwitchDisplay(int i_signal);
+#endif
static void TextMode (int tty);
static void GfxMode (int tty);
struct termios old_termios;
/* Original configuration information */
+#if 0
struct sigaction sig_usr1; /* USR1 previous handler */
struct sigaction sig_usr2; /* USR2 previous handler */
+#endif
struct vt_mode vt_mode; /* previous VT mode */
/* Framebuffer information */
uint32_t width;
uint32_t height;
uint32_t line_length;
+ vlc_fourcc_t chroma;
int bytes_per_pixel;
/* Video memory */
- uint8_t *video_ptr; /* base adress */
+ uint8_t *video_ptr; /* base address */
size_t video_size; /* page size */
picture_t *picture;
picture_pool_t *pool;
};
+
+static void ClearScreen(vout_display_sys_t *sys)
+{
+ switch (sys->chroma) {
+ /* XXX: add other chromas */
+ case VLC_CODEC_UYVY: {
+ unsigned int j, size = sys->video_size / 4;
+ uint32_t *ptr = (uint32_t*)((uintptr_t)(sys->video_ptr + 3) & ~3);
+ for(j=0; j < size; j++)
+ ptr[j] = 0x10801080; /* U = V = 16, Y = 128 */
+ break;
+ }
+ default: /* RGB */
+ memset(sys->video_ptr, 0, sys->video_size);
+ }
+}
+
/**
* This function allocates and initializes a FB vout method.
*/
#if !defined(WIN32) && defined(HAVE_ISATTY)
/* Check that stdin is a TTY */
if (sys->is_tty && !isatty(0)) {
- msg_Warn(vd, "fd 0 is not a TTY");
+ msg_Warn(vd, "standard input is not a TTY");
free(sys);
return VLC_EGENERIC;
}
- msg_Warn(vd, "disabling tty handling, use with caution because "
- "there is no way to return to the tty.");
+ msg_Warn(vd, "disabling TTY handling, use with caution because "
+ "there is no way to return to the TTY");
#endif
const int mode = var_CreateGetInteger(vd, "fb-mode");
break;
}
+ char *chroma = var_CreateGetNonEmptyString(vd, "fb-chroma");
+ if (chroma) {
+ sys->chroma = vlc_fourcc_GetCodecFromString(VIDEO_ES, chroma);
+
+ if (sys->chroma)
+ msg_Dbg(vd, "forcing chroma '%s'", chroma);
+ else
+ msg_Warn(vd, "chroma %s invalid, using default", chroma);
+
+ free(chroma);
+ } else
+ sys->chroma = 0;
+
/* tty handling */
if (sys->is_tty && TtyInit(vd)) {
free(sys);
Close(VLC_OBJECT(vd));
return VLC_EGENERIC;
}
+ vout_display_DeleteWindow(vd, NULL);
/* */
video_format_t fmt = vd->fmt;
- msg_Err(vd, "var_info.bits_per_pixel = %d", sys->var_info.bits_per_pixel);
- switch (sys->var_info.bits_per_pixel) {
- case 8: /* FIXME: set the palette */
- fmt.i_chroma = VLC_CODEC_RGB8;
- break;
- case 15:
- fmt.i_chroma = VLC_CODEC_RGB15;
- break;
- case 16:
- fmt.i_chroma = VLC_CODEC_RGB16;
- break;
- case 24:
- fmt.i_chroma = VLC_CODEC_RGB24;
- break;
- case 32:
- fmt.i_chroma = VLC_CODEC_RGB32;
- break;
- default:
- msg_Err(vd, "unknown screen depth %i",
- sys->var_info.bits_per_pixel);
- Close(VLC_OBJECT(vd));
- return VLC_EGENERIC;
- }
- if (sys->var_info.bits_per_pixel != 8) {
- fmt.i_rmask = ((1 << sys->var_info.red.length) - 1)
- << sys->var_info.red.offset;
- fmt.i_gmask = ((1 << sys->var_info.green.length) - 1)
- << sys->var_info.green.offset;
- fmt.i_bmask = ((1 << sys->var_info.blue.length) - 1)
- << sys->var_info.blue.offset;
+ if (sys->chroma) {
+ fmt.i_chroma = sys->chroma;
+ } else {
+ /* Assume RGB */
+
+ msg_Dbg(vd, "%d bppd", sys->var_info.bits_per_pixel);
+ switch (sys->var_info.bits_per_pixel) {
+ case 8: /* FIXME: set the palette */
+ fmt.i_chroma = VLC_CODEC_RGB8;
+ break;
+ case 15:
+ fmt.i_chroma = VLC_CODEC_RGB15;
+ break;
+ case 16:
+ fmt.i_chroma = VLC_CODEC_RGB16;
+ break;
+ case 24:
+ fmt.i_chroma = VLC_CODEC_RGB24;
+ break;
+ case 32:
+ fmt.i_chroma = VLC_CODEC_RGB32;
+ break;
+ default:
+ msg_Err(vd, "unknown screendepth %i", sys->var_info.bits_per_pixel);
+ Close(VLC_OBJECT(vd));
+ return VLC_EGENERIC;
+ }
+ if (sys->var_info.bits_per_pixel != 8) {
+ fmt.i_rmask = ((1 << sys->var_info.red.length) - 1)
+ << sys->var_info.red.offset;
+ fmt.i_gmask = ((1 << sys->var_info.green.length) - 1)
+ << sys->var_info.green.offset;
+ fmt.i_bmask = ((1 << sys->var_info.blue.length) - 1)
+ << sys->var_info.blue.offset;
+ }
}
+
fmt.i_width = sys->width;
fmt.i_height = sys->height;
vout_display_SendEventDisplaySize();
- /* Clear screen */
- memset(vd->sys->video_ptr, 0, vd->sys->video_size);
-
+ ClearScreen(vd->sys);
}
#endif
}
ioctl(sys->tty, VT_RELDISP, VT_ACKACQ);
+#if 0
/* Set-up tty signal handler to be aware of tty changes */
struct sigaction sig_tty;
memset(&sig_tty, 0, sizeof(sig_tty));
/* FIXME SIGUSR1 could have succeed */
goto error_signal;
}
+#endif
/* Set-up tty according to new signal handler */
if (-1 == ioctl(sys->tty, VT_GETMODE, &sys->vt_mode)) {
return VLC_SUCCESS;
error:
+#if 0
sigaction(SIGUSR1, &sys->sig_usr1, NULL);
sigaction(SIGUSR2, &sys->sig_usr2, NULL);
error_signal:
+#endif
tcsetattr(0, 0, &sys->old_termios);
TextMode(sys->tty);
return VLC_EGENERIC;
/* Reset the terminal */
ioctl(sys->tty, VT_SETMODE, &sys->vt_mode);
+#if 0
/* Remove signal handlers */
sigaction(SIGUSR1, &sys->sig_usr1, NULL);
sigaction(SIGUSR2, &sys->sig_usr2, NULL);
+#endif
/* Reset the keyboard state */
tcsetattr(0, 0, &sys->old_termios);
char *psz_device; /* framebuffer device path */
/* Open framebuffer device */
- if (!(psz_device = config_GetPsz(vd, FB_DEV_VAR))) {
+ if (!(psz_device = var_InheritString(vd, FB_DEV_VAR))) {
msg_Err(vd, "don't know which fb device to open");
return VLC_EGENERIC;
}
- sys->fd = utf8_open(psz_device, O_RDWR);
+ sys->fd = vlc_open(psz_device, O_RDWR);
if (sys->fd == -1) {
msg_Err(vd, "cannot open %s (%m)", psz_device);
free(psz_device);
close(sys->fd);
return VLC_EGENERIC;
}
- /* Clear the screen */
- memset(sys->video_ptr, 0, sys->video_size);
+
+ ClearScreen(sys);
msg_Dbg(vd,
"framebuffer type=%d, visual=%d, ypanstep=%d, ywrap=%d, accel=%d",
vout_display_sys_t *sys = vd->sys;
if (sys->video_ptr != MAP_FAILED) {
- /* Clear display */
- memset(sys->video_ptr, 0, sys->video_size);
+ ClearScreen(sys);
munmap(sys->video_ptr, sys->video_size);
}
}
}
+#if 0
/*****************************************************************************
* SwitchDisplay: VT change signal handler
*****************************************************************************
*****************************************************************************/
static void SwitchDisplay(int i_signal)
{
- VLC_UNUSED(i_signal);
-#if 0
vout_display_t *vd;
vlc_mutex_lock(&p_vout_bank->lock);
}
vlc_mutex_unlock(&p_vout_bank->lock);
-#endif
}
+#endif
/*****************************************************************************
* TextMode and GfxMode : switch tty to text/graphic mode
projects / vlc / blobdiff