diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 26 | ||||
| -rw-r--r-- | libvo/video_out.c | 4 | ||||
| -rw-r--r-- | libvo/vo_caca.c | 331 |
4 files changed, 362 insertions, 1 deletions
@@ -32,7 +32,7 @@ endif OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) -VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) +VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) $(CACA_LIB) AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(NAS_LIB) $(SGIAUDIO_LIB) CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(MATROSKA_LIB) COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) @@ -222,6 +222,7 @@ Video output: --enable-svga build with SVGAlib support [autodetect] --enable-sdl build with SDL render support [autodetect] --enable-aa build with AAlib render support [autodetect] + --enable-caca build with CACA render support [autodetect] --enable-ggi build with GGI render support [autodetect] --enable-directx build with DirectX support [autodetect] --enable-dxr2 build with DXR2 render support [autodetect] @@ -1137,6 +1138,7 @@ _gif=auto _gl=auto _ggi=auto _aa=auto +_caca=auto _svga=auto _vesa=auto _fbdev=auto @@ -1283,6 +1285,8 @@ for ac_option do --disable-ggi) _ggi=no ;; --enable-aa) _aa=yes ;; --disable-aa) _aa=no ;; + --enable-caca) _caca=yes ;; + --disable-caca) _caca=no ;; --enable-svga) _svga=yes ;; --disable-svga) _svga=no ;; --enable-vesa) _vesa=yes ;; @@ -3293,6 +3297,26 @@ else fi echores "$_aa" +echocheck "CACA" +if test "$_caca" = auto ; then + cat > $TMPC << EOF +#include <caca.h> +int main(void) { (void) caca_init(); return 0; } +EOF + _caca=no + cc_check `caca-config --libs` && _caca=yes +fi +if test "$_caca" = yes ; then + _def_caca='#define HAVE_CACA 1' + _ld_caca=`caca-config --libs` + _vosrc="$_vosrc vo_caca.c" + _vomodules="caca $_vomodules" +else + _def_caca='#undef HAVE_CACA' + _novomodules="caca $_novomodules" +fi +echores "$_caca" + echocheck "SVGAlib" if test "$_svga" = auto ; then @@ -5901,6 +5925,7 @@ GIF_LIB = $_ld_gif SDL_LIB = $_ld_sdl SVGA_LIB = $_ld_svga AA_LIB = $_ld_aa +CACA_LIB = $_ld_caca # audio output ALSA_LIB = $_ld_alsa @@ -6534,6 +6559,7 @@ $_def_svga $_def_vesa $_def_xdpms $_def_aa +$_def_caca $_def_tga /* used by GUI: */ diff --git a/libvo/video_out.c b/libvo/video_out.c index df26b6fcc6..d4ed70ce68 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -83,6 +83,7 @@ extern vo_functions_t video_out_svga; extern vo_functions_t video_out_png; extern vo_functions_t video_out_ggi; extern vo_functions_t video_out_aa; +extern vo_functions_t video_out_caca; extern vo_functions_t video_out_mpegpes; extern vo_functions_t video_out_yuv4mpeg; #ifdef HAVE_DIRECTX @@ -181,6 +182,9 @@ vo_functions_t* video_out_drivers[] = #ifdef HAVE_AA &video_out_aa, #endif +#ifdef HAVE_CACA + &video_out_caca, +#endif #ifdef HAVE_DXR2 &video_out_dxr2, #endif diff --git a/libvo/vo_caca.c b/libvo/vo_caca.c new file mode 100644 index 0000000000..c23504fed0 --- /dev/null +++ b/libvo/vo_caca.c @@ -0,0 +1,331 @@ +/* + * MPlayer + * + * Video driver for libcaca + * + * by Pigeon <pigeon@pigeond.net> + * + * Some functions/codes/ideas are from x11 and aalib vo + * + * TODO: support those draw_alpha stuff? + * + */ + +#include <stdio.h> +#include <stdlib.h> +#include <sys/stat.h> +#include <unistd.h> +#include <string.h> +#include <time.h> +#include <errno.h> + +#include "config.h" +#include "video_out.h" +#include "video_out_internal.h" +#include "sub.h" + +#include "osdep/keycodes.h" +#include "mp_msg.h" + +#include <caca.h> + +static vo_info_t info = { + "libcaca", + "caca", + "Pigeon <pigeon@pigeond.net>", + "" +}; + +LIBVO_EXTERN (caca) + +/* caca stuff */ +static struct caca_bitmap *cbitmap = NULL; + +/* image infos */ +static int image_format; +static int image_width; +static int image_height; + +static int screen_w, screen_h; + +/* We want 24bpp always for now */ +static unsigned int bpp = 24; +static unsigned int depth = 3; +static unsigned int rmask = 0xff0000; +static unsigned int gmask = 0x00ff00; +static unsigned int bmask = 0x0000ff; +static unsigned int amask = 0; + +#define MESSAGE_SIZE 512 +#define MESSAGE_DURATION 5 + +static time_t stoposd = 0; +static int showosdmessage = 0; +static char osdmessagetext[MESSAGE_SIZE]; +static char posbar[MESSAGE_SIZE]; + +static int osdx = 0, osdy = 0; +static int posbary = 2; + +static void osdmessage(int duration, char *fmt, ...) +{ + /* + * for outputting a centered string at the bottom + * of our window for a while + */ + va_list ar; + char m[MESSAGE_SIZE]; + + va_start(ar, fmt); + vsprintf(m, fmt, ar); + va_end(ar); + strcpy(osdmessagetext, m); + + showosdmessage = 1; + stoposd = time(NULL) + duration; + osdx = (screen_w - strlen (osdmessagetext)) / 2; + posbar[0] = '\0'; +} + +static void osdpercent(int duration, int min, int max, int val, char *desc, char *unit) +{ + /* + * prints a bar for setting values + */ + float step; + int where, i; + + step = (float)screen_w / (float)(max - min); + where = (val - min) * step; + osdmessage (duration, "%s: %i%s", desc, val, unit); + posbar[0] = '|'; + posbar[screen_w - 1] = '|'; + + for (i = 0; i < screen_w; i++) + { + if (i == where) + posbar[i] = '#'; + else + posbar[i] = '-'; + } + + if (where != 0) + posbar[0] = '|'; + + if (where != (screen_w - 1)) + posbar[screen_w - 1] = '|'; + + posbar[screen_w] = '\0'; +} + +static int resize () +{ + screen_w = caca_get_width(); + screen_h = caca_get_height(); + + if (cbitmap) + caca_free_bitmap(cbitmap); + + cbitmap = caca_create_bitmap(bpp, image_width, image_height, + depth * image_width, rmask, gmask, bmask, + amask); + + if (!cbitmap) + mp_msg(MSGT_VO, MSGL_FATAL, "vo_caca: caca_create_bitmap failed!\n"); + + return 0; +} + +static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, + uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format) +{ + image_height = height; + image_width = width; + image_format = format; + + showosdmessage = 0; + posbar[0] = '\0'; + + return resize (); +} + +static uint32_t draw_frame(uint8_t *src[]) +{ + caca_draw_bitmap(0, 0, screen_w, screen_h, cbitmap, src[0]); + return 0; +} + +static uint32_t draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y) +{ + return 0; +} + +static void flip_page(void) +{ + + if (showosdmessage) + { + if (time(NULL) >= stoposd) + { + showosdmessage = 0; + if (posbar) + posbar[0] = '\0'; + } else { + caca_putstr(osdx, osdy, osdmessagetext); + + if (posbar) + caca_putstr(0, posbary, posbar); + } + } + + caca_refresh(); +} + +static void check_events (void) +{ + unsigned int cev; + + if ((cev = caca_get_event(CACA_EVENT_ANY))) + { + if (cev & CACA_EVENT_RESIZE) + { + caca_refresh(); + resize(); + } else if (cev & CACA_EVENT_KEY_RELEASE) + { + int key = (cev & 0x00ffffff); + enum caca_feature cf; + + switch (key) { + case 'd': + case 'D': + /* Toggle dithering method */ + cf = 1 + caca_get_feature(CACA_DITHERING); + if (cf > CACA_DITHERING_MAX) + cf = CACA_DITHERING_MIN; + caca_set_feature(cf); + osdmessage(MESSAGE_DURATION, "Using %s", caca_get_feature_name(cf)); + break; + + case 'a': + case 'A': + /* Toggle antialiasing method */ + cf = 1 + caca_get_feature(CACA_ANTIALIASING); + if (cf > CACA_ANTIALIASING_MAX) + cf = CACA_ANTIALIASING_MIN; + caca_set_feature(cf); + osdmessage(MESSAGE_DURATION, "Using %s", caca_get_feature_name(cf)); + break; + + case 'b': + case 'B': + /* Toggle background method */ + cf = 1 + caca_get_feature(CACA_BACKGROUND); + if (cf > CACA_BACKGROUND_MAX) + cf = CACA_BACKGROUND_MIN; + caca_set_feature(cf); + osdmessage(MESSAGE_DURATION, "Using %s", caca_get_feature_name(cf)); + break; + + case CACA_KEY_UP: + mplayer_put_key(KEY_UP); + break; + case CACA_KEY_DOWN: + mplayer_put_key(KEY_DOWN); + break; + case CACA_KEY_LEFT: + mplayer_put_key(KEY_LEFT); + break; + case CACA_KEY_RIGHT: + mplayer_put_key(KEY_RIGHT); + break; + case CACA_KEY_ESCAPE: + mplayer_put_key(KEY_ESC); + break; + case CACA_KEY_PAGEUP: + mplayer_put_key(KEY_PAGE_UP); + break; + case CACA_KEY_PAGEDOWN: + mplayer_put_key(KEY_PAGE_DOWN); + break; + case CACA_KEY_RETURN: + mplayer_put_key(KEY_ENTER); + break; + case CACA_KEY_HOME: + mplayer_put_key(KEY_HOME); + break; + case CACA_KEY_END: + mplayer_put_key(KEY_END); + break; + default: + if (key <= 255) + mplayer_put_key (key); + break; + } + } + } +} + +static void uninit(void) +{ + caca_free_bitmap(cbitmap); + cbitmap = NULL; + caca_end(); +} + + +static void draw_osd(void) +{ +#ifdef USE_OSD + if (vo_osd_progbar_type != -1) + osdpercent(MESSAGE_DURATION, 0, 255, + vo_osd_progbar_value, __sub_osd_names[vo_osd_progbar_type], + ""); +#endif +} + +static uint32_t preinit(const char *arg) +{ + if (arg) + { + mp_msg(MSGT_VO, MSGL_ERR, "vo_caca: Unknown subdevice: %s\n", arg); + return ENOSYS; + } + + if (caca_init()) + { + mp_msg(MSGT_VO, MSGL_ERR, "vo_caca: failed to initialize\n"); + return ENOSYS; + } + + caca_set_window_title("MPlayer"); + + /* Default libcaca features */ + caca_set_feature(CACA_ANTIALIASING_PREFILTER); + caca_set_feature(CACA_DITHERING_RANDOM); + + return 0; +} + +static uint32_t query_format(uint32_t format) +{ + if (format == IMGFMT_BGR24) + return +#ifdef USE_OSD + VFCAP_OSD | +#endif + VFCAP_CSP_SUPPORTED; + + return 0; +} + +static uint32_t control(uint32_t request, void *data, ...) +{ + switch(request) + { + case VOCTRL_QUERY_FORMAT: + return query_format(*((uint32_t *)data)); + default: + return VO_NOTIMPL; + } +} |