summaryrefslogtreecommitdiff
authorzecke <zecke>2004-09-23 19:02:47 (UTC)
committer zecke <zecke>2004-09-23 19:02:47 (UTC)
commit9a7e9427062e820f7b654e77e051213c3f53e134 (patch) (side-by-side diff)
treeb37f5d9dd37a846551c44feca40c24c56ffc7a05
parent69bf1d25b253167f3d2ef4b162c42aec4d8bbf7a (diff)
downloadopie-9a7e9427062e820f7b654e77e051213c3f53e134.zip
opie-9a7e9427062e820f7b654e77e051213c3f53e134.tar.gz
opie-9a7e9427062e820f7b654e77e051213c3f53e134.tar.bz2
-OTicker is in libqtaux so we need to link it to avoid weird crashes
-Some function names have changed in xine update them -Start to merge video_out_fb.c changes into nullvideo and give credit to the source of it
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp15
-rw-r--r--noncore/multimedia/opieplayer2/nullvideo.c359
-rw-r--r--noncore/multimedia/opieplayer2/opieplayer2.pro2
-rw-r--r--noncore/multimedia/opieplayer2/xinevideowidget.cpp1
4 files changed, 236 insertions, 141 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 1ab5c96..248221b 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -48,2 +48,3 @@ using namespace Opie::Core;
#include <assert.h>
+#include <unistd.h>
@@ -110,6 +111,6 @@ void Lib::run()
{
- odebug << "Lib::run() started" << oendl;
+ odebug << "Lib::run() started" << oendl;
initialize();
m_initialized = true;
- odebug << "Lib::run() finished" << oendl;
+ odebug << "Lib::run() finished" << oendl;
}
@@ -148,3 +149,3 @@ void Lib::initialize()
- ::null_preload_decoders( m_stream );
+ ::null_preload_decoders( m_stream );
@@ -219,3 +220,3 @@ void Lib::stop() {
- odebug << "<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>" << oendl;
+ odebug << "<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>" << oendl;
xine_stop( m_stream );
@@ -331,5 +332,5 @@ void Lib::ensureInitialized()
- odebug << "waiting for initialization thread to finish" << oendl;
+ odebug << "waiting for initialization thread to finish" << oendl;
wait();
- odebug << "initialization thread finished!" << oendl;
+ odebug << "initialization thread finished!" << oendl;
}
@@ -426,3 +427,3 @@ void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) {
if ( !m_video ) {
- owarn << "not showing video now" << oendl;
+ owarn << "not showing video now" << oendl;
return;
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c
index 378bbd4..6769a37 100644
--- a/noncore/multimedia/opieplayer2/nullvideo.c
+++ b/noncore/multimedia/opieplayer2/nullvideo.c
@@ -6,2 +6,3 @@
Copyright (c) 2002 Holger Freyther <zecke@handhelds.org>
+ Copyright (c) 2002-2003 Miguel Freitas of xine
=.
@@ -115,3 +116,3 @@ static uint32_t null_get_capabilities( vo_driver_t *self ){
-static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) {
+static void null_frame_proc_slice (vo_frame_t *vo_img, uint8_t **src) {
opie_frame_t *frame = (opie_frame_t *) vo_img ;
@@ -177,5 +178,4 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){
- frame = (opie_frame_t*)malloc ( sizeof(opie_frame_t) );
+ frame = (opie_frame_t*)xine_xmalloc ( sizeof(opie_frame_t) );
- memset( frame, 0, sizeof( opie_frame_t) );
memcpy (&frame->sc, &this->sc, sizeof(vo_scale_t));
@@ -188,3 +188,3 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){
frame->frame.driver = self;
- frame->frame.proc_slice = null_frame_copy;
+ frame->frame.proc_slice = null_frame_proc_slice;
frame->frame.field = null_frame_field;
@@ -200,47 +200,30 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){
-static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
- uint32_t width, uint32_t height,
- double 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
+static void null_frame_compute_ideal_size( null_driver_t *this,
+ opie_frame_t *frame ) {
+ this = this;
- flags &= VO_BOTH_FIELDS;
+ _x_vo_scale_compute_ideal_size(&frame->sc);
+}
- /* find out if we need to adapt this frame */
+static void null_frame_compute_rgb_size( null_driver_t *this,
+ opie_frame_t *frame ){
+ this = this;
- if ((width != frame->sc.delivered_width)
- || (height != frame->sc.delivered_height)
- || (ratio_code != frame->sc.delivered_ratio)
- || (flags != frame->flags)
- || (format != frame->format)
- || (this->sc.user_ratio != frame->sc.user_ratio)
- || (this->gui_width != frame->sc.gui_width)
- || (this->gui_height != frame->sc.gui_height)) {
+ _x_vo_scale_compute_output_size(&frame->sc);
- frame->sc.delivered_width = width;
- frame->sc.delivered_height = height;
- frame->sc.delivered_ratio = ratio_code;
- frame->flags = flags;
- frame->format = format;
- frame->sc.user_ratio = this->sc.user_ratio;
- frame->sc.gui_width = this->gui_width;
- frame->sc.gui_height = this->gui_height;
- frame->sc.gui_pixel_aspect = 1.0;
+ /* avoid problems in yuv2rgb */
+ if(frame->sc.output_height < (frame->sc.delivered_height+15) >> 4)
+ frame->sc.output_height = (frame->sc.delivered_height+15) >> 4;
- vo_scale_compute_ideal_size ( &frame->sc );
- vo_scale_compute_output_size( &frame->sc );
+ if (frame->sc.output_width < 8)
+ frame->sc.output_width = 8;
-#ifdef LOG
- fprintf (stderr, "nullvideo: gui %dx%d delivered %dx%d output %dx%d\n",
- frame->sc.gui_width, frame->sc.gui_height,
- frame->sc.delivered_width, frame->sc.delivered_height,
- frame->sc.output_width, frame->sc.output_height);
-#endif
+ /* yuv2rgb_mlib needs an even YUV2 width */
+ if (frame->sc.output_width & 1)
+ frame->sc.output_width++;
+}
+static void null_frame_reallocate( null_driver_t *this, opie_frame_t *frame,
+ uint32_t width, uint32_t height, int format){
/*
@@ -264,3 +247,3 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
- frame->data = xine_xmalloc (frame->sc.output_width
+ frame->data = xine_xmalloc (frame->sc.output_width
* frame->sc.output_height
@@ -285,2 +268,83 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
+}
+
+static void null_setup_colorspace_converter(opie_frame_t *frame, int flags ) {
+ switch (flags) {
+ case VO_TOP_FIELD:
+ case VO_BOTTOM_FIELD:
+ frame->yuv2rgb->configure (frame->yuv2rgb,
+ frame->sc.delivered_width,
+ 16,
+ 2*frame->frame.pitches[0],
+ 2*frame->frame.pitches[1],
+ frame->sc.output_width,
+ frame->stripe_height,
+ frame->bytes_per_line*2);
+ frame->yuv_stride = frame->bytes_per_line*2;
+ break;
+ case VO_BOTH_FIELDS:
+ frame->yuv2rgb->configure (frame->yuv2rgb,
+ frame->sc.delivered_width,
+ 16,
+ frame->frame.pitches[0],
+ frame->frame.pitches[1],
+ frame->sc.output_width,
+ frame->stripe_height,
+ frame->bytes_per_line);
+ frame->yuv_stride = frame->bytes_per_line;
+ break;
+ }
+#ifdef LOG
+ fprintf (stderr, "nullvideo: colorspace converter configured.\n");
+#endif
+}
+
+static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
+ uint32_t width, uint32_t height,
+ double ratio_code, int format,
+ int flags ){
+ null_driver_t* this = (null_driver_t*) self;
+ opie_frame_t* frame = (opie_frame_t*)img;
+
+#ifdef LOG
+ fprintf (stderr, "nullvideo: update_frame_format\n");
+#endif
+
+ flags &= VO_BOTH_FIELDS;
+
+ /* find out if we need to adapt this frame */
+
+ if ((width != frame->sc.delivered_width)
+ || (height != frame->sc.delivered_height)
+ || (ratio_code != frame->sc.delivered_ratio)
+ || (flags != frame->flags)
+ || (format != frame->format)
+ || (this->sc.user_ratio != frame->sc.user_ratio)
+ || (this->gui_width != frame->sc.gui_width)
+ || (this->gui_height != frame->sc.gui_height)) {
+
+ frame->sc.delivered_width = width;
+ frame->sc.delivered_height = height;
+ frame->sc.delivered_ratio = ratio_code;
+ frame->flags = flags;
+ frame->format = format;
+ frame->sc.user_ratio = this->sc.user_ratio;
+ frame->sc.gui_width = this->gui_width;
+ frame->sc.gui_height = this->gui_height;
+ frame->sc.gui_pixel_aspect = 1.0;
+
+
+ null_frame_compute_ideal_size(this, frame);
+ null_frame_compute_rgb_size(this, frame);
+ null_frame_reallocate(this, frame, width, height, format);
+
+#ifdef LOG
+ fprintf (stderr, "nullvideo: gui %dx%d delivered %dx%d output %dx%d\n",
+ frame->sc.gui_width, frame->sc.gui_height,
+ frame->sc.delivered_width, frame->sc.delivered_height,
+ frame->sc.output_width, frame->sc.output_height);
+#endif
+
+
+
frame->stripe_height = 16 * frame->sc.output_height / frame->sc.delivered_height;
@@ -291,33 +355,5 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
*/
+ null_setup_colorspace_converter(frame, flags);
- switch (flags) {
- case VO_TOP_FIELD:
- case VO_BOTTOM_FIELD:
- frame->yuv2rgb->configure (frame->yuv2rgb,
- frame->sc.delivered_width,
- 16,
- 2*frame->frame.pitches[0],
- 2*frame->frame.pitches[1],
- frame->sc.output_width,
- frame->stripe_height,
- frame->bytes_per_line*2);
- frame->yuv_stride = frame->bytes_per_line*2;
- break;
- case VO_BOTH_FIELDS:
- frame->yuv2rgb->configure (frame->yuv2rgb,
- frame->sc.delivered_width,
- 16,
- frame->frame.pitches[0],
- frame->frame.pitches[1],
- frame->sc.output_width,
- frame->stripe_height,
- frame->bytes_per_line);
- frame->yuv_stride = frame->bytes_per_line;
- break;
- }
-#ifdef LOG
- fprintf (stderr, "nullvideo: colorspace converter configured.\n");
-#endif
}
-
/*
@@ -326,18 +362,18 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
- if (frame->data) {
- switch (flags) {
- case VO_TOP_FIELD:
- frame->rgb_dst = (uint8_t *)frame->data;
- frame->stripe_inc = 2 * frame->stripe_height * frame->bytes_per_line;
- break;
- 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;
+ if (frame->data) {
+ switch (flags) {
+ case VO_TOP_FIELD:
+ frame->rgb_dst = (uint8_t *)frame->data;
+ frame->stripe_inc = 2 * frame->stripe_height * frame->bytes_per_line;
+ break;
+ 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;
+ }
}
- }
}
@@ -366,2 +402,5 @@ static void null_overlay_clut_yuv2rgb (null_driver_t *this,
opie_frame_t *frame) {
+ this = this;
+
+
int i;
@@ -371,5 +410,6 @@ static void null_overlay_clut_yuv2rgb (null_driver_t *this,
*((uint32_t *)&clut[i]) =
- frame->yuv2rgb->yuv2rgb_single_pixel_fun (frame->yuv2rgb,
- clut[i].y, clut[i].cb,
- clut[i].cr);
+ frame->yuv2rgb->
+ yuv2rgb_single_pixel_fun (frame->yuv2rgb,
+ clut[i].y, clut[i].cb,
+ clut[i].cr);
}
@@ -403,20 +443,29 @@ static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen,
switch(this->bpp) {
- case 16:
- blend_rgb16( (uint8_t *)frame->data, overlay,
- frame->sc.output_width, frame->sc.output_height,
- frame->sc.delivered_width, frame->sc.delivered_height);
- break;
- case 24:
- blend_rgb24( (uint8_t *)frame->data, overlay,
- frame->sc.output_width, frame->sc.output_height,
- frame->sc.delivered_width, frame->sc.delivered_height);
- break;
- case 32:
- 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;
+ case 16:
+ blend_rgb16((uint8_t *)frame->data,
+ overlay,
+ frame->sc.output_width,
+ frame->sc.output_height,
+ frame->sc.delivered_width,
+ frame->sc.delivered_height);
+ break;
+ case 24:
+ blend_rgb24((uint8_t *)frame->data,
+ overlay,
+ frame->sc.output_width,
+ frame->sc.output_height,
+ frame->sc.delivered_width,
+ frame->sc.delivered_height);
+ break;
+ case 32:
+ 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;
}
@@ -426,9 +475,51 @@ static void null_overlay_blend ( vo_driver_t *this_gen, vo_frame_t *frame_gen,
-static int null_get_property( vo_driver_t* self,
- int property ){
+static int null_get_property( vo_driver_t* self, int property ){
+#if 0
+ null_driver_t *this = (null_driver_t *)self;
+
+ switch(property)
+ {
+ case VO_PROP_ASPECT_RATIO:
+ return this->sc.user_ratio;
+ case VO_PROP_BRIGHTNESS:
+ return this->yuv2rgb_brightness;
+ case VO_PROP_WINDOW_WIDTH:
+ return this->sc.gui_width;
+ case VO_PROP_WINDOW_HEIGHT:
+ return this->sc.gui_height;
+ default:
+ break;
+ }
+#else
+ property = property;
+ self = self;
+#endif
+
return 0;
}
-static int null_set_property( vo_driver_t* self,
- int property,
+static int null_set_property( vo_driver_t* self, int property,
int value ){
+#if 0
+ null_driver_t *this = (null_driver_t *)self;
+
+ switch(property)
+ {
+ case VO_PROP_ASPECT_RATIO:
+ if(value>=XINE_VO_ASPECT_NUM_RATIOS)
+ value = XINE_VO_ASPECT_AUTO;
+ this->sc.user_ratio = value;
+ break;
+ case VO_PROP_BRIGHTNESS:
+ this->yuv2rgb_brightness = value;
+ this->yuv2rgb_factory->
+ set_csc_levels(this->yuv2rgb_factory, value, 128, 128);
+ break;
+ default:
+ break;
+ }
+#else
+ self = self;
+ property = property;
+#endif
+
return value;
@@ -438,2 +529,5 @@ static void null_get_property_min_max( vo_driver_t* self,
int *max ){
+ self = self;
+ property = property;
+
*max = 0;
@@ -444,2 +538,6 @@ static int null_gui_data_exchange( vo_driver_t* self,
void *data ){
+ self = self;
+ data_type = data_type;
+ data = data;
+
return 0;
@@ -452,3 +550,5 @@ static void null_dispose ( vo_driver_t* self ){
static int null_redraw_needed( vo_driver_t* self ){
- return 0;
+ self = self;
+
+ return 0;
}
@@ -456,3 +556,3 @@ static int null_redraw_needed( vo_driver_t* self ){
-xine_vo_driver_t* init_video_out_plugin( xine_t *xine,
+xine_video_port_t* init_video_out_plugin( xine_t *xine,
void* video,
@@ -460,2 +560,5 @@ xine_vo_driver_t* init_video_out_plugin( xine_t *xine,
void *userData ){
+ video = video;
+
+
null_driver_t *vo;
@@ -466,3 +569,3 @@ xine_vo_driver_t* init_video_out_plugin( xine_t *xine,
- vo_scale_init (&vo->sc, 0, 0, xine->config);
+ _x_vo_scale_init (&vo->sc, 0, 0, xine->config);
@@ -493,3 +596,3 @@ xine_vo_driver_t* init_video_out_plugin( xine_t *xine,
/* capabilities */
- vo->m_capabilities = /* VO_CAP_COPIES_IMAGE | */ VO_CAP_YUY2 | VO_CAP_YV12;
+ vo->m_capabilities = VO_CAP_YUY2 | VO_CAP_YV12;
vo->yuv2rgb_factory = yuv2rgb_factory_init (MODE_16_RGB, vo->yuv2rgb_swap,
@@ -500,18 +603,5 @@ xine_vo_driver_t* init_video_out_plugin( xine_t *xine,
- /* return ( vo_driver_t*) vo; */
- return vo_new_port( xine, ( vo_driver_t* )vo, 0 );
+ return _x_vo_new_port(xine, &vo->vo_driver, 0);
}
-#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
@@ -566,4 +656,3 @@ void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) {
this->depth = depth;
- printf("depth %d %d\n", depth, this->bpp);
- printf("pixeltype %d\n", rgb );
+
switch ( this->depth ) {
@@ -630,5 +719,7 @@ void null_preload_decoders( xine_stream_t *stream )
uint8_t i;
+#if 0
for ( i = 0; i < preloadedAudioDecoderCount; ++i ) {
- audio_decoder_t *decoder = get_audio_decoder( stream, ( preloadedAudioDecoders[ i ] >> 16 ) & 0xff );
+ audio_decoder_t *decoder = get_audio_decoder( stream, ( preloadedAudioDecoders[ i ] >> 16 ) & 0xff );
+ decoder = decoder;
/* free_audio_decoder( stream, decoder ); */
@@ -637,5 +728,7 @@ void null_preload_decoders( xine_stream_t *stream )
for ( i = 0; i < preloadedVideoDecoderCount; ++i ) {
- video_decoder_t *decoder = get_video_decoder( stream, ( preloadedVideoDecoders[ i ] >> 16 ) & 0xff );
+ video_decoder_t *decoder = get_video_decoder( stream, ( preloadedVideoDecoders[ i ] >> 16 ) & 0xff );
+ decoder = decoder;
/* free_video_decoder( stream, decoder ); */
}
+#endif
}
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index b9a8d6d..8166658 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -17,3 +17,3 @@ INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lpthread -lopiecore2 -lopieui2 -lxine -lstdc++
+LIBS += -lqpe -lpthread -lopiecore2 -lopieui2 -lqtaux2 -lxine
MOC_DIR = qpeobj
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
index 15c611f..1ac9277 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
@@ -53,2 +53,3 @@ static inline void memcpy_rev ( void *_dst, void *_src, size_t len )
{
+
/*