summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-05 23:28:06 (UTC)
committer simon <simon>2002-12-05 23:28:06 (UTC)
commit8a1c4b4b84d8a8de87bb6adb4df3f09961854633 (patch) (side-by-side diff)
tree2399c784b4d5e87c8bb834389837870353b4a43f
parent15d4d1f2fc8b37d30694acc5765a822718af6c13 (diff)
downloadopie-8a1c4b4b84d8a8de87bb6adb4df3f09961854633.zip
opie-8a1c4b4b84d8a8de87bb6adb4df3f09961854633.tar.gz
opie-8a1c4b4b84d8a8de87bb6adb4df3f09961854633.tar.bz2
- adapted to xine CVS HEAD
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp7
-rw-r--r--noncore/multimedia/opieplayer2/nullvideo.c60
2 files changed, 36 insertions, 31 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 96bdb21..4a96408 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -39,29 +39,30 @@
#include <qfile.h>
#include <qgfx_qws.h>
#include <qdirectpainter_qws.h>
#include <assert.h>
#include "xinevideowidget.h"
#include "frame.h"
#include "lib.h"
+
typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame,
int width, int height,int bytes );
extern "C" {
- xine_vo_driver_t* init_video_out_plugin( xine_cfg_entry_t* conf, void* video);
+ xine_vo_driver_t* init_video_out_plugin( xine_t *xine, void* video, display_xine_frame_t, void * );
int null_is_showing_video( const xine_vo_driver_t* self );
void null_set_show_video( const xine_vo_driver_t* self, int show );
int null_is_fullscreen( const xine_vo_driver_t* self );
void null_set_fullscreen( const xine_vo_driver_t* self, int screen );
int null_is_scaling( const xine_vo_driver_t* self );
void null_set_scaling( const xine_vo_driver_t* self, int scale );
void null_set_gui_width( const xine_vo_driver_t* self, int width );
void null_set_gui_height( const xine_vo_driver_t* self, int height );
void null_set_mode( const xine_vo_driver_t* self, int depth, int rgb );
void null_set_videoGamma( const xine_vo_driver_t* self , int value );
void null_display_handler( const xine_vo_driver_t* self, display_xine_frame_t t, void* user_data );
}
@@ -85,31 +86,31 @@ Lib::Lib( XineVideoWidget* widget ) {
f.close();
}
m_xine = xine_new( );
xine_config_load( m_xine, str.data() );
xine_init( m_xine );
// allocate oss for sound
// and fb for framebuffer
m_audioOutput = xine_open_audio_driver( m_xine, "oss", NULL );
- m_videoOutput = ::init_video_out_plugin( m_config, NULL );
+ m_videoOutput = ::init_video_out_plugin( m_xine, NULL, xine_display_frame, this );
//xine_open_video_driver( m_xine, NULL, XINE_VISUAL_TYPE_FB, NULL);
- null_display_handler( m_videoOutput, xine_display_frame, this );
+// null_display_handler( m_videoOutput, xine_display_frame, this );
m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput );
if (m_wid != 0 ) {
printf( "!0\n" );
resize ( m_wid-> size ( ) );
::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() );
m_wid->repaint();
}
m_queue = xine_event_new_queue (m_stream);
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c
index 9c285a0..1ebb854 100644
--- a/noncore/multimedia/opieplayer2/nullvideo.c
+++ b/noncore/multimedia/opieplayer2/nullvideo.c
@@ -50,25 +50,25 @@
/*
#define LOG
*/
/* the caller for our event draw handler */
typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame,
int width, int height,int bytes );
typedef struct null_driver_s null_driver_t;
struct null_driver_s {
- xine_vo_driver_t vo_driver;
+ vo_driver_t vo_driver;
uint32_t m_capabilities;
int m_show_video;
int m_video_fullscreen;
int m_is_scaling;
int depth, bpp, bytes_per_pixel;
int yuv2rgb_mode;
int yuv2rgb_swap;
int yuv2rgb_gamma;
uint8_t *yuv2rgb_cmap;
yuv2rgb_factory_t *yuv2rgb_factory;
@@ -98,25 +98,25 @@ struct opie_frame_s {
uint8_t *data; /* rgb */
int bytes_per_line;
yuv2rgb_t *yuv2rgb;
uint8_t *rgb_dst;
int yuv_stride;
int stripe_height, stripe_inc;
null_driver_t *output;
};
-static uint32_t null_get_capabilities( xine_vo_driver_t *self ){
+static uint32_t null_get_capabilities( vo_driver_t *self ){
null_driver_t* this = (null_driver_t*)self;
return this->m_capabilities;
}
static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) {
opie_frame_t *frame = (opie_frame_t *) vo_img ;
if (!frame->output->m_show_video) {
/* printf("nullvideo: no video\n"); */
return;
}
@@ -154,25 +154,25 @@ static void null_frame_field (vo_frame_t *vo_img, int which_field) {
/* take care of the frame*/
static void null_frame_dispose( vo_frame_t* vo_img){
opie_frame_t* frame = (opie_frame_t*)vo_img;
if (frame->data)
free( frame->data );
free (frame);
}
/* end take care of frames*/
-static vo_frame_t* null_alloc_frame( xine_vo_driver_t* self ){
+static vo_frame_t* null_alloc_frame( vo_driver_t* self ){
null_driver_t* this = (null_driver_t*)self;
opie_frame_t* frame;
#ifdef LOG
fprintf (stderr, "nullvideo: alloc_frame\n");
#endif
frame = (opie_frame_t*)malloc ( sizeof(opie_frame_t) );
memset( frame, 0, sizeof( opie_frame_t) );
memcpy (&frame->sc, &this->sc, sizeof(vo_scale_t));
@@ -186,25 +186,25 @@ static vo_frame_t* null_alloc_frame( xine_vo_driver_t* self ){
frame->frame.copy = null_frame_copy;
frame->frame.field = null_frame_field;
frame->frame.dispose = null_frame_dispose;
/*
* colorspace converter for this frame
*/
frame->yuv2rgb = this->yuv2rgb_factory->create_converter (this->yuv2rgb_factory);
return (vo_frame_t*) frame;
}
-static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img,
+static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
uint32_t width, uint32_t height,
int ratio_code, int format, int flags ){
null_driver_t* this = (null_driver_t*) self;
opie_frame_t* frame = (opie_frame_t*)img;
/* not needed now */
#ifdef LOG
fprintf (stderr, "nullvideo: update_frame_format\n");
#endif
flags &= VO_BOTH_FIELDS;
@@ -329,25 +329,25 @@ static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img,
case VO_BOTTOM_FIELD:
frame->rgb_dst = (uint8_t *)frame->data + frame->bytes_per_line ;
frame->stripe_inc = 2 * frame->stripe_height * frame->bytes_per_line;
break;
case VO_BOTH_FIELDS:
frame->rgb_dst = (uint8_t *)frame->data;
frame->stripe_inc = frame->stripe_height * frame->bytes_per_line;
break;
}
}
}
-static void null_display_frame( xine_vo_driver_t* self, vo_frame_t *frame_gen ){
+static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){
null_driver_t* this = (null_driver_t*) self;
opie_frame_t* frame = (opie_frame_t*)frame_gen;
display_xine_frame_t display = this->frameDis;
if (!this->m_show_video)
return;
if( display != NULL ) {
(*display)(this->caller, frame->data,
frame->sc.output_width, frame->sc.output_height,
frame->bytes_per_line );
}
@@ -372,25 +372,25 @@ static void null_overlay_clut_yuv2rgb (null_driver_t *this,
}
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]) =
frame->yuv2rgb->yuv2rgb_single_pixel_fun(frame->yuv2rgb,
clut[i].y, clut[i].cb, clut[i].cr);
}
overlay->clip_rgb_clut++;
}
}
-static void null_overlay_blend ( xine_vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) {
+static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) {
null_driver_t *this = (null_driver_t *) this_gen;
opie_frame_t *frame = (opie_frame_t *) frame_gen;
if(!this->m_show_video || frame->sc.output_width == 0
|| frame->sc.output_height== 0)
return;
/* Alpha Blend here */
if (overlay->rle) {
if( !overlay->rgb_clut || !overlay->clip_rgb_clut)
null_overlay_clut_yuv2rgb(this,overlay,frame);
@@ -409,63 +409,63 @@ static void null_overlay_blend ( xine_vo_driver_t *this_gen, vo_frame_t *frame_g
blend_rgb32( (uint8_t *)frame->data, overlay,
frame->sc.output_width, frame->sc.output_height,
frame->sc.delivered_width, frame->sc.delivered_height);
break;
default:
/* It should never get here */
break;
}
}
}
-static int null_get_property( xine_vo_driver_t* self,
+static int null_get_property( vo_driver_t* self,
int property ){
return 0;
}
-static int null_set_property( xine_vo_driver_t* self,
+static int null_set_property( vo_driver_t* self,
int property,
int value ){
return value;
}
-static void null_get_property_min_max( xine_vo_driver_t* self,
+static void null_get_property_min_max( vo_driver_t* self,
int property, int *min,
int *max ){
*max = 0;
*min = 0;
}
-static int null_gui_data_exchange( xine_vo_driver_t* self,
+static int null_gui_data_exchange( vo_driver_t* self,
int data_type,
void *data ){
return 0;
}
-static void null_dispose ( xine_vo_driver_t* self ){
+static void null_dispose ( vo_driver_t* self ){
null_driver_t* this = (null_driver_t*)self;
free ( this );
}
-static int null_redraw_needed( xine_vo_driver_t* self ){
+static int null_redraw_needed( vo_driver_t* self ){
return 0;
}
-xine_vo_driver_t* init_video_out_plugin( config_values_t* conf,
- void* video ){
+xine_vo_driver_t* init_video_out_plugin( xine_t *xine,
+ void* video, display_xine_frame_t frameDisplayFunc, void *userData ){
null_driver_t *vo;
vo = (null_driver_t*)malloc( sizeof(null_driver_t ) );
/* memset? */
memset(vo,0, sizeof(null_driver_t ) );
- vo_scale_init (&vo->sc, 0, 0);
+ vo_scale_init (&vo->sc, 0, 0, xine->config);
vo->sc.gui_pixel_aspect = 1.0;
vo->m_show_video = 0; // false
vo->m_video_fullscreen = 0;
vo->m_is_scaling = 0;
vo->display_ratio = 1.0;
vo->gui_width = 16;
vo->gui_height = 8;
vo->frameDis = NULL;
/* install callback handlers*/
@@ -478,85 +478,89 @@ xine_vo_driver_t* init_video_out_plugin( config_values_t* conf,
vo->vo_driver.set_property = null_set_property;
vo->vo_driver.get_property_min_max = null_get_property_min_max;
vo->vo_driver.gui_data_exchange = null_gui_data_exchange;
vo->vo_driver.dispose = null_dispose;
vo->vo_driver.redraw_needed = null_redraw_needed;
/* capabilities */
vo->m_capabilities = VO_CAP_COPIES_IMAGE | VO_CAP_YUY2 | VO_CAP_YV12;
vo->yuv2rgb_factory = yuv2rgb_factory_init (MODE_16_RGB, vo->yuv2rgb_swap,
vo->yuv2rgb_cmap);
- return ( xine_vo_driver_t*) vo;
+ vo->caller = userData;
+ vo->frameDis = frameDisplayFunc;
+
+ /* return ( vo_driver_t*) vo; */
+ return vo_new_port( xine, ( vo_driver_t* )vo );
}
#if 0
static vo_info_t vo_info_null = {
5,
XINE_VISUAL_TYPE_FB
};
vo_info_t *get_video_out_plugin_info(){
vo_info_null.description = ("xine video output plugin using null device");
return &vo_info_null;
}
#endif
/* this is special for this device */
/**
* We know that we will be controled by the XINE LIB++
*/
/**
*
*/
int null_is_showing_video( xine_vo_driver_t* self ){
- null_driver_t* this = (null_driver_t*)self;
+ null_driver_t* this = (null_driver_t*)self->driver;
return this->m_show_video;
}
void null_set_show_video( xine_vo_driver_t* self, int show ) {
- ((null_driver_t*)self)->m_show_video = show;
+ ((null_driver_t*)self->driver)->m_show_video = show;
}
int null_is_fullscreen( xine_vo_driver_t* self ){
- return ((null_driver_t*)self)->m_video_fullscreen;
+ return ((null_driver_t*)self->driver)->m_video_fullscreen;
}
void null_set_fullscreen( xine_vo_driver_t* self, int screen ){
- ((null_driver_t*)self)->m_video_fullscreen = screen;
+ ((null_driver_t*)self->driver)->m_video_fullscreen = screen;
}
int null_is_scaling( xine_vo_driver_t* self ){
- return ((null_driver_t*)self)->m_is_scaling;
+ return ((null_driver_t*)self->driver)->m_is_scaling;
}
void null_set_videoGamma( xine_vo_driver_t* self , int value ) {
- ((null_driver_t*) self) ->yuv2rgb_gamma = value;
- ((null_driver_t*) self) ->yuv2rgb_factory->set_gamma( ((null_driver_t*) self) ->yuv2rgb_factory, value );
+ ((null_driver_t*) self->driver) ->yuv2rgb_gamma = value;
+ ((null_driver_t*) self->driver) ->yuv2rgb_factory->set_gamma( ((null_driver_t*) self) ->yuv2rgb_factory, value );
}
void null_set_scaling( xine_vo_driver_t* self, int scale ) {
- ((null_driver_t*)self)->m_is_scaling = scale;
+ ((null_driver_t*)self->driver)->m_is_scaling = scale;
}
void null_set_gui_width( xine_vo_driver_t* self, int width ) {
- ((null_driver_t*)self)->gui_width = width;
+ ((null_driver_t*)self->driver)->gui_width = width;
}
void null_set_gui_height( xine_vo_driver_t* self, int height ) {
- ((null_driver_t*)self)->gui_height = height;
+ ((null_driver_t*)self->driver)->gui_height = height;
}
void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) {
- null_driver_t* this = (null_driver_t*)self;
+ null_driver_t* this = (null_driver_t*)self->driver;
this->bytes_per_pixel = (depth + 7 ) / 8;
this->bpp = this->bytes_per_pixel * 8;
this->depth = depth;
printf("depth %d %d\n", depth, this->bpp);
printf("pixeltype %d\n", rgb );
switch ( this->depth ) {
case 32:
if( rgb == 0 )
this->yuv2rgb_mode = MODE_32_RGB;
else
this->yuv2rgb_mode = MODE_32_BGR;
@@ -594,17 +598,17 @@ void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) {
} else {
this->yuv2rgb_mode = MODE_8_BGR;
}
break;
};
//free(this->yuv2rgb_factory );
// this->yuv2rgb_factory = yuv2rgb_factory_init (this->yuv2rgb_mode, this->yuv2rgb_swap,
// this->yuv2rgb_cmap);
};
void null_display_handler( xine_vo_driver_t* self, display_xine_frame_t t,
void* user_data ) {
- null_driver_t* this = (null_driver_t*) self;
+ null_driver_t* this = (null_driver_t*) self->driver;
this->caller = user_data;
this->frameDis = t;
}