summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/alphablend.c2
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp2
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp133
-rw-r--r--noncore/multimedia/opieplayer2/lib.h28
-rw-r--r--noncore/multimedia/opieplayer2/nullvideo.c391
-rw-r--r--noncore/multimedia/opieplayer2/opieplayer2.pro2
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.cpp3
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp5
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp1
-rw-r--r--noncore/multimedia/opieplayer2/xinevideowidget.cpp35
10 files changed, 280 insertions, 322 deletions
diff --git a/noncore/multimedia/opieplayer2/alphablend.c b/noncore/multimedia/opieplayer2/alphablend.c
index 57f6013..cdd7b28 100644
--- a/noncore/multimedia/opieplayer2/alphablend.c
+++ b/noncore/multimedia/opieplayer2/alphablend.c
@@ -37,6 +37,8 @@
#include <stdio.h>
#include <inttypes.h>
+#include <xine.h>
+#include <xine/xine_internal.h>
#include <xine/video_out.h>
#include "alphablend.h"
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 45f301e..620c71f 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -332,7 +332,7 @@ void AudioWidget::setView( char view ) {
killTimers();
hide();
}
- qApp->processEvents();
+ // qApp->processEvents();
}
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index d8a0694..4021d4a 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -50,18 +50,18 @@ typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame,
int width, int height,int bytes );
extern "C" {
- vo_driver_t* init_video_out_plugin( config_values_t* conf, void* video);
- int null_is_showing_video( vo_driver_t* self );
- void null_set_show_video( vo_driver_t* self, int show );
- int null_is_fullscreen( vo_driver_t* self );
- void null_set_fullscreen( vo_driver_t* self, int screen );
- int null_is_scaling( vo_driver_t* self );
- void null_set_scaling( vo_driver_t* self, int scale );
- void null_set_gui_width( vo_driver_t* self, int width );
- void null_set_gui_height( vo_driver_t* self, int height );
- void null_set_mode( vo_driver_t* self, int depth, int rgb );
- void null_set_videoGamma( vo_driver_t* self , int value );
- void null_display_handler(vo_driver_t* self, display_xine_frame_t t, void* user_data);
+ xine_vo_driver_t* init_video_out_plugin( xine_cfg_entry_t* conf, void* video);
+ 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 );
}
using namespace XINE;
@@ -83,41 +83,44 @@ Lib::Lib(XineVideoWidget* widget) {
f.close();
}
- m_config = xine_config_file_init( str.data() );
+ m_xine = xine_new( );
+
+ xine_config_load( m_xine, str.data() );
+
// allocate oss for sound
// and fb for framebuffer
- m_audioOutput= xine_load_audio_output_plugin( m_config, "oss") ;
+ m_audioOutput = xine_open_audio_driver( m_xine, "oss", NULL );
m_videoOutput = ::init_video_out_plugin( m_config, NULL );
+
+
+//xine_open_video_driver( m_xine, NULL, XINE_VISUAL_TYPE_FB, NULL);
+
+
+ null_display_handler( m_videoOutput, xine_display_frame, this );
+ xine_init( 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-> setLogo ( new QImage ( Resource::loadImage("")));
+
m_wid->repaint();
}
- null_display_handler( m_videoOutput,
- xine_display_frame,
- this );
- m_xine = xine_init( m_videoOutput,
- m_audioOutput, m_config );
- // install the event handler
xine_register_event_listener( m_xine, xine_event_handler, this );
}
Lib::~Lib() {
- free( m_config );
+// free( m_config );
xine_remove_event_listener( m_xine, xine_event_handler );
xine_exit( m_xine );
/* FIXME either free or delete but valgrind bitches against both */
//free( m_videoOutput );
//delete m_audioOutput;
-
}
-void Lib::resize ( const QSize &s )
-{
+void Lib::resize ( const QSize &s ) {
if ( s. width ( ) && s. height ( )) {
::null_set_gui_width( m_videoOutput, s. width() );
::null_set_gui_height(m_videoOutput, s. height() );
@@ -125,82 +128,109 @@ void Lib::resize ( const QSize &s )
}
QCString Lib::version() {
- QCString str( xine_get_str_version() );
- return str;
-};
+ // QCString str( xine_get_str_version() );
+ // return str;
+ return "test";
+}
int Lib::majorVersion() {
- return xine_get_major_version();
+ xine_get_version ( &m_major_version, &m_minor_version, &m_sub_version );
+ return m_major_version;
}
+
int Lib::minorVersion() {
- return xine_get_minor_version();
-};
+ xine_get_version ( &m_major_version, &m_minor_version, &m_sub_version );
+ return m_minor_version;
+}
int Lib::subVersion() {
- return xine_get_sub_version();
+ xine_get_version ( &m_major_version, &m_minor_version, &m_sub_version );
+ return m_sub_version;
}
-int Lib::play( const QString& fileName,
- int startPos,
- int start_time ) {
+
+int Lib::play( const QString& fileName, int startPos, int start_time ) {
QString str = fileName.stripWhiteSpace();
- //workaround OpiePlayer bug
- //f (str.right(1) == QString::fromLatin1("/") )
- // str = str.mid( str.length() -1 );
- return xine_play( m_xine, QFile::encodeName(str.utf8() ).data(),
- startPos, start_time);
+ xine_open( m_xine, QFile::encodeName(str.utf8() ).data() );
+ return xine_play( m_xine, startPos, start_time);
}
+
void Lib::stop() {
qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>");
xine_stop(m_xine );
}
+
void Lib::pause(){
- xine_set_speed( m_xine, SPEED_PAUSE );
+ xine_set_param( m_xine, XINE_PARAM_SPEED, XINE_SPEED_PAUSE );
}
+
int Lib::speed() {
- return xine_get_speed( m_xine );
+ return xine_get_param ( m_xine, XINE_PARAM_SPEED );
}
+
void Lib::setSpeed( int speed ) {
- xine_set_speed( m_xine, speed );
+ xine_set_param ( m_xine, XINE_PARAM_SPEED, speed );
}
+
int Lib::status(){
return xine_get_status( m_xine );
}
+
int Lib::currentPosition(){
- return xine_get_current_position( m_xine );
+ xine_get_pos_length( m_xine, &m_pos, &m_time, &m_length );
+ return m_pos;
}
+
int Lib::currentTime() {
- return xine_get_current_time( m_xine );
-};
+ xine_get_pos_length( m_xine, &m_pos, &m_time, &m_length );
+ return m_time/1000;
+}
+
int Lib::length() {
- return xine_get_stream_length( m_xine );
+ xine_get_pos_length( m_xine, &m_pos, &m_time, &m_length );
+ return m_length/1000;
}
+
bool Lib::isSeekable() {
- return xine_is_stream_seekable(m_xine);
+ return xine_get_stream_info ( m_xine, XINE_STREAM_INFO_SEEKABLE );
}
+
Frame Lib::currentFrame() {
Frame frame;
return frame;
};
+
+QString Lib::metaInfo() {
+ xine_get_meta_info( m_xine, 0 );
+}
+
int Lib::error() {
return xine_get_error( m_xine );
};
+
void Lib::handleXineEvent( xine_event_t* t ) {
- if ( t->type == XINE_EVENT_PLAYBACK_FINISHED )
+ if ( t->type == XINE_EVENT_PLAYBACK_FINISHED ) {
emit stopped();
}
+}
+
+
void Lib::setShowVideo( bool video ) {
m_video = video;
::null_set_show_video( m_videoOutput, video );
}
+
bool Lib::isShowingVideo() {
return ::null_is_showing_video( m_videoOutput );
}
+
void Lib::showVideoFullScreen( bool fullScreen ) {
::null_set_fullscreen( m_videoOutput, fullScreen );
}
+
bool Lib::isVideoFullScreen() {
return ::null_is_fullscreen( m_videoOutput );
}
+
void Lib::setScaling( bool scale ) {
::null_set_scaling( m_videoOutput, scale );
}
@@ -213,19 +243,22 @@ void Lib::setGamma( int value ) {
bool Lib::isScaling() {
return ::null_is_scaling( m_videoOutput );
}
+
void Lib::xine_event_handler( void* user_data, xine_event_t* t ) {
((Lib*)user_data)->handleXineEvent( t );
}
+
void Lib::xine_display_frame( void* user_data, uint8_t *frame,
int width, int height, int bytes ) {
-
((Lib*)user_data)->drawFrame( frame, width, height, bytes );
}
+
void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) {
if (!m_video ) {
qWarning("not showing video now");
return;
}
+
// qWarning( "called draw frame %d %d", width, height );
m_wid-> setVideoFrame ( frame, width, height, bytes );
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index b9d0a8a..29adc4d 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -39,6 +39,7 @@
#include <qobject.h>
#include <xine.h>
+//#include "xine.h"
class XineVideoWidget;
@@ -72,7 +73,17 @@ namespace XINE {
void pause()/*const*/;
int speed() /*const*/;
- void setSpeed( int speed = SPEED_PAUSE );
+
+ /**
+ * Set the speed of the stream, if codec supports it
+ * XINE_SPEED_PAUSE 0
+ * XINE_SPEED_SLOW_4 1
+ * XINE_SPEED_SLOW_2 2
+ * XINE_SPEED_NORMAL 4
+ * XINE_SPEED_FAST_2 8
+ *XINE_SPEED_FAST_4 16
+ */
+ void setSpeed( int speed = XINE_SPEED_PAUSE );
int status() /*const*/;
@@ -103,6 +114,13 @@ namespace XINE {
*/
bool isVideoFullScreen()/*const*/ ;
+
+ /**
+ * Get the meta info (like author etc) from the stream
+ *
+ */
+ QString metaInfo() ;
+
/**
*
*/
@@ -133,12 +151,14 @@ namespace XINE {
void stopped();
private:
int m_bytes_per_pixel;
+ int m_length, m_pos, m_time;
+ int m_major_version, m_minor_version, m_sub_version;
bool m_video:1;
XineVideoWidget *m_wid;
xine_t *m_xine;
- config_values_t *m_config;
- vo_driver_t *m_videoOutput;
- ao_driver_t* m_audioOutput;
+ xine_cfg_entry_t *m_config;
+ xine_vo_driver_t *m_videoOutput;
+ xine_ao_driver_t* m_audioOutput;
void handleXineEvent( xine_event_t* t );
void drawFrame( uint8_t* frame, int width, int height, int bytes );
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c
index ceda333..dcdfae6 100644
--- a/noncore/multimedia/opieplayer2/nullvideo.c
+++ b/noncore/multimedia/opieplayer2/nullvideo.c
@@ -2,7 +2,7 @@
                This file is part of the Opie Project
              Copyright (c) 2002 Max Reiss <harlekin@handhelds.org>
- Copyright (c) 2002 L. Potter <ljp@llornkcor.com>
+ Copyright (c) 2002 LJP <>
Copyright (c) 2002 Holger Freyther <zecke@handhelds.org>
=.
.=l.
@@ -19,11 +19,11 @@
    : ..    .:,     . . . without even the implied warranty of
    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ; General Public License for more
+..}^=.=       =       ; Library General Public License for more
++=   -.     .`     .: details.
 :     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
-  -_. . .   )=.  = General Public License along with
+  -_. . .   )=.  = Library General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
@@ -31,16 +31,16 @@
*/
-/*#include <xine.h>*/
#include <stdlib.h>
#include <stdio.h>
#include <math.h>
+#include <xine.h>
#include <xine/video_out.h>
#include <xine/xine_internal.h>
#include <xine/xineutils.h>
-#include <xine/configfile.h>
+#include <xine/vo_scale.h>
#include <pthread.h>
#include "alphablend.h"
@@ -48,6 +48,10 @@
#define printf(x,...)
+/*
+#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 );
@@ -55,74 +59,68 @@ typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame,
typedef struct null_driver_s null_driver_t;
struct null_driver_s {
- vo_driver_t vo_driver;
+ xine_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;
+
vo_overlay_t *overlay;
- int user_ratio;
- double output_scale_factor;
- int last_frame_output_width;
- int last_frame_output_height;
+ vo_scale_t sc;
+
int gui_width;
int gui_height;
int gui_changed;
+
double display_ratio;
void* caller;
display_xine_frame_t frameDis;
-
-
};
+
typedef struct opie_frame_s opie_frame_t;
struct opie_frame_s {
vo_frame_t frame;
- char* name;
- int version;
- int width;
- int height;
- int ratio_code;
+
int format;
int flags;
- int user_ratio;
- double ratio_factor;
- int ideal_width;
- int ideal_height;
- int output_width, output_height;
- int gui_width, gui_height;
+ vo_scale_t sc;
+
uint8_t *chunk[3];
+ uint8_t *data; /* rgb */
+ int bytes_per_line;
+
yuv2rgb_t *yuv2rgb;
uint8_t *rgb_dst;
int yuv_stride;
int stripe_height, stripe_inc;
- int bytes_per_line;
- uint8_t *data;
-
-// int show_video;
null_driver_t *output;
};
-static uint32_t null_get_capabilities(vo_driver_t *self ){
+static uint32_t null_get_capabilities( xine_vo_driver_t *self ){
null_driver_t* this = (null_driver_t*)self;
- printf("capabilities\n");
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 ;
- printf("frame copy\n");
- if(!frame->output->m_show_video ){ printf("no video\n"); return; } // no video
- if (frame->format == IMGFMT_YV12) {
+ if (!frame->output->m_show_video) {
+ /* printf("nullvideo: no video\n"); */
+ return;
+ }
+
+ if (frame->format == XINE_IMGFMT_YV12) {
frame->yuv2rgb->yuv2rgb_fun (frame->yuv2rgb, frame->rgb_dst,
src[0], src[1], src[2]);
} else {
@@ -132,13 +130,11 @@ static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) {
}
frame->rgb_dst += frame->stripe_inc;
- printf("returning\n");
}
static void null_frame_field (vo_frame_t *vo_img, int which_field) {
opie_frame_t *frame = (opie_frame_t *) vo_img ;
- printf("field\n\n");
switch (which_field) {
case VO_TOP_FIELD:
@@ -159,7 +155,7 @@ 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;
- printf("frame_dispose\n");
+
if( frame->data )
free( frame->data );
free (frame);
@@ -167,182 +163,81 @@ static void null_frame_dispose( vo_frame_t* vo_img){
/* end take care of frames*/
-static vo_frame_t* null_alloc_frame( vo_driver_t* self ){
+static vo_frame_t* null_alloc_frame( xine_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));
+
pthread_mutex_init (&frame->frame.mutex, NULL);
- printf("alloc_frame\n");
- frame->name = "opie\0";
- frame->version = 1;
frame->output = this;
-// frame->show_video = this->m_show_video;
+
/* initialize the frame*/
frame->frame.driver = self;
- /*frame.frame.free = null_frame_free;*/
frame->frame.copy = null_frame_copy;
frame->frame.field = null_frame_field;
frame->frame.dispose = null_frame_dispose;
- frame->yuv2rgb = 0;
+
/*
* colorspace converter for this frame
*/
frame->yuv2rgb = this->yuv2rgb_factory->create_converter (this->yuv2rgb_factory);
-
return (vo_frame_t*) frame;
}
-// size specific
-static void null_compute_ideal_size (null_driver_t *this, opie_frame_t *frame) {
-
- if (!this->m_is_scaling /*|| !this->m_show_video*/) {
- printf("Not scaling\n");
- frame->ideal_width = frame->width;
- frame->ideal_height = frame->height;
- frame->ratio_factor = 1.0;
-
- } else {
-
- double image_ratio, desired_ratio, corr_factor;
-
- image_ratio = (double) frame->width / (double) frame->height;
-
- switch (frame->user_ratio) {
- case ASPECT_AUTO:
- switch (frame->ratio_code) {
- case XINE_ASPECT_RATIO_ANAMORPHIC: /* anamorphic */
- case XINE_ASPECT_RATIO_PAN_SCAN:
- desired_ratio = 16.0 /9.0;
- break;
- case XINE_ASPECT_RATIO_211_1: /* 2.11:1 */
- desired_ratio = 2.11/1.0;
- break;
- case XINE_ASPECT_RATIO_SQUARE: /* square pels */
- case XINE_ASPECT_RATIO_DONT_TOUCH: /* probably non-mpeg stream => don't touch aspect ratio */
- desired_ratio = image_ratio;
- break;
- case 0: /* forbidden -> 4:3 */
- printf ("video_out_fb: invalid ratio, using 4:3\n");
- default:
- printf ("video_out_fb: unknown aspect ratio (%d) in stream => using 4:3\n",
- frame->ratio_code);
- case XINE_ASPECT_RATIO_4_3: /* 4:3 */
- desired_ratio = 4.0 / 3.0;
- break;
- }
- break;
- case ASPECT_ANAMORPHIC:
- desired_ratio = 16.0 / 9.0;
- break;
- case ASPECT_DVB:
- desired_ratio = 2.0 / 1.0;
- break;
- case ASPECT_SQUARE:
- desired_ratio = image_ratio;
- break;
- case ASPECT_FULL:
- default:
- desired_ratio = 4.0 / 3.0;
- }
-
- frame->ratio_factor = this->display_ratio * desired_ratio;
-
- corr_factor = frame->ratio_factor / image_ratio ;
-
- if (fabs(corr_factor - 1.0) < 0.005) {
- frame->ideal_width = frame->width;
- frame->ideal_height = frame->height;
-
- } else {
-
- if (corr_factor >= 1.0) {
- frame->ideal_width = frame->width * corr_factor + 0.5;
- frame->ideal_height = frame->height;
- } else {
- frame->ideal_width = frame->width;
- frame->ideal_height = frame->height / corr_factor + 0.5;
- }
-
- }
- }
- printf("return from helper\n");
-}
-
-static void null_compute_rgb_size (null_driver_t *this, opie_frame_t *frame) {
-
- double x_factor, y_factor;
-
- /*
- * make the frame fit into the given destination area
- */
-
- x_factor = (double) this->gui_width / (double) frame->ideal_width;
- y_factor = (double) this->gui_height / (double) frame->ideal_height;
-
- if ( x_factor < y_factor ) {
- frame->output_width = (double) frame->ideal_width * x_factor ;
- frame->output_height = (double) frame->ideal_height * x_factor ;
- } else {
- frame->output_width = (double) frame->ideal_width * y_factor ;
- frame->output_height = (double) frame->ideal_height * y_factor ;
- }
-
-#define LOG 1
-#ifdef LOG
- printf("video_out_fb: frame source %d x %d => screen output %d x %d%s\n",
- frame->width, frame->height,
- frame->output_width, frame->output_height,
- ( frame->width != frame->output_width
- || frame->height != frame->output_height
- ? ", software scaling"
- : "" )
- );
-#endif
-}
-
-
-// size specific
-
-
-static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
+static void null_update_frame_format( xine_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");
+
+#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->width)
- || (height != frame->height)
- || (ratio_code != frame->ratio_code)
+ if ((width != frame->sc.delivered_width)
+ || (height != frame->sc.delivered_height)
+ || (ratio_code != frame->sc.delivered_ratio_code)
|| (flags != frame->flags)
|| (format != frame->format)
- || (this->user_ratio != frame->user_ratio)
- || (this->gui_width != frame-> gui_width )
- || (this-> gui_height != frame-> gui_height)) {
+ || (this->sc.user_ratio != frame->sc.user_ratio)
+ || (this->gui_width != frame->sc.gui_width)
+ || (this->gui_height != frame->sc.gui_height)) {
- frame->width = width;
- frame->height = height;
- frame->ratio_code = ratio_code;
+ frame->sc.delivered_width = width;
+ frame->sc.delivered_height = height;
+ frame->sc.delivered_ratio_code = ratio_code;
frame->flags = flags;
frame->format = format;
- frame->user_ratio = this->user_ratio;
- this->gui_changed = 0;
-// frame->show_video = this->m_show_video;
- frame->gui_width = this->gui_width;
- frame->gui_height = this->gui_height;
+ 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;
+
+ vo_scale_compute_ideal_size ( &frame->sc );
+ vo_scale_compute_output_size( &frame->sc );
- null_compute_ideal_size (this, frame);
- null_compute_rgb_size (this, frame);
+#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
/*
* (re-) allocate
@@ -362,11 +257,12 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
}
free ( frame->data );
}
- printf("after freeing\n");
- frame->data = xine_xmalloc (frame->output_width * frame->output_height *
- this->bytes_per_pixel );
- if( format == IMGFMT_YV12 ) {
+ frame->data = xine_xmalloc (frame->sc.output_width
+ * frame->sc.output_height
+ * this->bytes_per_pixel );
+
+ if( format == XINE_IMGFMT_YV12 ) {
frame->frame.pitches[0] = 8*((width + 7) / 8);
frame->frame.pitches[1] = 8*((width + 15) / 16);
frame->frame.pitches[2] = 8*((width + 15) / 16);
@@ -383,47 +279,43 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
frame->chunk[2] = NULL;
}
- frame->format = format;
- frame->width = width;
- frame->height = height;
-
- frame->stripe_height = 16 * frame->output_height / frame->height;
- frame->bytes_per_line = frame->output_width * this->bytes_per_pixel;
+ frame->stripe_height = 16 * frame->sc.output_height / frame->sc.delivered_height;
+ frame->bytes_per_line = frame->sc.output_width * this->bytes_per_pixel;
/*
* set up colorspace converter
*/
- if(1 /*this->m_show_video*/ ){
- printf("showing video\n");
switch (flags) {
case VO_TOP_FIELD:
case VO_BOTTOM_FIELD:
frame->yuv2rgb->configure (frame->yuv2rgb,
- frame->width,
+ frame->sc.delivered_width,
16,
2*frame->frame.pitches[0],
2*frame->frame.pitches[1],
- frame->output_width,
+ 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->width,
+ frame->sc.delivered_width,
16,
frame->frame.pitches[0],
frame->frame.pitches[1],
- frame->output_width,
+ 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
}
- }
- printf("after gui changed\n");
+
/*
* reset dest pointers
*/
@@ -444,32 +336,29 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
break;
}
}
- printf("done\n");
}
-static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){
+
+static void null_display_frame( xine_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;
- printf("display frame\n");
-// if( this->m_show_video ) { // return if not displaying
- printf("calling home aye\n" );
+ if (!this->m_show_video)
+ return;
+
if( display != NULL ) {
(*display)(this->caller, frame->data,
- frame->output_width, frame->output_height,
+ frame->sc.output_width, frame->sc.output_height,
frame->bytes_per_line );
- printf("display done hope you enyoyed the frame");
}
-// }
frame->frame.displayed (&frame->frame);
}
-// blending related
-
-
-static void null_overlay_clut_yuv2rgb(null_driver_t *this, vo_overlay_t *overlay,
+/* blending related */
+static void null_overlay_clut_yuv2rgb (null_driver_t *this,
+ vo_overlay_t *overlay,
opie_frame_t *frame) {
int i;
clut_t* clut = (clut_t*) overlay->color;
@@ -492,12 +381,12 @@ static void null_overlay_clut_yuv2rgb(null_driver_t *this, vo_overlay_t *overla
}
}
-static void null_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) {
+static void null_overlay_blend ( xine_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;
- printf("overlay blend\n");
- if(!this->m_show_video || frame->output_width == 0 || frame->output_height== 0)
+ if(!this->m_show_video || frame->sc.output_width == 0
+ || frame->sc.output_height== 0)
return;
/* Alpha Blend here */
@@ -508,18 +397,18 @@ static void null_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo
switch(this->bpp) {
case 16:
blend_rgb16( (uint8_t *)frame->data, overlay,
- frame->output_width, frame->output_height,
- frame->width, frame->height);
+ 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->output_width, frame->output_height,
- frame->width, frame->height);
+ 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->output_width, frame->output_height,
- frame->width, frame->height);
+ frame->sc.output_width, frame->sc.output_height,
+ frame->sc.delivered_width, frame->sc.delivered_height);
break;
default:
/* It should never get here */
@@ -529,49 +418,51 @@ static void null_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo
}
-static int null_get_property( vo_driver_t* self,
+static int null_get_property( xine_vo_driver_t* self,
int property ){
- printf("property get\n");
return 0;
}
-static int null_set_property( vo_driver_t* self,
+static int null_set_property( xine_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,
+static void null_get_property_min_max( xine_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,
+static int null_gui_data_exchange( xine_vo_driver_t* self,
int data_type,
void *data ){
return 0;
}
-static void null_exit( vo_driver_t* self ){
+
+static void null_exit( xine_vo_driver_t* self ){
null_driver_t* this = (null_driver_t*)self;
free ( this );
}
-static int null_redraw_needed( vo_driver_t* self ){
+static int null_redraw_needed( xine_vo_driver_t* self ){
return 0;
}
-vo_driver_t* init_video_out_plugin( config_values_t* conf,
+xine_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? */
memset(vo,0, sizeof(null_driver_t ) );
+
+ vo_scale_init (&vo->sc, 0, 0);
+
+ vo->sc.gui_pixel_aspect = 1.0;
+
vo->m_show_video = 0; // false
vo->m_video_fullscreen = 0;
vo->m_is_scaling = 0;
- vo->user_ratio = ASPECT_AUTO;
vo->display_ratio = 1.0;
vo->gui_width = 16;
vo->gui_height = 8;
@@ -595,16 +486,14 @@ vo_driver_t* init_video_out_plugin( config_values_t* conf,
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);
- printf("done initialisation\n");
- return (vo_driver_t*) vo;
+
+ return ( xine_vo_driver_t*) vo;
}
static vo_info_t vo_info_null = {
5,
"null plugin",
- NULL,
- VISUAL_TYPE_FB,
- 5
+ XINE_VISUAL_TYPE_FB
};
vo_info_t *get_video_out_plugin_info(){
@@ -620,42 +509,42 @@ vo_info_t *get_video_out_plugin_info(){
/**
*
*/
-int null_is_showing_video( vo_driver_t* self ){
+int null_is_showing_video( xine_vo_driver_t* self ){
null_driver_t* this = (null_driver_t*)self;
return this->m_show_video;
}
-void null_set_show_video( vo_driver_t* self, int show ) {
+void null_set_show_video( xine_vo_driver_t* self, int show ) {
((null_driver_t*)self)->m_show_video = show;
}
-int null_is_fullscreen( vo_driver_t* self ){
+int null_is_fullscreen( xine_vo_driver_t* self ){
return ((null_driver_t*)self)->m_video_fullscreen;
}
-void null_set_fullscreen( vo_driver_t* self, int screen ){
+void null_set_fullscreen( xine_vo_driver_t* self, int screen ){
((null_driver_t*)self)->m_video_fullscreen = screen;
}
-int null_is_scaling( vo_driver_t* self ){
+int null_is_scaling( xine_vo_driver_t* self ){
return ((null_driver_t*)self)->m_is_scaling;
}
-void null_set_videoGamma( vo_driver_t* self , int value ) {
+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 );
}
-void null_set_scaling( vo_driver_t* self, int scale ){
+void null_set_scaling( xine_vo_driver_t* self, int scale ) {
((null_driver_t*)self)->m_is_scaling = scale;
}
-void null_set_gui_width( vo_driver_t* self, int width ){
+void null_set_gui_width( xine_vo_driver_t* self, int width ) {
((null_driver_t*)self)->gui_width = width;
}
-void null_set_gui_height( vo_driver_t* self, int height ){
+void null_set_gui_height( xine_vo_driver_t* self, int height ) {
((null_driver_t*)self)->gui_height = height;
}
-void null_set_mode( vo_driver_t* self, int depth, int rgb ){
+void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) {
null_driver_t* this = (null_driver_t*)self;
this->bytes_per_pixel = (depth + 7 ) / 8;
@@ -671,10 +560,11 @@ void null_set_mode( vo_driver_t* self, int depth, int rgb ){
this->yuv2rgb_mode = MODE_32_BGR;
case 24:
if( this->bpp == 32 ) {
- if(rgb == 0 )
+ if( rgb == 0 ) {
this->yuv2rgb_mode = MODE_32_RGB;
- else
+ } else {
this->yuv2rgb_mode = MODE_32_BGR;
+ }
}else{
if( rgb == 0 )
this->yuv2rgb_mode = MODE_24_RGB;
@@ -683,29 +573,34 @@ void null_set_mode( vo_driver_t* self, int depth, int rgb ){
};
break;
case 16:
- if( rgb == 0 )
+ if( rgb == 0 ) {
this->yuv2rgb_mode = MODE_16_RGB;
- else
+ } else {
this->yuv2rgb_mode = MODE_16_BGR;
+ }
break;
case 15:
- if( rgb == 0 )
+ if( rgb == 0 ) {
this->yuv2rgb_mode = MODE_15_RGB;
- else
+ } else {
this->yuv2rgb_mode = MODE_15_BGR;
+ }
break;
case 8:
- if( rgb == 0 )
+ if( rgb == 0 ) {
this->yuv2rgb_mode = MODE_8_RGB;
- else
+ } 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(vo_driver_t* self, display_xine_frame_t t, void* user_data) {
+
+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;
this->caller = user_data;
this->frameDis = t;
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index a83a624..1b687a3 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -15,7 +15,7 @@ SOURCES = main.cpp \
TARGET = opieplayer2
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lpthread -lopie -lxine -lxineutils
+LIBS += -lqpe -lpthread -lopie -lxine
MOC_DIR = qpeobj
OBJECTS_DIR = qpeobj
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
index ce472f1..1042a0c 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
@@ -100,8 +100,7 @@ PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags
skinsMenu->isCheckable();
gammaMenu = new QPopupMenu( this );
- pmView->insertItem( tr( "Gamma" ), gammaMenu );
- gammaMenu->setMinimumHeight( 50 );
+ pmView->insertItem( tr( "Gamma (Video)" ), gammaMenu );
gammaSlider = new QSlider( QSlider::Vertical, gammaMenu );
gammaSlider->setRange( -100, 100 );
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index b0ec673..f5f5c37 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -384,7 +384,7 @@ void VideoWidget::makeVisible() {
resize( qApp->desktop()->size() );
slider->hide();
videoFrame-> setGeometry ( 0, 0, width ( ), height ( ));
- qApp->processEvents();
+// qApp->processEvents();
} else {
showNormal();
showMaximized();
@@ -398,7 +398,6 @@ void VideoWidget::makeVisible() {
connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
}
-
QWidget *d = QApplication::desktop();
int w=d->width();
int h=d->height();
@@ -409,7 +408,7 @@ void VideoWidget::makeVisible() {
} else
videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) );
- qApp->processEvents();
+// qApp->processEvents();
}
}
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 0137ae5..fabc9a5 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -94,6 +94,7 @@ void XineControl::play( const QString& fileName ) {
// which gui (video / audio)
mediaPlayerState->setView( whichGui );
+
#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
if ( !disabledSuspendScreenSaver ) {
disabledSuspendScreenSaver = TRUE;
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
index 9b26d41..1d88cea 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
@@ -44,6 +44,7 @@
#include "xinevideowidget.h"
+
// 0 deg rot: copy a line from src to dst (use libc memcpy)
// 180 deg rot: copy a line from src to dst reversed
@@ -59,25 +60,25 @@ static inline void memcpy_rev ( void *dst, void *src, size_t len )
// 90 deg rot: copy a column from src to dst
-static inline void memcpy_step ( void *dst, void *src, size_t len, size_t linestep )
+static inline void memcpy_step ( void *dst, void *src, size_t len, size_t step )
{
len >>= 1;
while ( len-- ) {
*((short int *) dst) ++ = *((short int *) src);
- ((char * ) src) += linestep;
+ ((char *) src ) += step;
}
}
// 270 deg rot: copy a column from src to dst reversed
-static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t linestep )
+static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t step )
{
len >>= 1;
- ((char *) src) += ( len * linestep );
+ ((char *) src ) += ( len * step );
while ( len-- ) {
- ((char *) src) -= linestep;
+ ((char *) src ) -= step;
*((short int *) dst) ++ = *((short int *) src);
}
}
@@ -182,6 +183,7 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
case 3: memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break;
default: break;
}
+ }
if ( rightfill )
memset ( dst + leftfill + framefill, 0, rightfill ); // "right" border -> black
}
@@ -198,6 +200,7 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
}
}
}
+ }
{
// QVFB hack by Martin Jones
@@ -212,16 +215,21 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
}
}
- QImage *XineVideoWidget::logo ( ) const {
+
+QImage *XineVideoWidget::logo ( ) const
+{
return m_logo;
}
- void XineVideoWidget::setLogo ( QImage * image ) {
+
+void XineVideoWidget::setLogo ( QImage* logo )
+{
delete m_logo;
- m_logo = image;
+ m_logo = logo;
}
- void XineVideoWidget::setVideoFrame ( uchar * img, int w, int h, int bpl ) {
+void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl )
+{
bool rot90 = (( -m_rotation ) & 1 );
if ( rot90 ) { // if the rotation is 90 or 270 we have to swap width / height
@@ -238,16 +246,16 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
// only repaint the area that *really* needs to be repainted
- repaint ((
+ repaint ((( m_thisframe & m_lastframe ) != m_lastframe ) ? m_lastframe : m_thisframe, false );
}
- void XineVideoWidget::resizeEvent ( QResizeEvent * ) {
+void XineVideoWidget::resizeEvent ( QResizeEvent * )
+{
QSize s = size ( );
bool fs = ( s == qApp-> desktop ( ) -> size ( ));
// if we are in fullscreen mode, do not rotate the video
// (!! the paint routine uses m_rotation + qt_screen-> transformOrientation() !!)
-
m_rotation = fs ? -qt_screen-> transformOrientation ( ) : 0;
if ( fs && qt_screen-> isTransformed ( ))
@@ -257,7 +265,8 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
}
- void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * ) {
+void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * /*me*/ )
+{
emit clicked ( );
}