author | sandman <sandman> | 2002-08-01 21:18:11 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-08-01 21:18:11 (UTC) |
commit | 54eb82d90a4ee254c0abb6d33937e76aeb32ddf1 (patch) (unidiff) | |
tree | e9628916c721262232efc3314a8ccd29613a7189 /noncore | |
parent | c80b2060a6f051f16690db4b8f0ccbc7dde84ec5 (diff) | |
download | opie-54eb82d90a4ee254c0abb6d33937e76aeb32ddf1.zip opie-54eb82d90a4ee254c0abb6d33937e76aeb32ddf1.tar.gz opie-54eb82d90a4ee254c0abb6d33937e76aeb32ddf1.tar.bz2 |
video in qvfb works now with 0/90/180/270° rotation
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 25 |
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 | |||
@@ -182,26 +182,26 @@ void Lib::setScaling( bool scale ) { | |||
182 | bool Lib::isScaling() { | 182 | bool Lib::isScaling() { |
183 | return ::null_is_scaling( m_videoOutput ); | 183 | return ::null_is_scaling( m_videoOutput ); |
184 | } | 184 | } |
185 | void Lib::xine_event_handler( void* user_data, xine_event_t* t ) { | 185 | void Lib::xine_event_handler( void* user_data, xine_event_t* t ) { |
186 | ((Lib*)user_data)->handleXineEvent( t ); | 186 | ((Lib*)user_data)->handleXineEvent( t ); |
187 | } | 187 | } |
188 | void Lib::xine_display_frame( void* user_data, uint8_t *frame, | 188 | void 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 | } |
194 | void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { | 194 | void 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; |
203 | int yoffset = (size.height() - height) / 2; | 203 | int yoffset = (size.height() - height) / 2; |
204 | int linestep = qt_screen->linestep(); | 204 | int linestep = qt_screen->linestep(); |
205 | 205 | ||
206 | m_wid->setImage( frame, yoffset, xoffset, width, height, linestep, bytes, m_bytes_per_pixel ); | 206 | m_wid->setImage( frame, yoffset, xoffset, width, height, linestep, bytes, m_bytes_per_pixel ); |
207 | // m_wid->repaint(false); | 207 | // m_wid->repaint(false); |
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 | |||
@@ -9,16 +9,18 @@ | |||
9 | #include <xine/xine_internal.h> | 9 | #include <xine/xine_internal.h> |
10 | #include <xine/xineutils.h> | 10 | #include <xine/xineutils.h> |
11 | #include <xine/configfile.h> | 11 | #include <xine/configfile.h> |
12 | 12 | ||
13 | #include <pthread.h> | 13 | #include <pthread.h> |
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 */ |
18 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, | 20 | typedef 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 ); |
20 | 22 | ||
21 | typedef struct null_driver_s null_driver_t; | 23 | typedef struct null_driver_s null_driver_t; |
22 | 24 | ||
23 | struct null_driver_s { | 25 | struct null_driver_s { |
24 | vo_driver_t vo_driver; | 26 | vo_driver_t vo_driver; |
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 | |||
@@ -50,30 +50,38 @@ static inline void memcpy_rev ( void *dst, void *src, size_t len ) | |||
50 | while ( len-- ) | 50 | while ( len-- ) |
51 | *((short int *) dst )++ = *--((short int *) src ); | 51 | *((short int *) dst )++ = *--((short int *) src ); |
52 | } | 52 | } |
53 | 53 | ||
54 | static inline void memcpy_step ( void *dst, void *src, size_t len, size_t step ) | 54 | 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 | } |
61 | } | 65 | } |
62 | 66 | ||
63 | static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t step ) | 67 | static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t step ) |
64 | { | 68 | { |
65 | len >>= 1; | 69 | len >>= 1; |
66 | 70 | ||
67 | ((char *) src ) += ( len * step ); | 71 | ((char *) src ) += ( len * step ); |
68 | 72 | ||
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 | ||
75 | 83 | ||
76 | XineVideoWidget::XineVideoWidget( int width, | 84 | XineVideoWidget::XineVideoWidget( int width, |
77 | int height, | 85 | int height, |
78 | QWidget* parent, | 86 | QWidget* parent, |
79 | const char* name ) | 87 | const char* name ) |
@@ -96,45 +104,45 @@ XineVideoWidget::~XineVideoWidget ( ) | |||
96 | void XineVideoWidget::clear ( ) | 104 | void XineVideoWidget::clear ( ) |
97 | { | 105 | { |
98 | m_buff = 0; | 106 | m_buff = 0; |
99 | repaint ( false ); | 107 | repaint ( false ); |
100 | } | 108 | } |
101 | 109 | ||
102 | void XineVideoWidget::paintEvent ( QPaintEvent * ) | 110 | void 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 ); |
108 | p. drawImage ( 0, 0, *m_image ); | 116 | p. drawImage ( 0, 0, *m_image ); |
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 | ||
122 | QRect framerect = QRect ( mapToGlobal ( m_thisframe. topLeft ( )), m_thisframe. size ( )); | 132 | QRect framerect = QRect ( mapToGlobal ( m_thisframe. topLeft ( )), m_thisframe. size ( )); |
123 | 133 | ||
124 | qt_bug_workaround_clip_rects. resize ( dp. numRects ( )); | 134 | qt_bug_workaround_clip_rects. resize ( dp. numRects ( )); |
125 | 135 | ||
126 | for ( int i = dp. numRects ( ) - 1; i >= 0; i-- ) { | 136 | for ( int i = dp. numRects ( ) - 1; i >= 0; i-- ) { |
127 | const QRect &clip = dp. rect ( i ); | 137 | const QRect &clip = dp. rect ( i ); |
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 ); |
136 | 144 | ||
137 | if ( rot == 180 ) | 145 | if ( rot == 180 ) |
138 | src += (( framerect. height ( ) - 1 ) * m_bytes_per_line_frame ); | 146 | src += (( framerect. height ( ) - 1 ) * m_bytes_per_line_frame ); |
139 | 147 | ||
140 | uint leftfill = 0; | 148 | uint leftfill = 0; |
@@ -171,17 +179,17 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
171 | src += ( rot == 0 ? m_bytes_per_line_frame : -m_bytes_per_line_frame ); | 179 | src += ( rot == 0 ? m_bytes_per_line_frame : -m_bytes_per_line_frame ); |
172 | } | 180 | } |
173 | } | 181 | } |
174 | else { // rot == 90 || rot == 270 | 182 | else { // rot == 90 || rot == 270 |
175 | uchar *dst = fb + ( clip. y ( ) * m_bytes_per_pixel ) + ( clip. x ( ) * m_bytes_per_line_fb ); | 183 | uchar *dst = fb + ( clip. y ( ) * m_bytes_per_pixel ) + ( clip. x ( ) * m_bytes_per_line_fb ); |
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; |
183 | uint rightfill = 0; | 191 | uint rightfill = 0; |
184 | uint clipwidth = clip. height ( ) * m_bytes_per_pixel; | 192 | uint clipwidth = clip. height ( ) * m_bytes_per_pixel; |
185 | 193 | ||
186 | if ( clip. bottom ( ) > framerect. bottom ( )) | 194 | if ( clip. bottom ( ) > framerect. bottom ( )) |
187 | leftfill = (( clip. bottom ( ) - framerect. bottom ( )) * m_bytes_per_pixel ) <? clipwidth; | 195 | leftfill = (( clip. bottom ( ) - framerect. bottom ( )) * m_bytes_per_pixel ) <? clipwidth; |
@@ -195,39 +203,40 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
195 | memset ( dst, 0, clipwidth ); | 203 | memset ( dst, 0, clipwidth ); |
196 | } | 204 | } |
197 | else { | 205 | else { |
198 | if ( leftfill ) | 206 | if ( leftfill ) |
199 | memset ( dst, 0, leftfill ); | 207 | memset ( dst, 0, leftfill ); |
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 | } |
216 | } | 224 | } |
217 | { | 225 | { |
218 | // QVFB hack by MArtin Jones | 226 | // QVFB hack by MArtin Jones |
219 | QPainter p ( this ); | 227 | QPainter p ( this ); |
220 | 228 | ||
221 | for ( int i = qt_bug_workaround_clip_rects. size ( ) - 1; i >= 0; i-- ) { | 229 | for ( int i = qt_bug_workaround_clip_rects. size ( ) - 1; i >= 0; i-- ) { |
222 | p. fillRect ( QRect ( mapFromGlobal ( qt_bug_workaround_clip_rects [i]. topLeft ( )), qt_bug_workaround_clip_rects [i]. size ( )), QBrush ( NoBrush ) ); | 230 | p. fillRect ( QRect ( mapFromGlobal ( qt_bug_workaround_clip_rects [i]. topLeft ( )), qt_bug_workaround_clip_rects [i]. size ( )), QBrush ( NoBrush ) ); |
223 | } | 231 | } |
224 | } | 232 | } |
225 | } | 233 | } |
234 | qWarning( "painting >>>" ); | ||
226 | } | 235 | } |
227 | 236 | ||
228 | int XineVideoWidget::height ( ) const | 237 | int XineVideoWidget::height ( ) const |
229 | { | 238 | { |
230 | return m_image-> height ( ); | 239 | return m_image-> height ( ); |
231 | } | 240 | } |
232 | 241 | ||
233 | int XineVideoWidget::width ( ) const | 242 | int XineVideoWidget::width ( ) const |