summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/video_out/Makefile.am10
-rw-r--r--src/video_out/video_out_directfb.c591
-rw-r--r--src/xine-engine/load_plugins.c6
-rw-r--r--src/xine-engine/xine_internal.h3
4 files changed, 605 insertions, 5 deletions
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 7b45d752c..5fb10d21a 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -24,6 +24,10 @@ if HAVE_FB
fb_module = xineplug_vo_out_fb.la
endif
+if HAVE_DIRECTFB
+directfb_module = xineplug_vo_out_directfb.la
+endif
+
if HAVE_SDL
sdl_module = xineplug_vo_out_sdl.la
endif
@@ -36,7 +40,7 @@ endif
# scheme "xineplug_vo_out_"
#
lib_LTLIBRARIES = $(xv_module) $(syncfb_module) $(xshm_module) $(aa_module) \
- $(fb_module) $(sdl_module) $(opengl_module)
+ $(fb_module) $(sdl_module) $(opengl_module) $(directfb_module)
xineplug_vo_out_xv_la_SOURCES = deinterlace.c alphablend.c video_out_xv.c
xineplug_vo_out_xv_la_LIBADD = $(XV_LIB) $(X_LIBS) -lXext
@@ -63,6 +67,10 @@ xineplug_vo_out_fb_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
alphablend.c video_out_fb.c
xineplug_vo_out_fb_la_LDFLAGS = -avoid-version -module
+xineplug_vo_out_directfb_la_SOURCES = alphablend.c video_out_directfb.c
+xineplug_vo_out_directfb_la_LIBADD = $(DIRECTFB_LIBS)
+xineplug_vo_out_directfb_la_LDFLAGS = -avoid-version -module
+
xineplug_vo_out_sdl_la_SOURCES = alphablend.c video_out_sdl.c
xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS)
xineplug_vo_out_sdl_la_LDFLAGS = -avoid-version -module
diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c
new file mode 100644
index 000000000..e5d19e059
--- /dev/null
+++ b/src/video_out/video_out_directfb.c
@@ -0,0 +1,591 @@
+/*
+ * Copyright (C) 2000, 2001 the xine project
+ *
+ * This file is part of xine, a unix video player.
+ *
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * $Id: video_out_directfb.c,v 1.1 2002/02/02 17:05:43 richwareham Exp $
+ *
+ * DirectFB based output plugin.
+ * Rich Wareham <richwareham@users.sourceforge.net>
+ *
+ * Based on video_out_xshm.c and video_out_xv.c
+ */
+
+#if 0
+# define DEBUGF(x) fprintf x
+#else
+# define DEBUGF(x) ((void) 0)
+#endif
+
+/* Uncomment for some fun! */
+/*
+#define SPHERE
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <assert.h>
+
+#include "video_out.h"
+
+#include <pthread.h>
+#include <netinet/in.h>
+
+#include "xine_internal.h"
+#include "alphablend.h"
+#include "yuv2rgb.h"
+#include "xineutils.h"
+#include <directfb.h>
+
+#define DFBCHECK(x...) \
+ { \
+ DFBResult err = x; \
+ \
+ if (err != DFB_OK) \
+ { \
+ fprintf( stderr, "%s <%d>:\n\t", __FILE__, __LINE__ ); \
+ DirectFBErrorFatal( #x, err ); \
+ } \
+ }
+
+typedef struct directfb_frame_s {
+ vo_frame_t vo_frame;
+ uint8_t *chunk[3];
+
+ int width, height;
+ int ratio_code;
+ int format;
+
+ IDirectFBSurface *surface;
+ int line;
+} directfb_frame_t;
+
+typedef struct directfb_driver_s {
+
+ vo_driver_t vo_driver;
+
+ config_values_t *config;
+
+ directfb_frame_t *cur_frame;
+ vo_overlay_t *overlay;
+
+ /* DirectFB related stuff */
+ IDirectFB *dfb;
+ IDirectFBSurface *primary;
+
+ /* output area */
+ int screen_width;
+ int screen_height;
+ int frame_width;
+ int frame_height;
+
+ /* last displayed frame */
+ int last_frame_width; /* original size */
+ int last_frame_height; /* original size */
+ int last_frame_ratio_code;
+
+ /* TODO: check */
+ int zoom_mpeg1;
+
+ /* display anatomy */
+ double display_ratio; /* given by visual parameter from init function */
+ void *user_data;
+
+ /* gui callbacks */
+
+ void (*request_dest_size) (void *user_data,
+ int video_width, int video_height,
+ int *dest_x, int *dest_y,
+ int *dest_height, int *dest_width);
+
+ void (*calc_dest_size) (void *user_data,
+ int video_width, int video_height,
+ int *dest_width, int *dest_height);
+
+} directfb_driver_t;
+
+#define CONTEXT_BAD 0
+#define CONTEXT_SAME_DRAWABLE 1
+#define CONTEXT_SET 2
+#define CONTEXT_RELOAD 3
+
+
+/*
+ * first, some utility functions
+ */
+vo_info_t *get_video_out_plugin_info();
+
+static void *my_malloc_aligned (size_t alignment, size_t size, uint8_t **chunk) {
+
+ uint8_t *pMem;
+
+ pMem = xine_xmalloc (size+alignment);
+
+ *chunk = pMem;
+
+ while ((int) pMem % alignment)
+ pMem++;
+
+ return pMem;
+}
+
+
+/*
+ * and now, the driver functions
+ */
+
+static uint32_t directfb_get_capabilities (vo_driver_t *this_gen) {
+ return VO_CAP_COPIES_IMAGE | VO_CAP_YV12 | VO_CAP_YUY2;
+}
+
+
+static void directfb_frame_copy (vo_frame_t *vo_img, uint8_t **src) {
+ directfb_frame_t *frame = (directfb_frame_t *) vo_img ;
+ /* directfb_driver_t *this = (directfb_driver_t *) vo_img->instance->driver; */
+ uint32_t *data;
+ uint8_t *py, *pu, *pv;
+ uint32_t pitch, x,y,frame_offset, src_offset,i,a;
+
+ DFBCHECK(frame->surface->Lock(frame->surface, DSLF_WRITE,
+ &data, &pitch));
+
+ i=0; py = src[0]; pu = src[1]; pv=src[2]; a=0;
+ for(y=frame->line; (y<frame->line+16) && (y<frame->height); y++, i++) {
+ frame_offset = (y * pitch)>>2; src_offset = i * frame->width;
+ a = (i>>1) * ((frame->width)>>1);
+ for(x=0; x<frame->width; x+=2) {
+ if(frame->format == IMGFMT_YV12) {
+ data[frame_offset+(x>>1)] = py[(src_offset+x)] +
+ ((pu[a])<<8) + ((py[(src_offset+x+1)])<<16) +
+ ((pv[a])<<24);
+ /* data[frame_offset+(x<<1)+2] = py[(src_offset+x+1)];
+ data[frame_offset+(x<<1)+1] = pu[a];
+ data[frame_offset+(x<<1)+3] = pv[a]; */
+ a++;
+ }
+ }
+ }
+ frame->line=y;
+ DFBCHECK(frame->surface->Unlock(frame->surface));
+}
+
+static void directfb_frame_field (vo_frame_t *vo_img, int which_field) {
+
+ /* directfb_frame_t *frame = (directfb_frame_t *) vo_img ; */
+
+ switch(which_field) {
+ case VO_BOTH_FIELDS:
+ break;
+ default:
+ fprintf(stderr, "Interlaced images not supported\n");
+ }
+#if 0
+ switch (which_field) {
+ case VO_TOP_FIELD:
+ frame->rgb_dst = frame->texture;
+ frame->stripe_inc = 2*STRIPE_HEIGHT * frame->width * BYTES_PER_PIXEL;
+ break;
+ case VO_BOTTOM_FIELD:
+ frame->rgb_dst = frame->texture + frame->width * BYTES_PER_PIXEL ;
+ frame->stripe_inc = 2*STRIPE_HEIGHT * frame->width * BYTES_PER_PIXEL;
+ break;
+ case VO_BOTH_FIELDS:
+ frame->rgb_dst = frame->texture;
+ frame->stripe_inc = STRIPE_HEIGHT * frame->width * BYTES_PER_PIXEL;
+ break;
+ }
+#endif
+}
+
+static void directfb_frame_dispose (vo_frame_t *vo_img) {
+
+ directfb_frame_t *frame = (directfb_frame_t *) vo_img ;
+
+ if (frame) {
+ DFBCHECK(frame->surface->Release(frame->surface));
+ frame->surface = NULL;
+ }
+ free (frame);
+}
+
+
+static vo_frame_t *directfb_alloc_frame (vo_driver_t *this_gen) {
+ directfb_frame_t *frame ;
+
+ frame = (directfb_frame_t *) calloc (1, sizeof (directfb_frame_t));
+ if (frame==NULL) {
+ printf ("directfb_alloc_frame: out of memory\n");
+ return NULL;
+ }
+
+ memset (frame, 0, sizeof(directfb_frame_t));
+
+ pthread_mutex_init (&frame->vo_frame.mutex, NULL);
+
+ /*
+ * supply required functions
+ */
+
+ frame->vo_frame.copy = directfb_frame_copy;
+ frame->vo_frame.field = directfb_frame_field;
+ frame->vo_frame.dispose = directfb_frame_dispose;
+
+ frame->surface = NULL;
+ frame->line = 0;
+
+ return (vo_frame_t *) frame;
+}
+
+
+static void directfb_adapt_to_output_area (directfb_driver_t *this,
+ int dest_width, int dest_height)
+{
+ this->frame_width = dest_width;
+ this->frame_height = dest_height;
+
+}
+
+static void directfb_update_frame_format (vo_driver_t *this_gen,
+ vo_frame_t *frame_gen,
+ uint32_t width, uint32_t height,
+ int ratio_code, int format, int flags) {
+
+ directfb_driver_t *this = (directfb_driver_t *) this_gen;
+ directfb_frame_t *frame = (directfb_frame_t *) frame_gen;
+ DFBSurfaceDescription dsc;
+ int image_size;
+
+ flags &= VO_BOTH_FIELDS;
+
+ /*this->frame_width = width;
+ this->frame_height = height; */
+ /* this->delivered_ratio_code = ratio_code;
+ this->delivered_flags = flags; */
+
+ if ((frame->width != width) || (frame->height != height)
+ || (frame->format != format)) {
+ if(frame->surface) {
+ DFBCHECK(frame->surface->Release(frame->surface));
+
+ if (frame->chunk[0]){
+ free (frame->chunk[0]);
+ frame->chunk[0] = NULL;
+ }
+ if (frame->chunk[1]) {
+ free (frame->chunk[1]);
+ frame->chunk[1] = NULL;
+ }
+ if (frame->chunk[2]) {
+ free (frame->chunk[2]);
+ frame->chunk[2] = NULL;
+ }
+ }
+ frame->surface = NULL;
+
+ frame->format = format;
+ frame->width = width;
+ frame->height = height;
+
+ if (format == IMGFMT_YV12) {
+ image_size = width * height;
+ frame->vo_frame.base[0] = my_malloc_aligned(16,image_size, &frame->chunk[0]);
+ frame->vo_frame.base[1] = my_malloc_aligned(16,image_size/4, &frame->chunk[1]);
+ frame->vo_frame.base[2] = my_malloc_aligned(16,image_size/4, &frame->chunk[2]);
+ } else {
+ image_size = width * height;
+ frame->vo_frame.base[0] = my_malloc_aligned(16,image_size*2, &frame->chunk[0]);
+ }
+
+ switch(frame->format) {
+ case IMGFMT_RGB:
+ dsc.pixelformat = DSPF_RGB16;
+ break;
+ case IMGFMT_YV12:
+ dsc.pixelformat = DSPF_YUY2;
+ break;
+ default:
+ fprintf(stderr,"Error unknown image format (%i), assuming YUY2\n", frame->format);
+ dsc.pixelformat = DSPF_YUY2;
+ }
+
+ dsc.flags = DSDESC_CAPS | DSDESC_PIXELFORMAT | DSDESC_WIDTH | DSDESC_HEIGHT;
+ dsc.caps = 0;
+ dsc.width = frame->width;
+ dsc.height = frame->height;
+
+ DFBCHECK(this->dfb->CreateSurface(this->dfb, &dsc, &(frame->surface)));
+ frame->ratio_code = ratio_code;
+
+ directfb_frame_field ((vo_frame_t *)frame, flags);
+
+ }
+}
+
+static void directfb_overlay_clut_yuv2rgb(directfb_driver_t *this, vo_overlay_t *overlay)
+{
+#if 0
+ int i;
+ clut_t* clut = (clut_t*) overlay->color;
+ if (!overlay->rgb_clut) {
+ for (i = 0; i < sizeof(overlay->color)/sizeof(overlay->color[0]); i++) {
+ *((uint32_t *)&clut[i]) =
+ this->yuv2rgb->yuv2rgb_single_pixel_fun(this->yuv2rgb,
+ clut[i].y, clut[i].cb, clut[i].cr);
+ }
+ overlay->rgb_clut++;
+ }
+ if (!overlay->clip_rgb_clut) {
+ clut = (clut_t*) overlay->clip_color;
+ for (i = 0; i < sizeof(overlay->color)/sizeof(overlay->color[0]); i++) {
+ *((uint32_t *)&clut[i]) =
+ this->yuv2rgb->yuv2rgb_single_pixel_fun(this->yuv2rgb,
+ clut[i].y, clut[i].cb, clut[i].cr);
+ }
+ overlay->clip_rgb_clut++;
+ }
+#endif
+
+}
+
+static void directfb_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) {
+ /* directfb_driver_t *this = (directfb_driver_t *) this_gen; */
+ /* directfb_frame_t *frame = (directfb_frame_t *) frame_gen; */
+
+#if 0
+ /* Alpha Blend here */
+ if (overlay->rle) {
+ if( !overlay->rgb_clut || !overlay->clip_rgb_clut)
+ directfb_overlay_clut_yuv2rgb(this,overlay);
+
+ assert (this->delivered_width == frame->width);
+ assert (this->delivered_height == frame->height);
+# if BYTES_PER_PIXEL == 3
+ blend_rgb24 ((uint8_t *)frame->texture, overlay,
+ frame->width, frame->height,
+ this->delivered_width, this->delivered_height);
+# elif BYTES_PER_PIXEL == 4
+ blend_rgb32 ((uint8_t *)frame->texture, overlay,
+ frame->width, frame->height,
+ this->delivered_width, this->delivered_height);
+# else
+# error "bad BYTES_PER_PIXEL"
+# endif
+ }
+#endif
+}
+
+static void directfb_render_image (directfb_driver_t *this, directfb_frame_t *frame)
+{
+ if(frame && frame->surface) {
+ frame->line = 0;
+ DFBCHECK(this->primary->StretchBlit(this->primary,
+ frame->surface, NULL,NULL));
+ DFBCHECK(this->primary->Flip(this->primary, NULL, 0));
+ }
+}
+
+
+static void directfb_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) {
+
+ directfb_driver_t *this = (directfb_driver_t *) this_gen;
+ directfb_frame_t *frame = (directfb_frame_t *) frame_gen;
+
+ if( this->cur_frame )
+ this->cur_frame->vo_frame.displayed (&this->cur_frame->vo_frame);
+ this->cur_frame = frame;
+
+ if ( (frame->width != this->last_frame_width) ||
+ (frame->height != this->last_frame_height))
+ {
+ this->last_frame_width = frame->width;
+ this->last_frame_height = frame->height;
+ this->last_frame_ratio_code = frame->ratio_code;
+
+ fprintf (stderr, "video_out_directfb: window size %d x %d, frame size %d x %d\n",
+ this->screen_width, this->screen_height,
+ this->frame_width, this->frame_height);
+ }
+
+ directfb_render_image (this, frame);
+
+ frame->vo_frame.displayed (&frame->vo_frame);
+ this->cur_frame = NULL;
+}
+
+
+static int directfb_get_property (vo_driver_t *this_gen, int property) {
+
+ /* directfb_driver_t *this = (directfb_driver_t *) this_gen; */
+
+ if ( property == VO_PROP_ASPECT_RATIO) {
+ return 1;
+ } else {
+ printf ("video_out_directfb: tried to get unsupported property %d\n", property);
+ }
+
+ return 0;
+}
+
+
+static char *aspect_ratio_name(int a)
+{
+ switch (a) {
+ case ASPECT_AUTO:
+ return "auto";
+ case ASPECT_SQUARE:
+ return "square";
+ case ASPECT_FULL:
+ return "4:3";
+ case ASPECT_ANAMORPHIC:
+ return "16:9";
+ case ASPECT_DVB:
+ return "2:1";
+ default:
+ return "unknown";
+ }
+}
+
+static int directfb_set_property (vo_driver_t *this_gen,
+ int property, int value) {
+
+ directfb_driver_t *this = (directfb_driver_t *) this_gen;
+
+ if ( property == VO_PROP_ASPECT_RATIO) {
+ if (value>=NUM_ASPECT_RATIOS)
+ value = ASPECT_AUTO;
+ /* this->user_ratio = value; */
+ printf("video_out_directfb: aspect ratio changed to %s\n",
+ aspect_ratio_name(value));
+ } else {
+ printf ("video_out_directfb: tried to set unsupported property %d\n", property);
+ }
+
+ return value;
+}
+
+static void directfb_get_property_min_max (vo_driver_t *this_gen,
+ int property, int *min, int *max) {
+ *min = 0;
+ *max = 0;
+}
+
+
+static int is_fullscreen_size (directfb_driver_t *this, int w, int h) {
+ /* Always fullscreen*/
+ return 1;
+}
+
+static void directfb_translate_gui2video(directfb_driver_t *this,
+ int x, int y,
+ int *vid_x, int *vid_y)
+{
+ *vid_x = x;
+ *vid_y = y;
+}
+
+static int directfb_gui_data_exchange (vo_driver_t *this_gen,
+ int data_type, void *data) {
+
+ /* directfb_driver_t *this = (directfb_driver_t *) this_gen; */
+
+
+ switch (data_type) {
+ default:
+ return -1;
+ }
+
+fprintf (stderr, "done gui_data_exchange\n");
+ return 0;
+}
+
+
+static void directfb_exit (vo_driver_t *this_gen) {
+ /* directfb_driver_t *this = (directfb_driver_t *) this_gen; */
+}
+
+typedef struct {
+ IDirectFB *dfb;
+ IDirectFBSurface *primary;
+} dfb_visual_info_t;
+
+vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
+
+ directfb_driver_t *this;
+ dfb_visual_info_t *visual_info = (dfb_visual_info_t*)visual_gen;
+ DFBSurfaceDescription dsc;
+
+ fprintf (stderr, "EXPERIMENTAL directfb output plugin\n");
+ /*
+ * allocate plugin struct
+ */
+
+ this = malloc (sizeof (directfb_driver_t));
+
+ if (!this) {
+ printf ("video_out_directfb: malloc failed\n");
+ return NULL;
+ }
+
+ memset (this, 0, sizeof(directfb_driver_t));
+
+ this->config = config;
+ this->screen_width = 0;
+ this->screen_height = 0;
+ this->frame_width = 0;
+ this->frame_height = 0;
+ this->zoom_mpeg1 = config->register_bool (config, "video.zoom_mpeg1", 1,
+ "Zoom small video formats to double size",
+ NULL, NULL, NULL);
+
+ this->vo_driver.get_capabilities = directfb_get_capabilities;
+ this->vo_driver.alloc_frame = directfb_alloc_frame;
+ this->vo_driver.update_frame_format = directfb_update_frame_format;
+ this->vo_driver.overlay_blend = directfb_overlay_blend;
+ this->vo_driver.display_frame = directfb_display_frame;
+ this->vo_driver.get_property = directfb_get_property;
+ this->vo_driver.set_property = directfb_set_property;
+ this->vo_driver.get_property_min_max = directfb_get_property_min_max;
+ this->vo_driver.gui_data_exchange = directfb_gui_data_exchange;
+ this->vo_driver.exit = directfb_exit;
+ this->vo_driver.get_info = get_video_out_plugin_info;
+
+ this->dfb = visual_info->dfb;
+ this->primary = visual_info->primary;
+ DFBCHECK(this->primary->GetSize(this->primary, &(this->screen_width),
+ &(this->screen_height)));
+
+ return &this->vo_driver;
+}
+
+static vo_info_t vo_info_directfb = {
+ 3,
+ "DirectFB",
+ "xine video output plugin using the DirectFB library.",
+ VISUAL_TYPE_DFB,
+ 8
+};
+
+vo_info_t *get_video_out_plugin_info() {
+ return &vo_info_directfb;
+}
+
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index a1831667b..59183304d 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: load_plugins.c,v 1.67 2002/01/08 16:41:39 cvogler Exp $
+ * $Id: load_plugins.c,v 1.68 2002/02/02 17:05:43 richwareham Exp $
*
*
* Load input/demux/audio_out/video_out/codec plugins
@@ -684,7 +684,7 @@ char **xine_list_video_output_plugins (int visual_type) {
* and finally if all this went through get it's id
*/
- if(!(plugin = dlopen (str, RTLD_LAZY))) {
+ if(!(plugin = dlopen (str, RTLD_LAZY | RTLD_GLOBAL))) {
printf("load_plugins: cannot load plugin %s:\n%s\n",
str, dlerror());
@@ -800,7 +800,7 @@ vo_driver_t *xine_load_video_output_plugin(config_values_t *config,
sprintf (str, "%s/%s", XINE_PLUGINDIR, dir_entry->d_name);
- if(!(plugin = dlopen (str, RTLD_LAZY))) {
+ if(!(plugin = dlopen (str, RTLD_LAZY | RTLD_GLOBAL))) {
printf("load_plugins: video output plugin %s failed to link:\n%s\n",
str, dlerror());
} else {
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index b57c355eb..9b2c0066a 100644
--- a/src/xine-engine/xine_internal.h
+++ b/src/xine-engine/xine_internal.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_internal.h,v 1.69 2002/01/09 22:33:04 jcdutton Exp $
+ * $Id: xine_internal.h,v 1.70 2002/02/02 17:05:43 richwareham Exp $
*
*/
@@ -502,6 +502,7 @@ void load_decoder_plugins (xine_t *this,
#define VISUAL_TYPE_AA 2
#define VISUAL_TYPE_FB 3
#define VISUAL_TYPE_GTK 4
+#define VISUAL_TYPE_DFB 5
/*
* list_video_output_plugins
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 23:33:29 +0000