Diffstat (limited to 'core/multimedia/opieplayer/libmpeg3') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/libmpeg3/Makefile.in | 6 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h | 5 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in index d255e4f..154f85d 100644 --- a/core/multimedia/opieplayer/libmpeg3/Makefile.in +++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in | |||
@@ -155,66 +155,64 @@ listaddonentmodules: | |||
155 | REQUIRES= | 155 | REQUIRES= |
156 | 156 | ||
157 | ####### Sub-libraries | 157 | ####### Sub-libraries |
158 | 158 | ||
159 | 159 | ||
160 | ###### Combined headers | 160 | ###### Combined headers |
161 | 161 | ||
162 | 162 | ||
163 | 163 | ||
164 | ####### Compile | 164 | ####### Compile |
165 | 165 | ||
166 | libmpeg3plugin.o: libmpeg3plugin.cpp \ | 166 | libmpeg3plugin.o: libmpeg3plugin.cpp \ |
167 | libmpeg3plugin.h \ | 167 | libmpeg3plugin.h \ |
168 | libmpeg3.h \ | 168 | libmpeg3.h \ |
169 | mpeg3private.h \ | 169 | mpeg3private.h \ |
170 | mpeg3atrack.h \ | 170 | mpeg3atrack.h \ |
171 | mpeg3demux.h \ | 171 | mpeg3demux.h \ |
172 | mpeg3title.h \ | 172 | mpeg3title.h \ |
173 | mpeg3io.h \ | 173 | mpeg3io.h \ |
174 | mpeg3css.h \ | 174 | mpeg3css.h \ |
175 | mpeg3private.inc \ | 175 | mpeg3private.inc \ |
176 | audio/mpeg3audio.h \ | 176 | audio/mpeg3audio.h \ |
177 | mpeg3vtrack.h \ | 177 | mpeg3vtrack.h \ |
178 | video/mpeg3video.h \ | 178 | video/mpeg3video.h \ |
179 | mpeg3protos.h \ | 179 | mpeg3protos.h |
180 | ../mediaplayerplugininterface.h | ||
181 | 180 | ||
182 | libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ | 181 | libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \ |
183 | libmpeg3plugin.h \ | 182 | libmpeg3plugin.h \ |
184 | libmpeg3.h \ | 183 | libmpeg3.h \ |
185 | mpeg3private.h \ | 184 | mpeg3private.h \ |
186 | mpeg3atrack.h \ | 185 | mpeg3atrack.h \ |
187 | mpeg3demux.h \ | 186 | mpeg3demux.h \ |
188 | mpeg3title.h \ | 187 | mpeg3title.h \ |
189 | mpeg3io.h \ | 188 | mpeg3io.h \ |
190 | mpeg3css.h \ | 189 | mpeg3css.h \ |
191 | mpeg3private.inc \ | 190 | mpeg3private.inc \ |
192 | audio/mpeg3audio.h \ | 191 | audio/mpeg3audio.h \ |
193 | mpeg3vtrack.h \ | 192 | mpeg3vtrack.h \ |
194 | video/mpeg3video.h \ | 193 | video/mpeg3video.h \ |
195 | mpeg3protos.h \ | 194 | mpeg3protos.h \ |
196 | ../mediaplayerplugininterface.h \ | ||
197 | libmpeg3pluginimpl.h | 195 | libmpeg3pluginimpl.h |
198 | 196 | ||
199 | bitstream.o: bitstream.c \ | 197 | bitstream.o: bitstream.c \ |
200 | mpeg3private.h \ | 198 | mpeg3private.h \ |
201 | mpeg3atrack.h \ | 199 | mpeg3atrack.h \ |
202 | mpeg3demux.h \ | 200 | mpeg3demux.h \ |
203 | mpeg3title.h \ | 201 | mpeg3title.h \ |
204 | mpeg3io.h \ | 202 | mpeg3io.h \ |
205 | mpeg3css.h \ | 203 | mpeg3css.h \ |
206 | mpeg3private.inc \ | 204 | mpeg3private.inc \ |
207 | audio/mpeg3audio.h \ | 205 | audio/mpeg3audio.h \ |
208 | mpeg3vtrack.h \ | 206 | mpeg3vtrack.h \ |
209 | video/mpeg3video.h \ | 207 | video/mpeg3video.h \ |
210 | mpeg3protos.h | 208 | mpeg3protos.h |
211 | 209 | ||
212 | libmpeg3.o: libmpeg3.c \ | 210 | libmpeg3.o: libmpeg3.c \ |
213 | libmpeg3.h \ | 211 | libmpeg3.h \ |
214 | mpeg3private.h \ | 212 | mpeg3private.h \ |
215 | mpeg3atrack.h \ | 213 | mpeg3atrack.h \ |
216 | mpeg3demux.h \ | 214 | mpeg3demux.h \ |
217 | mpeg3title.h \ | 215 | mpeg3title.h \ |
218 | mpeg3io.h \ | 216 | mpeg3io.h \ |
219 | mpeg3css.h \ | 217 | mpeg3css.h \ |
220 | mpeg3private.inc \ | 218 | mpeg3private.inc \ |
@@ -395,49 +393,49 @@ audio/header.o: audio/header.c \ | |||
395 | mpeg3vtrack.h \ | 393 | mpeg3vtrack.h \ |
396 | video/mpeg3video.h \ | 394 | video/mpeg3video.h \ |
397 | audio/../mpeg3protos.h | 395 | audio/../mpeg3protos.h |
398 | 396 | ||
399 | audio/layer2.o: audio/layer2.c \ | 397 | audio/layer2.o: audio/layer2.c \ |
400 | audio/mpeg3audio.h \ | 398 | audio/mpeg3audio.h \ |
401 | audio/ac3.h \ | 399 | audio/ac3.h \ |
402 | audio/mpeg3real.h \ | 400 | audio/mpeg3real.h \ |
403 | audio/../bitstream.h \ | 401 | audio/../bitstream.h \ |
404 | mpeg3demux.h \ | 402 | mpeg3demux.h \ |
405 | mpeg3title.h \ | 403 | mpeg3title.h \ |
406 | mpeg3io.h \ | 404 | mpeg3io.h \ |
407 | mpeg3css.h \ | 405 | mpeg3css.h \ |
408 | mpeg3private.inc \ | 406 | mpeg3private.inc \ |
409 | audio/../libmpeg3.h \ | 407 | audio/../libmpeg3.h \ |
410 | mpeg3private.h \ | 408 | mpeg3private.h \ |
411 | mpeg3atrack.h \ | 409 | mpeg3atrack.h \ |
412 | audio/mpeg3audio.h \ | 410 | audio/mpeg3audio.h \ |
413 | mpeg3vtrack.h \ | 411 | mpeg3vtrack.h \ |
414 | video/mpeg3video.h \ | 412 | video/mpeg3video.h \ |
415 | audio/../mpeg3protos.h \ | 413 | audio/../mpeg3protos.h \ |
416 | audio/tables.h | 414 | audio/tables.h |
417 | 415 | ||
418 | audio/layer3.o: audio/layer3.c \ | 416 | audio/layer3.o: audio/layer3.c \ |
419 | huffman.h \ | 417 | audio/huffman.h \ |
420 | audio/mpeg3audio.h \ | 418 | audio/mpeg3audio.h \ |
421 | audio/ac3.h \ | 419 | audio/ac3.h \ |
422 | audio/mpeg3real.h \ | 420 | audio/mpeg3real.h \ |
423 | audio/../bitstream.h \ | 421 | audio/../bitstream.h \ |
424 | mpeg3demux.h \ | 422 | mpeg3demux.h \ |
425 | mpeg3title.h \ | 423 | mpeg3title.h \ |
426 | mpeg3io.h \ | 424 | mpeg3io.h \ |
427 | mpeg3css.h \ | 425 | mpeg3css.h \ |
428 | mpeg3private.inc \ | 426 | mpeg3private.inc \ |
429 | audio/../libmpeg3.h \ | 427 | audio/../libmpeg3.h \ |
430 | mpeg3private.h \ | 428 | mpeg3private.h \ |
431 | mpeg3atrack.h \ | 429 | mpeg3atrack.h \ |
432 | audio/mpeg3audio.h \ | 430 | audio/mpeg3audio.h \ |
433 | mpeg3vtrack.h \ | 431 | mpeg3vtrack.h \ |
434 | video/mpeg3video.h \ | 432 | video/mpeg3video.h \ |
435 | audio/../mpeg3protos.h \ | 433 | audio/../mpeg3protos.h \ |
436 | audio/tables.h | 434 | audio/tables.h |
437 | 435 | ||
438 | audio/mantissa.o: audio/mantissa.c \ | 436 | audio/mantissa.o: audio/mantissa.c \ |
439 | audio/mpeg3audio.h \ | 437 | audio/mpeg3audio.h \ |
440 | audio/ac3.h \ | 438 | audio/ac3.h \ |
441 | audio/mpeg3real.h \ | 439 | audio/mpeg3real.h \ |
442 | audio/../bitstream.h \ | 440 | audio/../bitstream.h \ |
443 | mpeg3demux.h \ | 441 | mpeg3demux.h \ |
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h index 54f259b..e0eb930 100644 --- a/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h +++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3plugin.h | |||
@@ -1,79 +1,76 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2001 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2001 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef LIBMPEG3_PLUGIN_H | 20 | #ifndef LIBMPEG3_PLUGIN_H |
21 | #define LIBMPEG3_PLUGIN_H | 21 | #define LIBMPEG3_PLUGIN_H |
22 | 22 | ||
23 | |||
24 | #include <qstring.h> | 23 | #include <qstring.h> |
25 | #include <qapplication.h> | 24 | #include <qapplication.h> |
26 | #include "libmpeg3.h" | 25 | #include "libmpeg3.h" |
27 | #include "mpeg3protos.h" | 26 | #include "mpeg3protos.h" |
28 | //#include <qpe/mediaplayerplugininterface.h> | 27 | #include <qpe/mediaplayerplugininterface.h> |
29 | #include "../mediaplayerplugininterface.h" | ||
30 | 28 | ||
31 | 29 | ||
32 | // #define OLD_MEDIAPLAYER_API | 30 | // #define OLD_MEDIAPLAYER_API |
33 | 31 | ||
34 | 32 | ||
35 | class LibMpeg3Plugin : public MediaPlayerDecoder { | 33 | class LibMpeg3Plugin : public MediaPlayerDecoder { |
36 | 34 | ||
37 | public: | 35 | public: |
38 | LibMpeg3Plugin() { file = NULL; } | 36 | LibMpeg3Plugin() { file = NULL; } |
39 | ~LibMpeg3Plugin() { close(); } | 37 | ~LibMpeg3Plugin() { close(); } |
40 | 38 | ||
41 | const char *pluginName() { return "LibMpeg3Plugin"; } | 39 | const char *pluginName() { return "LibMpeg3Plugin"; } |
42 | const char *pluginComment() { return "This is the libmpeg3 library writen by ... which has been modified by trolltech to use fixed point maths"; } | 40 | const char *pluginComment() { return "This is the libmpeg3 library writen by ... which has been modified by trolltech to use fixed point maths"; } |
43 | double pluginVersion() { return 1.0; } | 41 | double pluginVersion() { return 1.0; } |
44 | 42 | ||
45 | bool isFileSupported( const QString& fileName ) { return mpeg3_check_sig( (char *)fileName.latin1() ) == 1; } | 43 | bool isFileSupported( const QString& fileName ) { return mpeg3_check_sig( (char *)fileName.latin1() ) == 1; } |
46 | bool open( const QString& fileName ) { file = mpeg3_open( (char *)fileName.latin1() ); return file != NULL; } | 44 | bool open( const QString& fileName ) { file = mpeg3_open( (char *)fileName.latin1() ); return file != NULL; } |
47 | bool close() { if ( file ) { int r = mpeg3_close( file ); file = NULL; return r == 1; } return FALSE; } | 45 | bool close() { if ( file ) { int r = mpeg3_close( file ); file = NULL; return r == 1; } return FALSE; } |
48 | bool isOpen() { return file != NULL; } | 46 | bool isOpen() { return file != NULL; } |
49 | const QString &fileInfo() { return strInfo = ""; } | 47 | const QString &fileInfo() { return strInfo = ""; } |
50 | 48 | ||
51 | // If decoder doesn't support audio then return 0 here | 49 | // If decoder doesn't support audio then return 0 here |
52 | int audioStreams() { return file ? mpeg3_total_astreams( file ) : 0; } | 50 | int audioStreams() { return file ? mpeg3_total_astreams( file ) : 0; } |
53 | int audioChannels( int stream ) { return file ? mpeg3_audio_channels( file, stream ) : 0; } | 51 | int audioChannels( int stream ) { return file ? mpeg3_audio_channels( file, stream ) : 0; } |
54 | int audioFrequency( int stream ) { return file ? mpeg3_sample_rate( file, stream ) : 0; } | 52 | int audioFrequency( int stream ) { return file ? mpeg3_sample_rate( file, stream ) : 0; } |
55 | int audioBitsPerSample(int) { return 0;} | ||
56 | int audioSamples( int stream ) { return file ? mpeg3_audio_samples( file, stream ) : 0; } | 53 | int audioSamples( int stream ) { return file ? mpeg3_audio_samples( file, stream ) : 0; } |
57 | bool audioSetSample( long sample, int stream ) { return file ? mpeg3_set_sample( file, sample, stream) == 1 : FALSE; } | 54 | bool audioSetSample( long sample, int stream ) { return file ? mpeg3_set_sample( file, sample, stream) == 1 : FALSE; } |
58 | long audioGetSample( int stream ) { return file ? mpeg3_get_sample( file, stream ) : 0; } | 55 | long audioGetSample( int stream ) { return file ? mpeg3_get_sample( file, stream ) : 0; } |
59 | #ifdef OLD_MEDIAPLAYER_API | 56 | #ifdef OLD_MEDIAPLAYER_API |
60 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); | 57 | bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream ); |
61 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); | 58 | bool audioReadStereoSamples( short *output, long samples, long& samplesRead, int stream ); |
62 | bool audioReadSamples( short *output, int channel, long samples, int stream ); | 59 | bool audioReadSamples( short *output, int channel, long samples, int stream ); |
63 | bool audioReReadSamples( short *output, int channel, long samples, int stream ); | 60 | bool audioReReadSamples( short *output, int channel, long samples, int stream ); |
64 | #else | 61 | #else |
65 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); | 62 | bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ); |
66 | #endif | 63 | #endif |
67 | 64 | ||
68 | // If decoder doesn't support video then return 0 here | 65 | // If decoder doesn't support video then return 0 here |
69 | int videoStreams() { return file ? mpeg3_total_vstreams( file ) : 0; } | 66 | int videoStreams() { return file ? mpeg3_total_vstreams( file ) : 0; } |
70 | int videoWidth( int stream ) { return file ? mpeg3_video_width( file, stream ) : 0; } | 67 | int videoWidth( int stream ) { return file ? mpeg3_video_width( file, stream ) : 0; } |
71 | int videoHeight( int stream ) { return file ? mpeg3_video_height( file, stream ) : 0; } | 68 | int videoHeight( int stream ) { return file ? mpeg3_video_height( file, stream ) : 0; } |
72 | double videoFrameRate( int stream ) { return file ? mpeg3_frame_rate( file, stream ) : 0.0; } | 69 | double videoFrameRate( int stream ) { return file ? mpeg3_frame_rate( file, stream ) : 0.0; } |
73 | int videoFrames( int stream ) | 70 | int videoFrames( int stream ) |
74 | { return file ? mpeg3_video_frames( file, stream ) : 0; } | 71 | { return file ? mpeg3_video_frames( file, stream ) : 0; } |
75 | /* | 72 | /* |
76 | { | 73 | { |
77 | if ( file ) { | 74 | if ( file ) { |
78 | int frames = mpeg3_video_frames( file, stream ); | 75 | int frames = mpeg3_video_frames( file, stream ); |
79 | if ( frames == 1 ) { | 76 | if ( frames == 1 ) { |
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h index 89abf97..e9926f4 100644 --- a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h +++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.h | |||
@@ -1,49 +1,47 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2001 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2001 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef LIBMPEG3_PLUGIN_IMPL_H | 20 | #ifndef LIBMPEG3_PLUGIN_IMPL_H |
21 | #define LIBMPEG3_PLUGIN_IMPL_H | 21 | #define LIBMPEG3_PLUGIN_IMPL_H |
22 | 22 | ||
23 | 23 | #include <qpe/mediaplayerplugininterface.h> | |
24 | //#include <qpe/mediaplayerplugininterface.h> | ||
25 | #include "../mediaplayerplugininterface.h" | ||
26 | 24 | ||
27 | 25 | ||
28 | class LibMpeg3Plugin; | 26 | class LibMpeg3Plugin; |
29 | 27 | ||
30 | 28 | ||
31 | class LibMpeg3PluginImpl : public MediaPlayerPluginInterface | 29 | class LibMpeg3PluginImpl : public MediaPlayerPluginInterface |
32 | { | 30 | { |
33 | public: | 31 | public: |
34 | LibMpeg3PluginImpl(); | 32 | LibMpeg3PluginImpl(); |
35 | virtual ~LibMpeg3PluginImpl(); | 33 | virtual ~LibMpeg3PluginImpl(); |
36 | 34 | ||
37 | #ifndef QT_NO_COMPONENT | 35 | #ifndef QT_NO_COMPONENT |
38 | 36 | ||
39 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 37 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
40 | Q_REFCOUNT | 38 | Q_REFCOUNT |
41 | 39 | ||
42 | #endif | 40 | #endif |
43 | 41 | ||
44 | virtual MediaPlayerDecoder *decoder(); | 42 | virtual MediaPlayerDecoder *decoder(); |
45 | virtual MediaPlayerEncoder *encoder(); | 43 | virtual MediaPlayerEncoder *encoder(); |
46 | 44 | ||
47 | private: | 45 | private: |
48 | LibMpeg3Plugin *libmpeg3plugin; | 46 | LibMpeg3Plugin *libmpeg3plugin; |
49 | ulong ref; | 47 | ulong ref; |