summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore 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.cpp165
-rw-r--r--noncore/multimedia/opieplayer2/lib.h28
-rw-r--r--noncore/multimedia/opieplayer2/nullvideo.c925
-rw-r--r--noncore/multimedia/opieplayer2/opieplayer2.pro2
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.cpp3
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp7
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp1
-rw-r--r--noncore/multimedia/opieplayer2/xinevideowidget.cpp151
10 files changed, 622 insertions, 664 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
@@ -1,87 +1,89 @@
//TOAST_SPU will define ALL spu entries - no matter the tranparency
//#define TOAST_SPU
/* #define PRIV_CLUT */
/* Currently only blend_yuv(..) works */
/*
*
* Copyright (C) James Courtier-Dutton James@superbug.demon.co.uk - July 2001
*
* Copyright (C) 2000 Thomas Mirlacher
*
* This program 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.
*
* This program 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., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* The author may be reached as <dent@linuxvideo.org>
*
*------------------------------------------------------------
*
*/
/*
#define LOG_BLEND_YUV
*/
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <inttypes.h>
+#include <xine.h>
+#include <xine/xine_internal.h>
#include <xine/video_out.h>
#include "alphablend.h"
#define BLEND_COLOR(dst, src, mask, o) ((((src&mask)*o + ((dst&mask)*(0x0f-o)))/0xf) & mask)
#define BLEND_BYTE(dst, src, o) (((src)*o + ((dst)*(0xf-o)))/0xf)
static void mem_blend16(uint16_t *mem, uint16_t clr, uint8_t o, int len) {
uint16_t *limit = mem + len;
while (mem < limit) {
*mem =
BLEND_COLOR(*mem, clr, 0xf800, o) |
BLEND_COLOR(*mem, clr, 0x07e0, o) |
BLEND_COLOR(*mem, clr, 0x001f, o);
mem++;
}
}
static void mem_blend24(uint8_t *mem, uint8_t r, uint8_t g, uint8_t b,
uint8_t o, int len) {
uint8_t *limit = mem + len*3;
while (mem < limit) {
*mem = BLEND_BYTE(*mem, r, o);
mem++;
*mem = BLEND_BYTE(*mem, g, o);
mem++;
*mem = BLEND_BYTE(*mem, b, o);
mem++;
}
}
static void mem_blend24_32(uint8_t *mem, uint8_t r, uint8_t g, uint8_t b,
uint8_t o, int len) {
uint8_t *limit = mem + len*4;
while (mem < limit) {
*mem = BLEND_BYTE(*mem, r, o);
mem++;
*mem = BLEND_BYTE(*mem, g, o);
mem++;
*mem = BLEND_BYTE(*mem, b, o);
mem += 2;
}
}
static void mem_blend32(uint8_t *mem, uint8_t *src, uint8_t o, int len) {
uint8_t *limit = mem + len*4;
while (mem < limit) {
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
@@ -287,97 +287,97 @@ void AudioWidget::sliderPressed() {
}
void AudioWidget::sliderReleased() {
audioSliderBeingMoved = FALSE;
if ( slider.width() == 0 )
return;
long val = long((double)slider.value() * mediaPlayerState->length() / slider.width());
mediaPlayerState->setPosition( val );
}
void AudioWidget::setPosition( long i ) {
// qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i);
updateSlider( i, mediaPlayerState->length() );
}
void AudioWidget::setLength( long max ) {
updateSlider( mediaPlayerState->position(), max );
}
void AudioWidget::setView( char view ) {
// this isnt working for some reason
if ( mediaPlayerState->streaming() ) {
qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>");
if( !slider.isHidden()) {
slider.hide();
}
disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
} else {
// this stops the slider from being moved, thus
// does not stop stream when it reaches the end
slider.show();
connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
}
if ( view == 'a' ) {
// startTimer( 150 );
showMaximized();
} else {
killTimers();
hide();
}
- qApp->processEvents();
+ // qApp->processEvents();
}
static QString timeAsString( long length ) {
int minutes = length / 60;
int seconds = length % 60;
return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 );
}
void AudioWidget::updateSlider( long i, long max ) {
time.setText( timeAsString( i ) + " / " + timeAsString( max ) );
// qDebug( timeAsString( i ) + " / " + timeAsString( max ) ) ;
if ( max == 0 ) {
return;
}
// Will flicker too much if we don't do this
// Scale to something reasonable
int width = slider.width();
int val = int((double)i * width / max);
if ( !audioSliderBeingMoved ) {
if ( slider.value() != val ) {
slider.setValue( val );
}
if ( slider.maxValue() != width ) {
slider.setMaxValue( width );
}
}
}
void AudioWidget::setToggleButton( int i, bool down ) {
qDebug("setToggleButton %d", i);
if ( down != audioButtons[i].isDown ) {
toggleButton( i );
}
}
void AudioWidget::toggleButton( int i ) {
audioButtons[i].isDown = !audioButtons[i].isDown;
QPainter p(this);
paintButton ( &p, i );
}
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
@@ -1,232 +1,265 @@
-/*
+ /*
                This file is part of the Opie Project
              Copyright (c) 2002 Max Reiss <harlekin@handhelds.org>
Copyright (c) 2002 LJP <>
Copyright (c) 2002 Holger Freyther <zecke@handhelds.org>
=.
.=l.
           .>+-=
 _;:,     .>    :=|. This program is free software; you can
.> <`_,   >  .   <= redistribute it and/or modify it under
:`=1 )Y*s>-.--   : the terms of the GNU General Public
.="- .-=="i,     .._ License as published by the Free Software
 - .   .-<_>     .<> Foundation; either version 2 of the License,
     ._= =}       : or (at your option) any later version.
    .%`+i>       _;_.
    .i_,=:_.      -<s. This program 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
..}^=.=       =       ; Library General Public License for more
++=   -.     .`     .: details.
 :     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = 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,
Boston, MA 02111-1307, USA.
*/
#include <stdio.h>
#include <stdlib.h>
#include <qimage.h>
#include <qtextstream.h>
#include <qpe/resource.h>
#include <qfile.h>
#include <qgfx_qws.h>
#include <qdirectpainter_qws.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" {
- 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;
-Lib::Lib(XineVideoWidget* widget) {
+Lib::Lib( XineVideoWidget* widget ) {
m_video = false;
m_wid = widget;
printf("Lib");
QCString str( getenv("HOME") );
str += "/Settings/opiexine.cf";
// get the configuration
// not really OO, should be an extra class, later
if ( !QFile(str).exists() ) {
QFile f(str);
f.open(IO_WriteOnly);
QTextStream ts( &f );
ts << "misc.memcpy_method:glibc\n";
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 ( ));
+ 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 )
-{
- if ( s. width ( ) && s. height ( )) {
- ::null_set_gui_width( m_videoOutput, s. width() );
- ::null_set_gui_height(m_videoOutput, s. height() );
- }
+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() );
+ }
}
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 );
+ xine_stop( m_xine );
}
-void Lib::pause(){
- xine_set_speed( m_xine, SPEED_PAUSE );
+
+void Lib::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(){
+
+int Lib::status() {
return xine_get_status( m_xine );
}
-int Lib::currentPosition(){
- return xine_get_current_position( m_xine );
+
+int Lib::currentPosition() {
+ xine_get_pos_length( m_xine, &m_pos, &m_time, &m_length );
+ return m_pos;
+}
+
+int Lib::currentTime() {
+ xine_get_pos_length( m_xine, &m_pos, &m_time, &m_length );
+ return m_time/1000;
}
-int Lib::currentTime() {
- return xine_get_current_time( m_xine );
-};
+
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 );
}
void Lib::setGamma( int value ) {
//qDebug( QString( "%1").arg(value) );
::null_set_videoGamma( m_videoOutput, 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 );
+ ( (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 );
+ ( (Lib*)user_data)->drawFrame( frame, width, height, bytes );
}
+
void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) {
- if (!m_video ) {
+ 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
@@ -1,153 +1,173 @@
/*
                This file is part of the Opie Project
              Copyright (c) 2002 Max Reiss <harlekin@handhelds.org>
Copyright (c) 2002 LJP <>
Copyright (c) 2002 Holger Freyther <zecke@handhelds.org>
=.
.=l.
           .>+-=
 _;:,     .>    :=|. This program is free software; you can
.> <`_,   >  .   <= redistribute it and/or modify it under
:`=1 )Y*s>-.--   : the terms of the GNU General Public
.="- .-=="i,     .._ License as published by the Free Software
 - .   .-<_>     .<> Foundation; either version 2 of the License,
     ._= =}       : or (at your option) any later version.
    .%`+i>       _;_.
    .i_,=:_.      -<s. This program 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
..}^=.=       =       ; Library General Public License for more
++=   -.     .`     .: details.
 :     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = 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,
Boston, MA 02111-1307, USA.
*/
#ifndef ZECKEXINELIB_H
#define ZECKEXINELIB_H
#include <qcstring.h>
#include <qstring.h>
#include <qobject.h>
#include <xine.h>
+//#include "xine.h"
class XineVideoWidget;
namespace XINE {
/**
* Lib wrapps the simple interface
* of libxine for easy every day use
* This will become a full C++ Wrapper
* It supports playing, pausing, info,
* stooping, seeking.
*/
class Frame;
class Lib : public QObject {
Q_OBJECT
public:
Lib(XineVideoWidget* = 0);
~Lib();
QCString version();
int majorVersion()/*const*/;
int minorVersion()/*const*/;
int subVersion()/*const*/;
void resize ( const QSize &s );
int play( const QString& fileName,
int startPos = 0,
int start_time = 0 );
void stop() /*const*/;
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*/;
int currentPosition()/*const*/;
//in seconds
int currentTime()/*const*/;
int length() /*const*/;
bool isSeekable()/*const*/;
/**
* Whether or not to show video output
*/
void setShowVideo(bool video);
/**
* is we show video
*/
bool isShowingVideo() /*const*/;
/**
*
*/
void showVideoFullScreen( bool fullScreen );
/**
*
*/
bool isVideoFullScreen()/*const*/ ;
+
+ /**
+ * Get the meta info (like author etc) from the stream
+ *
+ */
+ QString metaInfo() ;
+
/**
*
*/
bool isScaling();
/**
*
*/
void setScaling( bool );
/**
* Set the Gamma value for video output
* @param int the value between -100 and 100, 0 is original
*/
void setGamma( int );
/**
* test
*/
Frame currentFrame()/*const*/;
/**
* Returns the error code
*/
int error() /*const*/;
signals:
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 );
// C -> C++ bridge for the event system
static void xine_event_handler( void* user_data, xine_event_t* t);
static void xine_display_frame( void* user_data, uint8_t* frame ,
int width, int height, int bytes );
};
};
#endif
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
@@ -1,713 +1,608 @@
-/*
+ /*
                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.
           .>+-=
 _;:,     .>    :=|. This program is free software; you can
.> <`_,   >  .   <= redistribute it and/or modify it under
:`=1 )Y*s>-.--   : the terms of the GNU General Public
.="- .-=="i,     .._ License as published by the Free Software
 - .   .-<_>     .<> Foundation; either version 2 of the License,
     ._= =}       : or (at your option) any later version.
    .%`+i>       _;_.
    .i_,=:_.      -<s. This program 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
+..}^=.=       =       ; 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,
Boston, MA 02111-1307, USA.
*/
-/*#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"
#include "yuv2rgb.h"
#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 );
typedef struct null_driver_s null_driver_t;
struct null_driver_s {
- 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;
- int gui_width;
- int gui_height;
- int gui_changed;
- double display_ratio;
- void* caller;
- display_xine_frame_t frameDis;
-
-
+ 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;
+ 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;
- uint8_t *chunk[3];
-
- yuv2rgb_t *yuv2rgb;
- uint8_t *rgb_dst;
- int yuv_stride;
- int stripe_height, stripe_inc;
-
- int bytes_per_line;
- uint8_t *data;
+ vo_frame_t frame;
+
+ int format;
+ int flags;
+
+ vo_scale_t sc;
+
+ uint8_t *chunk[3];
-// int show_video;
- null_driver_t *output;
+ 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(vo_driver_t *self ){
- null_driver_t* this = (null_driver_t*)self;
- printf("capabilities\n");
- return this->m_capabilities;
+static uint32_t null_get_capabilities( xine_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 ;
- printf("frame copy\n");
- if(!frame->output->m_show_video ){ printf("no video\n"); return; } // no video
- if (frame->format == IMGFMT_YV12) {
- frame->yuv2rgb->yuv2rgb_fun (frame->yuv2rgb, frame->rgb_dst,
- src[0], src[1], src[2]);
+ 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 {
- frame->yuv2rgb->yuy22rgb_fun (frame->yuv2rgb, frame->rgb_dst,
- src[0]);
+ frame->yuv2rgb->yuy22rgb_fun (frame->yuv2rgb, frame->rgb_dst,
+ src[0]);
}
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:
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;
break;
}
}
/* 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);
-}
-
-/* end take care of frames*/
-
-static vo_frame_t* null_alloc_frame( vo_driver_t* self ){
- null_driver_t* this = (null_driver_t*)self;
- opie_frame_t* frame;
- frame = (opie_frame_t*)malloc ( sizeof(opie_frame_t) );
-
- memset( frame, 0, sizeof( opie_frame_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);
-
+ opie_frame_t* frame = (opie_frame_t*)vo_img;
- return (vo_frame_t*) frame;
+ if (frame->data)
+ free( frame->data );
+ free (frame);
}
-// size specific
-static void null_compute_ideal_size (null_driver_t *this, opie_frame_t *frame) {
+/* end take care of frames*/
- 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;
+static vo_frame_t* null_alloc_frame( xine_vo_driver_t* self ){
- } 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");
-}
+ null_driver_t* this = (null_driver_t*)self;
+ opie_frame_t* frame;
-static void null_compute_rgb_size (null_driver_t *this, opie_frame_t *frame) {
+#ifdef LOG
+ fprintf (stderr, "nullvideo: alloc_frame\n");
+#endif
- double x_factor, y_factor;
-
- /*
- * make the frame fit into the given destination area
- */
+ frame = (opie_frame_t*)malloc ( sizeof(opie_frame_t) );
- x_factor = (double) this->gui_width / (double) frame->ideal_width;
- y_factor = (double) this->gui_height / (double) frame->ideal_height;
+ memset( frame, 0, sizeof( opie_frame_t) );
+ memcpy (&frame->sc, &this->sc, sizeof(vo_scale_t));
- 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 ;
- }
+ pthread_mutex_init (&frame->frame.mutex, NULL);
+
+ frame->output = this;
+
+ /* initialize the frame*/
+ frame->frame.driver = 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,
+ 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 */
-#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"
- : "" )
- );
+ 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_code)
+ || (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_code = 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;
+
+ vo_scale_compute_ideal_size ( &frame->sc );
+ vo_scale_compute_output_size( &frame->sc );
+
+#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
+ */
+ if( frame->data ) {
+ 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;
+ }
+ free ( frame->data );
+ }
-// size specific
+ 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);
+ frame->frame.base[0] = xine_xmalloc_aligned (16, frame->frame.pitches[0] * height,(void **)&frame->chunk[0]);
+ frame->frame.base[1] = xine_xmalloc_aligned (16, frame->frame.pitches[1] * ((height+ 1)/2), (void **)&frame->chunk[1]);
+ frame->frame.base[2] = xine_xmalloc_aligned (16, frame->frame.pitches[2] * ((height+ 1)/2), (void **)&frame->chunk[2]);
-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");
-
- 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)
- || (flags != frame->flags)
- || (format != frame->format)
- || (this->user_ratio != frame->user_ratio)
- || (this->gui_width != frame-> gui_width )
- || (this-> gui_height != frame-> gui_height)) {
-
- frame->width = width;
- frame->height = height;
- frame->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;
-
- null_compute_ideal_size (this, frame);
- null_compute_rgb_size (this, frame);
-
- /*
- * (re-) allocate
- */
- if( frame->data ) {
- 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;
- }
- 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->frame.pitches[0] = 8*((width + 7) / 8);
- frame->frame.pitches[1] = 8*((width + 15) / 16);
- frame->frame.pitches[2] = 8*((width + 15) / 16);
- frame->frame.base[0] = xine_xmalloc_aligned (16, frame->frame.pitches[0] * height,(void **)&frame->chunk[0]);
- frame->frame.base[1] = xine_xmalloc_aligned (16, frame->frame.pitches[1] * ((height+ 1)/2), (void **)&frame->chunk[1]);
- frame->frame.base[2] = xine_xmalloc_aligned (16, frame->frame.pitches[2] * ((height+ 1)/2), (void **)&frame->chunk[2]);
-
- }else{
- frame->frame.pitches[0] = 8*((width + 3) / 4);
+ }else{
+ frame->frame.pitches[0] = 8*((width + 3) / 4);
- frame->frame.base[0] = xine_xmalloc_aligned (16, frame->frame.pitches[0] * height,
- (void **)&frame->chunk[0]);
- frame->chunk[1] = NULL;
- 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;
-
- /*
- * 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,
- 16,
- 2*frame->frame.pitches[0],
- 2*frame->frame.pitches[1],
- frame->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,
- 16,
- frame->frame.pitches[0],
- frame->frame.pitches[1],
- frame->output_width,
- frame->stripe_height,
- frame->bytes_per_line);
- frame->yuv_stride = frame->bytes_per_line;
- break;
- }
- }
+ frame->frame.base[0] = xine_xmalloc_aligned (16, frame->frame.pitches[0] * height,
+ (void **)&frame->chunk[0]);
+ frame->chunk[1] = NULL;
+ frame->chunk[2] = NULL;
}
- printf("after gui changed\n");
- /*
- * reset dest pointers
+
+ 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 (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;
- }
- }
- printf("done\n");
-}
-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;
-
- printf("display frame\n");
-// if( this->m_show_video ) { // return if not displaying
- printf("calling home aye\n" );
- if( display != NULL ) {
- (*display)(this->caller, frame->data,
- frame->output_width, frame->output_height,
- frame->bytes_per_line );
- printf("display done hope you enyoyed the frame");
- }
-// }
-
- frame->frame.displayed (&frame->frame);
+ 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
+ }
+
+ /*
+ * reset dest pointers
+ */
+
+ 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;
+ }
+ }
}
+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;
+
+ if (!this->m_show_video)
+ return;
-// blending related
+ if( display != NULL ) {
+ (*display)(this->caller, frame->data,
+ frame->sc.output_width, frame->sc.output_height,
+ frame->bytes_per_line );
+ }
+
+ frame->frame.displayed (&frame->frame);
+}
-static void null_overlay_clut_yuv2rgb(null_driver_t *this, vo_overlay_t *overlay,
- opie_frame_t *frame) {
+/* 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;
if (!overlay->rgb_clut) {
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->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]) =
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 (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)
- return;
+ 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);
-
- switch(this->bpp) {
- case 16:
- blend_rgb16( (uint8_t *)frame->data, overlay,
- frame->output_width, frame->output_height,
- frame->width, frame->height);
- break;
- case 24:
- blend_rgb24( (uint8_t *)frame->data, overlay,
- frame->output_width, frame->output_height,
- frame->width, frame->height);
- break;
- case 32:
- blend_rgb32( (uint8_t *)frame->data, overlay,
- frame->output_width, frame->output_height,
- frame->width, frame->height);
- break;
- default:
- /* It should never get here */
- break;
- }
- }
+ if (overlay->rle) {
+ if( !overlay->rgb_clut || !overlay->clip_rgb_clut)
+ null_overlay_clut_yuv2rgb(this,overlay,frame);
+
+ 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;
+ }
+ }
}
-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;
+ 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;
+ 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;
+ *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;
+ return 0;
}
-static void null_exit( vo_driver_t* self ){
- null_driver_t* this = (null_driver_t*)self;
- free ( this );
+
+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 ){
- return 0;
+static int null_redraw_needed( xine_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? */
- memset(vo,0, sizeof(null_driver_t ) );
- 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;
- vo->frameDis = NULL;
-
- /* install callback handlers*/
- vo->vo_driver.get_capabilities = null_get_capabilities;
- vo->vo_driver.alloc_frame = null_alloc_frame;
- vo->vo_driver.update_frame_format = null_update_frame_format;
- vo->vo_driver.display_frame = null_display_frame;
- vo->vo_driver.overlay_blend = null_overlay_blend;
- vo->vo_driver.get_property = null_get_property;
- 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.exit = null_exit;
- vo->vo_driver.redraw_needed = null_redraw_needed;
+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->display_ratio = 1.0;
+ vo->gui_width = 16;
+ vo->gui_height = 8;
+ vo->frameDis = NULL;
+
+ /* install callback handlers*/
+ vo->vo_driver.get_capabilities = null_get_capabilities;
+ vo->vo_driver.alloc_frame = null_alloc_frame;
+ vo->vo_driver.update_frame_format = null_update_frame_format;
+ vo->vo_driver.display_frame = null_display_frame;
+ vo->vo_driver.overlay_blend = null_overlay_blend;
+ vo->vo_driver.get_property = null_get_property;
+ 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.exit = null_exit;
+ 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);
- printf("done initialisation\n");
- return (vo_driver_t*) vo;
+ /* 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;
}
static vo_info_t vo_info_null = {
- 5,
- "null plugin",
- NULL,
- VISUAL_TYPE_FB,
- 5
+ 5,
+ "null plugin",
+ 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;
+ vo_info_null.description = _("xine video output plugin using null device");
+ return &vo_info_null;
}
/* this is special for this device */
/**
* We know that we will be controled by the XINE LIB++
*/
/**
*
*/
-int null_is_showing_video( vo_driver_t* self ){
- null_driver_t* this = (null_driver_t*)self;
- return this->m_show_video;
+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 ) {
- ((null_driver_t*)self)->m_show_video = 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 ){
- return ((null_driver_t*)self)->m_video_fullscreen;
+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 ){
- ((null_driver_t*)self)->m_video_fullscreen = 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 ){
- return ((null_driver_t*)self)->m_is_scaling;
+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 ) {
- ((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_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 ){
- ((null_driver_t*)self)->m_is_scaling = 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 ){
- ((null_driver_t*)self)->gui_width = 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 ){
- ((null_driver_t*)self)->gui_height = 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 ){
- null_driver_t* this = (null_driver_t*)self;
+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;
- 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;
- case 24:
- if( this->bpp == 32 ) {
- if(rgb == 0 )
- this->yuv2rgb_mode = MODE_32_RGB;
- else
- this->yuv2rgb_mode = MODE_32_BGR;
- }else{
- if( rgb == 0 )
- this->yuv2rgb_mode = MODE_24_RGB;
- else
- this->yuv2rgb_mode = MODE_24_BGR;
- };
- break;
- case 16:
- if( rgb == 0 )
- this->yuv2rgb_mode = MODE_16_RGB;
- else
- this->yuv2rgb_mode = MODE_16_BGR;
- break;
- case 15:
- if( rgb == 0 )
- this->yuv2rgb_mode = MODE_15_RGB;
- else
- this->yuv2rgb_mode = MODE_15_BGR;
- break;
- case 8:
- if( rgb == 0 )
- this->yuv2rgb_mode = MODE_8_RGB;
- else
- this->yuv2rgb_mode = MODE_8_BGR;
- break;
+ 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;
+ case 24:
+ if( this->bpp == 32 ) {
+ if( rgb == 0 ) {
+ this->yuv2rgb_mode = MODE_32_RGB;
+ } else {
+ this->yuv2rgb_mode = MODE_32_BGR;
+ }
+ }else{
+ if( rgb == 0 )
+ this->yuv2rgb_mode = MODE_24_RGB;
+ else
+ this->yuv2rgb_mode = MODE_24_BGR;
};
- //free(this->yuv2rgb_factory );
- // this->yuv2rgb_factory = yuv2rgb_factory_init (this->yuv2rgb_mode, this->yuv2rgb_swap,
- // this->yuv2rgb_cmap);
+ break;
+ case 16:
+ if( rgb == 0 ) {
+ this->yuv2rgb_mode = MODE_16_RGB;
+ } else {
+ this->yuv2rgb_mode = MODE_16_BGR;
+ }
+ break;
+ case 15:
+ if( rgb == 0 ) {
+ this->yuv2rgb_mode = MODE_15_RGB;
+ } else {
+ this->yuv2rgb_mode = MODE_15_BGR;
+ }
+ break;
+ case 8:
+ if( rgb == 0 ) {
+ this->yuv2rgb_mode = MODE_8_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(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;
+
+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
@@ -1,24 +1,24 @@
TEMPLATE = app
#CONFIG = qt warn_on release
CONFIG = qt warn_on debug
DESTDIR = $(OPIEDIR)/bin
HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h mediadetect.h\
videowidget.h audiowidget.h playlistwidget.h mediaplayer.h inputDialog.h \
frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\
alphablend.h yuv2rgb.h
SOURCES = main.cpp \
playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp mediadetect.cpp\
videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp inputDialog.cpp \
frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \
playlistwidgetgui.cpp\
alphablend.c yuv2rgb.c yuv2rgb_arm.c yuv2rgb_arm4l.S
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
#INCLUDEPATH += $(OPIEDIR)/include
#DEPENDPATH += $(OPIEDIR)/include
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
@@ -55,98 +55,97 @@
//only needed for the random play
#include <stdlib.h>
#include "audiowidget.h"
#include "videowidget.h"
#include "mediaplayerstate.h"
extern MediaPlayerState *mediaPlayerState;
PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags fl )
: QMainWindow( parent, name, fl ) {
d = new PlayListWidgetPrivate;
d->setDocumentUsed = FALSE;
d->current = NULL;
setBackgroundMode( PaletteButton );
setToolBarsMovable( FALSE );
// Create Toolbar
QPEToolBar *toolbar = new QPEToolBar( this );
toolbar->setHorizontalStretchable( TRUE );
// Create Menubar
QPEMenuBar *menu = new QPEMenuBar( toolbar );
menu->setMargin( 0 );
bar = new QPEToolBar( this );
bar->setLabel( tr( "Play Operations" ) );
tbDeletePlaylist = new QPushButton( Resource::loadIconSet( "trash" ), "", bar, "close" );
tbDeletePlaylist->setFlat( TRUE );
tbDeletePlaylist->setFixedSize( 20, 20 );
tbDeletePlaylist->hide();
pmPlayList = new QPopupMenu( this );
menu->insertItem( tr( "File" ), pmPlayList );
pmView = new QPopupMenu( this );
menu->insertItem( tr( "View" ), pmView );
pmView->isCheckable();
skinsMenu = new QPopupMenu( this );
pmView->insertItem( tr( "Skins" ), skinsMenu );
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 );
gammaSlider->setTickmarks( QSlider::Left );
gammaSlider->setTickInterval( 20 );
gammaSlider->setFocusPolicy( QWidget::NoFocus );
gammaSlider->setValue( 0 );
gammaSlider->setMinimumHeight( 50 );
gammaLCD = new QLCDNumber( 3, gammaMenu );
gammaMenu->insertItem( gammaSlider );
gammaMenu->insertItem( gammaLCD );
connect( gammaSlider, SIGNAL( valueChanged( int ) ), gammaLCD, SLOT( display( int ) ) );
vbox5 = new QVBox( this );
QVBox *vbox4 = new QVBox( vbox5 );
QHBox *hbox6 = new QHBox( vbox4 );
tabWidget = new QTabWidget( hbox6, "tabWidget" );
QWidget *pTab;
pTab = new QWidget( tabWidget, "pTab" );
tabWidget->insertTab( pTab, "Playlist");
QGridLayout *Playout = new QGridLayout( pTab );
Playout->setSpacing( 2);
Playout->setMargin( 2);
// Add the playlist area
QVBox *vbox3 = new QVBox( pTab );
d->playListFrame = vbox3;
QHBox *hbox2 = new QHBox( vbox3 );
d->selectedFiles = new PlayListSelection( hbox2 );
vbox1 = new QVBox( hbox2 );
QPEApplication::setStylusOperation( d->selectedFiles->viewport(), QPEApplication::RightOnHold );
QVBox *stretch1 = new QVBox( vbox1 ); // add stretch
Playout->addMultiCellWidget( vbox3, 0, 0, 0, 1 );
QWidget *aTab;
aTab = new QWidget( tabWidget, "aTab" );
QGridLayout *Alayout = new QGridLayout( aTab );
Alayout->setSpacing( 2 );
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
@@ -339,122 +339,121 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
return;
} else {
return;
}
}
case VideoStop: mediaPlayerState->setPlaying( FALSE ); return;
case VideoNext: if(playList->whichList() ==0) mediaPlayerState->setNext(); return;
case VideoPrevious: if(playList->whichList() ==0) mediaPlayerState->setPrev(); return;
case VideoVolUp: emit moreReleased(); return;
case VideoVolDown: emit lessReleased(); return;
case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
}
}
}
}
}
void VideoWidget::mousePressEvent( QMouseEvent *event ) {
mouseMoveEvent( event );
}
void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
if ( mediaPlayerState->fullscreen() ) {
mediaPlayerState->setFullscreen( FALSE );
makeVisible();
}
mouseMoveEvent( event );
}
void VideoWidget::showEvent( QShowEvent* ) {
QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 );
mouseMoveEvent( &event );
}
void VideoWidget::backToNormal() {
mediaPlayerState->setFullscreen( FALSE );
makeVisible();
}
void VideoWidget::makeVisible() {
if ( mediaPlayerState->fullscreen() ) {
setBackgroundMode( QWidget::NoBackground );
showFullScreen();
resize( qApp->desktop()->size() );
slider->hide();
videoFrame-> setGeometry ( 0, 0, width ( ), height ( ));
- qApp->processEvents();
+// qApp->processEvents();
} else {
showNormal();
showMaximized();
setBackgroundPixmap( *pixBg );
if ( mediaPlayerState->streaming() ) {
slider->hide();
disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
} else {
slider->show();
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 w=d->width();
int h=d->height();
if(w>h) {
int newW=(w/2)-(246/2); //this will only work with 320x240
videoFrame->setGeometry( QRect( newW, 4, 240, 170 ) );
} else
videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) );
- qApp->processEvents();
+// qApp->processEvents();
}
}
void VideoWidget::paintEvent( QPaintEvent * pe) {
QPainter p( this );
if ( mediaPlayerState->fullscreen() ) {
// Clear the background
p.setBrush( QBrush( Qt::black ) );
} else {
if ( !pe->erased() ) {
// Combine with background and double buffer
QPixmap pix( pe->rect().size() );
QPainter p( &pix );
p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() );
p.drawTiledPixmap( pe->rect(), *pixBg, pe->rect().topLeft() );
for ( int i = 0; i < numVButtons; i++ ) {
paintButton( &p, i );
}
QPainter p2( this );
p2.drawPixmap( pe->rect().topLeft(), pix );
} else {
QPainter p( this );
for ( int i = 0; i < numVButtons; i++ )
paintButton( &p, i );
}
slider->repaint( TRUE );
}
}
void VideoWidget::closeEvent( QCloseEvent* ) {
mediaPlayerState->setList();
}
void VideoWidget::keyReleaseEvent( QKeyEvent *e) {
switch ( e->key() ) {
////////////////////////////// Zaurus keys
case Key_Home:
break;
case Key_F9: //activity
break;
case Key_F10: //contacts
// hide();
break;
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
@@ -49,96 +49,97 @@ XineControl::XineControl( QObject *parent, const char *name )
connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) );
connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( updatePosition( long ) ) );
connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );
connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) );
connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) );
connect( mediaPlayerState, SIGNAL( videoGammaChanged( int ) ), this, SLOT( setGamma( int ) ) );
connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) );
disabledSuspendScreenSaver = FALSE;
}
XineControl::~XineControl() {
#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
if ( disabledSuspendScreenSaver ) {
disabledSuspendScreenSaver = FALSE;
// Re-enable the suspend mode
QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
}
#endif
delete libXine;
}
void XineControl::play( const QString& fileName ) {
hasVideoChannel=FALSE;
hasAudioChannel=FALSE;
m_fileName = fileName;
//qDebug("<<FILENAME: " + fileName + ">>>>");
libXine->play( fileName );
mediaPlayerState->setPlaying( true );
char whichGui = mdetect.videoOrAudio( fileName );
if (whichGui == 'f') {
qDebug("Nicht erkannter Dateityp");
return;
}
if (whichGui == 'a') {
libXine->setShowVideo( false );
hasAudioChannel=TRUE;
} else {
libXine->setShowVideo( true );
hasVideoChannel=TRUE;
}
// determine if slider is shown
mediaPlayerState->setIsStreaming( !libXine->isSeekable() );
// which gui (video / audio)
mediaPlayerState->setView( whichGui );
+
#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
if ( !disabledSuspendScreenSaver ) {
disabledSuspendScreenSaver = TRUE;
// Stop the screen from blanking and power saving state
QCopEnvelope("QPE/System", "setScreenSaverMode(int)" )
<< ( whichGui == 'v' ? QPEApplication::Disable : QPEApplication::DisableSuspend );
}
#endif
length();
position();
}
void XineControl::nextMedia() {
mediaPlayerState->setNext();
}
void XineControl::setGamma( int value ) {
libXine->setGamma( value );
}
void XineControl::stop( bool isSet ) {
if ( !isSet) {
libXine->stop( );
#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
if ( disabledSuspendScreenSaver ) {
disabledSuspendScreenSaver = FALSE;
// Re-enable the suspend mode
QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
}
#endif
}
}
/**
* Pause playback
* @isSet
*/
void XineControl::pause( bool isSet) {
if (isSet) {
libXine->pause();
} else {
libXine->play( m_fileName, 0, m_currentTime);
}
}
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
@@ -1,263 +1,272 @@
/*
                This file is part of the Opie Project
-
+
Copyright (c) 2002 Robert Griebl <sandman@handhelds.org>
Copyright (c) 2002 Holger Freyther <zecke@handhelds.org>
=.
.=l.
           .>+-=
 _;:,     .>    :=|. This program is free software; you can
.> <`_,   >  .   <= redistribute it and/or modify it under
:`=1 )Y*s>-.--   : the terms of the GNU General Public
.="- .-=="i,     .._ License as published by the Free Software
 - .   .-<_>     .<> Foundation; either version 2 of the License,
     ._= =}       : or (at your option) any later version.
    .%`+i>       _;_.
    .i_,=:_.      -<s. This program 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
..}^=.=       =       ; Library General Public License for more
++=   -.     .`     .: details.
 :     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = 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,
Boston, MA 02111-1307, USA.
-
+
*/
#include <qimage.h>
#include <qpainter.h>
#include <qgfx_qws.h>
#include <qdirectpainter_qws.h>
#include <qgfx_qws.h>
#include <qsize.h>
#include <qapplication.h>
#include <qpainter.h>
#include <qpe/resource.h>
#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
static inline void memcpy_rev ( void *dst, void *src, size_t len )
{
- ((char *) src) += len;
+ ((char *) src ) += len;
len >>= 1;
while ( len-- )
- *((short int *) dst) ++ = *--((short int *) src);
+ *((short int *) dst )++ = *--((short int *) src );
}
// 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;
+ *((short int *) dst )++ = *((short int *) src );
+ ((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;
- *((short int *) dst) ++ = *((short int *) src);
+ ((char *) src ) -= step;
+ *((short int *) dst )++ = *((short int *) src );
}
}
XineVideoWidget::XineVideoWidget ( QWidget* parent, const char* name )
- : QWidget ( parent, name, WRepaintNoErase | WResizeNoErase )
+ : QWidget ( parent, name, WRepaintNoErase | WResizeNoErase )
{
setBackgroundMode ( NoBackground );
- m_logo = 0;
- m_buff = 0;
+ m_logo = 0;
+ m_buff = 0;
m_bytes_per_line_fb = qt_screen-> linestep ( );
- m_bytes_per_pixel = ( qt_screen-> depth ( ) + 7 ) / 8;
- m_rotation = 0;
+ m_bytes_per_pixel = ( qt_screen->depth() + 7 ) / 8;
+ m_rotation = 0;
}
XineVideoWidget::~XineVideoWidget ( )
{
delete m_logo;
}
void XineVideoWidget::clear ( )
{
m_buff = 0;
repaint ( false );
}
void XineVideoWidget::paintEvent ( QPaintEvent * )
{
if ( m_buff == 0 ) {
QPainter p ( this );
p. fillRect ( rect ( ), black );
if ( m_logo )
p. drawImage ( 0, 0, *m_logo );
}
else {
// Qt needs to be notified which areas were really updated .. strange
QArray <QRect> qt_bug_workaround_clip_rects;
{
QDirectPainter dp ( this );
int rot = dp. transformOrientation ( ) + m_rotation; // device rotation + custom rotation
uchar *fb = dp. frameBuffer ( );
uchar *frame = m_buff;
// where is the video frame in fb coordinates
QRect framerect = qt_screen-> mapToDevice ( QRect ( mapToGlobal ( m_thisframe. topLeft ( )), m_thisframe. size ( )), QSize ( qt_screen-> width ( ), qt_screen-> height ( )));
qt_bug_workaround_clip_rects. resize ( dp. numRects ( ));
for ( int i = dp. numRects ( ) - 1; i >= 0; i-- ) {
const QRect &clip = dp. rect ( i );
qt_bug_workaround_clip_rects [ i ] = qt_screen-> mapFromDevice ( clip, QSize ( qt_screen-> width ( ), qt_screen-> height ( )));
uchar *dst = fb + ( clip. x ( ) * m_bytes_per_pixel ) + ( clip. y ( ) * m_bytes_per_line_fb ); // clip x/y in the fb
uchar *src = frame;
// Adjust the start the source data based on the rotation (xine frame)
switch ( rot ) {
case 0: src += ((( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame )); break;
case 1: src += ((( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame ) + (( framerect. height ( ) - 1 ) * m_bytes_per_pixel )); break;
case 2: src += ((( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame ) + (( framerect. height ( ) - 1 ) * m_bytes_per_line_frame )); break;
case 3: src += ((( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame )); break;
default: break;
}
// all of the following widths/heights are fb relative (0deg rotation)
uint leftfill = 0; // black border on the "left" side of the video frame
uint framefill = 0; // "width" of the video frame
uint rightfill = 0; // black border on the "right" side of the video frame
uint clipwidth = clip. width ( ) * m_bytes_per_pixel; // "width" of the current clip rect
if ( clip. left ( ) < framerect. left ( ))
- leftfill = (( framerect. left ( ) - clip. left ( )) * m_bytes_per_pixel ) < ? clipwidth;
+ leftfill = (( framerect. left ( ) - clip. left ( )) * m_bytes_per_pixel ) <? clipwidth;
if ( clip. right ( ) > framerect. right ( ))
- rightfill = (( clip. right ( ) - framerect. right ( )) * m_bytes_per_pixel ) < ? clipwidth;
+ rightfill = (( clip. right ( ) - framerect. right ( )) * m_bytes_per_pixel ) <? clipwidth;
framefill = clipwidth - ( leftfill + rightfill );
for ( int y = clip. top ( ); y <= clip. bottom ( ); y++ ) {
if (( y < framerect. top ( )) || ( y > framerect. bottom ( ))) {
// "above" or "below" the video -> black
memset ( dst, 0, clipwidth );
}
else {
if ( leftfill )
memset ( dst, 0, leftfill ); // "left" border -> black
if ( framefill ) { // blit in the video frame
// see above for an explanation of the different memcpys
switch ( rot ) {
case 0: memcpy ( dst + leftfill, src, framefill ); break;
case 1: memcpy_step ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break;
case 2: memcpy_rev ( dst + leftfill, src, framefill ); break;
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
}
+ if ( rightfill )
+ memset ( dst + leftfill + framefill, 0, rightfill ); // "right" border -> black
+ }
- dst += m_bytes_per_line_fb; // advance one line in the framebuffer
+ dst += m_bytes_per_line_fb; // advance one line in the framebuffer
- // advance one "line" in the xine frame data
- switch ( rot ) {
- case 0: src += m_bytes_per_line_frame; break;
- case 1: src -= m_bytes_per_pixel; break;
- case 2: src -= m_bytes_per_line_frame; break;
- case 3: src += m_bytes_per_pixel; break;
- default: break;
- }
+ // advance one "line" in the xine frame data
+ switch ( rot ) {
+ case 0: src += m_bytes_per_line_frame; break;
+ case 1: src -= m_bytes_per_pixel; break;
+ case 2: src -= m_bytes_per_line_frame; break;
+ case 3: src += m_bytes_per_pixel; break;
+ default: break;
}
}
+ }
+ }
- {
- // QVFB hack by Martin Jones
- // We need to "touch" all affected clip rects with a normal QPainter in addition to the QDirectPainter
+ {
+ // QVFB hack by Martin Jones
+ // We need to "touch" all affected clip rects with a normal QPainter in addition to the QDirectPainter
- QPainter p ( this );
+ QPainter p ( this );
- for ( int i = qt_bug_workaround_clip_rects. size ( ) - 1; i >= 0; i-- ) {
- p. fillRect ( QRect ( mapFromGlobal ( qt_bug_workaround_clip_rects [ i ]. topLeft ( )), qt_bug_workaround_clip_rects [ i ]. size ( )), QBrush ( NoBrush ));
- }
- }
+ for ( int i = qt_bug_workaround_clip_rects. size ( ) - 1; i >= 0; i-- ) {
+ p. fillRect ( QRect ( mapFromGlobal ( qt_bug_workaround_clip_rects [ i ]. topLeft ( )), qt_bug_workaround_clip_rects [ i ]. size ( )), QBrush ( NoBrush ));
}
}
+ }
+}
- QImage *XineVideoWidget::logo ( ) const {
- return m_logo;
- }
- void XineVideoWidget::setLogo ( QImage * image ) {
- delete m_logo;
- m_logo = image;
- }
+QImage *XineVideoWidget::logo ( ) const
+{
+ return m_logo;
+}
- 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
- int d = w;
- w = h;
- h = d;
- }
+void XineVideoWidget::setLogo ( QImage* logo )
+{
+ delete m_logo;
+ m_logo = logo;
+}
- m_lastframe = m_thisframe;
- m_thisframe. setRect (( width ( ) - w ) / 2, ( height ( ) - h ) / 2, w , h );
+void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl )
+{
+ bool rot90 = (( -m_rotation ) & 1 );
- m_buff = img;
- m_bytes_per_line_frame = bpl;
+ if ( rot90 ) { // if the rotation is 90 or 270 we have to swap width / height
+ int d = w;
+ w = h;
+ h = d;
+ }
- // only repaint the area that *really* needs to be repainted
+ m_lastframe = m_thisframe;
+ m_thisframe. setRect (( width ( ) - w ) / 2, ( height ( ) - h ) / 2, w , h );
- repaint ((
- }
+ m_buff = img;
+ m_bytes_per_line_frame = bpl;
- void XineVideoWidget::resizeEvent ( QResizeEvent * ) {
- QSize s = size ( );
- bool fs = ( s == qApp-> desktop ( ) -> size ( ));
+ // only repaint the area that *really* needs to be repainted
- // if we are in fullscreen mode, do not rotate the video
- // (!! the paint routine uses m_rotation + qt_screen-> transformOrientation() !!)
+ repaint ((( m_thisframe & m_lastframe ) != m_lastframe ) ? m_lastframe : m_thisframe, false );
+}
+
+void XineVideoWidget::resizeEvent ( QResizeEvent * )
+{
+ QSize s = size ( );
+ bool fs = ( s == qApp-> desktop ( )-> size ( ));
- m_rotation = fs ? -qt_screen-> transformOrientation ( ) : 0;
+ // 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 ( ))
- s = qt_screen-> mapToDevice ( s );
+ if ( fs && qt_screen-> isTransformed ( ))
+ s = qt_screen-> mapToDevice ( s );
- emit videoResized ( s );
- }
+ emit videoResized ( s );
+}
- void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * ) {
- emit clicked ( );
- }
+void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * /*me*/ )
+{
+ emit clicked();
+}