| -rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 24 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.h | 3 |
2 files changed, 25 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp index b27b8e1..7c98ce5 100644 --- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp +++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp @@ -113,13 +113,13 @@ static inline void memcpy_step_rev ( void *_dst, void *_src, size_t len, size_t *dst++ = *src; } } XineVideoWidget::XineVideoWidget ( QWidget* parent, const char* name ) - : QWidget ( parent, name, WRepaintNoErase | WResizeNoErase ) + : QWidget ( parent, name, WRepaintNoErase | WResizeNoErase ),old_framerect(0,0,0,0),old_size(0,0) { setBackgroundMode ( NoBackground ); m_logo = 0; m_buff = 0; m_bytes_per_line_fb = qt_screen-> linestep ( ); @@ -128,31 +128,34 @@ XineVideoWidget::XineVideoWidget ( QWidget* parent, const char* name ) m_lastsize = 0; } XineVideoWidget::~XineVideoWidget ( ) { - ThreadUtil::AutoLock a(m_bufmutex); +#if 0 if (m_buff) { delete[]m_buff; m_lastsize=0; m_buff = 0; } +#endif if (m_logo) { delete m_logo; } } void XineVideoWidget::clear ( ) { +#if 0 ThreadUtil::AutoLock a(m_bufmutex); if (m_buff) { delete[]m_buff; m_lastsize=0; m_buff = 0; } +#endif repaint ( false ); } QSize XineVideoWidget::videoSize() const { QSize s = size(); @@ -207,12 +210,24 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * ) QRect framerect = qt_screen-> mapToDevice ( QRect ( mapToGlobal ( m_thisframe. topLeft ( )), m_thisframe. size ( )), QSize ( qt_screen-> width ( ), qt_screen-> height ( ))); uchar * src = frame; uchar * dst = fb+framerect.y()*m_bytes_per_line_fb+framerect.x()*m_bytes_per_pixel; + /* clean up the fb screen when shrinking the image only! */ + if (old_framerect.isValid() && old_size.width()==width()&&old_size.height()==height() && + (old_framerect.width()>framerect.width() || old_framerect.height()>framerect.height())) { + uchar*_dst = fb+old_framerect.y()*m_bytes_per_line_fb+old_framerect.x()*m_bytes_per_pixel; + for (int z=0;z<old_framerect.height();++z) { + memset(_dst,0,m_bytes_per_line_fb); + _dst+=m_bytes_per_line_fb; + } + } + old_framerect=framerect; + old_size = size(); + if (framerect.height()!=m_framesize.height()) { odebug << "Hoehm: " << framerect.height() << " <-> " << m_framesize.height() << oendl; } for (int y = 0;y<framerect.height();++y) { switch (rot) { case 0: @@ -262,29 +277,34 @@ void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl ) if (!isVisible()||w>width()||h>height()/*||m_bufmutex.isLocked()*/) { //drop frame return; } bool rot90 = (( -m_rotation ) & 1 ); int l = h*bpl; +#if 0 if (l!=m_lastsize) { if (m_buff) { delete[]m_buff; } if (l>0) { m_buff = new uchar[l]; odebug << "Point to: " << (unsigned long)m_buff << oendl; m_lastsize=l; } else { m_buff = 0; } } +#endif m_lastsize = l; m_framesize = QSize(w,h); +#if 0 if (m_buff && m_lastsize) { memcpy(m_buff,img,m_lastsize); } +#endif + m_buff = img; m_bytes_per_line_frame = bpl; if (m_buff) paintEvent2(0); } // Release Mutex } void XineVideoWidget::resizeEvent ( QResizeEvent * ) diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.h b/noncore/multimedia/opieplayer2/xinevideowidget.h index a0ec5bc..f240b1c 100644 --- a/noncore/multimedia/opieplayer2/xinevideowidget.h +++ b/noncore/multimedia/opieplayer2/xinevideowidget.h @@ -31,12 +31,13 @@ Boston, MA 02111-1307, USA. */ #include <qwidget.h> +#include <qrect.h> #include "lib.h" class QImage; @@ -54,12 +55,14 @@ public: QSize videoSize() const; protected: void paintEvent2( QPaintEvent *p ); virtual void paintEvent(QPaintEvent*); virtual void resizeEvent ( QResizeEvent *r ); + QRect old_framerect; + QSize old_size; void mouseReleaseEvent ( QMouseEvent *e ); signals: void clicked ( ); void videoResized ( const QSize &s ); |