author | harlekin <harlekin> | 2002-09-24 20:26:17 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-09-24 20:26:17 (UTC) |
commit | 7a04855af4e042152a47e90192dc4c2c20858e8c (patch) (unidiff) | |
tree | cca4567d71b8210dc8905804cebc203b71fc4958 | |
parent | 02074fb65c5e879ef1d28e52cf4e1ec4a6727599 (diff) | |
download | opie-7a04855af4e042152a47e90192dc4c2c20858e8c.zip opie-7a04855af4e042152a47e90192dc4c2c20858e8c.tar.gz opie-7a04855af4e042152a47e90192dc4c2c20858e8c.tar.bz2 |
adapted to the new api
-rw-r--r-- | noncore/multimedia/opieplayer2/alphablend.c | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 133 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.h | 28 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 391 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/opieplayer2.pro | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidgetgui.cpp | 3 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 5 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 35 |
10 files changed, 280 insertions, 322 deletions
diff --git a/noncore/multimedia/opieplayer2/alphablend.c b/noncore/multimedia/opieplayer2/alphablend.c index 57f6013..cdd7b28 100644 --- a/noncore/multimedia/opieplayer2/alphablend.c +++ b/noncore/multimedia/opieplayer2/alphablend.c | |||
@@ -38,4 +38,6 @@ | |||
38 | #include <inttypes.h> | 38 | #include <inttypes.h> |
39 | 39 | ||
40 | #include <xine.h> | ||
41 | #include <xine/xine_internal.h> | ||
40 | #include <xine/video_out.h> | 42 | #include <xine/video_out.h> |
41 | #include "alphablend.h" | 43 | #include "alphablend.h" |
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 45f301e..620c71f 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -333,5 +333,5 @@ void AudioWidget::setView( char view ) { | |||
333 | hide(); | 333 | hide(); |
334 | } | 334 | } |
335 | qApp->processEvents(); | 335 | // qApp->processEvents(); |
336 | } | 336 | } |
337 | 337 | ||
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 | |||
@@ -51,16 +51,16 @@ typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, | |||
51 | 51 | ||
52 | extern "C" { | 52 | extern "C" { |
53 | vo_driver_t* init_video_out_plugin( config_values_t* conf, void* video); | 53 | xine_vo_driver_t* init_video_out_plugin( xine_cfg_entry_t* conf, void* video); |
54 | int null_is_showing_video( vo_driver_t* self ); | 54 | int null_is_showing_video( const xine_vo_driver_t* self ); |
55 | void null_set_show_video( vo_driver_t* self, int show ); | 55 | void null_set_show_video( const xine_vo_driver_t* self, int show ); |
56 | int null_is_fullscreen( vo_driver_t* self ); | 56 | int null_is_fullscreen( const xine_vo_driver_t* self ); |
57 | void null_set_fullscreen( vo_driver_t* self, int screen ); | 57 | void null_set_fullscreen( const xine_vo_driver_t* self, int screen ); |
58 | int null_is_scaling( vo_driver_t* self ); | 58 | int null_is_scaling( const xine_vo_driver_t* self ); |
59 | void null_set_scaling( vo_driver_t* self, int scale ); | 59 | void null_set_scaling( const xine_vo_driver_t* self, int scale ); |
60 | void null_set_gui_width( vo_driver_t* self, int width ); | 60 | void null_set_gui_width( const xine_vo_driver_t* self, int width ); |
61 | void null_set_gui_height( vo_driver_t* self, int height ); | 61 | void null_set_gui_height( const xine_vo_driver_t* self, int height ); |
62 | void null_set_mode( vo_driver_t* self, int depth, int rgb ); | 62 | void null_set_mode( const xine_vo_driver_t* self, int depth, int rgb ); |
63 | void null_set_videoGamma( vo_driver_t* self , int value ); | 63 | void null_set_videoGamma( const xine_vo_driver_t* self , int value ); |
64 | void null_display_handler(vo_driver_t* self, display_xine_frame_t t, void* user_data); | 64 | void null_display_handler( const xine_vo_driver_t* self, display_xine_frame_t t, void* user_data ); |
65 | } | 65 | } |
66 | 66 | ||
@@ -84,29 +84,34 @@ Lib::Lib(XineVideoWidget* widget) { | |||
84 | } | 84 | } |
85 | 85 | ||
86 | m_config = xine_config_file_init( str.data() ); | 86 | m_xine = xine_new( ); |
87 | |||
88 | xine_config_load( m_xine, str.data() ); | ||
89 | |||
87 | 90 | ||
88 | // allocate oss for sound | 91 | // allocate oss for sound |
89 | // and fb for framebuffer | 92 | // and fb for framebuffer |
90 | m_audioOutput= xine_load_audio_output_plugin( m_config, "oss") ; | 93 | m_audioOutput = xine_open_audio_driver( m_xine, "oss", NULL ); |
91 | m_videoOutput = ::init_video_out_plugin( m_config, NULL ); | 94 | m_videoOutput = ::init_video_out_plugin( m_config, NULL ); |
95 | |||
96 | |||
97 | //xine_open_video_driver( m_xine, NULL, XINE_VISUAL_TYPE_FB, NULL); | ||
98 | |||
99 | |||
100 | null_display_handler( m_videoOutput, xine_display_frame, this ); | ||
101 | xine_init( m_xine, m_audioOutput, m_videoOutput ); | ||
102 | |||
92 | if (m_wid != 0 ) { | 103 | if (m_wid != 0 ) { |
93 | printf("!0\n" ); | 104 | printf("!0\n" ); |
94 | resize ( m_wid-> size ( )); | 105 | resize ( m_wid-> size ( )); |
95 | ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() ); | 106 | ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() ); |
96 | m_wid-> setLogo ( new QImage ( Resource::loadImage(""))); | 107 | |
97 | m_wid->repaint(); | 108 | m_wid->repaint(); |
98 | } | 109 | } |
99 | null_display_handler( m_videoOutput, | ||
100 | xine_display_frame, | ||
101 | this ); | ||
102 | 110 | ||
103 | m_xine = xine_init( m_videoOutput, | ||
104 | m_audioOutput, m_config ); | ||
105 | // install the event handler | ||
106 | xine_register_event_listener( m_xine, xine_event_handler, this ); | 111 | xine_register_event_listener( m_xine, xine_event_handler, this ); |
107 | } | 112 | } |
108 | 113 | ||
109 | Lib::~Lib() { | 114 | Lib::~Lib() { |
110 | free( m_config ); | 115 | // free( m_config ); |
111 | xine_remove_event_listener( m_xine, xine_event_handler ); | 116 | xine_remove_event_listener( m_xine, xine_event_handler ); |
112 | xine_exit( m_xine ); | 117 | xine_exit( m_xine ); |
@@ -114,9 +119,7 @@ Lib::~Lib() { | |||
114 | //free( m_videoOutput ); | 119 | //free( m_videoOutput ); |
115 | //delete m_audioOutput; | 120 | //delete m_audioOutput; |
116 | |||
117 | } | 121 | } |
118 | 122 | ||
119 | void Lib::resize ( const QSize &s ) | 123 | void Lib::resize ( const QSize &s ) { |
120 | { | ||
121 | if ( s. width ( ) && s. height ( )) { | 124 | if ( s. width ( ) && s. height ( )) { |
122 | ::null_set_gui_width( m_videoOutput, s. width() ); | 125 | ::null_set_gui_width( m_videoOutput, s. width() ); |
@@ -126,80 +129,107 @@ void Lib::resize ( const QSize &s ) | |||
126 | 129 | ||
127 | QCString Lib::version() { | 130 | QCString Lib::version() { |
128 | QCString str( xine_get_str_version() ); | 131 | // QCString str( xine_get_str_version() ); |
129 | return str; | 132 | // return str; |
130 | }; | 133 | return "test"; |
134 | } | ||
131 | 135 | ||
132 | int Lib::majorVersion() { | 136 | int Lib::majorVersion() { |
133 | return xine_get_major_version(); | 137 | xine_get_version ( &m_major_version, &m_minor_version, &m_sub_version ); |
138 | return m_major_version; | ||
134 | } | 139 | } |
140 | |||
135 | int Lib::minorVersion() { | 141 | int Lib::minorVersion() { |
136 | return xine_get_minor_version(); | 142 | xine_get_version ( &m_major_version, &m_minor_version, &m_sub_version ); |
137 | }; | 143 | return m_minor_version; |
144 | } | ||
138 | 145 | ||
139 | int Lib::subVersion() { | 146 | int Lib::subVersion() { |
140 | return xine_get_sub_version(); | 147 | xine_get_version ( &m_major_version, &m_minor_version, &m_sub_version ); |
148 | return m_sub_version; | ||
141 | } | 149 | } |
142 | int Lib::play( const QString& fileName, | 150 | |
143 | int startPos, | 151 | int Lib::play( const QString& fileName, int startPos, int start_time ) { |
144 | int start_time ) { | ||
145 | QString str = fileName.stripWhiteSpace(); | 152 | QString str = fileName.stripWhiteSpace(); |
146 | //workaround OpiePlayer bug | 153 | xine_open( m_xine, QFile::encodeName(str.utf8() ).data() ); |
147 | //f (str.right(1) == QString::fromLatin1("/") ) | 154 | return xine_play( m_xine, startPos, start_time); |
148 | // str = str.mid( str.length() -1 ); | ||
149 | return xine_play( m_xine, QFile::encodeName(str.utf8() ).data(), | ||
150 | startPos, start_time); | ||
151 | } | 155 | } |
156 | |||
152 | void Lib::stop() { | 157 | void Lib::stop() { |
153 | qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>"); | 158 | qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>"); |
154 | xine_stop(m_xine ); | 159 | xine_stop(m_xine ); |
155 | } | 160 | } |
161 | |||
156 | void Lib::pause(){ | 162 | void Lib::pause(){ |
157 | xine_set_speed( m_xine, SPEED_PAUSE ); | 163 | xine_set_param( m_xine, XINE_PARAM_SPEED, XINE_SPEED_PAUSE ); |
158 | } | 164 | } |
165 | |||
159 | int Lib::speed() { | 166 | int Lib::speed() { |
160 | return xine_get_speed( m_xine ); | 167 | return xine_get_param ( m_xine, XINE_PARAM_SPEED ); |
161 | } | 168 | } |
169 | |||
162 | void Lib::setSpeed( int speed ) { | 170 | void Lib::setSpeed( int speed ) { |
163 | xine_set_speed( m_xine, speed ); | 171 | xine_set_param ( m_xine, XINE_PARAM_SPEED, speed ); |
164 | } | 172 | } |
173 | |||
165 | int Lib::status(){ | 174 | int Lib::status(){ |
166 | return xine_get_status( m_xine ); | 175 | return xine_get_status( m_xine ); |
167 | } | 176 | } |
177 | |||
168 | int Lib::currentPosition(){ | 178 | int Lib::currentPosition(){ |
169 | return xine_get_current_position( m_xine ); | 179 | xine_get_pos_length( m_xine, &m_pos, &m_time, &m_length ); |
180 | return m_pos; | ||
170 | } | 181 | } |
182 | |||
171 | int Lib::currentTime() { | 183 | int Lib::currentTime() { |
172 | return xine_get_current_time( m_xine ); | 184 | xine_get_pos_length( m_xine, &m_pos, &m_time, &m_length ); |
173 | }; | 185 | return m_time/1000; |
186 | } | ||
187 | |||
174 | int Lib::length() { | 188 | int Lib::length() { |
175 | return xine_get_stream_length( m_xine ); | 189 | xine_get_pos_length( m_xine, &m_pos, &m_time, &m_length ); |
190 | return m_length/1000; | ||
176 | } | 191 | } |
192 | |||
177 | bool Lib::isSeekable() { | 193 | bool Lib::isSeekable() { |
178 | return xine_is_stream_seekable(m_xine); | 194 | return xine_get_stream_info ( m_xine, XINE_STREAM_INFO_SEEKABLE ); |
179 | } | 195 | } |
196 | |||
180 | Frame Lib::currentFrame() { | 197 | Frame Lib::currentFrame() { |
181 | Frame frame; | 198 | Frame frame; |
182 | return frame; | 199 | return frame; |
183 | }; | 200 | }; |
201 | |||
202 | QString Lib::metaInfo() { | ||
203 | xine_get_meta_info( m_xine, 0 ); | ||
204 | } | ||
205 | |||
184 | int Lib::error() { | 206 | int Lib::error() { |
185 | return xine_get_error( m_xine ); | 207 | return xine_get_error( m_xine ); |
186 | }; | 208 | }; |
209 | |||
187 | void Lib::handleXineEvent( xine_event_t* t ) { | 210 | void Lib::handleXineEvent( xine_event_t* t ) { |
188 | if ( t->type == XINE_EVENT_PLAYBACK_FINISHED ) | 211 | if ( t->type == XINE_EVENT_PLAYBACK_FINISHED ) { |
189 | emit stopped(); | 212 | emit stopped(); |
190 | } | 213 | } |
214 | } | ||
215 | |||
216 | |||
191 | void Lib::setShowVideo( bool video ) { | 217 | void Lib::setShowVideo( bool video ) { |
192 | m_video = video; | 218 | m_video = video; |
193 | ::null_set_show_video( m_videoOutput, video ); | 219 | ::null_set_show_video( m_videoOutput, video ); |
194 | } | 220 | } |
221 | |||
195 | bool Lib::isShowingVideo() { | 222 | bool Lib::isShowingVideo() { |
196 | return ::null_is_showing_video( m_videoOutput ); | 223 | return ::null_is_showing_video( m_videoOutput ); |
197 | } | 224 | } |
225 | |||
198 | void Lib::showVideoFullScreen( bool fullScreen ) { | 226 | void Lib::showVideoFullScreen( bool fullScreen ) { |
199 | ::null_set_fullscreen( m_videoOutput, fullScreen ); | 227 | ::null_set_fullscreen( m_videoOutput, fullScreen ); |
200 | } | 228 | } |
229 | |||
201 | bool Lib::isVideoFullScreen() { | 230 | bool Lib::isVideoFullScreen() { |
202 | return ::null_is_fullscreen( m_videoOutput ); | 231 | return ::null_is_fullscreen( m_videoOutput ); |
203 | } | 232 | } |
233 | |||
204 | void Lib::setScaling( bool scale ) { | 234 | void Lib::setScaling( bool scale ) { |
205 | ::null_set_scaling( m_videoOutput, scale ); | 235 | ::null_set_scaling( m_videoOutput, scale ); |
@@ -214,12 +244,14 @@ bool Lib::isScaling() { | |||
214 | return ::null_is_scaling( m_videoOutput ); | 244 | return ::null_is_scaling( m_videoOutput ); |
215 | } | 245 | } |
246 | |||
216 | void Lib::xine_event_handler( void* user_data, xine_event_t* t ) { | 247 | void Lib::xine_event_handler( void* user_data, xine_event_t* t ) { |
217 | ((Lib*)user_data)->handleXineEvent( t ); | 248 | ((Lib*)user_data)->handleXineEvent( t ); |
218 | } | 249 | } |
250 | |||
219 | void Lib::xine_display_frame( void* user_data, uint8_t *frame, | 251 | void Lib::xine_display_frame( void* user_data, uint8_t *frame, |
220 | int width, int height, int bytes ) { | 252 | int width, int height, int bytes ) { |
221 | |||
222 | ((Lib*)user_data)->drawFrame( frame, width, height, bytes ); | 253 | ((Lib*)user_data)->drawFrame( frame, width, height, bytes ); |
223 | } | 254 | } |
255 | |||
224 | void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { | 256 | void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { |
225 | if (!m_video ) { | 257 | if (!m_video ) { |
@@ -227,4 +259,5 @@ void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { | |||
227 | return; | 259 | return; |
228 | } | 260 | } |
261 | |||
229 | // qWarning( "called draw frame %d %d", width, height ); | 262 | // qWarning( "called draw frame %d %d", width, height ); |
230 | 263 | ||
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 | |||
@@ -40,4 +40,5 @@ | |||
40 | 40 | ||
41 | #include <xine.h> | 41 | #include <xine.h> |
42 | //#include "xine.h" | ||
42 | 43 | ||
43 | class XineVideoWidget; | 44 | class XineVideoWidget; |
@@ -73,5 +74,15 @@ namespace XINE { | |||
73 | 74 | ||
74 | int speed() /*const*/; | 75 | int speed() /*const*/; |
75 | void setSpeed( int speed = SPEED_PAUSE ); | 76 | |
77 | /** | ||
78 | * Set the speed of the stream, if codec supports it | ||
79 | * XINE_SPEED_PAUSE 0 | ||
80 | * XINE_SPEED_SLOW_4 1 | ||
81 | * XINE_SPEED_SLOW_2 2 | ||
82 | * XINE_SPEED_NORMAL 4 | ||
83 | * XINE_SPEED_FAST_2 8 | ||
84 | *XINE_SPEED_FAST_4 16 | ||
85 | */ | ||
86 | void setSpeed( int speed = XINE_SPEED_PAUSE ); | ||
76 | 87 | ||
77 | int status() /*const*/; | 88 | int status() /*const*/; |
@@ -104,4 +115,11 @@ namespace XINE { | |||
104 | bool isVideoFullScreen()/*const*/ ; | 115 | bool isVideoFullScreen()/*const*/ ; |
105 | 116 | ||
117 | |||
118 | /** | ||
119 | * Get the meta info (like author etc) from the stream | ||
120 | * | ||
121 | */ | ||
122 | QString metaInfo() ; | ||
123 | |||
106 | /** | 124 | /** |
107 | * | 125 | * |
@@ -134,10 +152,12 @@ namespace XINE { | |||
134 | private: | 152 | private: |
135 | int m_bytes_per_pixel; | 153 | int m_bytes_per_pixel; |
154 | int m_length, m_pos, m_time; | ||
155 | int m_major_version, m_minor_version, m_sub_version; | ||
136 | bool m_video:1; | 156 | bool m_video:1; |
137 | XineVideoWidget *m_wid; | 157 | XineVideoWidget *m_wid; |
138 | xine_t *m_xine; | 158 | xine_t *m_xine; |
139 | config_values_t *m_config; | 159 | xine_cfg_entry_t *m_config; |
140 | vo_driver_t *m_videoOutput; | 160 | xine_vo_driver_t *m_videoOutput; |
141 | ao_driver_t* m_audioOutput; | 161 | xine_ao_driver_t* m_audioOutput; |
142 | 162 | ||
143 | void handleXineEvent( xine_event_t* t ); | 163 | void handleXineEvent( xine_event_t* t ); |
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 | |||
@@ -3,5 +3,5 @@ | |||
3 | 3 | ||
4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> | 4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> |
5 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> | 5 | Copyright (c) 2002 LJP <> |
6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | 6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> |
7 | =. | 7 | =. |
@@ -20,9 +20,9 @@ | |||
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
@@ -32,5 +32,4 @@ | |||
32 | */ | 32 | */ |
33 | 33 | ||
34 | /*#include <xine.h>*/ | ||
35 | #include <stdlib.h> | 34 | #include <stdlib.h> |
36 | #include <stdio.h> | 35 | #include <stdio.h> |
@@ -38,8 +37,9 @@ | |||
38 | #include <math.h> | 37 | #include <math.h> |
39 | 38 | ||
39 | #include <xine.h> | ||
40 | #include <xine/video_out.h> | 40 | #include <xine/video_out.h> |
41 | #include <xine/xine_internal.h> | 41 | #include <xine/xine_internal.h> |
42 | #include <xine/xineutils.h> | 42 | #include <xine/xineutils.h> |
43 | #include <xine/configfile.h> | 43 | #include <xine/vo_scale.h> |
44 | 44 | ||
45 | #include <pthread.h> | 45 | #include <pthread.h> |
@@ -49,4 +49,8 @@ | |||
49 | #define printf(x,...) | 49 | #define printf(x,...) |
50 | 50 | ||
51 | /* | ||
52 | #define LOG | ||
53 | */ | ||
54 | |||
51 | /* the caller for our event draw handler */ | 55 | /* the caller for our event draw handler */ |
52 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, | 56 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, |
@@ -56,9 +60,11 @@ typedef struct null_driver_s null_driver_t; | |||
56 | 60 | ||
57 | struct null_driver_s { | 61 | struct null_driver_s { |
58 | vo_driver_t vo_driver; | 62 | xine_vo_driver_t vo_driver; |
63 | |||
59 | uint32_t m_capabilities; | 64 | uint32_t m_capabilities; |
60 | int m_show_video; | 65 | int m_show_video; |
61 | int m_video_fullscreen; | 66 | int m_video_fullscreen; |
62 | int m_is_scaling; | 67 | int m_is_scaling; |
68 | |||
63 | int depth, bpp, bytes_per_pixel; | 69 | int depth, bpp, bytes_per_pixel; |
64 | int yuv2rgb_mode; | 70 | int yuv2rgb_mode; |
@@ -67,37 +73,31 @@ struct null_driver_s { | |||
67 | uint8_t *yuv2rgb_cmap; | 73 | uint8_t *yuv2rgb_cmap; |
68 | yuv2rgb_factory_t *yuv2rgb_factory; | 74 | yuv2rgb_factory_t *yuv2rgb_factory; |
75 | |||
69 | vo_overlay_t *overlay; | 76 | vo_overlay_t *overlay; |
70 | int user_ratio; | 77 | vo_scale_t sc; |
71 | double output_scale_factor; | 78 | |
72 | int last_frame_output_width; | ||
73 | int last_frame_output_height; | ||
74 | int gui_width; | 79 | int gui_width; |
75 | int gui_height; | 80 | int gui_height; |
76 | int gui_changed; | 81 | int gui_changed; |
82 | |||
77 | double display_ratio; | 83 | double display_ratio; |
78 | void* caller; | 84 | void* caller; |
79 | display_xine_frame_t frameDis; | 85 | display_xine_frame_t frameDis; |
80 | |||
81 | |||
82 | }; | 86 | }; |
87 | |||
83 | typedef struct opie_frame_s opie_frame_t; | 88 | typedef struct opie_frame_s opie_frame_t; |
84 | struct opie_frame_s { | 89 | struct opie_frame_s { |
85 | vo_frame_t frame; | 90 | vo_frame_t frame; |
86 | char* name; | 91 | |
87 | int version; | ||
88 | int width; | ||
89 | int height; | ||
90 | int ratio_code; | ||
91 | int format; | 92 | int format; |
92 | int flags; | 93 | int flags; |
93 | int user_ratio; | ||
94 | 94 | ||
95 | double ratio_factor; | 95 | vo_scale_t sc; |
96 | int ideal_width; | 96 | |
97 | int ideal_height; | ||
98 | int output_width, output_height; | ||
99 | int gui_width, gui_height; | ||
100 | uint8_t *chunk[3]; | 97 | uint8_t *chunk[3]; |
101 | 98 | ||
99 | uint8_t *data; /* rgb */ | ||
100 | int bytes_per_line; | ||
101 | |||
102 | yuv2rgb_t *yuv2rgb; | 102 | yuv2rgb_t *yuv2rgb; |
103 | uint8_t *rgb_dst; | 103 | uint8_t *rgb_dst; |
@@ -105,14 +105,9 @@ struct opie_frame_s { | |||
105 | int stripe_height, stripe_inc; | 105 | int stripe_height, stripe_inc; |
106 | 106 | ||
107 | int bytes_per_line; | ||
108 | uint8_t *data; | ||
109 | |||
110 | // int show_video; | ||
111 | null_driver_t *output; | 107 | null_driver_t *output; |
112 | }; | 108 | }; |
113 | 109 | ||
114 | static uint32_t null_get_capabilities(vo_driver_t *self ){ | 110 | static uint32_t null_get_capabilities( xine_vo_driver_t *self ){ |
115 | null_driver_t* this = (null_driver_t*)self; | 111 | null_driver_t* this = (null_driver_t*)self; |
116 | printf("capabilities\n"); | ||
117 | return this->m_capabilities; | 112 | return this->m_capabilities; |
118 | } | 113 | } |
@@ -120,8 +115,11 @@ static uint32_t null_get_capabilities(vo_driver_t *self ){ | |||
120 | static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) { | 115 | static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) { |
121 | opie_frame_t *frame = (opie_frame_t *) vo_img ; | 116 | opie_frame_t *frame = (opie_frame_t *) vo_img ; |
122 | printf("frame copy\n"); | ||
123 | if(!frame->output->m_show_video ){ printf("no video\n"); return; } // no video | ||
124 | 117 | ||
125 | if (frame->format == IMGFMT_YV12) { | 118 | if (!frame->output->m_show_video) { |
119 | /* printf("nullvideo: no video\n"); */ | ||
120 | return; | ||
121 | } | ||
122 | |||
123 | if (frame->format == XINE_IMGFMT_YV12) { | ||
126 | frame->yuv2rgb->yuv2rgb_fun (frame->yuv2rgb, frame->rgb_dst, | 124 | frame->yuv2rgb->yuv2rgb_fun (frame->yuv2rgb, frame->rgb_dst, |
127 | src[0], src[1], src[2]); | 125 | src[0], src[1], src[2]); |
@@ -133,5 +131,4 @@ static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) { | |||
133 | 131 | ||
134 | frame->rgb_dst += frame->stripe_inc; | 132 | frame->rgb_dst += frame->stripe_inc; |
135 | printf("returning\n"); | ||
136 | } | 133 | } |
137 | 134 | ||
@@ -139,5 +136,4 @@ static void null_frame_field (vo_frame_t *vo_img, int which_field) { | |||
139 | 136 | ||
140 | opie_frame_t *frame = (opie_frame_t *) vo_img ; | 137 | opie_frame_t *frame = (opie_frame_t *) vo_img ; |
141 | printf("field\n\n"); | ||
142 | 138 | ||
143 | switch (which_field) { | 139 | switch (which_field) { |
@@ -160,5 +156,5 @@ static void null_frame_field (vo_frame_t *vo_img, int which_field) { | |||
160 | static void null_frame_dispose( vo_frame_t* vo_img){ | 156 | static void null_frame_dispose( vo_frame_t* vo_img){ |
161 | opie_frame_t* frame = (opie_frame_t*)vo_img; | 157 | opie_frame_t* frame = (opie_frame_t*)vo_img; |
162 | printf("frame_dispose\n"); | 158 | |
163 | if( frame->data ) | 159 | if( frame->data ) |
164 | free( frame->data ); | 160 | free( frame->data ); |
@@ -168,24 +164,28 @@ static void null_frame_dispose( vo_frame_t* vo_img){ | |||
168 | /* end take care of frames*/ | 164 | /* end take care of frames*/ |
169 | 165 | ||
170 | static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ | 166 | static vo_frame_t* null_alloc_frame( xine_vo_driver_t* self ){ |
167 | |||
171 | null_driver_t* this = (null_driver_t*)self; | 168 | null_driver_t* this = (null_driver_t*)self; |
172 | opie_frame_t* frame; | 169 | opie_frame_t* frame; |
170 | |||
171 | #ifdef LOG | ||
172 | fprintf (stderr, "nullvideo: alloc_frame\n"); | ||
173 | #endif | ||
174 | |||
173 | frame = (opie_frame_t*)malloc ( sizeof(opie_frame_t) ); | 175 | frame = (opie_frame_t*)malloc ( sizeof(opie_frame_t) ); |
174 | 176 | ||
175 | memset( frame, 0, sizeof( opie_frame_t) ); | 177 | memset( frame, 0, sizeof( opie_frame_t) ); |
178 | memcpy (&frame->sc, &this->sc, sizeof(vo_scale_t)); | ||
179 | |||
176 | pthread_mutex_init (&frame->frame.mutex, NULL); | 180 | pthread_mutex_init (&frame->frame.mutex, NULL); |
177 | 181 | ||
178 | printf("alloc_frame\n"); | ||
179 | frame->name = "opie\0"; | ||
180 | frame->version = 1; | ||
181 | frame->output = this; | 182 | frame->output = this; |
182 | // frame->show_video = this->m_show_video; | 183 | |
183 | /* initialize the frame*/ | 184 | /* initialize the frame*/ |
184 | frame->frame.driver = self; | 185 | frame->frame.driver = self; |
185 | /*frame.frame.free = null_frame_free;*/ | ||
186 | frame->frame.copy = null_frame_copy; | 186 | frame->frame.copy = null_frame_copy; |
187 | frame->frame.field = null_frame_field; | 187 | frame->frame.field = null_frame_field; |
188 | frame->frame.dispose = null_frame_dispose; | 188 | frame->frame.dispose = null_frame_dispose; |
189 | frame->yuv2rgb = 0; | 189 | |
190 | /* | 190 | /* |
191 | * colorspace converter for this frame | 191 | * colorspace converter for this frame |
@@ -193,121 +193,8 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){ | |||
193 | frame->yuv2rgb = this->yuv2rgb_factory->create_converter (this->yuv2rgb_factory); | 193 | frame->yuv2rgb = this->yuv2rgb_factory->create_converter (this->yuv2rgb_factory); |
194 | 194 | ||
195 | |||
196 | return (vo_frame_t*) frame; | 195 | return (vo_frame_t*) frame; |
197 | } | 196 | } |
198 | 197 | ||
199 | // size specific | 198 | static void null_update_frame_format( xine_vo_driver_t* self, vo_frame_t* img, |
200 | static void null_compute_ideal_size (null_driver_t *this, opie_frame_t *frame) { | ||
201 | |||
202 | if (!this->m_is_scaling /*|| !this->m_show_video*/) { | ||
203 | printf("Not scaling\n"); | ||
204 | frame->ideal_width = frame->width; | ||
205 | frame->ideal_height = frame->height; | ||
206 | frame->ratio_factor = 1.0; | ||
207 | |||
208 | } else { | ||
209 | |||
210 | double image_ratio, desired_ratio, corr_factor; | ||
211 | |||
212 | image_ratio = (double) frame->width / (double) frame->height; | ||
213 | |||
214 | switch (frame->user_ratio) { | ||
215 | case ASPECT_AUTO: | ||
216 | switch (frame->ratio_code) { | ||
217 | case XINE_ASPECT_RATIO_ANAMORPHIC: /* anamorphic */ | ||
218 | case XINE_ASPECT_RATIO_PAN_SCAN: | ||
219 | desired_ratio = 16.0 /9.0; | ||
220 | break; | ||
221 | case XINE_ASPECT_RATIO_211_1: /* 2.11:1 */ | ||
222 | desired_ratio = 2.11/1.0; | ||
223 | break; | ||
224 | case XINE_ASPECT_RATIO_SQUARE: /* square pels */ | ||
225 | case XINE_ASPECT_RATIO_DONT_TOUCH: /* probably non-mpeg stream => don't touch aspect ratio */ | ||
226 | desired_ratio = image_ratio; | ||
227 | break; | ||
228 | case 0: /* forbidden -> 4:3 */ | ||
229 | printf ("video_out_fb: invalid ratio, using 4:3\n"); | ||
230 | default: | ||
231 | printf ("video_out_fb: unknown aspect ratio (%d) in stream => using 4:3\n", | ||
232 | frame->ratio_code); | ||
233 | case XINE_ASPECT_RATIO_4_3: /* 4:3 */ | ||
234 | desired_ratio = 4.0 / 3.0; | ||
235 | break; | ||
236 | } | ||
237 | break; | ||
238 | case ASPECT_ANAMORPHIC: | ||
239 | desired_ratio = 16.0 / 9.0; | ||
240 | break; | ||
241 | case ASPECT_DVB: | ||
242 | desired_ratio = 2.0 / 1.0; | ||
243 | break; | ||
244 | case ASPECT_SQUARE: | ||
245 | desired_ratio = image_ratio; | ||
246 | break; | ||
247 | case ASPECT_FULL: | ||
248 | default: | ||
249 | desired_ratio = 4.0 / 3.0; | ||
250 | } | ||
251 | |||
252 | frame->ratio_factor = this->display_ratio * desired_ratio; | ||
253 | |||
254 | corr_factor = frame->ratio_factor / image_ratio ; | ||
255 | |||
256 | if (fabs(corr_factor - 1.0) < 0.005) { | ||
257 | frame->ideal_width = frame->width; | ||
258 | frame->ideal_height = frame->height; | ||
259 | |||
260 | } else { | ||
261 | |||
262 | if (corr_factor >= 1.0) { | ||
263 | frame->ideal_width = frame->width * corr_factor + 0.5; | ||
264 | frame->ideal_height = frame->height; | ||
265 | } else { | ||
266 | frame->ideal_width = frame->width; | ||
267 | frame->ideal_height = frame->height / corr_factor + 0.5; | ||
268 | } | ||
269 | |||
270 | } | ||
271 | } | ||
272 | printf("return from helper\n"); | ||
273 | } | ||
274 | |||
275 | static void null_compute_rgb_size (null_driver_t *this, opie_frame_t *frame) { | ||
276 | |||
277 | double x_factor, y_factor; | ||
278 | |||
279 | /* | ||
280 | * make the frame fit into the given destination area | ||
281 | */ | ||
282 | |||
283 | x_factor = (double) this->gui_width / (double) frame->ideal_width; | ||
284 | y_factor = (double) this->gui_height / (double) frame->ideal_height; | ||
285 | |||
286 | if ( x_factor < y_factor ) { | ||
287 | frame->output_width = (double) frame->ideal_width * x_factor ; | ||
288 | frame->output_height = (double) frame->ideal_height * x_factor ; | ||
289 | } else { | ||
290 | frame->output_width = (double) frame->ideal_width * y_factor ; | ||
291 | frame->output_height = (double) frame->ideal_height * y_factor ; | ||
292 | } | ||
293 | |||
294 | #define LOG 1 | ||
295 | #ifdef LOG | ||
296 | printf("video_out_fb: frame source %d x %d => screen output %d x %d%s\n", | ||
297 | frame->width, frame->height, | ||
298 | frame->output_width, frame->output_height, | ||
299 | ( frame->width != frame->output_width | ||
300 | || frame->height != frame->output_height | ||
301 | ? ", software scaling" | ||
302 | : "" ) | ||
303 | ); | ||
304 | #endif | ||
305 | } | ||
306 | |||
307 | |||
308 | // size specific | ||
309 | |||
310 | |||
311 | static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, | ||
312 | uint32_t width, uint32_t height, | 199 | uint32_t width, uint32_t height, |
313 | int ratio_code, int format, int flags ){ | 200 | int ratio_code, int format, int flags ){ |
@@ -315,6 +202,8 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, | |||
315 | opie_frame_t* frame = (opie_frame_t*)img; | 202 | opie_frame_t* frame = (opie_frame_t*)img; |
316 | /* not needed now */ | 203 | /* not needed now */ |
317 | printf("update_frame_format\n"); | 204 | |
318 | printf("al crash aye?\n"); | 205 | #ifdef LOG |
206 | fprintf (stderr, "nullvideo: update_frame_format\n"); | ||
207 | #endif | ||
319 | 208 | ||
320 | flags &= VO_BOTH_FIELDS; | 209 | flags &= VO_BOTH_FIELDS; |
@@ -322,26 +211,32 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, | |||
322 | /* find out if we need to adapt this frame */ | 211 | /* find out if we need to adapt this frame */ |
323 | 212 | ||
324 | if ((width != frame->width) | 213 | if ((width != frame->sc.delivered_width) |
325 | || (height != frame->height) | 214 | || (height != frame->sc.delivered_height) |
326 | || (ratio_code != frame->ratio_code) | 215 | || (ratio_code != frame->sc.delivered_ratio_code) |
327 | || (flags != frame->flags) | 216 | || (flags != frame->flags) |
328 | || (format != frame->format) | 217 | || (format != frame->format) |
329 | || (this->user_ratio != frame->user_ratio) | 218 | || (this->sc.user_ratio != frame->sc.user_ratio) |
330 | || (this->gui_width != frame-> gui_width ) | 219 | || (this->gui_width != frame->sc.gui_width) |
331 | || (this-> gui_height != frame-> gui_height)) { | 220 | || (this->gui_height != frame->sc.gui_height)) { |
332 | 221 | ||
333 | frame->width = width; | 222 | frame->sc.delivered_width = width; |
334 | frame->height = height; | 223 | frame->sc.delivered_height = height; |
335 | frame->ratio_code = ratio_code; | 224 | frame->sc.delivered_ratio_code = ratio_code; |
336 | frame->flags = flags; | 225 | frame->flags = flags; |
337 | frame->format = format; | 226 | frame->format = format; |
338 | frame->user_ratio = this->user_ratio; | 227 | frame->sc.user_ratio = this->sc.user_ratio; |
339 | this->gui_changed = 0; | 228 | frame->sc.gui_width = this->gui_width; |
340 | //frame->show_video = this->m_show_video; | 229 | frame->sc.gui_height = this->gui_height; |
341 | frame->gui_width = this->gui_width; | 230 | frame->sc.gui_pixel_aspect = 1.0; |
342 | frame->gui_height = this->gui_height; | 231 | |
232 | vo_scale_compute_ideal_size ( &frame->sc ); | ||
233 | vo_scale_compute_output_size( &frame->sc ); | ||
343 | 234 | ||
344 | null_compute_ideal_size (this, frame); | 235 | #ifdef LOG |
345 | null_compute_rgb_size (this, frame); | 236 | fprintf (stderr, "nullvideo: gui %dx%d delivered %dx%d output %dx%d\n", |
237 | frame->sc.gui_width, frame->sc.gui_height, | ||
238 | frame->sc.delivered_width, frame->sc.delivered_height, | ||
239 | frame->sc.output_width, frame->sc.output_height); | ||
240 | #endif | ||
346 | 241 | ||
347 | /* | 242 | /* |
@@ -363,9 +258,10 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, | |||
363 | free ( frame->data ); | 258 | free ( frame->data ); |
364 | } | 259 | } |
365 | printf("after freeing\n"); | ||
366 | frame->data = xine_xmalloc (frame->output_width * frame->output_height * | ||
367 | this->bytes_per_pixel ); | ||
368 | 260 | ||
369 | if( format == IMGFMT_YV12 ) { | 261 | frame->data = xine_xmalloc (frame->sc.output_width |
262 | * frame->sc.output_height | ||
263 | * this->bytes_per_pixel ); | ||
264 | |||
265 | if( format == XINE_IMGFMT_YV12 ) { | ||
370 | frame->frame.pitches[0] = 8*((width + 7) / 8); | 266 | frame->frame.pitches[0] = 8*((width + 7) / 8); |
371 | frame->frame.pitches[1] = 8*((width + 15) / 16); | 267 | frame->frame.pitches[1] = 8*((width + 15) / 16); |
@@ -384,16 +280,10 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, | |||
384 | } | 280 | } |
385 | 281 | ||
386 | frame->format = format; | 282 | frame->stripe_height = 16 * frame->sc.output_height / frame->sc.delivered_height; |
387 | frame->width = width; | 283 | frame->bytes_per_line = frame->sc.output_width * this->bytes_per_pixel; |
388 | frame->height = height; | ||
389 | |||
390 | frame->stripe_height = 16 * frame->output_height / frame->height; | ||
391 | frame->bytes_per_line = frame->output_width * this->bytes_per_pixel; | ||
392 | 284 | ||
393 | /* | 285 | /* |
394 | * set up colorspace converter | 286 | * set up colorspace converter |
395 | */ | 287 | */ |
396 | if(1 /*this->m_show_video*/ ){ | ||
397 | printf("showing video\n"); | ||
398 | 288 | ||
399 | switch (flags) { | 289 | switch (flags) { |
@@ -401,9 +291,9 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, | |||
401 | case VO_BOTTOM_FIELD: | 291 | case VO_BOTTOM_FIELD: |
402 | frame->yuv2rgb->configure (frame->yuv2rgb, | 292 | frame->yuv2rgb->configure (frame->yuv2rgb, |
403 | frame->width, | 293 | frame->sc.delivered_width, |
404 | 16, | 294 | 16, |
405 | 2*frame->frame.pitches[0], | 295 | 2*frame->frame.pitches[0], |
406 | 2*frame->frame.pitches[1], | 296 | 2*frame->frame.pitches[1], |
407 | frame->output_width, | 297 | frame->sc.output_width, |
408 | frame->stripe_height, | 298 | frame->stripe_height, |
409 | frame->bytes_per_line*2); | 299 | frame->bytes_per_line*2); |
@@ -412,9 +302,9 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, | |||
412 | case VO_BOTH_FIELDS: | 302 | case VO_BOTH_FIELDS: |
413 | frame->yuv2rgb->configure (frame->yuv2rgb, | 303 | frame->yuv2rgb->configure (frame->yuv2rgb, |
414 | frame->width, | 304 | frame->sc.delivered_width, |
415 | 16, | 305 | 16, |
416 | frame->frame.pitches[0], | 306 | frame->frame.pitches[0], |
417 | frame->frame.pitches[1], | 307 | frame->frame.pitches[1], |
418 | frame->output_width, | 308 | frame->sc.output_width, |
419 | frame->stripe_height, | 309 | frame->stripe_height, |
420 | frame->bytes_per_line); | 310 | frame->bytes_per_line); |
@@ -422,7 +312,9 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, | |||
422 | break; | 312 | break; |
423 | } | 313 | } |
314 | #ifdef LOG | ||
315 | fprintf (stderr, "nullvideo: colorspace converter configured.\n"); | ||
316 | #endif | ||
424 | } | 317 | } |
425 | } | 318 | |
426 | printf("after gui changed\n"); | ||
427 | /* | 319 | /* |
428 | * reset dest pointers | 320 | * reset dest pointers |
@@ -445,21 +337,19 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img, | |||
445 | } | 337 | } |
446 | } | 338 | } |
447 | printf("done\n"); | ||
448 | } | 339 | } |
449 | static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){ | 340 | |
341 | static void null_display_frame( xine_vo_driver_t* self, vo_frame_t *frame_gen ){ | ||
450 | null_driver_t* this = (null_driver_t*) self; | 342 | null_driver_t* this = (null_driver_t*) self; |
451 | opie_frame_t* frame = (opie_frame_t*)frame_gen; | 343 | opie_frame_t* frame = (opie_frame_t*)frame_gen; |
452 | display_xine_frame_t display = this->frameDis; | 344 | display_xine_frame_t display = this->frameDis; |
453 | 345 | ||
454 | printf("display frame\n"); | 346 | if (!this->m_show_video) |
455 | // if( this->m_show_video ) { // return if not displaying | 347 | return; |
456 | printf("calling home aye\n" ); | 348 | |
457 | if( display != NULL ) { | 349 | if( display != NULL ) { |
458 | (*display)(this->caller, frame->data, | 350 | (*display)(this->caller, frame->data, |
459 | frame->output_width, frame->output_height, | 351 | frame->sc.output_width, frame->sc.output_height, |
460 | frame->bytes_per_line ); | 352 | frame->bytes_per_line ); |
461 | printf("display done hope you enyoyed the frame"); | ||
462 | } | 353 | } |
463 | // } | ||
464 | 354 | ||
465 | frame->frame.displayed (&frame->frame); | 355 | frame->frame.displayed (&frame->frame); |
@@ -467,8 +357,7 @@ static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){ | |||
467 | 357 | ||
468 | 358 | ||
469 | // blending related | 359 | /* blending related */ |
470 | 360 | static void null_overlay_clut_yuv2rgb (null_driver_t *this, | |
471 | 361 | vo_overlay_t *overlay, | |
472 | static void null_overlay_clut_yuv2rgb(null_driver_t *this, vo_overlay_t *overlay, | ||
473 | opie_frame_t *frame) { | 362 | opie_frame_t *frame) { |
474 | int i; | 363 | int i; |
@@ -493,10 +382,10 @@ static void null_overlay_clut_yuv2rgb(null_driver_t *this, vo_overlay_t *overla | |||
493 | } | 382 | } |
494 | 383 | ||
495 | static void null_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { | 384 | static void null_overlay_blend ( xine_vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { |
496 | null_driver_t *this = (null_driver_t *) this_gen; | 385 | null_driver_t *this = (null_driver_t *) this_gen; |
497 | opie_frame_t *frame = (opie_frame_t *) frame_gen; | 386 | opie_frame_t *frame = (opie_frame_t *) frame_gen; |
498 | 387 | ||
499 | printf("overlay blend\n"); | 388 | if(!this->m_show_video || frame->sc.output_width == 0 |
500 | if(!this->m_show_video || frame->output_width == 0 || frame->output_height== 0) | 389 | || frame->sc.output_height== 0) |
501 | return; | 390 | return; |
502 | 391 | ||
@@ -509,16 +398,16 @@ static void null_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo | |||
509 | case 16: | 398 | case 16: |
510 | blend_rgb16( (uint8_t *)frame->data, overlay, | 399 | blend_rgb16( (uint8_t *)frame->data, overlay, |
511 | frame->output_width, frame->output_height, | 400 | frame->sc.output_width, frame->sc.output_height, |
512 | frame->width, frame->height); | 401 | frame->sc.delivered_width, frame->sc.delivered_height); |
513 | break; | 402 | break; |
514 | case 24: | 403 | case 24: |
515 | blend_rgb24( (uint8_t *)frame->data, overlay, | 404 | blend_rgb24( (uint8_t *)frame->data, overlay, |
516 | frame->output_width, frame->output_height, | 405 | frame->sc.output_width, frame->sc.output_height, |
517 | frame->width, frame->height); | 406 | frame->sc.delivered_width, frame->sc.delivered_height); |
518 | break; | 407 | break; |
519 | case 32: | 408 | case 32: |
520 | blend_rgb32( (uint8_t *)frame->data, overlay, | 409 | blend_rgb32( (uint8_t *)frame->data, overlay, |
521 | frame->output_width, frame->output_height, | 410 | frame->sc.output_width, frame->sc.output_height, |
522 | frame->width, frame->height); | 411 | frame->sc.delivered_width, frame->sc.delivered_height); |
523 | break; | 412 | break; |
524 | default: | 413 | default: |
@@ -530,37 +419,35 @@ static void null_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo | |||
530 | 419 | ||
531 | 420 | ||
532 | static int null_get_property( vo_driver_t* self, | 421 | static int null_get_property( xine_vo_driver_t* self, |
533 | int property ){ | 422 | int property ){ |
534 | printf("property get\n"); | ||
535 | return 0; | 423 | return 0; |
536 | } | 424 | } |
537 | static int null_set_property( vo_driver_t* self, | 425 | static int null_set_property( xine_vo_driver_t* self, |
538 | int property, | 426 | int property, |
539 | int value ){ | 427 | int value ){ |
540 | printf("set property\n"); | ||
541 | return value; | 428 | return value; |
542 | } | 429 | } |
543 | static void null_get_property_min_max( vo_driver_t* self, | 430 | static void null_get_property_min_max( xine_vo_driver_t* self, |
544 | int property, int *min, | 431 | int property, int *min, |
545 | int *max ){ | 432 | int *max ){ |
546 | printf("min max\n"); | ||
547 | *max = 0; | 433 | *max = 0; |
548 | *min = 0; | 434 | *min = 0; |
549 | } | 435 | } |
550 | static int null_gui_data_exchange( vo_driver_t* self, | 436 | static int null_gui_data_exchange( xine_vo_driver_t* self, |
551 | int data_type, | 437 | int data_type, |
552 | void *data ){ | 438 | void *data ){ |
553 | return 0; | 439 | return 0; |
554 | } | 440 | } |
555 | static void null_exit( vo_driver_t* self ){ | 441 | |
442 | static void null_exit( xine_vo_driver_t* self ){ | ||
556 | null_driver_t* this = (null_driver_t*)self; | 443 | null_driver_t* this = (null_driver_t*)self; |
557 | free ( this ); | 444 | free ( this ); |
558 | } | 445 | } |
559 | static int null_redraw_needed( vo_driver_t* self ){ | 446 | static int null_redraw_needed( xine_vo_driver_t* self ){ |
560 | return 0; | 447 | return 0; |
561 | } | 448 | } |
562 | 449 | ||
563 | 450 | ||
564 | vo_driver_t* init_video_out_plugin( config_values_t* conf, | 451 | xine_vo_driver_t* init_video_out_plugin( config_values_t* conf, |
565 | void* video ){ | 452 | void* video ){ |
566 | null_driver_t *vo; | 453 | null_driver_t *vo; |
@@ -569,8 +456,12 @@ vo_driver_t* init_video_out_plugin( config_values_t* conf, | |||
569 | /* memset? */ | 456 | /* memset? */ |
570 | memset(vo,0, sizeof(null_driver_t ) ); | 457 | memset(vo,0, sizeof(null_driver_t ) ); |
458 | |||
459 | vo_scale_init (&vo->sc, 0, 0); | ||
460 | |||
461 | vo->sc.gui_pixel_aspect = 1.0; | ||
462 | |||
571 | vo->m_show_video = 0; // false | 463 | vo->m_show_video = 0; // false |
572 | vo->m_video_fullscreen = 0; | 464 | vo->m_video_fullscreen = 0; |
573 | vo->m_is_scaling = 0; | 465 | vo->m_is_scaling = 0; |
574 | vo->user_ratio = ASPECT_AUTO; | ||
575 | vo->display_ratio = 1.0; | 466 | vo->display_ratio = 1.0; |
576 | vo->gui_width = 16; | 467 | vo->gui_width = 16; |
@@ -596,6 +487,6 @@ vo_driver_t* init_video_out_plugin( config_values_t* conf, | |||
596 | vo->yuv2rgb_factory = yuv2rgb_factory_init (MODE_16_RGB, vo->yuv2rgb_swap, | 487 | vo->yuv2rgb_factory = yuv2rgb_factory_init (MODE_16_RGB, vo->yuv2rgb_swap, |
597 | vo->yuv2rgb_cmap); | 488 | vo->yuv2rgb_cmap); |
598 | printf("done initialisation\n"); | 489 | |
599 | return (vo_driver_t*) vo; | 490 | return ( xine_vo_driver_t*) vo; |
600 | } | 491 | } |
601 | 492 | ||
@@ -603,7 +494,5 @@ static vo_info_t vo_info_null = { | |||
603 | 5, | 494 | 5, |
604 | "null plugin", | 495 | "null plugin", |
605 | NULL, | 496 | XINE_VISUAL_TYPE_FB |
606 | VISUAL_TYPE_FB, | ||
607 | 5 | ||
608 | }; | 497 | }; |
609 | 498 | ||
@@ -621,40 +510,40 @@ vo_info_t *get_video_out_plugin_info(){ | |||
621 | * | 510 | * |
622 | */ | 511 | */ |
623 | int null_is_showing_video( vo_driver_t* self ){ | 512 | int null_is_showing_video( xine_vo_driver_t* self ){ |
624 | null_driver_t* this = (null_driver_t*)self; | 513 | null_driver_t* this = (null_driver_t*)self; |
625 | return this->m_show_video; | 514 | return this->m_show_video; |
626 | } | 515 | } |
627 | void null_set_show_video( vo_driver_t* self, int show ) { | 516 | void null_set_show_video( xine_vo_driver_t* self, int show ) { |
628 | ((null_driver_t*)self)->m_show_video = show; | 517 | ((null_driver_t*)self)->m_show_video = show; |
629 | } | 518 | } |
630 | 519 | ||
631 | int null_is_fullscreen( vo_driver_t* self ){ | 520 | int null_is_fullscreen( xine_vo_driver_t* self ){ |
632 | return ((null_driver_t*)self)->m_video_fullscreen; | 521 | return ((null_driver_t*)self)->m_video_fullscreen; |
633 | } | 522 | } |
634 | void null_set_fullscreen( vo_driver_t* self, int screen ){ | 523 | void null_set_fullscreen( xine_vo_driver_t* self, int screen ){ |
635 | ((null_driver_t*)self)->m_video_fullscreen = screen; | 524 | ((null_driver_t*)self)->m_video_fullscreen = screen; |
636 | } | 525 | } |
637 | int null_is_scaling( vo_driver_t* self ){ | 526 | int null_is_scaling( xine_vo_driver_t* self ){ |
638 | return ((null_driver_t*)self)->m_is_scaling; | 527 | return ((null_driver_t*)self)->m_is_scaling; |
639 | } | 528 | } |
640 | 529 | ||
641 | void null_set_videoGamma( vo_driver_t* self , int value ) { | 530 | void null_set_videoGamma( xine_vo_driver_t* self , int value ) { |
642 | ((null_driver_t*) self) ->yuv2rgb_gamma = value; | 531 | ((null_driver_t*) self) ->yuv2rgb_gamma = value; |
643 | ((null_driver_t*) self) ->yuv2rgb_factory->set_gamma( ((null_driver_t*) self) ->yuv2rgb_factory, value ); | 532 | ((null_driver_t*) self) ->yuv2rgb_factory->set_gamma( ((null_driver_t*) self) ->yuv2rgb_factory, value ); |
644 | } | 533 | } |
645 | 534 | ||
646 | void null_set_scaling( vo_driver_t* self, int scale ){ | 535 | void null_set_scaling( xine_vo_driver_t* self, int scale ) { |
647 | ((null_driver_t*)self)->m_is_scaling = scale; | 536 | ((null_driver_t*)self)->m_is_scaling = scale; |
648 | } | 537 | } |
649 | 538 | ||
650 | void null_set_gui_width( vo_driver_t* self, int width ){ | 539 | void null_set_gui_width( xine_vo_driver_t* self, int width ) { |
651 | ((null_driver_t*)self)->gui_width = width; | 540 | ((null_driver_t*)self)->gui_width = width; |
652 | } | 541 | } |
653 | void null_set_gui_height( vo_driver_t* self, int height ){ | 542 | void null_set_gui_height( xine_vo_driver_t* self, int height ) { |
654 | ((null_driver_t*)self)->gui_height = height; | 543 | ((null_driver_t*)self)->gui_height = height; |
655 | } | 544 | } |
656 | 545 | ||
657 | 546 | ||
658 | void null_set_mode( vo_driver_t* self, int depth, int rgb ){ | 547 | void null_set_mode( xine_vo_driver_t* self, int depth, int rgb ) { |
659 | null_driver_t* this = (null_driver_t*)self; | 548 | null_driver_t* this = (null_driver_t*)self; |
660 | 549 | ||
@@ -672,8 +561,9 @@ void null_set_mode( vo_driver_t* self, int depth, int rgb ){ | |||
672 | case 24: | 561 | case 24: |
673 | if( this->bpp == 32 ) { | 562 | if( this->bpp == 32 ) { |
674 | if(rgb == 0 ) | 563 | if( rgb == 0 ) { |
675 | this->yuv2rgb_mode = MODE_32_RGB; | 564 | this->yuv2rgb_mode = MODE_32_RGB; |
676 | else | 565 | } else { |
677 | this->yuv2rgb_mode = MODE_32_BGR; | 566 | this->yuv2rgb_mode = MODE_32_BGR; |
567 | } | ||
678 | }else{ | 568 | }else{ |
679 | if( rgb == 0 ) | 569 | if( rgb == 0 ) |
@@ -684,20 +574,23 @@ void null_set_mode( vo_driver_t* self, int depth, int rgb ){ | |||
684 | break; | 574 | break; |
685 | case 16: | 575 | case 16: |
686 | if( rgb == 0 ) | 576 | if( rgb == 0 ) { |
687 | this->yuv2rgb_mode = MODE_16_RGB; | 577 | this->yuv2rgb_mode = MODE_16_RGB; |
688 | else | 578 | } else { |
689 | this->yuv2rgb_mode = MODE_16_BGR; | 579 | this->yuv2rgb_mode = MODE_16_BGR; |
580 | } | ||
690 | break; | 581 | break; |
691 | case 15: | 582 | case 15: |
692 | if( rgb == 0 ) | 583 | if( rgb == 0 ) { |
693 | this->yuv2rgb_mode = MODE_15_RGB; | 584 | this->yuv2rgb_mode = MODE_15_RGB; |
694 | else | 585 | } else { |
695 | this->yuv2rgb_mode = MODE_15_BGR; | 586 | this->yuv2rgb_mode = MODE_15_BGR; |
587 | } | ||
696 | break; | 588 | break; |
697 | case 8: | 589 | case 8: |
698 | if( rgb == 0 ) | 590 | if( rgb == 0 ) { |
699 | this->yuv2rgb_mode = MODE_8_RGB; | 591 | this->yuv2rgb_mode = MODE_8_RGB; |
700 | else | 592 | } else { |
701 | this->yuv2rgb_mode = MODE_8_BGR; | 593 | this->yuv2rgb_mode = MODE_8_BGR; |
594 | } | ||
702 | break; | 595 | break; |
703 | }; | 596 | }; |
@@ -706,5 +599,7 @@ void null_set_mode( vo_driver_t* self, int depth, int rgb ){ | |||
706 | // this->yuv2rgb_cmap); | 599 | // this->yuv2rgb_cmap); |
707 | }; | 600 | }; |
708 | void null_display_handler(vo_driver_t* self, display_xine_frame_t t, void* user_data) { | 601 | |
602 | void null_display_handler( xine_vo_driver_t* self, display_xine_frame_t t, | ||
603 | void* user_data ) { | ||
709 | null_driver_t* this = (null_driver_t*) self; | 604 | null_driver_t* this = (null_driver_t*) self; |
710 | this->caller = user_data; | 605 | this->caller = user_data; |
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 | |||
@@ -16,5 +16,5 @@ TARGET = opieplayer2 | |||
16 | INCLUDEPATH += $(OPIEDIR)/include | 16 | INCLUDEPATH += $(OPIEDIR)/include |
17 | DEPENDPATH += $(OPIEDIR)/include | 17 | DEPENDPATH += $(OPIEDIR)/include |
18 | LIBS += -lqpe -lpthread -lopie -lxine -lxineutils | 18 | LIBS += -lqpe -lpthread -lopie -lxine |
19 | MOC_DIR = qpeobj | 19 | MOC_DIR = qpeobj |
20 | OBJECTS_DIR = qpeobj | 20 | OBJECTS_DIR = qpeobj |
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp index ce472f1..1042a0c 100644 --- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp | |||
@@ -101,6 +101,5 @@ PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags | |||
101 | 101 | ||
102 | gammaMenu = new QPopupMenu( this ); | 102 | gammaMenu = new QPopupMenu( this ); |
103 | pmView->insertItem( tr( "Gamma" ), gammaMenu ); | 103 | pmView->insertItem( tr( "Gamma (Video)" ), gammaMenu ); |
104 | gammaMenu->setMinimumHeight( 50 ); | ||
105 | 104 | ||
106 | gammaSlider = new QSlider( QSlider::Vertical, gammaMenu ); | 105 | gammaSlider = new QSlider( QSlider::Vertical, gammaMenu ); |
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 | |||
@@ -385,5 +385,5 @@ void VideoWidget::makeVisible() { | |||
385 | slider->hide(); | 385 | slider->hide(); |
386 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); | 386 | videoFrame-> setGeometry ( 0, 0, width ( ), height ( )); |
387 | qApp->processEvents(); | 387 | // qApp->processEvents(); |
388 | } else { | 388 | } else { |
389 | showNormal(); | 389 | showNormal(); |
@@ -399,5 +399,4 @@ void VideoWidget::makeVisible() { | |||
399 | connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 399 | connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
400 | } | 400 | } |
401 | |||
402 | QWidget *d = QApplication::desktop(); | 401 | QWidget *d = QApplication::desktop(); |
403 | int w=d->width(); | 402 | int w=d->width(); |
@@ -410,5 +409,5 @@ void VideoWidget::makeVisible() { | |||
410 | videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) ); | 409 | videoFrame->setGeometry( QRect( 0, 30, 240, 170 ) ); |
411 | 410 | ||
412 | qApp->processEvents(); | 411 | // qApp->processEvents(); |
413 | } | 412 | } |
414 | } | 413 | } |
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 | |||
@@ -95,4 +95,5 @@ void XineControl::play( const QString& fileName ) { | |||
95 | mediaPlayerState->setView( whichGui ); | 95 | mediaPlayerState->setView( whichGui ); |
96 | 96 | ||
97 | |||
97 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 98 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
98 | if ( !disabledSuspendScreenSaver ) { | 99 | if ( !disabledSuspendScreenSaver ) { |
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 | |||
@@ -45,4 +45,5 @@ | |||
45 | #include "xinevideowidget.h" | 45 | #include "xinevideowidget.h" |
46 | 46 | ||
47 | |||
47 | // 0 deg rot: copy a line from src to dst (use libc memcpy) | 48 | // 0 deg rot: copy a line from src to dst (use libc memcpy) |
48 | 49 | ||
@@ -60,10 +61,10 @@ static inline void memcpy_rev ( void *dst, void *src, size_t len ) | |||
60 | // 90 deg rot: copy a column from src to dst | 61 | // 90 deg rot: copy a column from src to dst |
61 | 62 | ||
62 | static inline void memcpy_step ( void *dst, void *src, size_t len, size_t linestep ) | 63 | static inline void memcpy_step ( void *dst, void *src, size_t len, size_t step ) |
63 | { | 64 | { |
64 | len >>= 1; | 65 | len >>= 1; |
65 | while ( len-- ) { | 66 | while ( len-- ) { |
66 | *((short int *) dst) ++ = *((short int *) src); | 67 | *((short int *) dst) ++ = *((short int *) src); |
67 | ((char * ) src) += linestep; | 68 | ((char *) src ) += step; |
68 | } | 69 | } |
69 | } | 70 | } |
@@ -71,12 +72,12 @@ static inline void memcpy_step ( void *dst, void *src, size_t len, size_t linest | |||
71 | // 270 deg rot: copy a column from src to dst reversed | 72 | // 270 deg rot: copy a column from src to dst reversed |
72 | 73 | ||
73 | static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t linestep ) | 74 | static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t step ) |
74 | { | 75 | { |
75 | len >>= 1; | 76 | len >>= 1; |
76 | 77 | ||
77 | ((char *) src) += ( len * linestep ); | 78 | ((char *) src ) += ( len * step ); |
78 | 79 | ||
79 | while ( len-- ) { | 80 | while ( len-- ) { |
80 | ((char *) src) -= linestep; | 81 | ((char *) src ) -= step; |
81 | *((short int *) dst) ++ = *((short int *) src); | 82 | *((short int *) dst) ++ = *((short int *) src); |
82 | } | 83 | } |
@@ -183,4 +184,5 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
183 | default: break; | 184 | default: break; |
184 | } | 185 | } |
186 | } | ||
185 | if ( rightfill ) | 187 | if ( rightfill ) |
186 | memset ( dst + leftfill + framefill, 0, rightfill ); // "right" border -> black | 188 | memset ( dst + leftfill + framefill, 0, rightfill ); // "right" border -> black |
@@ -199,4 +201,5 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
199 | } | 201 | } |
200 | } | 202 | } |
203 | } | ||
201 | 204 | ||
202 | { | 205 | { |
@@ -213,14 +216,19 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
213 | } | 216 | } |
214 | 217 | ||
215 | QImage *XineVideoWidget::logo ( ) const { | 218 | |
219 | QImage *XineVideoWidget::logo ( ) const | ||
220 | { | ||
216 | return m_logo; | 221 | return m_logo; |
217 | } | 222 | } |
218 | 223 | ||
219 | void XineVideoWidget::setLogo ( QImage * image ) { | 224 | |
225 | void XineVideoWidget::setLogo ( QImage* logo ) | ||
226 | { | ||
220 | delete m_logo; | 227 | delete m_logo; |
221 | m_logo = image; | 228 | m_logo = logo; |
222 | } | 229 | } |
223 | 230 | ||
224 | void XineVideoWidget::setVideoFrame ( uchar * img, int w, int h, int bpl ) { | 231 | void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl ) |
232 | { | ||
225 | bool rot90 = (( -m_rotation ) & 1 ); | 233 | bool rot90 = (( -m_rotation ) & 1 ); |
226 | 234 | ||
@@ -239,8 +247,9 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
239 | // only repaint the area that *really* needs to be repainted | 247 | // only repaint the area that *really* needs to be repainted |
240 | 248 | ||
241 | repaint (( | 249 | repaint ((( m_thisframe & m_lastframe ) != m_lastframe ) ? m_lastframe : m_thisframe, false ); |
242 | } | 250 | } |
243 | 251 | ||
244 | void XineVideoWidget::resizeEvent ( QResizeEvent * ) { | 252 | void XineVideoWidget::resizeEvent ( QResizeEvent * ) |
253 | { | ||
245 | QSize s = size ( ); | 254 | QSize s = size ( ); |
246 | bool fs = ( s == qApp-> desktop ( ) -> size ( )); | 255 | bool fs = ( s == qApp-> desktop ( ) -> size ( )); |
@@ -248,5 +257,4 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
248 | // if we are in fullscreen mode, do not rotate the video | 257 | // if we are in fullscreen mode, do not rotate the video |
249 | // (!! the paint routine uses m_rotation + qt_screen-> transformOrientation() !!) | 258 | // (!! the paint routine uses m_rotation + qt_screen-> transformOrientation() !!) |
250 | |||
251 | m_rotation = fs ? -qt_screen-> transformOrientation ( ) : 0; | 259 | m_rotation = fs ? -qt_screen-> transformOrientation ( ) : 0; |
252 | 260 | ||
@@ -258,5 +266,6 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) | |||
258 | 266 | ||
259 | 267 | ||
260 | void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * ) { | 268 | void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * /*me*/ ) |
269 | { | ||
261 | emit clicked ( ); | 270 | emit clicked ( ); |
262 | } | 271 | } |