summaryrefslogtreecommitdiff
authorsandman <sandman>2002-08-01 21:18:11 (UTC)
committer sandman <sandman>2002-08-01 21:18:11 (UTC)
commit54eb82d90a4ee254c0abb6d33937e76aeb32ddf1 (patch) (unidiff)
treee9628916c721262232efc3314a8ccd29613a7189
parentc80b2060a6f051f16690db4b8f0ccbc7dde84ec5 (diff)
downloadopie-54eb82d90a4ee254c0abb6d33937e76aeb32ddf1.zip
opie-54eb82d90a4ee254c0abb6d33937e76aeb32ddf1.tar.gz
opie-54eb82d90a4ee254c0abb6d33937e76aeb32ddf1.tar.bz2
video in qvfb works now with 0/90/180/270° rotation
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp6
-rw-r--r--noncore/multimedia/opieplayer2/nullvideo.c2
-rw-r--r--noncore/multimedia/opieplayer2/xinevideowidget.cpp25
3 files changed, 22 insertions, 11 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index ac5cdd5..5ae6c21 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -187,16 +187,16 @@ void Lib::xine_event_handler( void* user_data, xine_event_t* t ) {
187} 187}
188void Lib::xine_display_frame( void* user_data, uint8_t *frame, 188void Lib::xine_display_frame( void* user_data, uint8_t *frame,
189 int width, int height, int bytes ) { 189 int width, int height, int bytes ) {
190 printf("display x frame"); 190// printf("display x frame");
191 ((Lib*)user_data)->drawFrame( frame, width, height, bytes ); 191 ((Lib*)user_data)->drawFrame( frame, width, height, bytes );
192 printf("displayed x frame\n"); 192// printf("displayed x frame\n");
193} 193}
194void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { 194void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) {
195 if (!m_video ) { 195 if (!m_video ) {
196 qWarning("not showing video now"); 196 qWarning("not showing video now");
197 return; 197 return;
198 } 198 }
199 qWarning("called draw frame %d %d", width, height); 199// qWarning("called draw frame %d %d", width, height);
200 200
201 QSize size = m_wid->size(); 201 QSize size = m_wid->size();
202 int xoffset = (size.width() - width) / 2; 202 int xoffset = (size.width() - width) / 2;
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c
index 63d5752..3a18a40 100644
--- a/noncore/multimedia/opieplayer2/nullvideo.c
+++ b/noncore/multimedia/opieplayer2/nullvideo.c
@@ -14,6 +14,8 @@
14#include "alphablend.h" 14#include "alphablend.h"
15#include "yuv2rgb.h" 15#include "yuv2rgb.h"
16 16
17#define printf(x,...)
18
17/* the caller for our event draw handler */ 19/* the caller for our event draw handler */
18typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, 20typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame,
19 int width, int height,int bytes ); 21 int width, int height,int bytes );
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
index e46c4df..8e8f139 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
@@ -55,6 +55,10 @@ static inline void memcpy_step ( void *dst, void *src, size_t len, size_t step )
55{ 55{
56 len >>= 1; 56 len >>= 1;
57 while ( len-- ) { 57 while ( len-- ) {
58 // *((char *) dst ) = *((char *) src + 1);
59 // *((char *) dst + 1) = *((char *) src );
60 // ((char *) dst ) += 2;
61
58 *((short int *) dst )++ = *((short int *) src ); 62 *((short int *) dst )++ = *((short int *) src );
59 ((char *) src ) += step; 63 ((char *) src ) += step;
60 } 64 }
@@ -69,6 +73,10 @@ static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t st
69 while ( len-- ) { 73 while ( len-- ) {
70 ((char *) src ) -= step; 74 ((char *) src ) -= step;
71 *((short int *) dst )++ = *((short int *) src ); 75 *((short int *) dst )++ = *((short int *) src );
76
77 // *((char *) dst ) = *((char *) src + 1);
78 // *((char *) dst + 1) = *((char *) src );
79 // ((char *) dst ) += 2;
72 } 80 }
73} 81}
74 82
@@ -101,7 +109,7 @@ void XineVideoWidget::clear ( )
101 109
102void XineVideoWidget::paintEvent ( QPaintEvent * ) 110void XineVideoWidget::paintEvent ( QPaintEvent * )
103{ 111{
104 qWarning( "painting" ); 112 qWarning( "painting <<<" );
105 if ( m_buff == 0 ) { 113 if ( m_buff == 0 ) {
106 QPainter p ( this ); 114 QPainter p ( this );
107 p. fillRect ( rect ( ), black ); 115 p. fillRect ( rect ( ), black );
@@ -109,13 +117,15 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
109 qWarning ( "logo\n" ); 117 qWarning ( "logo\n" );
110 } 118 }
111 else { 119 else {
112 qWarning ( "paintevent\n" ); 120 // qWarning ( "paintevent\n" );
113 121
114 QArray <QRect> qt_bug_workaround_clip_rects; 122 QArray <QRect> qt_bug_workaround_clip_rects;
115 123
116 { 124 {
117 QDirectPainter dp ( this ); 125 QDirectPainter dp ( this );
118 126
127 int rot = dp. transformOrientation ( );
128
119 uchar *fb = dp. frameBuffer ( ); 129 uchar *fb = dp. frameBuffer ( );
120 uchar *frame = m_buff; // rot == 0 ? m_buff : m_buff + ( m_thisframe. height ( ) - 1 ) * m_bytes_per_line_frame; 130 uchar *frame = m_buff; // rot == 0 ? m_buff : m_buff + ( m_thisframe. height ( ) - 1 ) * m_bytes_per_line_frame;
121 131
@@ -128,8 +138,6 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
128 138
129 qt_bug_workaround_clip_rects [i] = clip; 139 qt_bug_workaround_clip_rects [i] = clip;
130 140
131 int rot = dp. transformOrientation ( );
132
133 if ( rot == 0 || rot == 180 ) { 141 if ( rot == 0 || rot == 180 ) {
134 uchar *dst = fb + ( clip. x ( ) * m_bytes_per_pixel ) + ( clip. y ( ) * m_bytes_per_line_fb ); 142 uchar *dst = fb + ( clip. x ( ) * m_bytes_per_pixel ) + ( clip. y ( ) * m_bytes_per_line_fb );
135 uchar *src = frame + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame ); 143 uchar *src = frame + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame );
@@ -176,7 +184,7 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
176 uchar *src = frame + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame ); 184 uchar *src = frame + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame );
177 185
178 if ( rot == 270 ) 186 if ( rot == 270 )
179 src += (( framerect. height ( ) - 1 ) * m_bytes_per_line_frame ); 187 src += (( framerect. height ( ) - 1 ) * m_bytes_per_pixel );
180 188
181 uint leftfill = 0; 189 uint leftfill = 0;
182 uint framefill = 0; 190 uint framefill = 0;
@@ -200,16 +208,16 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
200 208
201 if ( framefill ) { 209 if ( framefill ) {
202 if ( rot == 90 ) 210 if ( rot == 90 )
203 memcpy_step ( dst + leftfill, src, framefill, m_bytes_per_line_frame );
204 else
205 memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); 211 memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame );
212 else
213 memcpy_step ( dst + leftfill, src, framefill, m_bytes_per_line_frame );
206 } 214 }
207 if ( rightfill ) 215 if ( rightfill )
208 memset ( dst + leftfill + framefill, 0, rightfill ); 216 memset ( dst + leftfill + framefill, 0, rightfill );
209 } 217 }
210 218
211 dst += m_bytes_per_line_fb; 219 dst += m_bytes_per_line_fb;
212 src += ( rot == 90 ? +1 : -1 ); // m_bytes_per_line_frame : -m_bytes_per_line_frame ); 220 src += ( rot == 270 ? -m_bytes_per_pixel : m_bytes_per_pixel );
213 } 221 }
214 } 222 }
215 } 223 }
@@ -223,6 +231,7 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
223 } 231 }
224 } 232 }
225 } 233 }
234 qWarning( "painting >>>" );
226} 235}
227 236
228int XineVideoWidget::height ( ) const 237int XineVideoWidget::height ( ) const