summaryrefslogtreecommitdiff
authorzecke <zecke>2002-07-06 23:38:54 (UTC)
committer zecke <zecke>2002-07-06 23:38:54 (UTC)
commit4f44b353d8211a51e2f0bfb609f2c2d79c44827f (patch) (side-by-side diff)
tree2178fb8097d7bb09c8a7fdac206dd64318a6b489
parent8703ff76831bf3f971087440b991608d59f429bf (diff)
downloadopie-4f44b353d8211a51e2f0bfb609f2c2d79c44827f.zip
opie-4f44b353d8211a51e2f0bfb609f2c2d79c44827f.tar.gz
opie-4f44b353d8211a51e2f0bfb609f2c2d79c44827f.tar.bz2
Null video fixes
lib updates
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp8
-rw-r--r--noncore/multimedia/opieplayer2/nullvideo.c54
2 files changed, 55 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 123ca91..0ea85dd 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -22,53 +22,55 @@ Lib::Lib() {
// get the configuration
m_config = xine_config_file_init( str.data() );
// allocate oss for sound
// and fb for framebuffer
m_audioOutput= xine_load_audio_output_plugin( m_config, "oss") ;
if (m_audioOutput == NULL )
printf("Failure\n");
else
printf("Success\n");
// test code
m_videoOutput = xine_load_video_output_plugin(m_config, "fb",
VISUAL_TYPE_FB,
0 );
char** files = xine_list_video_output_plugins(3);
char* out;
int i = 0;
while ( ( out = files[i] ) != 0 ) {
printf("Audio %s\n", out );
i++;
}
- m_xine = xine_init( m_videoOutput,
- m_audioOutput,
- m_config );
+// m_xine = xine_init( m_videoOutput,
+// m_audioOutput,
+// m_config );
// test loading
m_videoOutput = ::init_video_out_plugin( m_config, NULL );
+ m_xine = xine_init( m_videoOutput,
+ m_audioOutput, m_config );
}
Lib::~Lib() {
delete m_config;
xine_exit( m_xine );
delete m_videoOutput;
//delete m_audioOutput;
}
QCString Lib::version() {
QCString str( xine_get_str_version() );
return str;
};
int Lib::majorVersion() {
return xine_get_major_version();
}
int Lib::minorVersion() {
return xine_get_minor_version();
};
int Lib::subVersion() {
return xine_get_sub_version();
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c
index c97800c..5224862 100644
--- a/noncore/multimedia/opieplayer2/nullvideo.c
+++ b/noncore/multimedia/opieplayer2/nullvideo.c
@@ -1,106 +1,152 @@
/*#include <xine.h>*/
#include <stdlib.h>
#include <stdio.h>
#include <xine/video_out.h>
#include <xine/xine_internal.h>
#include <xine/xineutils.h>
#include <xine/configfile.h>
typedef struct null_driver_s null_driver_t;
struct null_driver_s {
vo_driver_t vo_driver;
uint32_t m_capabilities;
};
typedef struct opie_frame_s opie_frame_t;
struct opie_frame_s {
vo_frame_t frame;
char* name;
int version;
+ int m_width;
+ int m_height;
+ uint8_t *chunk[3];
null_driver_t *output;
};
-static uint32_t null_get_capabilities(vo_driver_t *self ){
+static uint32_t null_get_capabilities(vo_driver_t *self ){
null_driver_t* this = (null_driver_t*)self;
+ printf("capabilities\n");
return this->m_capabilities;
}
/* take care of the frame*/
-static void null_frame_dispose( vo_frame_t* vo_img){
+static void null_frame_dispose( vo_frame_t* vo_img){
opie_frame_t* frame = (opie_frame_t*)vo_img;
+ printf("frame_dispose\n");
free (frame);
}
static void null_frame_field( vo_frame_t* frame, int inti ){
+ printf("frame_field\n");
/* not needed */
}
/* end take care of frames*/
-static vo_frame_t* null_alloc_frame( 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 = (opie_frame_t*)malloc ( sizeof(opie_frame_t) );
memset( frame, 0, sizeof( opie_frame_t) );
+ printf("alloc_frame\n");
frame->name = "opie\0";
frame->version = 1;
frame->output = this;
/* initialize the frame*/
frame->frame.driver = self;
/*frame.frame.free = null_frame_free;*/
frame->frame.copy = NULL;
frame->frame.field = null_frame_field;
frame->frame.dispose = null_frame_dispose;
+
return (vo_frame_t*) frame;
}
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 */
+ printf("update_frame_format\n");
+ printf("al crash aye?\n");
+
+ 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;
+ }
+
+
+ if( format == IMGFMT_YV12 ) {
+ int image_size = width * height; /* cast ouch*/
+ frame->frame.base[0] = xine_xmalloc_aligned(16, image_size,
+ (void **)&frame->chunk[0] );
+ frame->frame.base[1] = xine_xmalloc_aligned(16, image_size,
+ (void **)&frame->chunk[1] );
+ frame->frame.base[2] = xine_xmalloc_aligned(16, image_size,
+ (void **)&frame->chunk[2] );
+ }else{
+ int image_size = width * height; /* cast ouch*/
+ frame->frame.base[0] = xine_xmalloc_aligned(16, image_size,
+ (void **)&frame->chunk[0] );
+ frame->chunk[1] = NULL;
+ frame->chunk[2] = NULL;
+ }
+
}
static void null_display_frame( vo_driver_t* self, vo_frame_t *frame ){
- printf("display frame");
+ printf("display frame\n");
}
static void null_overlay_blend( vo_driver_t* self, vo_frame_t* frame,
vo_overlay_t* overlay ){
/* sure */
}
static int null_get_property( vo_driver_t* self,
int property ){
+ printf("property get]n");
return 0;
}
static int null_set_property( vo_driver_t* self,
int property,
int value ){
+ printf("set property\n");
return value;
}
static void null_get_property_min_max( vo_driver_t* self,
int property, int *min,
int *max ){
+ printf("min max\n");
*max = 0;
*min = 0;
}
static int null_gui_data_exchange( vo_driver_t* self,
int data_type,
void *data ){
return 0;
}
static void null_exit( vo_driver_t* self ){
null_driver_t* this = (null_driver_t*)self;
free ( this );
}
static int null_redraw_needed( vo_driver_t* self ){
return 0;
}
vo_driver_t* init_video_out_plugin( config_values_t* conf,
void* video ){
null_driver_t *vo;
vo = (null_driver_t*)malloc( sizeof(null_driver_t ) );
/* memset? */
/* install callback handlers*/